diff --git a/openlp/core/ui/icons.py b/openlp/core/ui/icons.py
index 5e4fd91ba..6c9171994 100644
--- a/openlp/core/ui/icons.py
+++ b/openlp/core/ui/icons.py
@@ -97,6 +97,7 @@ class UiIcons(object):
'picture': 'fa.picture-o',
'print': 'fa.print',
'remote': 'fa.rss',
+ 'repeat': 'fa.repeat',
'save': 'fa.save',
'search': 'fa.search',
'search_minus': 'fa.search-minus',
diff --git a/openlp/core/ui/media/mediacontroller.py b/openlp/core/ui/media/mediacontroller.py
index dbb6adfdb..297c8f4b8 100644
--- a/openlp/core/ui/media/mediacontroller.py
+++ b/openlp/core/ui/media/mediacontroller.py
@@ -38,6 +38,7 @@ from openlp.core.common.settings import Settings
from openlp.core.lib import ItemCapabilities
from openlp.core.lib.ui import critical_error_message_box
from openlp.core.ui import DisplayControllerType
+from openlp.core.ui.icons import UiIcons
from openlp.core.ui.media import MediaState, MediaInfo, MediaType, get_media_players, set_media_players, \
parse_optical_path
from openlp.core.ui.media.endpoint import media_endpoint
@@ -283,19 +284,19 @@ class MediaController(RegistryBase, LogMixin, RegistryProperties):
# Build a Media ToolBar
controller.mediabar = OpenLPToolbar(controller)
controller.mediabar.add_toolbar_action('playbackPlay', text='media_playback_play',
- icon=':/slides/media_playback_start.png',
+ icon=UiIcons().play,
tooltip=translate('OpenLP.SlideController', 'Start playing media.'),
triggers=controller.send_to_plugins)
controller.mediabar.add_toolbar_action('playbackPause', text='media_playback_pause',
- icon=':/slides/media_playback_pause.png',
+ icon=UiIcons().pause,
tooltip=translate('OpenLP.SlideController', 'Pause playing media.'),
triggers=controller.send_to_plugins)
controller.mediabar.add_toolbar_action('playbackStop', text='media_playback_stop',
- icon=':/slides/media_playback_stop.png',
+ icon=UiIcons().stop,
tooltip=translate('OpenLP.SlideController', 'Stop playing media.'),
triggers=controller.send_to_plugins)
controller.mediabar.add_toolbar_action('playbackLoop', text='media_playback_loop',
- icon=':/media/media_repeat.png', checked=False,
+ icon=UiIcons().repeat, checked=False,
tooltip=translate('OpenLP.SlideController', 'Loop playing media.'),
triggers=controller.send_to_plugins)
controller.position_label = QtWidgets.QLabel()
diff --git a/openlp/plugins/media/forms/mediaclipselectordialog.py b/openlp/plugins/media/forms/mediaclipselectordialog.py
index 22f239cf5..3c32df553 100644
--- a/openlp/plugins/media/forms/mediaclipselectordialog.py
+++ b/openlp/plugins/media/forms/mediaclipselectordialog.py
@@ -24,7 +24,7 @@
from PyQt5 import QtCore, QtWidgets
from openlp.core.common.i18n import translate
-from openlp.core.lib import build_icon
+from openlp.core.ui.icons import UiIcons
class Ui_MediaClipSelector(object):
@@ -106,7 +106,7 @@ class Ui_MediaClipSelector(object):
self.controls_layout = QtWidgets.QHBoxLayout()
self.controls_layout.setObjectName('controls_layout')
self.play_button = QtWidgets.QToolButton(media_clip_selector)
- self.play_button.setIcon(build_icon(':/slides/media_playback_start.png'))
+ self.play_button.setIcon(UiIcons().play)
self.play_button.setObjectName('play_button')
self.controls_layout.addWidget(self.play_button)
self.position_slider = QtWidgets.QSlider(media_clip_selector)
diff --git a/openlp/plugins/media/forms/mediaclipselectorform.py b/openlp/plugins/media/forms/mediaclipselectorform.py
index 7c0db8db7..83d9763fc 100644
--- a/openlp/plugins/media/forms/mediaclipselectorform.py
+++ b/openlp/plugins/media/forms/mediaclipselectorform.py
@@ -25,13 +25,14 @@ import re
from datetime import datetime
from time import sleep
-from PyQt5 import QtCore, QtGui, QtWidgets
+from PyQt5 import QtCore, QtWidgets
from openlp.core.common import is_win, is_linux, is_macosx
from openlp.core.common.i18n import translate
from openlp.core.common.mixins import RegistryProperties
from openlp.core.common.path import Path
from openlp.core.lib.ui import critical_error_message_box
+from openlp.core.ui.icons import UiIcons
from openlp.core.ui.media.vlcplayer import get_vlc
from openlp.plugins.media.forms.mediaclipselectordialog import Ui_MediaClipSelector
@@ -66,12 +67,8 @@ class MediaClipSelectorForm(QtWidgets.QDialog, Ui_MediaClipSelector, RegistryPro
self.media_item = media_item
self.setupUi(self)
# setup play/pause icon
- self.play_icon = QtGui.QIcon()
- self.play_icon.addPixmap(QtGui.QPixmap(":/slides/media_playback_start.png"), QtGui.QIcon.Normal,
- QtGui.QIcon.Off)
- self.pause_icon = QtGui.QIcon()
- self.pause_icon.addPixmap(QtGui.QPixmap(":/slides/media_playback_pause.png"), QtGui.QIcon.Normal,
- QtGui.QIcon.Off)
+ self.play_icon = UiIcons().play
+ self.pause_icon = UiIcons().pause
def reject(self):
"""
diff --git a/openlp/plugins/presentations/lib/mediaitem.py b/openlp/plugins/presentations/lib/mediaitem.py
index 09cd45537..b0072ce83 100644
--- a/openlp/plugins/presentations/lib/mediaitem.py
+++ b/openlp/plugins/presentations/lib/mediaitem.py
@@ -37,9 +37,6 @@ from openlp.plugins.presentations.lib.pdfcontroller import PDF_CONTROLLER_FILETY
log = logging.getLogger(__name__)
-ERROR_IMAGE = QtGui.QImage(':/general/general_delete.png')
-
-
class PresentationMediaItem(MediaManagerItem):
"""
This is the Presentation media manager item for Presentation Items. It can present files using Openoffice and
@@ -175,7 +172,7 @@ class PresentationMediaItem(MediaManagerItem):
file_name = file_path.name
if not file_path.exists():
item_name = QtWidgets.QListWidgetItem(file_name)
- item_name.setIcon(build_icon(ERROR_IMAGE))
+ item_name.setIcon(UiIcons().delete)
item_name.setData(QtCore.Qt.UserRole, path_to_str(file_path))
item_name.setToolTip(str(file_path))
self.list_view.addItem(item_name)
diff --git a/openlp/plugins/songs/forms/songselectdialog.py b/openlp/plugins/songs/forms/songselectdialog.py
index 4b93e7e5c..ebccdac8b 100644
--- a/openlp/plugins/songs/forms/songselectdialog.py
+++ b/openlp/plugins/songs/forms/songselectdialog.py
@@ -26,7 +26,6 @@ The :mod:`~openlp.plugins.songs.forms.songselectdialog` module contains the user
from PyQt5 import QtCore, QtWidgets
from openlp.core.common.i18n import translate
-from openlp.core.lib import build_icon
from openlp.core.ui import SingleColumnTableWidget
from openlp.core.ui.icons import UiIcons
from openlp.core.widgets.edits import HistoryComboBox
@@ -211,7 +210,7 @@ class Ui_SongSelectDialog(object):
QtWidgets.QSizePolicy.Minimum)
self.import_layout.addItem(self.import_spacer)
self.import_button = QtWidgets.QPushButton(self.song_page)
- self.import_button.setIcon(build_icon(':/general/general_import.png'))
+ self.import_button.setIcon(UiIcons().download)
self.import_button.setObjectName('import_button')
self.import_layout.addWidget(self.import_button)
self.song_layout.addLayout(self.import_layout, 5, 0, 1, 5)
diff --git a/resources/images/general_delete.png b/resources/images/general_delete.png
deleted file mode 100644
index ef8e685e2..000000000
Binary files a/resources/images/general_delete.png and /dev/null differ
diff --git a/resources/images/general_import.png b/resources/images/general_import.png
deleted file mode 100644
index 0ee789269..000000000
Binary files a/resources/images/general_import.png and /dev/null differ
diff --git a/resources/images/media_playback_pause.png b/resources/images/media_playback_pause.png
deleted file mode 100644
index a9b3113fb..000000000
Binary files a/resources/images/media_playback_pause.png and /dev/null differ
diff --git a/resources/images/media_playback_start.png b/resources/images/media_playback_start.png
deleted file mode 100644
index 80ff3a1d5..000000000
Binary files a/resources/images/media_playback_start.png and /dev/null differ
diff --git a/resources/images/media_playback_stop.png b/resources/images/media_playback_stop.png
deleted file mode 100644
index 180280e8b..000000000
Binary files a/resources/images/media_playback_stop.png and /dev/null differ
diff --git a/resources/images/media_repeat.png b/resources/images/media_repeat.png
deleted file mode 100644
index 78330449a..000000000
Binary files a/resources/images/media_repeat.png and /dev/null differ
diff --git a/resources/images/openlp-2.qrc b/resources/images/openlp-2.qrc
index 244cf00b0..e0e52503c 100644
--- a/resources/images/openlp-2.qrc
+++ b/resources/images/openlp-2.qrc
@@ -24,14 +24,9 @@
plugin_songusage.png
- general_delete.png
- general_import.png
slide_theme.png
- media_playback_start.png
- media_playback_stop.png
- media_playback_pause.png
openlp-logo.svg
@@ -66,7 +61,6 @@
media_time.png
- media_repeat.png
slidecontroller_multimedia.png
auto-start_active.png
auto-start_inactive.png