diff --git a/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/editor/GraphitiScrollingGraphicalViewer.java b/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/editor/GraphitiScrollingGraphicalViewer.java
index fba9e7f..862835f 100644
--- a/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/editor/GraphitiScrollingGraphicalViewer.java
+++ b/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/editor/GraphitiScrollingGraphicalViewer.java
@@ -1,5 +1,5 @@
 /*********************************************************************
-* Copyright (c) 2005, 2019 SAP SE
+* Copyright (c) 2005, 2021 SAP SE, Space Codesign
 *
 * This program and the accompanying materials are made
 * available under the terms of the Eclipse Public License 2.0
diff --git a/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/util/draw2d/GFColorConstants.java b/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/util/draw2d/GFColorConstants.java
index 2c167d2..f338e6e 100644
--- a/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/util/draw2d/GFColorConstants.java
+++ b/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/util/draw2d/GFColorConstants.java
@@ -1,5 +1,5 @@
 /*********************************************************************
-* Copyright (c) 2005, 2019 SAP SE
+* Copyright (c) 2005, 2021 SAP SE, CEA
 *
 * This program and the accompanying materials are made
 * available under the terms of the Eclipse Public License 2.0
@@ -7,6 +7,7 @@
 *
 * Contributors:
 *    SAP SE - initial API, implementation and documentation
+*    Julien Capul - Bug 571535 - ContextButton tooltips are unreadable
 *
 * SPDX-License-Identifier: EPL-2.0
 **********************************************************************/
diff --git a/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/util/draw2d/Tooltip.java b/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/util/draw2d/Tooltip.java
index 2f3b8e2..95ec61a 100644
--- a/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/util/draw2d/Tooltip.java
+++ b/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/util/draw2d/Tooltip.java
@@ -1,5 +1,5 @@
 /*********************************************************************
-* Copyright (c) 2005, 2019 SAP SE
+* Copyright (c) 2005, 2021 SAP SE, CEA
 *
 * This program and the accompanying materials are made
 * available under the terms of the Eclipse Public License 2.0
@@ -9,13 +9,13 @@
 *    SAP SE - initial API, implementation and documentation
 *    mwenz - Bug 373298 - Possible Resource leaks in Graphiti
 *    apupier - Bug 508133 - Use FontRegistry for Tooltip
+*    Julien Capul - Bug 571535 - ContextButton tooltips are unreadable
 *
 * SPDX-License-Identifier: EPL-2.0
 **********************************************************************/
 package org.eclipse.graphiti.ui.internal.util.draw2d;
 
 import org.eclipse.draw2d.Border;
-import org.eclipse.draw2d.ColorConstants;
 import org.eclipse.draw2d.MarginBorder;
 import org.eclipse.draw2d.geometry.Dimension;
 import org.eclipse.draw2d.text.FlowPage;