diff --git a/openlp/core/ui/icons.py b/openlp/core/ui/icons.py
index c9ab20590..a8c68890a 100644
--- a/openlp/core/ui/icons.py
+++ b/openlp/core/ui/icons.py
@@ -54,6 +54,7 @@ class UiIcons(object):
                          color_disabled=palette.color(QtGui.QPalette.Disabled,
                                                       QtGui.QPalette.ButtonText))
         icon_list = {
+            'active': {'icon': 'fa.child'},
             'add': {'icon': 'fa.plus-circle'},
             'alert': {'icon': 'fa.exclamation-triangle'},
             'arrow_down': {'icon': 'fa.arrow-down'},
@@ -65,6 +66,7 @@ class UiIcons(object):
             'back': {'icon': 'fa.step-backward'},
             'bible': {'icon': 'fa.book'},
             'blank': {'icon': 'fa.times-circle'},
+            'book': {'icon': 'fa.book'},
             'bottom': {'icon': 'fa.angle-double-down'},
             'clock': {'icon': 'fa.clock-o'},
             'clone': {'icon': 'fa.clone'},
@@ -79,6 +81,7 @@ class UiIcons(object):
             'email': {'icon': 'fa.envelope'},
             'exit': {'icon': 'fa.sign-out'},
             'group': {'icon': 'fa.object-group'},
+            'inactive': {'icon': 'fa.child', 'attr': 'color=\'red\''},
             'info': {'icon': 'fa.info'},
             'live': {'icon': 'fa.desktop'},
             'manual': {'icon': 'fa.graduation-cap'},
diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py
index 7a036df46..ee228e01f 100644
--- a/openlp/core/ui/servicemanager.py
+++ b/openlp/core/ui/servicemanager.py
@@ -253,7 +253,7 @@ class Ui_ServiceManager(object):
         self.time_action = create_widget_action(self.menu, text=translate('OpenLP.ServiceManager', '&Start Time'),
                                                 icon=':/media/media_time.png', triggers=self.on_start_time_form)
         self.auto_start_action = create_widget_action(self.menu, text='',
-                                                      icon=':/media/auto-start_active.png',
+                                                      icon=UiIcons().active,
                                                       triggers=self.on_auto_start)
         # Add already existing delete action to the menu.
         self.menu.addAction(self.delete_action)
@@ -315,8 +315,6 @@ class ServiceManager(QtWidgets.QWidget, RegistryBase, Ui_ServiceManager, LogMixi
         Sets up the service manager, toolbars, list view, et al.
         """
         super().__init__(parent)
-        self.active = build_icon(':/media/auto-start_active.png')
-        self.inactive = build_icon(':/media/auto-start_inactive.png')
         self.service_items = []
         self.suffixes = []
         self.drop_position = -1
@@ -799,11 +797,12 @@ class ServiceManager(QtWidgets.QWidget, RegistryBase, Ui_ServiceManager, LogMixi
             self.time_action.setVisible(True)
         if service_item['service_item'].is_capable(ItemCapabilities.CanAutoStartForLive):
             self.auto_start_action.setVisible(True)
-            self.auto_start_action.setIcon(self.inactive)
-            self.auto_start_action.setText(translate('OpenLP.ServiceManager', '&Auto Start - inactive'))
             if service_item['service_item'].will_auto_start:
                 self.auto_start_action.setText(translate('OpenLP.ServiceManager', '&Auto Start - active'))
-                self.auto_start_action.setIcon(self.active)
+                self.auto_start_action.setIcon(UiIcons().active)
+            else:
+                self.auto_start_action.setIcon(UiIcons().inactive)
+                self.auto_start_action.setText(translate('OpenLP.ServiceManager', '&Auto Start - inactive'))
         if service_item['service_item'].is_text():
             for plugin in self.plugin_manager.plugins:
                 if plugin.name == 'custom' and plugin.status == PluginStatus.Active:
diff --git a/openlp/plugins/songs/forms/songmaintenancedialog.py b/openlp/plugins/songs/forms/songmaintenancedialog.py
index 4df97ede1..fdcbfdc84 100644
--- a/openlp/plugins/songs/forms/songmaintenancedialog.py
+++ b/openlp/plugins/songs/forms/songmaintenancedialog.py
@@ -52,7 +52,7 @@ class Ui_SongMaintenanceDialog(object):
         self.topics_list_item = QtWidgets.QListWidgetItem(self.type_list_widget)
         self.topics_list_item.setIcon(build_icon(':/songs/topic_maintenance.png'))
         self.books_list_item = QtWidgets.QListWidgetItem(self.type_list_widget)
-        self.books_list_item.setIcon(build_icon(':/songs/book_maintenance.png'))
+        self.books_list_item.setIcon(UiIcons().book)
         self.dialog_layout.addWidget(self.type_list_widget, 0, 0)
         self.stacked_layout = QtWidgets.QStackedLayout()
         self.stacked_layout.setObjectName('stacked_layout')
diff --git a/resources/images/auto-start_active.png b/resources/images/auto-start_active.png
deleted file mode 100644
index 4213f429f..000000000
Binary files a/resources/images/auto-start_active.png and /dev/null differ
diff --git a/resources/images/auto-start_inactive.png b/resources/images/auto-start_inactive.png
deleted file mode 100644
index 2e6ed64cd..000000000
Binary files a/resources/images/auto-start_inactive.png and /dev/null differ
diff --git a/resources/images/book_maintenance.png b/resources/images/book_maintenance.png
deleted file mode 100644
index a850e97c6..000000000
Binary files a/resources/images/book_maintenance.png and /dev/null differ
diff --git a/resources/images/openlp-2.qrc b/resources/images/openlp-2.qrc
index 0462b463f..645725049 100644
--- a/resources/images/openlp-2.qrc
+++ b/resources/images/openlp-2.qrc
@@ -5,7 +5,6 @@
     <file>song_search_lyrics.png</file>
     <file>song_search_title.png</file>
     <file>song_search_topic.png</file>
-    <file>book_maintenance.png</file>
     <file>topic_maintenance.png</file>
     </qresource>
   <qresource prefix="images">
@@ -56,8 +55,6 @@
   <qresource prefix="media">
     <file>media_time.png</file>
     <file>slidecontroller_multimedia.png</file>
-    <file>auto-start_active.png</file>
-    <file>auto-start_inactive.png</file>
     <file>multimedia-player.png</file>
   </qresource>
   <qresource prefix="messagebox">