diff --git a/openlp/core/lib/mediamanageritem.py b/openlp/core/lib/mediamanageritem.py
index 2983eaca2..322ce8cd0 100644
--- a/openlp/core/lib/mediamanageritem.py
+++ b/openlp/core/lib/mediamanageritem.py
@@ -525,8 +525,7 @@ class MediaManagerItem(QtGui.QWidget):
         if self.ServiceItemIconName:
             service_item.add_icon(self.ServiceItemIconName)
         else:
-            service_item.add_icon(
-                u':/media/media_' + self.PluginNameShort.lower() + u'.png')
+            service_item.add_icon(self.parent.icon)
         if self.generateSlideData(service_item, item):
             return service_item
         else:
diff --git a/openlp/plugins/bibles/bibleplugin.py b/openlp/plugins/bibles/bibleplugin.py
index 2398ead9c..b891b14ad 100644
--- a/openlp/plugins/bibles/bibleplugin.py
+++ b/openlp/plugins/bibles/bibleplugin.py
@@ -38,7 +38,7 @@ class BiblePlugin(Plugin):
     def __init__(self, plugin_helpers):
         Plugin.__init__(self, u'Bibles', u'1.9.2', plugin_helpers)
         self.weight = -9
-        self.icon = build_icon(u':/media/media_bible.png')
+        self.icon = build_icon(u':/plugins/plugin_bibles.png')
         #Register the bible Manager
         self.status = PluginStatus.Active
         self.manager = None
@@ -99,4 +99,4 @@ class BiblePlugin(Plugin):
     def can_delete_theme(self, theme):
         if self.settings_tab.bible_theme == theme:
             return False
-        return True
\ No newline at end of file
+        return True
diff --git a/openlp/plugins/custom/customplugin.py b/openlp/plugins/custom/customplugin.py
index 362f8d64c..76d597f28 100644
--- a/openlp/plugins/custom/customplugin.py
+++ b/openlp/plugins/custom/customplugin.py
@@ -50,7 +50,7 @@ class CustomPlugin(Plugin):
         self.weight = -5
         self.custommanager = Manager(u'custom', init_schema)
         self.edit_custom_form = EditCustomForm(self.custommanager)
-        self.icon = build_icon(u':/media/media_custom.png')
+        self.icon = build_icon(u':/plugins/plugin_custom.png')
         self.status = PluginStatus.Active
 
     def get_settings_tab(self):
@@ -82,4 +82,4 @@ class CustomPlugin(Plugin):
         if not self.custommanager.get_all_objects_filtered(CustomSlide,
             filter_string):
             return True
-        return False
\ No newline at end of file
+        return False
diff --git a/openlp/plugins/images/imageplugin.py b/openlp/plugins/images/imageplugin.py
index 8e9f9e220..9ebaa128f 100644
--- a/openlp/plugins/images/imageplugin.py
+++ b/openlp/plugins/images/imageplugin.py
@@ -36,7 +36,7 @@ class ImagePlugin(Plugin):
     def __init__(self, plugin_helpers):
         Plugin.__init__(self, u'Images', u'1.9.2', plugin_helpers)
         self.weight = -7
-        self.icon = build_icon(u':/media/media_image.png')
+        self.icon = build_icon(u':/plugins/plugin_images.png')
         self.status = PluginStatus.Active
 
     def initialise(self):
@@ -64,4 +64,4 @@ class ImagePlugin(Plugin):
             'an image is selected any songs which are rendered will use the '
             'selected image from the background instead of the one provied by '
             'the theme.<br>')
-        return about_text
\ No newline at end of file
+        return about_text
diff --git a/openlp/plugins/media/mediaplugin.py b/openlp/plugins/media/mediaplugin.py
index f7c2c998f..33261f1e2 100644
--- a/openlp/plugins/media/mediaplugin.py
+++ b/openlp/plugins/media/mediaplugin.py
@@ -38,7 +38,7 @@ class MediaPlugin(Plugin):
     def __init__(self, plugin_helpers):
         Plugin.__init__(self, u'Media', u'1.9.2', plugin_helpers)
         self.weight = -6
