diff --git a/openlp/core/ui/exceptiondialog.py b/openlp/core/ui/exceptiondialog.py
index d43005451..55591ecd0 100644
--- a/openlp/core/ui/exceptiondialog.py
+++ b/openlp/core/ui/exceptiondialog.py
@@ -48,7 +48,7 @@ class Ui_ExceptionDialog(object):
self.message_layout.setContentsMargins(0, 0, 50, 0)
self.message_layout.addSpacing(12)
self.bug_label = QtWidgets.QLabel(exception_dialog)
- self.bug_label.setPixmap(QtGui.QPixmap(':/graphics/exception.png'))
+ self.bug_label.setPixmap(QtGui.QPixmap(UiIcons().exception))
self.bug_label.setSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed)
self.bug_label.setObjectName('bug_label')
self.message_layout.addWidget(self.bug_label)
diff --git a/openlp/core/ui/icons.py b/openlp/core/ui/icons.py
index 311b09dee..fe34522cf 100644
--- a/openlp/core/ui/icons.py
+++ b/openlp/core/ui/icons.py
@@ -74,6 +74,7 @@ class UiIcons(object):
'bottom': {'icon': 'fa.angle-double-down'},
'clock': {'icon': 'fa.clock-o'},
'clone': {'icon': 'fa.clone'},
+ 'close': {'icon': 'fa.times-circle-o'},
'copy': {'icon': 'fa.copy'},
'copyright': {'icon': 'fa.copyright'},
'database': {'icon': 'fa.database'},
@@ -83,12 +84,15 @@ class UiIcons(object):
'download': {'icon': 'fa.cloud-download'},
'edit': {'icon': 'fa.edit'},
'email': {'icon': 'fa.envelope'},
+ 'exception': {'icon': 'fa.times-circle'},
'exit': {'icon': 'fa.sign-out'},
'group': {'icon': 'fa.object-group'},
'inactive': {'icon': 'fa.child', 'attr': 'lightGray'},
'info': {'icon': 'fa.info'},
+ 'lightbulb': {'icon': 'fa.lightbulb-o'},
'live': {'icon': 'fa.desktop'},
'manual': {'icon': 'fa.graduation-cap'},
+ 'media': {'icon': 'fa.fax'},
'minus': {'icon': 'fa.minus'},
'music': {'icon': 'fa.music'},
'new': {'icon': 'fa.file'},
@@ -113,10 +117,12 @@ class UiIcons(object):
'search_ref': {'icon': 'fa.institution'},
'settings': {'icon': 'fa.cogs'},
'shortcuts': {'icon': 'fa.wrench'},
+ 'song_usage': {'icon': 'fa.line-chart'},
'sort': {'icon': 'fa.sort'},
'stop': {'icon': 'fa.stop'},
'square': {'icon': 'fa.square'},
'text': {'icon': 'op.file-text'},
+ 'time': {'icon': 'fa.history'},
'theme': {'icon': 'fa.file-image-o'},
'top': {'icon': 'fa.angle-double-up'},
'undo': {'icon': 'fa.undo'},
diff --git a/openlp/core/ui/maindisplay.py b/openlp/core/ui/maindisplay.py
index 181d241ff..50a4dc1f8 100644
--- a/openlp/core/ui/maindisplay.py
+++ b/openlp/core/ui/maindisplay.py
@@ -43,6 +43,7 @@ from openlp.core.display.screens import ScreenList
from openlp.core.lib import ServiceItem, ImageSource, build_html, expand_tags, image_to_byte
from openlp.core.lib.theme import BackgroundType
from openlp.core.ui import HideMode, AlertLocation, DisplayControllerType
+from openlp.core.ui.icons import UiIcons
if is_macosx():
from ctypes import pythonapi, c_void_p, c_char_p, py_object
@@ -492,7 +493,7 @@ class MainDisplay(Display, LogMixin, RegistryProperties):
path = str(AppLocation.get_section_data_path('themes') / self.service_item.theme_data.theme_name)
service_item.add_from_command(path,
path_to_str(self.service_item.theme_data.background_filename),
- ':/media/slidecontroller_multimedia.png')
+ UiIcons().media)
self.media_controller.video(DisplayControllerType.Live, service_item, video_behind_text=True)
self._hide_mouse()
diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py
index ee228e01f..fbed8ee9e 100644
--- a/openlp/core/ui/servicemanager.py
+++ b/openlp/core/ui/servicemanager.py
@@ -251,7 +251,7 @@ class Ui_ServiceManager(object):
icon=UiIcons().notes,
triggers=self.on_service_item_note_form)
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)
+ icon=UiIcons().time, triggers=self.on_start_time_form)
self.auto_start_action = create_widget_action(self.menu, text='',
icon=UiIcons().active,
triggers=self.on_auto_start)
diff --git a/openlp/plugins/alerts/alertsplugin.py b/openlp/plugins/alerts/alertsplugin.py
index db2ba1c6b..ea019eb5a 100644
--- a/openlp/plugins/alerts/alertsplugin.py
+++ b/openlp/plugins/alerts/alertsplugin.py
@@ -28,7 +28,7 @@ from openlp.core.api.http import register_endpoint
from openlp.core.common.actions import ActionList
from openlp.core.common.i18n import UiStrings, translate
from openlp.core.common.settings import Settings
-from openlp.core.lib import Plugin, StringContent, build_icon
+from openlp.core.lib import Plugin, StringContent
from openlp.core.lib.db import Manager
from openlp.core.lib.theme import VerticalType
from openlp.core.lib.ui import create_action
@@ -139,8 +139,8 @@ class AlertsPlugin(Plugin):
"""
super(AlertsPlugin, self).__init__('alerts', __default_settings__, settings_tab_class=AlertsTab)
self.weight = -3
- self.icon_path = ':/plugins/plugin_alerts.png'
- self.icon = build_icon(self.icon_path)
+ self.icon_path = UiIcons().alert
+ self.icon = self.icon_path
AlertsManager(self)
self.manager = Manager('alerts', init_schema)
self.alert_form = AlertForm(self)
diff --git a/openlp/plugins/images/lib/mediaitem.py b/openlp/plugins/images/lib/mediaitem.py
index 8eda8a232..7be3d7823 100644
--- a/openlp/plugins/images/lib/mediaitem.py
+++ b/openlp/plugins/images/lib/mediaitem.py
@@ -193,7 +193,7 @@ class ImageMediaItem(MediaManagerItem):
self.list_view, text=UiStrings().ReplaceBG, icon=':/slides/slide_theme.png',
triggers=self.on_replace_click)
self.reset_action_context = create_widget_action(
- self.list_view, text=UiStrings().ReplaceLiveBG, icon=':/system/system_close.png',
+ self.list_view, text=UiStrings().ReplaceLiveBG, icon=UiIcons().close,
visible=False, triggers=self.on_reset_click)
def add_start_header_bar(self):
@@ -212,7 +212,7 @@ class ImageMediaItem(MediaManagerItem):
icon=':/slides/slide_theme.png',
triggers=self.on_replace_click)
self.reset_action = self.toolbar.add_toolbar_action('reset_action',
- icon=':/system/system_close.png',
+ icon=UiIcons().close,
visible=False, triggers=self.on_reset_click)
def recursively_delete_group(self, image_group):
diff --git a/openlp/plugins/media/lib/mediaitem.py b/openlp/plugins/media/lib/mediaitem.py
index 0ab3b28f7..3a26c433b 100644
--- a/openlp/plugins/media/lib/mediaitem.py
+++ b/openlp/plugins/media/lib/mediaitem.py
@@ -153,7 +153,7 @@ class MediaMediaItem(MediaManagerItem, RegistryProperties):
self.replace_action.setDisabled(True)
if hasattr(self, 'replace_action_context'):
self.replace_action_context.setDisabled(True)
- self.reset_action = self.toolbar.add_toolbar_action('reset_action', icon=':/system/system_close.png',
+ self.reset_action = self.toolbar.add_toolbar_action('reset_action', icon=UiIcons().close,
visible=False, triggers=self.on_reset_click)
self.media_widget = QtWidgets.QWidget(self)
self.media_widget.setObjectName('media_widget')
@@ -177,7 +177,7 @@ class MediaMediaItem(MediaManagerItem, RegistryProperties):
self.list_view, text=UiStrings().ReplaceBG, icon=':/slides/slide_theme.png',
triggers=self.on_replace_click)
self.reset_action_context = create_widget_action(
- self.list_view, text=UiStrings().ReplaceLiveBG, icon=':/system/system_close.png',
+ self.list_view, text=UiStrings().ReplaceLiveBG, icon=UiIcons().close,
visible=False, triggers=self.on_reset_click)
@staticmethod
diff --git a/openlp/plugins/songs/forms/songmaintenancedialog.py b/openlp/plugins/songs/forms/songmaintenancedialog.py
index fdcbfdc84..9728858ff 100644
--- a/openlp/plugins/songs/forms/songmaintenancedialog.py
+++ b/openlp/plugins/songs/forms/songmaintenancedialog.py
@@ -23,7 +23,6 @@
from PyQt5 import QtCore, QtWidgets
from openlp.core.common.i18n import UiStrings
-from openlp.core.lib import build_icon
from openlp.core.lib.ui import create_button_box
from openlp.core.ui.icons import UiIcons
from openlp.plugins.songs.lib.ui import SongStrings
@@ -50,7 +49,7 @@ class Ui_SongMaintenanceDialog(object):
self.authors_list_item = QtWidgets.QListWidgetItem(self.type_list_widget)
self.authors_list_item.setIcon(UiIcons().usermo)
self.topics_list_item = QtWidgets.QListWidgetItem(self.type_list_widget)
- self.topics_list_item.setIcon(build_icon(':/songs/topic_maintenance.png'))
+ self.topics_list_item.setIcon(UiIcons().lightbulb)
self.books_list_item = QtWidgets.QListWidgetItem(self.type_list_widget)
self.books_list_item.setIcon(UiIcons().book)
self.dialog_layout.addWidget(self.type_list_widget, 0, 0)
diff --git a/openlp/plugins/songusage/songusageplugin.py b/openlp/plugins/songusage/songusageplugin.py
index 455ab3713..7c327f410 100644
--- a/openlp/plugins/songusage/songusageplugin.py
+++ b/openlp/plugins/songusage/songusageplugin.py
@@ -32,6 +32,7 @@ from openlp.core.common.settings import Settings
from openlp.core.lib import Plugin, StringContent, build_icon
from openlp.core.lib.db import Manager
from openlp.core.lib.ui import create_action
+from openlp.core.ui.icons import UiIcons
from openlp.plugins.songusage.forms import SongUsageDetailForm, SongUsageDeleteForm
from openlp.plugins.songusage.lib import upgrade
from openlp.plugins.songusage.lib.db import init_schema, SongUsageItem
@@ -63,7 +64,7 @@ class SongUsagePlugin(Plugin):
super(SongUsagePlugin, self).__init__('songusage', __default_settings__)
self.manager = Manager('songusage', init_schema, upgrade_mod=upgrade)
self.weight = -4
- self.icon = build_icon(':/plugins/plugin_songusage.png')
+ self.icon = UiIcons().song_usage
self.active_icon = build_icon(':/songusage/song_usage_active.png')
self.inactive_icon = build_icon(':/songusage/song_usage_inactive.png')
self.song_usage_active = False
diff --git a/resources/images/exception.png b/resources/images/exception.png
deleted file mode 100644
index c7ace707e..000000000
Binary files a/resources/images/exception.png and /dev/null differ
diff --git a/resources/images/media_time.png b/resources/images/media_time.png
deleted file mode 100644
index 77ba33c8c..000000000
Binary files a/resources/images/media_time.png and /dev/null differ
diff --git a/resources/images/openlp-2.qrc b/resources/images/openlp-2.qrc
index 645725049..a8e36c188 100644
--- a/resources/images/openlp-2.qrc
+++ b/resources/images/openlp-2.qrc
@@ -5,17 +5,14 @@
song_search_lyrics.png
song_search_title.png
song_search_topic.png
- topic_maintenance.png
- plugin_alerts.png
plugin_songs.png
- plugin_songusage.png
-
+
@@ -25,7 +22,6 @@
openlp-logo.svg
- exception.png
openlp-splash-screen.png
openlp-about-logo.png
@@ -44,7 +40,6 @@
- system_close.png
system_mediamanager.png
system_volunteer.png
system_servicemanager.png
@@ -53,7 +48,6 @@
system_edit_copy.png
- media_time.png
slidecontroller_multimedia.png
multimedia-player.png
diff --git a/resources/images/plugin_alerts.png b/resources/images/plugin_alerts.png
deleted file mode 100644
index 331aa2687..000000000
Binary files a/resources/images/plugin_alerts.png and /dev/null differ
diff --git a/resources/images/plugin_songusage.png b/resources/images/plugin_songusage.png
deleted file mode 100644
index bf110aa6d..000000000
Binary files a/resources/images/plugin_songusage.png and /dev/null differ
diff --git a/resources/images/system_close.png b/resources/images/system_close.png
deleted file mode 100644
index 2c2f99eb4..000000000
Binary files a/resources/images/system_close.png and /dev/null differ
diff --git a/resources/images/topic_maintenance.png b/resources/images/topic_maintenance.png
deleted file mode 100644
index e3b8555dd..000000000
Binary files a/resources/images/topic_maintenance.png and /dev/null differ