diff --git a/data/gui/account_context_menu.ui b/data/gui/account_context_menu.ui
index 9576edd5e..4d6521ed9 100644
--- a/data/gui/account_context_menu.ui
+++ b/data/gui/account_context_menu.ui
@@ -8,8 +8,8 @@
         <property name="label">_Status</property>
         <property name="visible">True</property>
         <property name="use_underline">True</property>
-        <property name="use_stock">True</property>
-        <property name="accel_group">accelgroup1</property>
+        <property name="image">image1</property>
+        <property name="use_stock">False</property>
       </object>
     </child>
     <child>
@@ -18,8 +18,8 @@
         <property name="visible">True</property>
         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
         <property name="use_underline">True</property>
-        <property name="use_stock">True</property>
-        <property name="accel_group">accelgroup1</property>
+        <property name="image">image2</property>
+        <property name="use_stock">False</property>
       </object>
     </child>
     <child>
@@ -34,8 +34,8 @@
         <property name="visible">True</property>
         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
         <property name="use_underline">True</property>
-        <property name="use_stock">True</property>
-        <property name="accel_group">accelgroup1</property>
+        <property name="image">image3</property>
+        <property name="use_stock">False</property>
       </object>
     </child>
     <child>
@@ -43,8 +43,8 @@
         <property name="label">Join _Group Chat...</property>
         <property name="visible">True</property>
         <property name="use_underline">True</property>
-        <property name="use_stock">True</property>
-        <property name="accel_group">accelgroup1</property>
+        <property name="image">image4</property>
+        <property name="use_stock">False</property>
       </object>
     </child>
     <child>
@@ -57,8 +57,8 @@
         <property name="label">_Add Contact...</property>
         <property name="visible">True</property>
         <property name="use_underline">True</property>
-        <property name="use_stock">True</property>
-        <property name="accel_group">accelgroup1</property>
+        <property name="image">image5</property>
+        <property name="use_stock">False</property>
       </object>
     </child>
     <child>
@@ -66,8 +66,8 @@
         <property name="label">_Discover Services</property>
         <property name="visible">True</property>
         <property name="use_underline">True</property>
-        <property name="use_stock">True</property>
-        <property name="accel_group">accelgroup1</property>
+        <property name="image">image6</property>
+        <property name="use_stock">False</property>
       </object>
     </child>
     <child>
@@ -75,8 +75,8 @@
         <property name="label">_Execute Command...</property>
         <property name="visible">True</property>
         <property name="use_underline">True</property>
-        <property name="use_stock">True</property>
-        <property name="accel_group">accelgroup1</property>
+        <property name="image">image7</property>
+        <property name="use_stock">False</property>
       </object>
     </child>
     <child>
@@ -96,10 +96,49 @@
         <property name="label">_Modify Account</property>
         <property name="visible">True</property>
         <property name="use_underline">True</property>
-        <property name="use_stock">True</property>
-        <property name="accel_group">accelgroup1</property>
+        <property name="image">image8</property>
+        <property name="use_stock">False</property>
       </object>
     </child>
   </object>
-  <object class="GtkAccelGroup" id="accelgroup1"/>
+  <object class="GtkImage" id="image1">
+    <property name="visible">True</property>
+    <property name="stock">gtk-network</property>
+    <property name="icon-size">1</property>
+  </object>
+  <object class="GtkImage" id="image2">
+    <property name="visible">True</property>
+    <property name="stock">gtk-home</property>
+    <property name="icon-size">1</property>
+  </object>
+  <object class="GtkImage" id="image3">
+    <property name="visible">True</property>
+    <property name="stock">gtk-jump-to</property>
+    <property name="icon-size">1</property>
+  </object>
+  <object class="GtkImage" id="image4">
+    <property name="visible">True</property>
+    <property name="stock">gtk-connect</property>
+    <property name="icon-size">1</property>
+  </object>
+  <object class="GtkImage" id="image5">
+    <property name="visible">True</property>
+    <property name="stock">gtk-add</property>
+    <property name="icon-size">1</property>
+  </object>
+  <object class="GtkImage" id="image6">
+    <property name="visible">True</property>
+    <property name="stock">gtk-find</property>
+    <property name="icon-size">1</property>
+  </object>
+  <object class="GtkImage" id="image7">
+    <property name="visible">True</property>
+    <property name="stock">gtk-execute</property>
+    <property name="icon-size">1</property>
+  </object>
+  <object class="GtkImage" id="image8">
+    <property name="visible">True</property>
+    <property name="stock">gtk-preferences</property>
+    <property name="icon-size">1</property>
+  </object>
 </interface>
