diff --git a/src/chat_control.py b/src/chat_control.py
index 686a28eb0..63ecf2826 100644
--- a/src/chat_control.py
+++ b/src/chat_control.py
@@ -353,6 +353,9 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools):
                 contact, acct, resource=resource)
 
         widget = self.xml.get_object('history_button')
+        if gtkgui_helpers.gtk_icon_theme.has_icon('document-open-recent'):
+            img = self.xml.get_object('image5')
+            img.set_from_icon_name('document-open-recent', Gtk.IconSize.MENU)
         id_ = widget.connect('clicked', self._on_history_menuitem_activate)
         self.handlers[id_] = widget
 
diff --git a/src/groupchat_control.py b/src/groupchat_control.py
index c49fb781f..635057c7d 100644
--- a/src/groupchat_control.py
+++ b/src/groupchat_control.py
@@ -340,6 +340,9 @@ class GroupchatControl(ChatControlBase):
                 gajim.connections[self.account].pubsub_publish_options_supported))
             widget.show()
 
+        if gtkgui_helpers.gtk_icon_theme.has_icon('document-open-recent'):
+                img = self.xml.get_object('image8')
+                img.set_from_icon_name('document-open-recent', Gtk.IconSize.MENU)
         widget = self.xml.get_object('list_treeview')
         id_ = widget.connect('row_expanded', self.on_list_treeview_row_expanded)
         self.handlers[id_] = widget
@@ -820,6 +823,10 @@ class GroupchatControl(ChatControlBase):
             img = Gtk.Image()
             img.set_from_icon_name('bookmark-new', Gtk.IconSize.MENU)
             bookmark_room_menuitem.set_image(img)
+        if gtkgui_helpers.gtk_icon_theme.has_icon('document-open-recent'):
+            img = Gtk.Image()
+            img.set_from_icon_name('document-open-recent', Gtk.IconSize.MENU)
+            history_menuitem.set_image(img)
 
         if hide_buttonbar_items:
             change_nick_menuitem.hide()
diff --git a/src/gui_menu_builder.py b/src/gui_menu_builder.py
index 888fce7bd..62e45abac 100644
--- a/src/gui_menu_builder.py
+++ b/src/gui_menu_builder.py
@@ -254,6 +254,10 @@ control=None, gc_contact=None, is_anonymous=True):
     rename_menuitem.connect('activate', roster.on_rename, 'contact', jid,
             account)
     history_menuitem.connect('activate', roster.on_history, contact, account)
+    if gtkgui_helpers.gtk_icon_theme.has_icon('document-open-recent'):
+        img = Gtk.Image()
+        img.set_from_icon_name('document-open-recent', Gtk.IconSize.MENU)
+        history_menuitem.set_image(img)
 
     if control:
         convert_to_gc_menuitem.connect('activate',