diff --git a/src/client/composer/composer-widget.vala b/src/client/composer/composer-widget.vala
index 2464bbed..292f59a7 100644
--- a/src/client/composer/composer-widget.vala
+++ b/src/client/composer/composer-widget.vala
@@ -396,9 +396,6 @@ public class ComposerWidget : Gtk.EventBox {
         bcc_entry.changed.connect(validate_send_button);
         reply_to_entry.changed.connect(validate_send_button);
         
-        actions.get_action(ACTION_INDENT).icon_name = "format-indent-more-symbolic";
-        actions.get_action(ACTION_OUTDENT).icon_name = "format-indent-less-symbolic";
-        
         composer_toolbar = new ComposerToolbar(actions, menu);
         Gtk.Alignment toolbar_area = (Gtk.Alignment) builder.get_object("toolbar area");
         toolbar_area.add(composer_toolbar);
diff --git a/ui/composer.glade b/ui/composer.glade
index 87ed4f65..d332b012 100644
--- a/ui/composer.glade
+++ b/ui/composer.glade
@@ -79,12 +79,14 @@
     <child>
       <object class="GtkAction" id="indent">
         <property name="tooltip" translatable="yes">Quote text  (Ctrl+])</property>
+        <property name="icon_name">format-indent-more-symbolic</property>
       </object>
       <accelerator key="bracketright" modifiers="GDK_CONTROL_MASK"/>
     </child>
     <child>
       <object class="GtkAction" id="outdent">
         <property name="tooltip" translatable="yes">Unquote text (Ctrl+[)</property>
+        <property name="icon_name">format-indent-less-symbolic</property>
       </object>
       <accelerator key="bracketleft" modifiers="GDK_CONTROL_MASK"/>
     </child>