diff --git a/data/gui/advanced_menuitem_menu.ui b/data/gui/advanced_menuitem_menu.ui
index e168f5a75..01c80f0d5 100644
--- a/data/gui/advanced_menuitem_menu.ui
+++ b/data/gui/advanced_menuitem_menu.ui
@@ -29,8 +29,8 @@
                 <property name="label">_Send Server Message...</property>
                 <property name="tooltip_text" translatable="yes">Sends a message to users currently connected to this server</property>
                 <property name="use_underline">True</property>
-                <property name="use_stock">True</property>
-                <property name="accel_group">accelgroup1</property>
+                <property name="image">image1</property>
+                <property name="use_stock">False</property>
               </object>
             </child>
             <child>
@@ -56,9 +56,8 @@
               <object class="GtkImageMenuItem" id="delete_motd_menuitem">
                 <property name="label">Delete MOTD</property>
                 <property name="tooltip_text" translatable="yes">Deletes Message of the Day</property>
-                <property name="use_underline">True</property>
-                <property name="use_stock">True</property>
-                <property name="accel_group">accelgroup1</property>
+                <property name="image">image2</property>
+                <property name="use_stock">False</property>
               </object>
             </child>
           </object>
@@ -66,5 +65,14 @@
       </object>
     </child>
   </object>
-  <object class="GtkAccelGroup" id="accelgroup1"/>
+  <object class="GtkImage" id="image1">
+    <property name="visible">True</property>
+    <property name="stock">gtk-new</property>
+    <property name="icon-size">1</property>
+  </object>
+  <object class="GtkImage" id="image2">
+    <property name="visible">True</property>
+    <property name="stock">gtk-clear</property>
+    <property name="icon-size">1</property>
+  </object>
 </interface>
diff --git a/data/gui/chat_context_menu.ui b/data/gui/chat_context_menu.ui
index 523aea79e..0efb31d79 100644
--- a/data/gui/chat_context_menu.ui
+++ b/data/gui/chat_context_menu.ui
@@ -8,8 +8,8 @@
         <property name="label">_Copy Link Location</property>
         <property name="visible">True</property>
         <property name="use_underline">True</property>
-        <property name="use_stock">True</property>
-        <property name="accel_group">accelgroup1</property>
+        <property name="image">image1</property>
+        <property name="use_stock">False</property>
       </object>
     </child>
     <child>
@@ -17,8 +17,8 @@
         <property name="label">_Open Link in Browser</property>
         <property name="visible">True</property>
         <property name="use_underline">True</property>
-        <property name="use_stock">True</property>
-        <property name="accel_group">accelgroup1</property>
+        <property name="image">image2</property>
+        <property name="use_stock">False</property>
       </object>
     </child>
     <child>
@@ -26,8 +26,8 @@
         <property name="label">_Copy JID/Email Address</property>
         <property name="visible">True</property>
         <property name="use_underline">True</property>
-        <property name="use_stock">True</property>
-        <property name="accel_group">accelgroup1</property>
+        <property name="image">image3</property>
+        <property name="use_stock">False</property>
       </object>
     </child>
     <child>
@@ -35,8 +35,8 @@
         <property name="label">_Open Email Composer</property>
         <property name="visible">True</property>
         <property name="use_underline">True</property>
-        <property name="use_stock">True</property>
-        <property name="accel_group">accelgroup1</property>
+        <property name="image">image4</property>
+        <property name="use_stock">False</property>
       </object>
     </child>
     <child>
