diff --git a/ChangeLog b/ChangeLog
index 36824b59f4..919cc2471c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-03-18  Sven Neumann  <sven@gimp.org>
+
+	* app/actions/context-actions.c: added more action blurbs.
+
+	* menus/image-menu.xml.in: moved toolbox and fg/bg color actions
+	to the bottom of the Tools menu.
+
 2006-03-18  Michael Natterer  <mitch@gimp.org>
 
 	* tools/pdbgen/app.pl
diff --git a/app/actions/context-actions.c b/app/actions/context-actions.c
index 1b74886853..5978a9c26b 100644
--- a/app/actions/context-actions.c
+++ b/app/actions/context-actions.c
@@ -62,12 +62,14 @@ static GimpActionEntry context_actions[] =
   { "context-brush-angle-menu",    NULL,                  N_("A_ngle")      },
 
   { "context-colors-default", GIMP_STOCK_DEFAULT_COLORS,
-    N_("_Default Colors"), "D", NULL,
+    N_("_Default Colors"), "D",
+    N_("Set foreground color to black, background color to white"),
     G_CALLBACK (context_colors_default_cmd_callback),
     GIMP_HELP_TOOLBOX_DEFAULT_COLORS },
 
   { "context-colors-swap", GIMP_STOCK_SWAP_COLORS,
-    N_("S_wap Colors"), "X", NULL,
+    N_("S_wap Colors"), "X",
+    N_("Exchange foreground and background colors"),
     G_CALLBACK (context_colors_swap_cmd_callback),
     GIMP_HELP_TOOLBOX_SWAP_COLORS }
 };
diff --git a/menus/image-menu.xml.in b/menus/image-menu.xml.in
index 426a7eda37..bc67d90b1b 100644
--- a/menus/image-menu.xml.in
+++ b/menus/image-menu.xml.in
@@ -465,10 +465,6 @@
     </menu>
 
     <menu action="tools-menu" name="Tools">
-      <menuitem action="dialogs-toolbox" />
-      <menuitem action="context-colors-default" />
-      <menuitem action="context-colors-swap" />
-      <separator />
       <menu action="tools-select-menu" name="Selection Tools">
 	<menuitem action="tools-rect-select" />
 	<menuitem action="tools-ellipse-select" />
@@ -515,6 +511,10 @@
       <menuitem action="tools-zoom" />
       <menuitem action="tools-measure" />
       <menuitem action="tools-text" />
+      <separator />
+      <menuitem action="dialogs-toolbox" />
+      <menuitem action="context-colors-default" />
+      <menuitem action="context-colors-swap" />
     </menu>
 
     <menu action="dialogs-menu" name="Dialogs">