-        self.icon = build_icon(u':/media/media_video.png')
+        self.icon = build_icon(u':/plugins/plugin_media.png')
         # passed with drag and drop messages
         self.dnd_id = u'Media'
         self.status = PluginStatus.Active
diff --git a/openlp/plugins/presentations/presentationplugin.py b/openlp/plugins/presentations/presentationplugin.py
index 9303d5921..d92483b88 100644
--- a/openlp/plugins/presentations/presentationplugin.py
+++ b/openlp/plugins/presentations/presentationplugin.py
@@ -40,7 +40,7 @@ class PresentationPlugin(Plugin):
         self.controllers = {}
         Plugin.__init__(self, u'Presentations', u'1.9.2', plugin_helpers)
         self.weight = -8
-        self.icon = build_icon(u':/media/media_presentation.png')
+        self.icon = build_icon(u':/plugins/plugin_presentations.png')
         self.status = PluginStatus.Active
 
     def get_settings_tab(self):
diff --git a/openlp/plugins/songs/songsplugin.py b/openlp/plugins/songs/songsplugin.py
index c24352a91..82a780fa9 100644
--- a/openlp/plugins/songs/songsplugin.py
+++ b/openlp/plugins/songs/songsplugin.py
@@ -57,7 +57,7 @@ class SongsPlugin(Plugin):
         Plugin.__init__(self, u'Songs', u'1.9.2', plugin_helpers)
         self.weight = -10
         self.manager = SongManager()
-        self.icon = build_icon(u':/media/media_song.png')
+        self.icon = build_icon(u':/plugins/plugin_songs.png')
         self.status = PluginStatus.Active
 
     def get_settings_tab(self):
diff --git a/resources/images/openlp-2.qrc b/resources/images/openlp-2.qrc
index ba382e0fd..118a30eae 100644
--- a/resources/images/openlp-2.qrc
+++ b/resources/images/openlp-2.qrc
@@ -19,6 +19,12 @@
   </qresource>
   <qresource prefix="plugins">
     <file>plugin_alerts.png</file>
+    <file>plugin_bibles.png</file>
+    <file>plugin_custom.png</file>
+    <file>plugin_images.png</file>
+    <file>plugin_media.png</file>
+    <file>plugin_presentations.png</file>
+    <file>plugin_songs.png</file>
     <file>plugin_remote.png</file>
     <file>plugin_songusage.png</file>
   </qresource>
@@ -95,12 +101,6 @@
     <file>system_settings.png</file>
   </qresource>
   <qresource prefix="media">
-    <file>media_custom.png</file>
-    <file>media_presentation.png</file>
-    <file>media_image.png</file>
-    <file>media_song.png</file>
-    <file>media_bible.png</file>
-    <file>media_video.png</file>
     <file>media_time.png</file>
     <file>media_stop.png</file>
     <file>image_clapperboard.png</file>
diff --git a/resources/images/media_bible.png b/resources/images/plugin_bibles.png
similarity index 100%
rename from resources/images/media_bible.png
rename to resources/images/plugin_bibles.png
diff --git a/resources/images/media_custom.png b/resources/images/plugin_custom.png
similarity index 100%
rename from resources/images/media_custom.png
rename to resources/images/plugin_custom.png
diff --git a/resources/images/media_image.png b/resources/images/plugin_images.png
similarity index 100%
rename from resources/images/media_image.png
rename to resources/images/plugin_images.png
diff --git a/resources/images/media_video.png b/resources/images/plugin_media.png
similarity index 100%
rename from resources/images/media_video.png
rename to resources/images/plugin_media.png
diff --git a/resources/images/media_presentation.png b/resources/images/plugin_presentations.png
similarity index 100%
rename from resources/images/media_presentation.png
rename to resources/images/plugin_presentations.png
diff --git a/resources/images/media_song.png b/resources/images/plugin_songs.png
similarity index 100%
rename from resources/images/media_song.png
rename to resources/images/plugin_songs.png