@@ -49,8 +49,8 @@
         <property name="label">_Start Chat</property>
         <property name="visible">True</property>
         <property name="use_underline">True</property>
-        <property name="use_stock">True</property>
-        <property name="accel_group">accelgroup1</property>
+        <property name="image">image5</property>
+        <property name="use_stock">False</property>
       </object>
     </child>
     <child>
@@ -58,8 +58,8 @@
         <property name="label">Join _Group Chat</property>
         <property name="visible">True</property>
         <property name="use_underline">True</property>
-        <property name="use_stock">True</property>
-        <property name="accel_group">accelgroup1</property>
+        <property name="image">image6</property>
+        <property name="use_stock">False</property>
         <signal name="activate" handler="on_join_group_chat_menuitem_activate"/>
       </object>
     </child>
@@ -68,10 +68,44 @@
         <property name="label">_Add to Roster...</property>
         <property name="visible">True</property>
         <property name="use_underline">True</property>
-        <property name="use_stock">True</property>
-        <property name="accel_group">accelgroup1</property>
+        <property name="image">image7</property>
+        <property name="use_stock">False</property>
       </object>
     </child>
   </object>
-  <object class="GtkAccelGroup" id="accelgroup1"/>
+  <object class="GtkImage" id="image1">
+    <property name="visible">True</property>
+    <property name="stock">gtk-copy</property>
+    <property name="icon-size">1</property>
+  </object>
+  <object class="GtkImage" id="image2">
+    <property name="visible">True</property>
+    <property name="stock">gtk-jump-to</property>
+    <property name="icon-size">1</property>
+  </object>
+  <object class="GtkImage" id="image3">
+    <property name="visible">True</property>
+    <property name="stock">gtk-copy</property>
+    <property name="icon-size">1</property>
+  </object>
+  <object class="GtkImage" id="image4">
+    <property name="visible">True</property>
+    <property name="stock">gtk-jump-to</property>
+    <property name="icon-size">1</property>
+  </object>
+  <object class="GtkImage" id="image5">
+    <property name="visible">True</property>
+    <property name="stock">gtk-jump-to</property>
+    <property name="icon-size">1</property>
+  </object>
+  <object class="GtkImage" id="image6">
+    <property name="visible">True</property>
+    <property name="stock">gtk-connect</property>
+    <property name="icon-size">1</property>
+  </object>
+  <object class="GtkImage" id="image7">
+    <property name="visible">True</property>
+    <property name="stock">gtk-add</property>
+    <property name="icon-size">1</property>
+  </object>
 </interface>
diff --git a/data/gui/gc_control_popup_menu.ui b/data/gui/gc_control_popup_menu.ui
index 729ab47d5..455943410 100644
--- a/data/gui/gc_control_popup_menu.ui
+++ b/data/gui/gc_control_popup_menu.ui
@@ -8,8 +8,8 @@
         <property name="label">Change _Nickname...</property>
         <property name="no_show_all">True</property>
         <property name="use_underline">True</property>
-        <property name="use_stock">True</property>
-        <property name="accel_group">accelgroup1</property>
+        <property name="image">image1</property>
+        <property name="use_stock">False</property>
       </object>
     </child>
     <child>
@@ -18,8 +18,8 @@
         <property name="visible">True</property>
         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
         <property name="use_underline">True</property>
-        <property name="use_stock">True</property>
-        <property name="accel_group">accelgroup1</property>
+        <property name="image">image5</property>
+        <property name="use_stock">False</property>
         <child type="submenu">
           <object class="GtkMenu" id="menu1">
             <property name="visible">True</property>
@@ -29,16 +29,16 @@
                 <property name="label">Change _Subject...</property>
                 <property name="no_show_all">True</property>
                 <property name="use_underline">True</property>
-                <property name="use_stock">True</property>
-                <property name="accel_group">accelgroup1</property>
+                <property name="image">image2</property>
+                <property name="use_stock">False</property>
               </object>
             </child>
             <child>
               <object class="GtkImageMenuItem" id="configure_room_menuitem">
                 <property name="label">Configure _Room...</property>
                 <property name="use_underline">True</property>
