diff --git a/openlp/core/common/i18n.py b/openlp/core/common/i18n.py
index d7e4a3673..a4abc01b7 100644
--- a/openlp/core/common/i18n.py
+++ b/openlp/core/common/i18n.py
@@ -577,7 +577,11 @@ class UiIcons(object):
These are the font icons used in the code.
"""
self.add = qta.icon('fa.plus-circle')
+ self.arrow_down = qta.icon('fa.arrow-down')
+ self.arrow_up = qta.icon('fa.arrow-up')
+ self.address = qta.icon('fa.book')
self.bible = qta.icon('fa.book')
+ self.bottom = qta.icon('fa.angle-double-down')
self.clone = qta.icon('fa.clone')
self.copy = qta.icon('fa.copy')
self.copyright = qta.icon('fa.copyright')
@@ -587,15 +591,19 @@ class UiIcons(object):
self.edit = qta.icon('fa.edit')
self.download = qta.icon('fa.cloud-download')
self.live = qta.icon('fa.camera')
+ self.minus = qta.icon('fa.minus')
self.music = qta.icon('fa.music')
self.new = qta.icon('fa.file')
self.notes = qta.icon('fa.sticky-note')
self.open = qta.icon('fa.map')
+ self.plus = qta.icon('fa.plus')
self.presentation = qta.icon("fa.bar-chart")
self.preview = qta.icon('fa.laptop')
self.picture = qta.icon("fa.picture-o")
self.print = qta.icon('fa.print')
+ #self.remote = qta.icon('fa.podcast')
self.save = qta.icon('fa.save')
+ self.top = qta.icon('fa.angle-double-up')
self.upload = qta.icon('fa.cloud-upload')
self.user = qta.icon('fa.user')
self.video = qta.icon('fa.file-video-o')
diff --git a/openlp/core/lib/serviceitem.py b/openlp/core/lib/serviceitem.py
index 2be9a4ad5..2b4d25d02 100644
--- a/openlp/core/lib/serviceitem.py
+++ b/openlp/core/lib/serviceitem.py
@@ -239,7 +239,7 @@ class ServiceItem(RegistryProperties):
if self.name == 'songs':
self.iconic_representation = UiIcons().music
elif self.name == 'bibles':
- self.iconic_representation = UiIcons().music
+ self.iconic_representation = UiIcons().bible
elif self.name == 'presentations':
self.iconic_representation = UiIcons().presentation
elif self.name == 'images':
diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py
index 36b55245e..c1b78f75a 100644
--- a/openlp/core/ui/servicemanager.py
+++ b/openlp/core/ui/servicemanager.py
@@ -178,22 +178,22 @@ class Ui_ServiceManager(object):
action_list.add_category(UiStrings().Service, CategoryOrder.standard_toolbar)
self.move_top_action = self.order_toolbar.add_toolbar_action(
'moveTop',
- text=translate('OpenLP.ServiceManager', 'Move to &top'), icon=':/services/service_top.png',
+ text=translate('OpenLP.ServiceManager', 'Move to &top'), icon=UiIcons().top,
tooltip=translate('OpenLP.ServiceManager', 'Move item to the top of the service.'),
can_shortcuts=True, category=UiStrings().Service, triggers=self.on_service_top)
self.move_up_action = self.order_toolbar.add_toolbar_action(
'moveUp',
- text=translate('OpenLP.ServiceManager', 'Move &up'), icon=':/services/service_up.png',
+ text=translate('OpenLP.ServiceManager', 'Move &up'), icon=UiIcons().arrow_up,
tooltip=translate('OpenLP.ServiceManager', 'Move item up one position in the service.'),
can_shortcuts=True, category=UiStrings().Service, triggers=self.on_service_up)
self.move_down_action = self.order_toolbar.add_toolbar_action(
'moveDown',
- text=translate('OpenLP.ServiceManager', 'Move &down'), icon=':/services/service_down.png',
+ text=translate('OpenLP.ServiceManager', 'Move &down'), icon=UiIcons().arrow_down,
tooltip=translate('OpenLP.ServiceManager', 'Move item down one position in the service.'),
can_shortcuts=True, category=UiStrings().Service, triggers=self.on_service_down)
self.move_bottom_action = self.order_toolbar.add_toolbar_action(
'moveBottom',
- text=translate('OpenLP.ServiceManager', 'Move to &bottom'), icon=':/services/service_bottom.png',
+ text=translate('OpenLP.ServiceManager', 'Move to &bottom'), icon=UiIcons().bottom,
tooltip=translate('OpenLP.ServiceManager', 'Move item to the end of the service.'),
can_shortcuts=True, category=UiStrings().Service, triggers=self.on_service_end)
self.order_toolbar.addSeparator()
@@ -205,12 +205,12 @@ class Ui_ServiceManager(object):
self.order_toolbar.addSeparator()
self.expand_action = self.order_toolbar.add_toolbar_action(
'expand', can_shortcuts=True,
- text=translate('OpenLP.ServiceManager', '&Expand all'), icon=':/services/service_expand_all.png',
+ text=translate('OpenLP.ServiceManager', '&Expand all'), icon=UiIcons().plus,
tooltip=translate('OpenLP.ServiceManager', 'Expand all the service items.'),
category=UiStrings().Service, triggers=self.on_expand_all)
self.collapse_action = self.order_toolbar.add_toolbar_action(
'collapse', can_shortcuts=True,
- text=translate('OpenLP.ServiceManager', '&Collapse all'), icon=':/services/service_collapse_all.png',
+ text=translate('OpenLP.ServiceManager', '&Collapse all'), icon=UiIcons().minus,
tooltip=translate('OpenLP.ServiceManager', 'Collapse all the service items.'),
category=UiStrings().Service, triggers=self.on_collapse_all)
self.order_toolbar.addSeparator()
diff --git a/openlp/plugins/songs/lib/mediaitem.py b/openlp/plugins/songs/lib/mediaitem.py
index 754a399db..aef0a64ef 100644
--- a/openlp/plugins/songs/lib/mediaitem.py
+++ b/openlp/plugins/songs/lib/mediaitem.py
@@ -158,7 +158,7 @@ class SongMediaItem(MediaManagerItem):
translate('SongsPlugin.MediaItem', 'Search Authors...')),
(SongSearch.Topics, ':/songs/song_search_topic.png', SongStrings.Topics,
translate('SongsPlugin.MediaItem', 'Search Topics...')),
- (SongSearch.Books, ':/songs/song_book_edit.png', SongStrings.SongBooks,
+ (SongSearch.Books, UiIcons().address, SongStrings.SongBooks,
translate('SongsPlugin.MediaItem', 'Search Songbooks...')),
(SongSearch.Themes, ':/slides/slide_theme.png', UiStrings().Themes, UiStrings().SearchThemes),
(SongSearch.Copyright, UiIcons().copyright,
diff --git a/resources/images/openlp-2.qrc b/resources/images/openlp-2.qrc
index 4e7266fa9..ec2025d7b 100644
--- a/resources/images/openlp-2.qrc
+++ b/resources/images/openlp-2.qrc
@@ -20,7 +20,6 @@
author_maintenance.png
topic_maintenance.png
song_author_edit.png
- song_book_edit.png
image_group.png
@@ -91,12 +90,8 @@
wizard_duplicateremoval.bmp
- service_collapse_all.png
- service_expand_all.png
service_item_notes.png
- service_bottom.png
service_down.png
- service_top.png
service_up.png
diff --git a/resources/images/service_bottom.png b/resources/images/service_bottom.png
deleted file mode 100644
index 468362c37..000000000
Binary files a/resources/images/service_bottom.png and /dev/null differ
diff --git a/resources/images/service_collapse_all.png b/resources/images/service_collapse_all.png
deleted file mode 100644
index 6e682fc4d..000000000
Binary files a/resources/images/service_collapse_all.png and /dev/null differ
diff --git a/resources/images/service_expand_all.png b/resources/images/service_expand_all.png
deleted file mode 100644
index 09b4ba394..000000000
Binary files a/resources/images/service_expand_all.png and /dev/null differ
diff --git a/resources/images/service_top.png b/resources/images/service_top.png
deleted file mode 100644
index 999539296..000000000
Binary files a/resources/images/service_top.png and /dev/null differ
diff --git a/resources/images/song_book_edit.png b/resources/images/song_book_edit.png
deleted file mode 100644
index 8fa59df19..000000000
Binary files a/resources/images/song_book_edit.png and /dev/null differ