diff -uNr exaile-3.4.4/xlgui/main.py exaile-3.4.4_diff/xlgui/main.py
--- exaile-3.4.4/xlgui/main.py	2015-03-15 14:40:27.000000000 -0500
+++ exaile-3.4.4_diff/xlgui/main.py	2015-03-18 23:09:47.140359734 -0500
@@ -419,7 +419,7 @@
         widget.set_data('hovered', True)
         if event.state & gtk.gdk.SHIFT_MASK:
             widget.set_image(gtk.image_new_from_stock(
-                gtk.STOCK_STOP, gtk.ICON_SIZE_BUTTON))
+	        "process-stop", gtk.ICON_SIZE_BUTTON))                
         else:
             widget.set_image(gtk.image_new_from_stock(
                 gtk.STOCK_MEDIA_STOP, gtk.ICON_SIZE_BUTTON))
diff -uNr exaile-3.4.4/xlgui/menu.py exaile-3.4.4_diff/xlgui/menu.py
--- exaile-3.4.4/xlgui/menu.py	2015-03-15 14:40:27.000000000 -0500
+++ exaile-3.4.4_diff/xlgui/menu.py	2015-03-18 23:21:19.593852300 -0500
@@ -84,7 +84,7 @@
     items.append(_sep('open-sep', [items[-1].name]))
 
     items.append(_smi('import-playlist', [items[-1].name],
-        _("Import Playlist"), gtk.STOCK_OPEN, 
+        _("Import Playlist"), "document-open", 
         lambda *e: get_main().controller.get_panel('playlists').import_playlist()
     ))
     
@@ -106,13 +106,13 @@
         dialog.connect('message', on_message)
         dialog.show()
     items.append(_smi('export-playlist', [items[-1].name],
-        _("_Export Current Playlist"), gtk.STOCK_SAVE_AS, export_playlist_cb))
+        _("_Export Current Playlist"), "document-save-as", export_playlist_cb))
     items.append(_sep('export-sep', [items[-1].name]))
 
     def close_tab_cb(*args):
         get_main().get_selected_page().tab.close()
     items.append(_smi('close-tab', [items[-1].name],
-        _("Close Tab"), gtk.STOCK_CLOSE, callback=close_tab_cb,
+        _("Close Tab"), "window-close", callback=close_tab_cb,
         accelerator='<Control>w'))
     accelerators.append(Accelerator('<Control>w', close_tab_cb))
 
@@ -197,7 +197,7 @@
         if page:
             page.playlist.clear()
     items.append(_smi('clear-playlist', [items[-1].name], _('C_lear playlist'),
-         gtk.STOCK_CLEAR, clear_playlist_cb, accelerator='<Control>l'))
+         "edit-clear", clear_playlist_cb, accelerator='<Control>l'))
     accelerators.append(Accelerator('<Control>l', clear_playlist_cb))
 
     for item in items:
@@ -213,16 +213,16 @@
 def __create_tools_menu():
     items = []
     items.append(_smi('device-manager', [], _('_Device Manager'),
-        gtk.STOCK_HARDDISK, lambda *x: get_main().controller.show_devices()))
+        "drive-harddisk", lambda *x: get_main().controller.show_devices()))
     
     items.append(_smi('scan-collection', [items[-1].name], _('Re_scan Collection'),
-        gtk.STOCK_REFRESH, get_main().controller.on_rescan_collection))
+        "view-refresh", get_main().controller.on_rescan_collection))
     
     items.append(_smi('slow-scan-collection', [items[-1].name], _('Rescan Collection (slow)'),
-        gtk.STOCK_REFRESH, get_main().controller.on_rescan_collection_forced))
+        "view-refresh", get_main().controller.on_rescan_collection_forced))
 
     items.append(_smi('track-properties', [items[-1].name], _('Track _Properties'),
-        gtk.STOCK_PROPERTIES, get_main().controller.on_track_properties))
+        "document-properties", get_main().controller.on_track_properties))
 
     for item in items:
         providers.register('menubar-tools-menu', item)
diff -uNr exaile-3.4.4/xlgui/panel/menus.py exaile-3.4.4_diff/xlgui/panel/menus.py
--- exaile-3.4.4/xlgui/panel/menus.py	2015-03-15 14:40:27.000000000 -0500
+++ exaile-3.4.4_diff/xlgui/panel/menus.py	2015-03-18 23:28:37.141654764 -0500
@@ -171,17 +171,17 @@
     
     # w, n, o, c: window, name, parent, context
 