-                <property name="use_stock">True</property>
-                <property name="accel_group">accelgroup1</property>
+                <property name="image">image3</property>
+                <property name="use_stock">False</property>
               </object>
             </child>
             <child>
@@ -51,8 +51,8 @@
                 <property name="label">_Destroy Room</property>
                 <property name="visible">True</property>
                 <property name="use_underline">True</property>
-                <property name="use_stock">True</property>
-                <property name="accel_group">accelgroup1</property>
+                <property name="image">image4</property>
+                <property name="use_stock">False</property>
               </object>
             </child>
           </object>
@@ -76,8 +76,8 @@
         <property name="label">_Bookmark</property>
         <property name="no_show_all">True</property>
         <property name="use_underline">True</property>
-        <property name="use_stock">True</property>
-        <property name="accel_group">accelgroup1</property>
+        <property name="image">image6</property>
+        <property name="use_stock">False</property>
       </object>
     </child>
     <child>
@@ -90,10 +90,44 @@
         <property name="label">_History</property>
         <property name="no_show_all">True</property>
         <property name="use_underline">True</property>
-        <property name="use_stock">True</property>
-        <property name="accel_group">accelgroup1</property>
+        <property name="image">image7</property>
+        <property name="use_stock">False</property>
       </object>
     </child>
   </object>
-  <object class="GtkAccelGroup" id="accelgroup1"/>
+  <object class="GtkImage" id="image1">
+    <property name="visible">True</property>
+    <property name="stock">gtk-edit</property>
+    <property name="icon-size">1</property>
+  </object>
+  <object class="GtkImage" id="image2">
+    <property name="visible">True</property>
+    <property name="stock">gtk-edit</property>
+    <property name="icon-size">1</property>
+  </object>
+  <object class="GtkImage" id="image3">
+    <property name="visible">True</property>
+    <property name="stock">gtk-preferences</property>
+    <property name="icon-size">1</property>
+  </object>
+  <object class="GtkImage" id="image4">
+    <property name="visible">True</property>
+    <property name="stock">gtk-delete</property>
+    <property name="icon-size">1</property>
+  </object>
+  <object class="GtkImage" id="image5">
+    <property name="visible">True</property>
+    <property name="stock">gtk-properties</property>
+    <property name="icon-size">1</property>
+  </object>
+  <object class="GtkImage" id="image6">
+    <property name="visible">True</property>
+    <property name="stock">gtk-add</property>
+    <property name="icon-size">1</property>
+  </object>
+  <object class="GtkImage" id="image7">
+    <property name="visible">True</property>
+    <property name="stock">gtk-justify-fill</property>
+    <property name="icon-size">1</property>
+  </object>
 </interface>
diff --git a/data/gui/gc_occupants_menu.ui b/data/gui/gc_occupants_menu.ui
index ddcf383f1..3066fecac 100644
--- a/data/gui/gc_occupants_menu.ui
+++ b/data/gui/gc_occupants_menu.ui
@@ -8,7 +8,8 @@
         <property name="label">_Send Private Message</property>
         <property name="visible">True</property>
         <property name="use_underline">True</property>
-        <property name="use_stock">True</property>
+        <property name="image">image1</property>
+        <property name="use_stock">False</property>
         <property name="accel_group">accelgroup1</property>
       </object>
     </child>
@@ -18,7 +19,8 @@
         <property name="visible">True</property>
         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
         <property name="use_underline">True</property>
-        <property name="use_stock">True</property>
+        <property name="image">image2</property>
+        <property name="use_stock">False</property>
         <property name="accel_group">accelgroup1</property>
       </object>
     </child>
@@ -102,7 +104,8 @@
         <property name="label">_Add to Roster</property>
         <property name="visible">True</property>
         <property name="use_underline">True</property>
-        <property name="use_stock">True</property>
+        <property name="image">image3</property>
+        <property name="use_stock">False</property>
         <property name="accel_group">accelgroup1</property>
       </object>
     </child>
