diff --git a/app/actions/text-editor-actions.c b/app/actions/text-editor-actions.c
index 9db7b1884e..8e886c2ba9 100644
--- a/app/actions/text-editor-actions.c
+++ b/app/actions/text-editor-actions.c
@@ -36,11 +36,6 @@
 
 static const GimpActionEntry text_editor_actions[] =
 {
-  { "text-editor-toolbar", GIMP_ICON_EDIT,
-    NC_("text-editor-action", "Text Editor Toolbar"),
-    NULL, { NULL }, NULL, NULL,
-    GIMP_HELP_TEXT_EDITOR_DIALOG },
-
   { "text-editor-load", GIMP_ICON_DOCUMENT_OPEN,
     NC_("text-editor-action", "Open"), NULL, { NULL },
     NC_("text-editor-action", "Load text from file"),
diff --git a/app/widgets/gimptoolbar.c b/app/widgets/gimptoolbar.c
index a8aaf879d3..a95690cd22 100644
--- a/app/widgets/gimptoolbar.c
+++ b/app/widgets/gimptoolbar.c
@@ -265,8 +265,6 @@ gimp_toolbar_add_action (GimpToolbar *toolbar,
         }
 
       gtk_tool_button_set_label (GTK_TOOL_BUTTON (item), action_label);
-      gtk_tool_button_set_icon_name (GTK_TOOL_BUTTON (item),
-                                     gimp_action_get_icon_name (GIMP_ACTION (action)));
       gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON (item),
                                          gimp_toggle_action_get_active (GIMP_TOGGLE_ACTION (action)));
 
@@ -277,8 +275,7 @@ gimp_toolbar_add_action (GimpToolbar *toolbar,
                                G_CALLBACK (gimp_toolbar_toggle_action_toggled),
                                item, 0);
     }
-  else if (GIMP_IS_PROCEDURE_ACTION (action) ||
-           GIMP_IS_ENUM_ACTION (action))
+  else
     {
       item = gtk_tool_button_new (NULL, action_label);
 
@@ -286,12 +283,9 @@ gimp_toolbar_add_action (GimpToolbar *toolbar,
                                 G_CALLBACK (gimp_action_activate),
                                 action);
     }
-  else
-    {
-      item = gtk_tool_button_new (NULL, action_label);
 
-      gtk_actionable_set_action_name (GTK_ACTIONABLE (item), action_name);
-    }
+  gtk_tool_button_set_icon_name (GTK_TOOL_BUTTON (item),
+                                 gimp_action_get_icon_name (GIMP_ACTION (action)));
 
   g_object_set_data (G_OBJECT (item), GIMP_TOOLBAR_ACTION_KEY, action);