-    menu.simple_menu_item('new-playlist', [], _('New Playlist'), 'gtk-new',
+    menu.simple_menu_item('new-playlist', [], _('New Playlist'), 'document-new',
                           lambda w, n, o, c: o.add_new_playlist()) \
         .register('playlist-panel-menu')
         
     menu.simple_menu_item('new-smart-playlist', ['new-playlist'],
-                          _('New Smart Playlist'), 'gtk-new',
+                          _('New Smart Playlist'), 'document-new',
                          lambda w, n, o, c: o.add_smart_playlist()) \
         .register('playlist-panel-menu')
         
     menu.simple_menu_item('import-playlist', ['new-smart-playlist'],
-                          _('Import Playlist'), 'gtk-open',
+                          _('Import Playlist'), 'document-open',
                          lambda w, n, o, c: o.import_playlist()) \
         .register('playlist-panel-menu')
         
@@ -248,7 +248,7 @@
     
     # w, n, o, c: window, name, parent, context
 
-    menu.simple_menu_item('new-station', [], _('New Station'), 'gtk-new',
+    menu.simple_menu_item('new-station', [], _('New Station'), 'document-new',
                           lambda w, n, o, c: o._on_add_button_clicked()) \
         .register('radio-panel-menu')
 
diff -uNr exaile-3.4.4/xlgui/playlist_container.py exaile-3.4.4_diff/xlgui/playlist_container.py
--- exaile-3.4.4/xlgui/playlist_container.py	2015-03-15 14:40:27.000000000 -0500
+++ exaile-3.4.4_diff/xlgui/playlist_container.py	2015-03-18 23:29:58.499247603 -0500
@@ -126,7 +126,7 @@
         item = menu.simple_separator('clear-sep',[])
         item.register('playlist-closed-tab-menu', self)
         
-        item = menu.simple_menu_item('clear-history', ['clear-sep'], None, 'gtk-clear',
+        item = menu.simple_menu_item('clear-history', ['clear-sep'], None, 'edit-clear',
             self.clear_closed_tabs)
         item.register('playlist-closed-tab-menu', self)     
             
diff -uNr exaile-3.4.4/xlgui/widgets/menuitems.py exaile-3.4.4_diff/xlgui/widgets/menuitems.py
--- exaile-3.4.4/xlgui/widgets/menuitems.py	2015-03-15 14:40:27.000000000 -0500
+++ exaile-3.4.4_diff/xlgui/widgets/menuitems.py	2015-03-18 23:36:50.708191137 -0500
@@ -93,7 +93,7 @@
     player.QUEUE.extend(tracks)
 
 def EnqueueMenuItem(name, after, get_tracks_func=generic_get_tracks_func):
-    return menu.simple_menu_item(name, after, _("Enqueue"), gtk.STOCK_ADD,
+    return menu.simple_menu_item(name, after, _("Enqueue"), "list-add",
             _enqueue_cb, callback_args=[get_tracks_func])
 
 # TODO: move logic into (GUI?) playlist
@@ -121,7 +121,7 @@
 
 def AppendMenuItem(name, after, get_tracks_func=generic_get_tracks_func):
     return menu.simple_menu_item(name, after, _("Append to Current"),
-            'gtk-add', _append_cb, callback_args=[get_tracks_func])
+            'list-add', _append_cb, callback_args=[get_tracks_func])
 
 def _properties_cb(widget, name, parent, context, get_tracks_func, dialog_parent):
     tracks = get_tracks_func(parent, context)
@@ -144,7 +144,7 @@
 
 def OpenDirectoryMenuItem(name, after, get_tracks_func=generic_get_tracks_func):
     return menu.simple_menu_item(name, after, _("Open Directory"),
-            'gtk-open', _open_directory_cb, callback_args=[get_tracks_func])
+            'document-open', _open_directory_cb, callback_args=[get_tracks_func])
 
 def generic_trash_tracks_func(parent, context, tracks):
     for track in tracks:
@@ -192,7 +192,7 @@
     def __init__(self, name, after, callback=None, callback_args=[], accelerator=None):
         def factory(container, parent, context):
             item = gtk.ImageMenuItem(_("_Show Playing Track"))
-            image = gtk.image_new_from_icon_name('gtk-jump-to-ltr',
+            image = gtk.image_new_from_icon_name('go-jump',
                     size=gtk.ICON_SIZE_MENU)
             item.set_image(image)
 
@@ -228,15 +228,15 @@
                           condition_fn=lambda n, p, c: isinstance(c['selected-playlist'], playlist.SmartPlaylist))
 
 def ExportPlaylistMenuItem(name, after, get_pl_func=generic_get_playlist_func):
-    return menu.simple_menu_item(name, after, _('Export Playlist'), 'gtk-save',
+    return menu.simple_menu_item(name, after, _('Export Playlist'), 'document-save',
                           lambda w, n, o, c: dialogs.export_playlist_dialog(get_pl_func(o, c)))
 
 def ExportPlaylistFilesMenuItem(name, after, get_pl_func=generic_get_playlist_func):
-    return menu.simple_menu_item(name, after, _('Export Files'), 'gtk-save',
+    return menu.simple_menu_item(name, after, _('Export Files'), 'document-save',
                           lambda w, n, o, c: dialogs.export_playlist_files(get_pl_func(o, c)))
 
 def DeletePlaylistMenuItem(name, after, get_pl_func=generic_get_playlist_func):
-    return menu.simple_menu_item(name, after, _('Delete Playlist'), 'gtk-delete',
+    return menu.simple_menu_item(name, after, _('Delete Playlist'), 'list-remove',
                           lambda w, n, o, c: o.remove_playlist(get_pl_func(o, c)))