@@ -111,7 +114,8 @@
         <property name="label">_Block</property>
         <property name="visible">True</property>
         <property name="use_underline">True</property>
-        <property name="use_stock">True</property>
+        <property name="image">image4</property>
+        <property name="use_stock">False</property>
         <property name="accel_group">accelgroup1</property>
       </object>
     </child>
@@ -120,7 +124,8 @@
         <property name="label">_Unblock</property>
         <property name="visible">True</property>
         <property name="use_underline">True</property>
-        <property name="use_stock">True</property>
+        <property name="image">image5</property>
+        <property name="use_stock">False</property>
         <property name="accel_group">accelgroup1</property>
       </object>
     </child>
@@ -143,10 +148,41 @@
         <property name="label">_History</property>
         <property name="visible">True</property>
         <property name="use_underline">True</property>
-        <property name="use_stock">True</property>
+        <property name="image">image6</property>
+        <property name="use_stock">False</property>
         <property name="accel_group">accelgroup1</property>
       </object>
     </child>
   </object>
   <object class="GtkAccelGroup" id="accelgroup1"/>
+  <object class="GtkImage" id="image1">
+    <property name="visible">True</property>
+    <property name="stock">gtk-jump-to</property>
+    <property name="icon-size">1</property>
+  </object>
+  <object class="GtkImage" id="image2">
+    <property name="visible">True</property>
+    <property name="stock">gtk-save</property>
+    <property name="icon-size">1</property>
+  </object>
+  <object class="GtkImage" id="image3">
+    <property name="visible">True</property>
+    <property name="stock">gtk-add</property>
+    <property name="icon-size">1</property>
+  </object>
+  <object class="GtkImage" id="image4">
+    <property name="visible">True</property>
+    <property name="stock">gtk-stop</property>
+    <property name="icon-size">1</property>
+  </object>
+  <object class="GtkImage" id="image5">
+    <property name="visible">True</property>
+    <property name="stock">gtk-stop</property>
+    <property name="icon-size">1</property>
+  </object>
+  <object class="GtkImage" id="image6">
+    <property name="visible">True</property>
+    <property name="stock">gtk-justify-fill</property>
+    <property name="icon-size">1</property>
+  </object>
 </interface>
diff --git a/data/gui/roster_window.ui b/data/gui/roster_window.ui
index 62bfacfda..1996515cf 100644
--- a/data/gui/roster_window.ui
+++ b/data/gui/roster_window.ui
@@ -37,7 +37,8 @@
                         <property name="label">_Start Chat...</property>
                         <property name="visible">True</property>
                         <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
+                        <property name="image">image1</property>
+                        <property name="use_stock">False</property>
                         <property name="accel_group">accelgroup1</property>
                       </object>
                     </child>
@@ -45,7 +46,8 @@
                       <object class="GtkImageMenuItem" id="send_single_message_menuitem">
                         <property name="label">_Send Single Message...</property>
                         <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
+                        <property name="image">image2</property>
+                        <property name="use_stock">False</property>
                         <property name="accel_group">accelgroup1</property>
                       </object>
                     </child>
@@ -53,8 +55,8 @@
                       <object class="GtkImageMenuItem" id="join_gc_menuitem">
                         <property name="label">Join _Group Chat...</property>
                         <property name="visible">True</property>
-                        <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
+                        <property name="image">image3</property>
+                        <property name="use_stock">False</property>
                         <property name="accel_group">accelgroup1</property>
                       </object>
                     </child>
@@ -67,8 +69,8 @@
                       <object class="GtkImageMenuItem" id="add_new_contact_menuitem">
                         <property name="label">Add _Contact...</property>
                         <property name="visible">True</property>
-                        <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
+                        <property name="image">image4</property>
+                        <property name="use_stock">False</property>
                         <property name="accel_group">accelgroup1</property>
                       </object>
                     </child>
@@ -77,7 +79,8 @@
                         <property name="label">_Discover Services</property>
                         <property name="visible">True</property>
                         <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
+                        <property name="image">image5</property>
+                        <property name="use_stock">False</property>
                         <property name="accel_group">accelgroup1</property>
                       </object>
                     </child>
