diff --git a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ActionMessages.java b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ActionMessages.java
index 7b335e39922..17143a4d796 100644
--- a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ActionMessages.java
+++ b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ActionMessages.java
@@ -270,5 +270,6 @@ public class ActionMessages extends NLS {
 	public static String LaunchActionToolTip_Hours;
 	public static String LaunchActionToolTip_OneDay;
 	public static String LaunchActionToolTip_Days;
+	public static String AbstractLaunchHistoryAction_running;
 
 }
\ No newline at end of file
diff --git a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ActionMessages.properties b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ActionMessages.properties
index 7680a1ea579..b8c70888621 100644
--- a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ActionMessages.properties
+++ b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ActionMessages.properties
@@ -257,5 +257,6 @@ LaunchActionToolTip_Hours =Last executed {0} hours ago
 LaunchActionToolTip_OneDay =Last executed 1 day ago
 LaunchActionToolTip_Days =Last executed {0} days ago
 
+AbstractLaunchHistoryAction_running=Running
 
 
diff --git a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/AbstractLaunchHistoryAction.java b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/AbstractLaunchHistoryAction.java
index 66c65de56b1..712975dd906 100644
--- a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/AbstractLaunchHistoryAction.java
+++ b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/AbstractLaunchHistoryAction.java
@@ -354,11 +354,7 @@ protected void fillMenu(Menu menu) {
 		ILaunch[] launches = DebugPlugin.getDefault().getLaunchManager().getLaunches();
 		for (ILaunchConfiguration launch : favoriteList) {
 			LaunchAction action= new LaunchAction(launch, getMode());
-			if (checkIfLaunchActive(launch, launches)) {
-				action.setText(action.getText() + "  \u2699"); //$NON-NLS-1$
-			} else {
-				addRecentLaunchTimeTooltip(launch, action);
-			}
+			applyRunningState(action, launch, launches);
 			addToMenu(menu, action, accelerator);
 			accelerator++;
 		}
@@ -371,11 +367,7 @@ protected void fillMenu(Menu menu) {
 		// Add history launches next
 		for (ILaunchConfiguration launch : historyList) {
 			LaunchAction action= new LaunchAction(launch, getMode());
-			if (checkIfLaunchActive(launch, launches)) {
-				action.setText(action.getText() + "  \u2699"); //$NON-NLS-1$
-			} else {
-				addRecentLaunchTimeTooltip(launch, action);
-			}
+			applyRunningState(action, launch, launches);
 			addToMenu(menu, action, accelerator);
 			accelerator++;
 		}
@@ -388,6 +380,15 @@ protected void fillMenu(Menu menu) {
 		}
 	}
 
+	private void applyRunningState(LaunchAction action, ILaunchConfiguration launch, ILaunch[] launches) {
+		if (checkIfLaunchActive(launch, launches)) {
+			action.setText(action.getText() + "  ⚙"); //$NON-NLS-1$
+			action.setToolTipText(ActionMessages.AbstractLaunchHistoryAction_running);
+		} else {
+			addRecentLaunchTimeTooltip(launch, action);
+		}
+	}
+
 	/**
 	 * Returns whether the given launch configuration has been launched and active
 	 * now.