diff --git a/THANKS b/THANKS
index 8751bb44..e6641e03 100644
--- a/THANKS
+++ b/THANKS
@@ -16,6 +16,7 @@ Jens Georg <mail@jensge.org>
 Michael George <mdgeorge@cs.cornell.edu>
 Sven Hagemann <sven@rednose.nl>
 Mathias Hasselmann <mathias@openismus.com>
+Brendan Long <self@brendanlong.com>
 Timo Kluck <tkluck@infty.nl>
 Avi Levy <avi.w.levy@gmail.com>
 Kai Mast <mail@kai-mast.de>
diff --git a/ui/composer.glade b/ui/composer.glade
index f70cba50..05dec081 100644
--- a/ui/composer.glade
+++ b/ui/composer.glade
@@ -3,23 +3,38 @@
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkActionGroup" id="compose actions">
     <child>
-      <object class="GtkAction" id="undo"/>
+      <object class="GtkAction" id="undo">
+        <property name="label" translatable="yes">Undo</property>
+        <property name="icon-name">undo</property>
+      </object>
       <accelerator key="z" modifiers="GDK_CONTROL_MASK"/>
     </child>
     <child>
-      <object class="GtkAction" id="redo"/>
+      <object class="GtkAction" id="redo">
+        <property name="label" translatable="yes">Redo</property>
+        <property name="icon-name">redo</property>
+      </object>
       <accelerator key="z" modifiers="GDK_SHIFT_MASK | GDK_CONTROL_MASK"/>
     </child>
     <child>
-      <object class="GtkAction" id="cut"/>
+      <object class="GtkAction" id="cut">
+        <property name="label" translatable="yes">Cut</property>
+        <property name="icon-name">edit-cut</property>
+      </object>
       <accelerator key="x" modifiers="GDK_CONTROL_MASK"/>
     </child>
     <child>
-      <object class="GtkAction" id="copy"/>
+      <object class="GtkAction" id="copy">
+        <property name="label" translatable="yes">Copy</property>
+        <property name="icon-name">edit-copy</property>
+      </object>
       <accelerator key="c" modifiers="GDK_CONTROL_MASK"/>
     </child>
     <child>
-      <object class="GtkAction" id="paste"/>
+      <object class="GtkAction" id="paste">
+        <property name="label" translatable="yes">Paste</property>
+        <property name="icon-name">edit-paste</property>
+      </object>
       <accelerator key="v" modifiers="GDK_CONTROL_MASK"/>
     </child>
     <child>