@@ -95,7 +98,7 @@
                     </child>
                     <child>
                       <object class="GtkImageMenuItem" id="quit_menuitem">
-                        <property name="label">_Quit</property>
+                        <property name="label">gtk-quit</property>
                         <property name="visible">True</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
@@ -121,7 +124,8 @@
                         <property name="label">_Accounts</property>
                         <property name="visible">True</property>
                         <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
+                        <property name="image">image6</property>
+                        <property name="use_stock">False</property>
                         <property name="accel_group">accelgroup1</property>
                         <accelerator key="A" signal="activate" modifiers="GDK_SHIFT_MASK | GDK_CONTROL_MASK"/>
                         <signal name="activate" handler="on_accounts_menuitem_activate"/>
@@ -132,7 +136,8 @@
                         <property name="label">Profile, A_vatar</property>
                         <property name="visible">True</property>
                         <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
+                        <property name="image">image7</property>
+                        <property name="use_stock">False</property>
                         <property name="accel_group">accelgroup1</property>
                       </object>
                     </child>
@@ -143,7 +148,7 @@
                     </child>
                     <child>
                       <object class="GtkImageMenuItem" id="preferences_menuitem">
-                        <property name="label">_Preferences</property>
+                        <property name="label">gtk-preferences</property>
                         <property name="visible">True</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
@@ -211,7 +216,8 @@
                         <property name="label">File _Transfers</property>
                         <property name="visible">True</property>
                         <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
+                        <property name="image">image8</property>
+                        <property name="use_stock">False</property>
                         <property name="accel_group">accelgroup1</property>
                         <accelerator key="T" signal="activate" modifiers="GDK_CONTROL_MASK"/>
                         <signal name="activate" handler="on_file_transfers_menuitem_activate"/>
@@ -223,7 +229,8 @@
                         <property name="visible">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
+                        <property name="image">image9</property>
+                        <property name="use_stock">False</property>
                         <property name="accel_group">accelgroup1</property>
                         <signal name="activate" handler="on_history_menuitem_activate"/>
                       </object>
@@ -245,7 +252,8 @@
                         <property name="visible">True</property>
                         <property name="tooltip_text" translatable="yes">Help online</property>
                         <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
+                        <property name="image">image10</property>
+                        <property name="use_stock">False</property>
                         <property name="accel_group">accelgroup1</property>
                         <signal name="activate" handler="on_contents_menuitem_activate"/>
                       </object>
@@ -256,7 +264,8 @@
                         <property name="visible">True</property>
                         <property name="tooltip_text" translatable="yes">Frequently Asked Questions (online)</property>
                         <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
+                        <property name="image">image11</property>
+                        <property name="use_stock">False</property>
                         <property name="accel_group">accelgroup1</property>
                         <signal name="activate" handler="on_faq_menuitem_activate"/>
                       </object>
@@ -272,7 +281,8 @@
                         <property name="visible">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
+                        <property name="image">image12</property>
+                        <property name="use_stock">False</property>
                         <property name="accel_group">accelgroup1</property>
                         <signal name="activate" handler="on_features_menuitem_activate"/>
                       </object>
@@ -320,7 +330,6 @@
                         <property name="can_focus">True</property>
                         <property name="headers_visible">False</property>
                         <property name="reorderable">True</property>
-                        <signal name="style_set" handler="on_roster_treeview_style_set"/>
                         <signal name="row_collapsed" handler="on_roster_treeview_row_collapsed"/>
                         <signal name="button_press_event" handler="on_roster_treeview_button_press_event"/>
                         <signal name="motion_notify_event" handler="on_roster_treeview_motion_notify_event"/>
@@ -328,6 +337,7 @@
                         <signal name="button_release_event" handler="on_roster_treeview_button_release_event"/>
                         <signal name="row_expanded" handler="on_roster_treeview_row_expanded"/>
                         <signal name="key_press_event" handler="on_roster_treeview_key_press_event"/>
