diff --git a/openlp/core/lib/mediamanageritem.py b/openlp/core/lib/mediamanageritem.py
index 3752ffc4d..2d563962e 100644
--- a/openlp/core/lib/mediamanageritem.py
+++ b/openlp/core/lib/mediamanageritem.py
@@ -541,4 +541,3 @@ class MediaManagerItem(QtGui.QWidget):
         individual service items need to be processed by the plugins
         """
         pass
-
diff --git a/openlp/core/lib/serviceitem.py b/openlp/core/lib/serviceitem.py
index 9e5b6ef6e..ab57e4328 100644
--- a/openlp/core/lib/serviceitem.py
+++ b/openlp/core/lib/serviceitem.py
@@ -212,7 +212,7 @@ class ServiceItem(object):
         self.service_item_type = ServiceItemType.Text
         title = title.split(u'\n')[0]
         self._raw_frames.append(
-            {u'title': title, u'raw_slide': raw_slide, u'verseTag':verse_tag})
+            {u'title': title, u'raw_slide': raw_slide, u'verseTag': verse_tag})
         self._new_item()
 
     def add_from_command(self, path, file_name, image):
@@ -230,7 +230,7 @@ class ServiceItem(object):
         """
         self.service_item_type = ServiceItemType.Command
         self._raw_frames.append(
-            {u'title': file_name, u'image':image, u'path': path})
+            {u'title': file_name, u'image': image, u'path': path})
         self._new_item()
 
     def get_service_repr(self):
@@ -241,17 +241,17 @@ class ServiceItem(object):
         service_header = {
             u'name': self.name.lower(),
             u'plugin': self.name,
-            u'theme':self.theme,
-            u'title':self.title,
-            u'icon':self.icon,
-            u'footer':self.raw_footer,
-            u'type':self.service_item_type,
-            u'audit':self.audit,
-            u'notes':self.notes,
-            u'from_plugin':self.from_plugin,
-            u'capabilities':self.capabilities,
-            u'search':self.search_string,
-            u'data':self.data_string
+            u'theme': self.theme,
+            u'title': self.title,
+            u'icon': self.icon,
+            u'footer': self.raw_footer,
+            u'type': self.service_item_type,
+            u'audit': self.audit,
+            u'notes': self.notes,
+            u'from_plugin': self.from_plugin,
+            u'capabilities': self.capabilities,
+            u'search': self.search_string,
+            u'data': self.data_string
         }
         service_data = []
         if self.service_item_type == ServiceItemType.Text:
@@ -263,7 +263,7 @@ class ServiceItem(object):
         elif self.service_item_type == ServiceItemType.Command:
             for slide in self._raw_frames:
                 service_data.append(
-                    {u'title':slide[u'title'], u'image':slide[u'image']})
+                    {u'title': slide[u'title'], u'image': slide[u'image']})
         return {u'header': service_header, u'data': service_data}
 
     def set_from_service(self, serviceitem, path=None):
diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py
index 18459bba5..427c6e509 100644
--- a/openlp/core/ui/servicemanager.py
+++ b/openlp/core/ui/servicemanager.py
@@ -204,13 +204,13 @@ class ServiceManager(QtGui.QWidget):
         self.orderToolbar.addSeparator()
         self.orderToolbar.addToolbarButton(
             translate('OpenLP.ServiceManager', '&Expand all'),
-            u':/services/service_top.png',
+            u':/services/service_expand_all.png',
             translate('OpenLP.ServiceManager',
             'Expand all the service items.'),
             self.onExpandAll)
         self.orderToolbar.addToolbarButton(
             translate('OpenLP.ServiceManager', '&Collapse all'),
-            u':/services/service_bottom.png',
+            u':/services/service_collapse_all.png',
             translate('OpenLP.ServiceManager',
             'Collapse all the service items.'),
             self.onCollapseAll)
diff --git a/openlp/plugins/media/lib/mediatab.py b/openlp/plugins/media/lib/mediatab.py
index cc8a34705..e67da62df 100644
--- a/openlp/plugins/media/lib/mediatab.py
+++ b/openlp/plugins/media/lib/mediatab.py
@@ -80,5 +80,3 @@ class MediaTab(SettingsTab):
             QtCore.QSettings().setValue(self.settingsSection + u'/use phonon',
                 QtCore.QVariant(self.usePhonon))
             Receiver.send_message(u'config_screen_changed')
-
-
diff --git a/resources/images/openlp-2.qrc b/resources/images/openlp-2.qrc
index 7e8645441..0ecb87bca 100644
--- a/resources/images/openlp-2.qrc
+++ b/resources/images/openlp-2.qrc
@@ -83,6 +83,8 @@
     <file>wizard_importbible.bmp</file>
   </qresource>
   <qresource prefix="services">
+    <file>service_collapse_all.png</file>
+    <file>service_expand_all.png</file>
     <file>service_notes.png</file>
     <file>service_item_notes.png</file>
     <file>service_bottom.png</file>
diff --git a/resources/images/service_collapse_all.png b/resources/images/service_collapse_all.png
new file mode 100644
index 000000000..6e682fc4d
Binary files /dev/null and b/resources/images/service_collapse_all.png differ
diff --git a/resources/images/service_expand_all.png b/resources/images/service_expand_all.png
new file mode 100644
index 000000000..09b4ba394
Binary files /dev/null and b/resources/images/service_expand_all.png differ