Merge "Bug 571535 - ContextButton tooltips are unreadable"
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 be07cc1..2c167d2 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
@@ -85,7 +85,7 @@
 
 	// === Graphiti System Colors ===
 
-	public static final Color TOOLTIP_FG = tooltipBackground; // LIGHT_BEIGE;
+	public static final Color TOOLTIP_FG = tooltipForeground; // LIGHT_BEIGE;
 
 	public static final Color TOOLTIP_BG = tooltipBackground; // LIGHT_ORANGE;
 
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 cce2078..2f3b8e2 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
@@ -44,12 +44,12 @@
 		setBorder(TOOLTIP_BORDER);
 
 		header = new TextFlow();
-		header.setForegroundColor(ColorConstants.darkGray);
+		header.setForegroundColor(GFColorConstants.TOOLTIP_FG);
 		header.setFont(getBoldFont());
 		add(header);
 
 		description = new TextFlow();
-		description.setForegroundColor(ColorConstants.darkGray);
+		description.setForegroundColor(GFColorConstants.TOOLTIP_FG);
 		add(description);
 	}