+                        <signal name="style_set" handler="on_roster_treeview_style_set"/>
                         <signal name="scroll_event" handler="on_roster_treeview_scroll_event"/>
                         <signal name="leave_notify_event" handler="on_roster_treeview_leave_notify_event"/>
                       </object>
@@ -365,4 +375,64 @@
     </child>
   </object>
   <object class="GtkAccelGroup" id="accelgroup1"/>
+  <object class="GtkImage" id="image1">
+    <property name="visible">True</property>
+    <property name="stock">gtk-jump-to</property>
+    <property name="icon-size">1</property>
+  </object>
+  <object class="GtkImage" id="image2">
+    <property name="visible">True</property>
+    <property name="stock">gtk-new</property>
+    <property name="icon-size">1</property>
+  </object>
+  <object class="GtkImage" id="image3">
+    <property name="visible">True</property>
+    <property name="stock">gtk-connect</property>
+    <property name="icon-size">1</property>
+  </object>
+  <object class="GtkImage" id="image4">
+    <property name="visible">True</property>
+    <property name="stock">gtk-add</property>
+    <property name="icon-size">1</property>
+  </object>
+  <object class="GtkImage" id="image5">
+    <property name="visible">True</property>
+    <property name="stock">gtk-find</property>
+    <property name="icon-size">1</property>
+  </object>
+  <object class="GtkImage" id="image6">
+    <property name="visible">True</property>
+    <property name="stock">gtk-network</property>
+    <property name="icon-size">1</property>
+  </object>
+  <object class="GtkImage" id="image7">
+    <property name="visible">True</property>
+    <property name="stock">gtk-properties</property>
+    <property name="icon-size">1</property>
+  </object>
+  <object class="GtkImage" id="image8">
+    <property name="visible">True</property>
+    <property name="stock">gtk-save</property>
+    <property name="icon-size">1</property>
+  </object>
+  <object class="GtkImage" id="image9">
+    <property name="visible">True</property>
+    <property name="stock">gtk-justify-fill</property>
+    <property name="icon-size">1</property>
+  </object>
+  <object class="GtkImage" id="image10">
+    <property name="visible">True</property>
+    <property name="stock">gtk-help</property>
+    <property name="icon-size">1</property>
+  </object>
+  <object class="GtkImage" id="image11">
+    <property name="visible">True</property>
+    <property name="stock">gtk-dialog-question</property>
+    <property name="icon-size">1</property>
+  </object>
+  <object class="GtkImage" id="image12">
+    <property name="visible">True</property>
+    <property name="stock">gtk-properties</property>
+    <property name="icon-size">1</property>
+  </object>
 </interface>
diff --git a/data/gui/subscription_request_popup_menu.ui b/data/gui/subscription_request_popup_menu.ui
index c61e203e5..990770c5a 100644
--- a/data/gui/subscription_request_popup_menu.ui
+++ b/data/gui/subscription_request_popup_menu.ui
@@ -8,7 +8,8 @@
         <property name="label">_Start Chat</property>
         <property name="visible">True</property>
         <property name="use_underline">True</property>
-        <property name="use_stock">True</property>
+        <property name="image">image1</property>
+        <property name="use_stock">False</property>
         <property name="accel_group">accelgroup1</property>
         <signal name="activate" handler="on_start_chat_activate"/>
       </object>
@@ -25,4 +26,9 @@
     </child>
   </object>
   <object class="GtkAccelGroup" id="accelgroup1"/>
+  <object class="GtkImage" id="image1">
+    <property name="visible">True</property>
+    <property name="stock">gtk-jump-to</property>
+    <property name="icon-size">1</property>
+  </object>
 </interface>
diff --git a/data/gui/systray_context_menu.ui b/data/gui/systray_context_menu.ui
index bbb54f1bf..7f0a410a7 100644
--- a/data/gui/systray_context_menu.ui
+++ b/data/gui/systray_context_menu.ui
@@ -8,7 +8,8 @@
         <property name="label">Sta_tus</property>
         <property name="visible">True</property>
         <property name="use_underline">True</property>
