diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py
index 2d108e72c..0f0f15a3d 100644
--- a/openlp/core/ui/slidecontroller.py
+++ b/openlp/core/ui/slidecontroller.py
@@ -855,7 +855,11 @@ class SlideController(Controller):
             else:
                 label = QtGui.QLabel()
                 label.setMargin(4)
-                label.setScaledContents(True)
+                if serviceItem.is_media():
+                    label.setAlignment(QtCore.Qt.AlignHCenter |
+                        QtCore.Qt.AlignVCenter)
+                else:
+                    label.setScaledContents(True)
                 if self.serviceItem.is_command():
                     label.setPixmap(QtGui.QPixmap(frame[u'image']))
                 else:
diff --git a/openlp/plugins/media/lib/mediaitem.py b/openlp/plugins/media/lib/mediaitem.py
index fe66b90d8..bd987e79d 100644
--- a/openlp/plugins/media/lib/mediaitem.py
+++ b/openlp/plugins/media/lib/mediaitem.py
@@ -42,8 +42,9 @@ from openlp.core.ui.media import get_media_players, set_media_players
 
 log = logging.getLogger(__name__)
 
-CLAPPERBOARD = QtGui.QImage(u':/media/media_video.png')
-#TODO: Add an appropriate Icon for DVDs, CDs, ...
+CLAPPERBOARD = u':/media/slidecontroller_multimedia.png'
+VIDEO = QtGui.QImage(u':/media/media_video.png')
+AUDIO = QtGui.QImage(u':/media/media_audio.png')
 DVD_ICON = QtGui.QImage(u':/media/media_video.png')
 
 class MediaMediaItem(MediaManagerItem):
@@ -218,7 +219,7 @@ class MediaMediaItem(MediaManagerItem):
         service_item.add_capability(ItemCapabilities.RequiresMedia)
         # force a non-existent theme
         service_item.theme = -1
-        frame = u':/media/image_clapperboard.png'
+        frame = CLAPPERBOARD
         (path, name) = os.path.split(filename)
         service_item.add_from_command(path, name, frame)
         return True
@@ -290,10 +291,10 @@ class MediaMediaItem(MediaManagerItem):
             key=lambda filename: os.path.split(unicode(filename))[1].lower())
         for track in media:
             track_info = QtCore.QFileInfo(track)
-            if not track_info.isFile():
+            if track_info.isFile():
                 filename = os.path.split(unicode(track))[1]
                 item_name = QtGui.QListWidgetItem(filename)
-                item_name.setIcon(build_icon(CLAPPERBOARD))
+                item_name.setIcon(build_icon(VIDEO))
                 item_name.setData(QtCore.Qt.UserRole, QtCore.QVariant(track))
             else:
                 filename = os.path.split(unicode(track))[1]
diff --git a/resources/images/media_audio.png b/resources/images/media_audio.png
new file mode 100644
index 000000000..f05a5bf55
Binary files /dev/null and b/resources/images/media_audio.png differ
diff --git a/resources/images/media_video.png b/resources/images/media_video.png
new file mode 100644
index 000000000..6e7340a13
Binary files /dev/null and b/resources/images/media_video.png differ
diff --git a/resources/images/openlp-2.qrc b/resources/images/openlp-2.qrc
index 128042bf0..78651f9ce 100644
--- a/resources/images/openlp-2.qrc
+++ b/resources/images/openlp-2.qrc
@@ -130,7 +130,9 @@
   <qresource prefix="media">
     <file>media_time.png</file>
     <file>media_stop.png</file>
-    <file>image_clapperboard.png</file>
+    <file>media_audio.png</file>
+    <file>media_video.png</file>
+    <file>slidecontroller_multimedia.png</file>
   </qresource>
   <qresource prefix="messagebox">
     <file>messagebox_critical.png</file>
diff --git a/resources/images/slidecontroller_multimedia.png b/resources/images/slidecontroller_multimedia.png
new file mode 100644
index 000000000..55f63d880
Binary files /dev/null and b/resources/images/slidecontroller_multimedia.png differ