-        <property name="use_stock">True</property>
+        <property name="image">image1</property>
+        <property name="use_stock">False</property>
         <property name="accel_group">accelgroup1</property>
       </object>
     </child>
@@ -17,7 +18,8 @@
         <property name="label">_Start Chat</property>
         <property name="visible">True</property>
         <property name="use_underline">True</property>
-        <property name="use_stock">True</property>
+        <property name="image">image2</property>
+        <property name="use_stock">False</property>
         <property name="accel_group">accelgroup1</property>
       </object>
     </child>
@@ -26,7 +28,8 @@
         <property name="label">_Group Chat</property>
         <property name="visible">True</property>
         <property name="use_underline">True</property>
-        <property name="use_stock">True</property>
+        <property name="image">image3</property>
+        <property name="use_stock">False</property>
         <property name="accel_group">accelgroup1</property>
       </object>
     </child>
@@ -35,7 +38,8 @@
         <property name="label">Send Single _Message</property>
         <property name="visible">True</property>
         <property name="use_underline">True</property>
-        <property name="use_stock">True</property>
+        <property name="image">image4</property>
+        <property name="use_stock">False</property>
         <property name="accel_group">accelgroup1</property>
       </object>
     </child>
@@ -65,7 +69,8 @@
         <property name="label">Show _Roster</property>
         <property name="visible">True</property>
         <property name="use_underline">True</property>
-        <property name="use_stock">True</property>
+        <property name="image">image5</property>
+        <property name="use_stock">False</property>
         <property name="accel_group">accelgroup1</property>
         <signal name="activate" handler="on_show_roster_menuitem_activate"/>
       </object>
@@ -97,4 +102,29 @@
     </child>
   </object>
   <object class="GtkAccelGroup" id="accelgroup1"/>
+  <object class="GtkImage" id="image1">
+    <property name="visible">True</property>
+    <property name="stock">gtk-network</property>
+    <property name="icon-size">1</property>
+  </object>
+  <object class="GtkImage" id="image2">
+    <property name="visible">True</property>
+    <property name="stock">gtk-jump-to</property>
+    <property name="icon-size">1</property>
+  </object>
+  <object class="GtkImage" id="image3">
+    <property name="visible">True</property>
+    <property name="stock">gtk-connect</property>
+    <property name="icon-size">1</property>
+  </object>
+  <object class="GtkImage" id="image4">
+    <property name="visible">True</property>
+    <property name="stock">gtk-new</property>
+    <property name="icon-size">1</property>
+  </object>
+  <object class="GtkImage" id="image5">
+    <property name="visible">True</property>
+    <property name="stock">gtk-home</property>
+    <property name="icon-size">1</property>
+  </object>
 </interface>
diff --git a/data/gui/zeroconf_context_menu.ui b/data/gui/zeroconf_context_menu.ui
index b91ae3aee..158b7befe 100644
--- a/data/gui/zeroconf_context_menu.ui
+++ b/data/gui/zeroconf_context_menu.ui
@@ -8,8 +8,8 @@
         <property name="label">_Status</property>
         <property name="visible">True</property>
         <property name="use_underline">True</property>
-        <property name="use_stock">True</property>
-        <property name="accel_group">accelgroup1</property>
+        <property name="image">image1</property>
+        <property name="use_stock">False</property>
       </object>
     </child>
     <child>
@@ -23,10 +23,19 @@
         <property name="label">_Modify Account...</property>
         <property name="visible">True</property>
         <property name="use_underline">True</property>
-        <property name="use_stock">True</property>
-        <property name="accel_group">accelgroup1</property>
+        <property name="image">image2</property>
+        <property name="use_stock">False</property>
       </object>
     </child>
   </object>
-  <object class="GtkAccelGroup" id="accelgroup1"/>
+  <object class="GtkImage" id="image1">
+    <property name="visible">True</property>
+    <property name="stock">gtk-network</property>
+    <property name="icon-size">1</property>
+  </object>
+  <object class="GtkImage" id="image2">
+    <property name="visible">True</property>
+    <property name="stock">gtk-preferences</property>
+    <property name="icon-size">1</property>
+  </object>
 </interface>