diff --git a/openlp/core/projectors/editform.py b/openlp/core/projectors/editform.py
index bc0516ab9..ef88605ef 100644
--- a/openlp/core/projectors/editform.py
+++ b/openlp/core/projectors/editform.py
@@ -29,7 +29,7 @@ from PyQt5 import QtCore, QtWidgets
 
 from openlp.core.common import verify_ip_address
 from openlp.core.common.i18n import translate
-from openlp.core.lib import build_icon
+from openlp.core.ui.icons import UiIcons
 from openlp.core.projectors.constants import PJLINK_PORT
 from openlp.core.projectors.db import Projector
 
@@ -47,7 +47,7 @@ class Ui_ProjectorEditForm(object):
         Create the interface layout.
         """
         edit_projector_dialog.setObjectName('edit_projector_dialog')
-        edit_projector_dialog.setWindowIcon(build_icon(':/icon/openlp-logo.svg'))
+        edit_projector_dialog.setWindowIcon(UiIcons().main_icon)
         edit_projector_dialog.setMinimumWidth(400)
         edit_projector_dialog.setModal(True)
         # Define the basic layout
diff --git a/openlp/core/ui/aboutdialog.py b/openlp/core/ui/aboutdialog.py
index b162d0586..399bec8d4 100644
--- a/openlp/core/ui/aboutdialog.py
+++ b/openlp/core/ui/aboutdialog.py
@@ -24,8 +24,8 @@ import datetime
 from PyQt5 import QtGui, QtWidgets
 
 from openlp.core.common.i18n import UiStrings, translate
-from openlp.core.lib import build_icon
 from openlp.core.lib.ui import create_button, create_button_box
+from openlp.core.ui.icons import UiIcons
 
 
 class UiAboutDialog(object):
@@ -40,7 +40,7 @@ class UiAboutDialog(object):
         :param about_dialog: The QDialog object to set up.
         """
         about_dialog.setObjectName('about_dialog')
-        about_dialog.setWindowIcon(build_icon(':/icon/openlp-logo.svg'))
+        about_dialog.setWindowIcon(UiIcons().main_icon)
         self.about_dialog_layout = QtWidgets.QVBoxLayout(about_dialog)
         self.about_dialog_layout.setContentsMargins(8, 8, 8, 8)
         self.about_dialog_layout.setObjectName('about_dialog_layout')
diff --git a/openlp/core/ui/exceptiondialog.py b/openlp/core/ui/exceptiondialog.py
index 830dff504..d43005451 100644
--- a/openlp/core/ui/exceptiondialog.py
+++ b/openlp/core/ui/exceptiondialog.py
@@ -27,7 +27,6 @@ from PyQt5 import QtGui, QtWidgets
 
 from openlp.core.common.i18n import translate
 from openlp.core.ui.icons import UiIcons
-from openlp.core.lib import build_icon
 from openlp.core.lib.ui import create_button, create_button_box
 
 
@@ -40,7 +39,7 @@ class Ui_ExceptionDialog(object):
         Set up the UI.
         """
         exception_dialog.setObjectName('exception_dialog')
-        exception_dialog.setWindowIcon(build_icon(':/icon/openlp-logo.svg'))
+        exception_dialog.setWindowIcon(UiIcons().main_icon)
         self.exception_layout = QtWidgets.QVBoxLayout(exception_dialog)
         self.exception_layout.setObjectName('exception_layout')
         self.message_layout = QtWidgets.QHBoxLayout()
diff --git a/openlp/core/ui/filerenamedialog.py b/openlp/core/ui/filerenamedialog.py
index 9db2dbb06..648933538 100644
--- a/openlp/core/ui/filerenamedialog.py
+++ b/openlp/core/ui/filerenamedialog.py
@@ -25,8 +25,8 @@ The UI widgets for the rename dialog
 from PyQt5 import QtCore, QtGui, QtWidgets
 
 from openlp.core.common.i18n import translate
-from openlp.core.lib import build_icon
 from openlp.core.lib.ui import create_button_box
+from openlp.core.ui.icons import UiIcons
 
 
 class Ui_FileRenameDialog(object):
@@ -38,7 +38,7 @@ class Ui_FileRenameDialog(object):
         Set up the UI
         """
         file_rename_dialog.setObjectName('file_rename_dialog')
-        file_rename_dialog.setWindowIcon(build_icon(':/icon/openlp-logo.svg'))
+        file_rename_dialog.setWindowIcon(UiIcons().main_icon)
         file_rename_dialog.resize(300, 10)
         self.dialog_layout = QtWidgets.QGridLayout(file_rename_dialog)
         self.dialog_layout.setObjectName('dialog_layout')
diff --git a/openlp/core/ui/firsttimelanguagedialog.py b/openlp/core/ui/firsttimelanguagedialog.py
index 21aeac5e5..ab56e479a 100644
--- a/openlp/core/ui/firsttimelanguagedialog.py
+++ b/openlp/core/ui/firsttimelanguagedialog.py
@@ -25,8 +25,8 @@ The UI widgets of the language selection dialog.
 from PyQt5 import QtWidgets
 
 from openlp.core.common.i18n import translate
-from openlp.core.lib import build_icon
 from openlp.core.lib.ui import create_button_box
+from openlp.core.ui.icons import UiIcons
 
 
 class Ui_FirstTimeLanguageDialog(object):
@@ -38,7 +38,7 @@ class Ui_FirstTimeLanguageDialog(object):
         Set up the UI.
         """
         language_dialog.setObjectName('language_dialog')
-        language_dialog.setWindowIcon(build_icon(':/icon/openlp-logo.svg'))
+        language_dialog.setWindowIcon(UiIcons().main_icon)
         language_dialog.resize(300, 50)
         self.dialog_layout = QtWidgets.QVBoxLayout(language_dialog)
         self.dialog_layout.setContentsMargins(8, 8, 8, 8)
diff --git a/openlp/core/ui/firsttimewizard.py b/openlp/core/ui/firsttimewizard.py
index 1d8ce5f01..75611c722 100644
--- a/openlp/core/ui/firsttimewizard.py
+++ b/openlp/core/ui/firsttimewizard.py
@@ -25,10 +25,10 @@ The UI widgets for the first time wizard.
 from PyQt5 import QtCore, QtGui, QtWidgets
 
 from openlp.core.common import is_macosx, clean_button_text
-from openlp.core.common.i18n import UiStrings, translate
+from openlp.core.common.i18n import translate
 from openlp.core.common.settings import Settings
-from openlp.core.lib import build_icon
 from openlp.core.lib.ui import add_welcome_page
+from openlp.core.ui.icons import UiIcons
 
 
 class FirstTimePage(object):
@@ -57,7 +57,7 @@ class UiFirstTimeWizard(object):
         :param first_time_wizard: The wizard form
         """
         first_time_wizard.setObjectName('first_time_wizard')
-        first_time_wizard.setWindowIcon(build_icon(':/icon/openlp-logo.svg'))
+        first_time_wizard.setWindowIcon(UiIcons().main_icon)
         first_time_wizard.resize(550, 386)
         first_time_wizard.setModal(True)
         first_time_wizard.setOptions(QtWidgets.QWizard.IndependentPages | QtWidgets.QWizard.NoBackButtonOnStartPage |
diff --git a/openlp/core/ui/formattingtagdialog.py b/openlp/core/ui/formattingtagdialog.py
index 59a19c2d8..b88ece576 100644
--- a/openlp/core/ui/formattingtagdialog.py
+++ b/openlp/core/ui/formattingtagdialog.py
@@ -26,7 +26,6 @@ from PyQt5 import QtCore, QtWidgets
 
 from openlp.core.common.i18n import UiStrings, translate
 from openlp.core.ui.icons import UiIcons
-from openlp.core.lib import build_icon
 from openlp.core.lib.ui import create_button_box
 
 
@@ -39,7 +38,7 @@ class Ui_FormattingTagDialog(object):
         Set up the UI
         """
         formatting_tag_dialog.setObjectName('formatting_tag_dialog')
-        formatting_tag_dialog.setWindowIcon(build_icon(':/icon/openlp-logo.svg'))
+        formatting_tag_dialog.setWindowIcon(UiIcons().main_icon)
         formatting_tag_dialog.resize(725, 548)
         self.list_data_grid_layout = QtWidgets.QVBoxLayout(formatting_tag_dialog)
         self.list_data_grid_layout.setContentsMargins(8, 8, 8, 8)
diff --git a/openlp/core/ui/icons.py b/openlp/core/ui/icons.py
index 567281157..37baf65da 100644
--- a/openlp/core/ui/icons.py
+++ b/openlp/core/ui/icons.py
@@ -26,6 +26,8 @@ import qtawesome as qta
 
 from PyQt5 import QtGui, QtWidgets
 
+from openlp.core.lib import build_icon
+
 
 class UiIcons(object):
     """
@@ -114,6 +116,8 @@ class UiIcons(object):
             except:
                 setattr(self, key, qta.icon('fa.plus-circle', color='red'))
 
+        self.main_icon = build_icon(':/icon/openlp-logo.svg')
+
     @staticmethod
     def _print_icons():
         """
diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py
index 754aefdc1..8e6c036b6 100644
--- a/openlp/core/ui/mainwindow.py
+++ b/openlp/core/ui/mainwindow.py
@@ -43,7 +43,7 @@ from openlp.core.common.registry import Registry
 from openlp.core.common.settings import Settings
 from openlp.core.display.renderer import Renderer
 from openlp.core.display.screens import ScreenList
-from openlp.core.lib import PluginManager, ImageManager, PluginStatus, build_icon
+from openlp.core.lib import PluginManager, ImageManager, PluginStatus
 from openlp.core.lib.ui import create_action
 from openlp.core.projectors.manager import ProjectorManager
 from openlp.core.ui import AboutForm, SettingsForm, ServiceManager, ThemeManager, LiveController, PluginForm, \
@@ -66,7 +66,7 @@ class Ui_MainWindow(object):
         Set up the user interface
         """
         main_window.setObjectName('MainWindow')
-        main_window.setWindowIcon(build_icon(':/icon/openlp-logo.svg'))
+        main_window.setWindowIcon(UiIcons().main_icon)
         main_window.setDockNestingEnabled(True)
         if is_macosx():
             main_window.setDocumentMode(True)
diff --git a/openlp/core/ui/plugindialog.py b/openlp/core/ui/plugindialog.py
index 8aabea21d..76c587d6a 100644
--- a/openlp/core/ui/plugindialog.py
+++ b/openlp/core/ui/plugindialog.py
@@ -25,8 +25,8 @@ The UI widgets of the plugin view dialog
 from PyQt5 import QtCore, QtWidgets
 
 from openlp.core.common.i18n import UiStrings, translate
-from openlp.core.lib import build_icon
 from openlp.core.lib.ui import create_button_box
+from openlp.core.ui.icons import UiIcons
 
 
 class Ui_PluginViewDialog(object):
@@ -38,7 +38,7 @@ class Ui_PluginViewDialog(object):
         Set up the UI
         """
         plugin_view_dialog.setObjectName('plugin_view_dialog')
-        plugin_view_dialog.setWindowIcon(build_icon(':/icon/openlp-logo.svg'))
+        plugin_view_dialog.setWindowIcon(UiIcons().main_icon)
         plugin_view_dialog.setWindowModality(QtCore.Qt.ApplicationModal)
         self.plugin_layout = QtWidgets.QVBoxLayout(plugin_view_dialog)
         self.plugin_layout.setObjectName('plugin_layout')
diff --git a/openlp/core/ui/printservicedialog.py b/openlp/core/ui/printservicedialog.py
index 87771606f..f529f5206 100644
--- a/openlp/core/ui/printservicedialog.py
+++ b/openlp/core/ui/printservicedialog.py
@@ -25,7 +25,6 @@ The UI widgets of the print service dialog.
 from PyQt5 import QtCore, QtWidgets, QtPrintSupport
 
 from openlp.core.common.i18n import UiStrings, translate
-from openlp.core.lib import build_icon
 from openlp.core.ui.icons import UiIcons
 from openlp.core.widgets.edits import SpellTextEdit
 
@@ -51,7 +50,7 @@ class Ui_PrintServiceDialog(object):
         Set up the UI
         """
         print_service_dialog.setObjectName('print_service_dialog')
-        print_service_dialog.setWindowIcon(build_icon(':/icon/openlp-logo.svg'))
+        print_service_dialog.setWindowIcon(UiIcons().main_icon)
         print_service_dialog.resize(664, 594)
         self.main_layout = QtWidgets.QVBoxLayout(print_service_dialog)
         self.main_layout.setSpacing(0)
diff --git a/openlp/core/ui/serviceitemeditdialog.py b/openlp/core/ui/serviceitemeditdialog.py
index 5206ff136..0c9949da8 100644
--- a/openlp/core/ui/serviceitemeditdialog.py
+++ b/openlp/core/ui/serviceitemeditdialog.py
@@ -25,8 +25,8 @@ The UI widgets for the service item edit dialog
 from PyQt5 import QtWidgets
 
 from openlp.core.common.i18n import translate
-from openlp.core.lib import build_icon
 from openlp.core.lib.ui import create_button_box, create_button
+from openlp.core.ui.icons import UiIcons
 
 
 class Ui_ServiceItemEditDialog(object):
@@ -38,7 +38,7 @@ class Ui_ServiceItemEditDialog(object):
         Set up the UI
         """
         serviceItemEditDialog.setObjectName('serviceItemEditDialog')
-        serviceItemEditDialog.setWindowIcon(build_icon(':/icon/openlp-logo.svg'))
+        serviceItemEditDialog.setWindowIcon(UiIcons().main_icon)
         self.dialog_layout = QtWidgets.QGridLayout(serviceItemEditDialog)
         self.dialog_layout.setContentsMargins(8, 8, 8, 8)
         self.dialog_layout.setSpacing(8)
diff --git a/openlp/core/ui/settingsdialog.py b/openlp/core/ui/settingsdialog.py
index a6b91368c..913f0255d 100644
--- a/openlp/core/ui/settingsdialog.py
+++ b/openlp/core/ui/settingsdialog.py
@@ -25,8 +25,8 @@ The UI widgets of the settings dialog.
 from PyQt5 import QtCore, QtWidgets
 
 from openlp.core.common.i18n import translate
-from openlp.core.lib import build_icon
 from openlp.core.lib.ui import create_button_box
+from openlp.core.ui.icons import UiIcons
 
 
 class Ui_SettingsDialog(object):
@@ -38,7 +38,7 @@ class Ui_SettingsDialog(object):
         Set up the UI
         """
         settings_dialog.setObjectName('settings_dialog')
-        settings_dialog.setWindowIcon(build_icon(':/icon/openlp-logo.svg'))
+        settings_dialog.setWindowIcon(UiIcons().main_icon)
         settings_dialog.resize(920, 625)
         self.dialog_layout = QtWidgets.QGridLayout(settings_dialog)
         self.dialog_layout.setObjectName('dialog_layout')
diff --git a/openlp/core/ui/shortcutlistdialog.py b/openlp/core/ui/shortcutlistdialog.py
index ebf432b8a..e7c498f92 100644
--- a/openlp/core/ui/shortcutlistdialog.py
+++ b/openlp/core/ui/shortcutlistdialog.py
@@ -25,7 +25,6 @@ The list of shortcuts within a dialog.
 from PyQt5 import QtCore, QtWidgets
 
 from openlp.core.common.i18n import translate
-from openlp.core.lib import build_icon
 from openlp.core.lib.ui import create_button_box
 from openlp.core.ui.icons import UiIcons
 
@@ -73,7 +72,7 @@ class Ui_ShortcutListDialog(object):
         Set up the UI
         """
         shortcutListDialog.setObjectName('shortcutListDialog')
-        shortcutListDialog.setWindowIcon(build_icon(':/icon/openlp-logo.svg'))
+        shortcutListDialog.setWindowIcon(UiIcons().main_icon)
         shortcutListDialog.resize(500, 438)
         self.shortcut_list_layout = QtWidgets.QVBoxLayout(shortcutListDialog)
         self.shortcut_list_layout.setObjectName('shortcut_list_layout')
diff --git a/openlp/core/ui/starttimedialog.py b/openlp/core/ui/starttimedialog.py
index 05118bce6..c159f7660 100644
--- a/openlp/core/ui/starttimedialog.py
+++ b/openlp/core/ui/starttimedialog.py
@@ -25,8 +25,8 @@ The UI widgets for the time dialog
 from PyQt5 import QtCore, QtWidgets
 
 from openlp.core.common.i18n import UiStrings, translate
-from openlp.core.lib import build_icon
 from openlp.core.lib.ui import create_button_box
+from openlp.core.ui.icons import UiIcons
 
 
 class Ui_StartTimeDialog(object):
@@ -38,7 +38,7 @@ class Ui_StartTimeDialog(object):
         Set up the UI
         """
         StartTimeDialog.setObjectName('StartTimeDialog')
-        StartTimeDialog.setWindowIcon(build_icon(':/icon/openlp-logo.svg'))
+        StartTimeDialog.setWindowIcon(UiIcons().main_icon)
         StartTimeDialog.resize(350, 10)
         self.dialog_layout = QtWidgets.QGridLayout(StartTimeDialog)
         self.dialog_layout.setObjectName('dialog_layout')
diff --git a/openlp/core/ui/themelayoutdialog.py b/openlp/core/ui/themelayoutdialog.py
index 159ac7c9e..f09770b60 100644
--- a/openlp/core/ui/themelayoutdialog.py
+++ b/openlp/core/ui/themelayoutdialog.py
@@ -25,8 +25,8 @@ The layout of the theme
 from PyQt5 import QtWidgets
 
 from openlp.core.common.i18n import translate
-from openlp.core.lib import build_icon
 from openlp.core.lib.ui import create_button_box
+from openlp.core.ui.icons import UiIcons
 
 
 class Ui_ThemeLayoutDialog(object):
@@ -38,7 +38,7 @@ class Ui_ThemeLayoutDialog(object):
         Set up the UI
         """
         themeLayoutDialog.setObjectName('themeLayoutDialogDialog')
-        themeLayoutDialog.setWindowIcon(build_icon(':/icon/openlp-logo.svg'))
+        themeLayoutDialog.setWindowIcon(UiIcons().main_icon)
         self.preview_layout = QtWidgets.QVBoxLayout(themeLayoutDialog)
         self.preview_layout.setObjectName('preview_layout')
         self.preview_area = QtWidgets.QWidget(themeLayoutDialog)
diff --git a/openlp/core/ui/themewizard.py b/openlp/core/ui/themewizard.py
index 9e75c1e82..0219ef758 100644
--- a/openlp/core/ui/themewizard.py
+++ b/openlp/core/ui/themewizard.py
@@ -26,9 +26,9 @@ from PyQt5 import QtCore, QtGui, QtWidgets
 
 from openlp.core.common import is_macosx
 from openlp.core.common.i18n import UiStrings, translate
-from openlp.core.lib import build_icon
 from openlp.core.lib.theme import HorizontalType, BackgroundType, BackgroundGradientType
 from openlp.core.lib.ui import add_welcome_page, create_valign_selection_widgets
+from openlp.core.ui.icons import UiIcons
 from openlp.core.widgets.buttons import ColorButton
 from openlp.core.widgets.edits import PathEdit
 
@@ -42,7 +42,7 @@ class Ui_ThemeWizard(object):
         Set up the UI
         """
         theme_wizard.setObjectName('OpenLP.ThemeWizard')
-        theme_wizard.setWindowIcon(build_icon(':/icon/openlp-logo.svg'))
+        theme_wizard.setWindowIcon(UiIcons().main_icon)
         theme_wizard.setModal(True)
         theme_wizard.setOptions(QtWidgets.QWizard.IndependentPages |
                                 QtWidgets.QWizard.NoBackButtonOnStartPage | QtWidgets.QWizard.HaveCustomButton1)
diff --git a/openlp/core/widgets/wizard.py b/openlp/core/widgets/wizard.py
index f39caacc2..713889dfb 100644
--- a/openlp/core/widgets/wizard.py
+++ b/openlp/core/widgets/wizard.py
@@ -124,7 +124,7 @@ class OpenLPWizard(QtWidgets.QWizard, RegistryProperties):
         Set up the wizard UI.
         :param image: path to start up image
         """
-        self.setWindowIcon(build_icon(':/icon/openlp-logo.svg'))
+        self.setWindowIcon(UiIcons().main_icon)
         self.setModal(True)
         self.setOptions(QtWidgets.QWizard.IndependentPages |
                         QtWidgets.QWizard.NoBackButtonOnStartPage | QtWidgets.QWizard.NoBackButtonOnLastPage)
diff --git a/openlp/plugins/alerts/forms/alertdialog.py b/openlp/plugins/alerts/forms/alertdialog.py
index 04aee0842..983c79085 100644
--- a/openlp/plugins/alerts/forms/alertdialog.py
+++ b/openlp/plugins/alerts/forms/alertdialog.py
@@ -24,7 +24,6 @@ from PyQt5 import QtWidgets
 
 from openlp.core.common.i18n import translate
 from openlp.core.ui.icons import UiIcons
-from openlp.core.lib import build_icon
 from openlp.core.lib.ui import create_button, create_button_box
 
 
@@ -40,7 +39,7 @@ class Ui_AlertDialog(object):
         """
         alert_dialog.setObjectName('alert_dialog')
         alert_dialog.resize(400, 300)
-        alert_dialog.setWindowIcon(build_icon(':/icon/openlp-logo.svg'))
+        alert_dialog.setWindowIcon(UiIcons().main_icon)
         self.alert_dialog_layout = QtWidgets.QGridLayout(alert_dialog)
         self.alert_dialog_layout.setObjectName('alert_dialog_layout')
         self.alert_text_layout = QtWidgets.QFormLayout()
diff --git a/openlp/plugins/bibles/forms/booknamedialog.py b/openlp/plugins/bibles/forms/booknamedialog.py
index 05beaff19..a76078f9f 100644
--- a/openlp/plugins/bibles/forms/booknamedialog.py
+++ b/openlp/plugins/bibles/forms/booknamedialog.py
@@ -23,14 +23,14 @@
 from PyQt5 import QtCore, QtWidgets
 
 from openlp.core.common.i18n import translate
-from openlp.core.lib import build_icon
 from openlp.core.lib.ui import create_button_box
+from openlp.core.ui.icons import UiIcons
 
 
 class Ui_BookNameDialog(object):
     def setupUi(self, book_name_dialog):
         book_name_dialog.setObjectName('book_name_dialog')
-        book_name_dialog.setWindowIcon(build_icon(':/icon/openlp-logo.svg'))
+        book_name_dialog.setWindowIcon(UiIcons().main_icon)
         book_name_dialog.resize(400, 271)
         self.book_name_layout = QtWidgets.QVBoxLayout(book_name_dialog)
         self.book_name_layout.setSpacing(8)
diff --git a/openlp/plugins/bibles/forms/editbibledialog.py b/openlp/plugins/bibles/forms/editbibledialog.py
index f57239da6..b5bf1aba3 100644
--- a/openlp/plugins/bibles/forms/editbibledialog.py
+++ b/openlp/plugins/bibles/forms/editbibledialog.py
@@ -23,16 +23,16 @@
 from PyQt5 import QtCore, QtWidgets
 
 from openlp.core.common.i18n import translate
-from openlp.core.lib import build_icon
 from openlp.core.lib.ui import create_button_box
 from openlp.plugins.bibles.lib import LanguageSelection, BibleStrings
 from openlp.plugins.bibles.lib.db import BiblesResourcesDB
+from openlp.core.ui.icons import UiIcons
 
 
 class Ui_EditBibleDialog(object):
     def setupUi(self, edit_bible_dialog):
         edit_bible_dialog.setObjectName('edit_bible_dialog')
-        edit_bible_dialog.setWindowIcon(build_icon(':/icon/openlp-logo.svg'))
+        edit_bible_dialog.setWindowIcon(UiIcons().main_icon)
         edit_bible_dialog.resize(520, 400)
         edit_bible_dialog.setModal(True)
         self.dialog_layout = QtWidgets.QVBoxLayout(edit_bible_dialog)
diff --git a/openlp/plugins/bibles/forms/languagedialog.py b/openlp/plugins/bibles/forms/languagedialog.py
index 0af3a0393..b93b62626 100644
--- a/openlp/plugins/bibles/forms/languagedialog.py
+++ b/openlp/plugins/bibles/forms/languagedialog.py
@@ -23,14 +23,14 @@
 from PyQt5 import QtWidgets
 
 from openlp.core.common.i18n import translate
-from openlp.core.lib import build_icon
 from openlp.core.lib.ui import create_button_box
+from openlp.core.ui.icons import UiIcons
 
 
 class Ui_LanguageDialog(object):
     def setupUi(self, language_dialog):
         language_dialog.setObjectName('language_dialog')
-        language_dialog.setWindowIcon(build_icon(':/icon/openlp-logo.svg'))
+        language_dialog.setWindowIcon(UiIcons().main_icon)
         language_dialog.resize(400, 165)
         self.language_layout = QtWidgets.QVBoxLayout(language_dialog)
         self.language_layout.setSpacing(8)
diff --git a/openlp/plugins/custom/forms/editcustomdialog.py b/openlp/plugins/custom/forms/editcustomdialog.py
index 79771e4b2..4fd300d38 100644
--- a/openlp/plugins/custom/forms/editcustomdialog.py
+++ b/openlp/plugins/custom/forms/editcustomdialog.py
@@ -22,8 +22,8 @@
 from PyQt5 import QtWidgets
 
 from openlp.core.common.i18n import UiStrings, translate
-from openlp.core.lib import build_icon
 from openlp.core.lib.ui import create_button_box, create_button
+from openlp.core.ui.icons import UiIcons
 
 
 class Ui_CustomEditDialog(object):
@@ -33,7 +33,7 @@ class Ui_CustomEditDialog(object):
         :param custom_edit_dialog: The Dialog
         """
         custom_edit_dialog.setObjectName('custom_edit_dialog')
-        custom_edit_dialog.setWindowIcon(build_icon(':/icon/openlp-logo.svg'))
+        custom_edit_dialog.setWindowIcon(UiIcons().main_icon)
         custom_edit_dialog.resize(450, 350)
         self.dialog_layout = QtWidgets.QVBoxLayout(custom_edit_dialog)
         self.dialog_layout.setObjectName('dialog_layout')
diff --git a/openlp/plugins/custom/forms/editcustomslidedialog.py b/openlp/plugins/custom/forms/editcustomslidedialog.py
index 4256277f3..46f74b42a 100644
--- a/openlp/plugins/custom/forms/editcustomslidedialog.py
+++ b/openlp/plugins/custom/forms/editcustomslidedialog.py
@@ -23,7 +23,6 @@
 from PyQt5 import QtWidgets
 
 from openlp.core.common.i18n import UiStrings, translate
-from openlp.core.lib import build_icon
 from openlp.core.lib.ui import create_button, create_button_box
 from openlp.core.ui.icons import UiIcons
 from openlp.core.widgets.edits import SpellTextEdit
@@ -32,7 +31,7 @@ from openlp.core.widgets.edits import SpellTextEdit
 class Ui_CustomSlideEditDialog(object):
     def setupUi(self, custom_slide_edit_dialog):
         custom_slide_edit_dialog.setObjectName('custom_slide_edit_dialog')
-        custom_slide_edit_dialog.setWindowIcon(build_icon(':/icon/openlp-logo.svg'))
+        custom_slide_edit_dialog.setWindowIcon(UiIcons().main_icon)
         custom_slide_edit_dialog.resize(350, 300)
         self.dialog_layout = QtWidgets.QVBoxLayout(custom_slide_edit_dialog)
         self.slide_text_edit = SpellTextEdit(self)
diff --git a/openlp/plugins/songs/forms/authorsdialog.py b/openlp/plugins/songs/forms/authorsdialog.py
index a65789277..7a83b463f 100644
--- a/openlp/plugins/songs/forms/authorsdialog.py
+++ b/openlp/plugins/songs/forms/authorsdialog.py
@@ -23,8 +23,8 @@
 from PyQt5 import QtWidgets
 
 from openlp.core.common.i18n import translate
-from openlp.core.lib import build_icon
 from openlp.core.lib.ui import create_button_box
+from openlp.core.ui.icons import UiIcons
 
 
 class Ui_AuthorsDialog(object):
@@ -37,7 +37,7 @@ class Ui_AuthorsDialog(object):
         Set up the UI for the dialog.
         """
         authors_dialog.setObjectName('authors_dialog')
-        authors_dialog.setWindowIcon(build_icon(':/icon/openlp-logo.svg'))
+        authors_dialog.setWindowIcon(UiIcons().main_icon)
         authors_dialog.resize(300, 10)
         authors_dialog.setModal(True)
         self.dialog_layout = QtWidgets.QVBoxLayout(authors_dialog)
diff --git a/openlp/plugins/songs/forms/editsongdialog.py b/openlp/plugins/songs/forms/editsongdialog.py
index 79001d323..026b79ea5 100644
--- a/openlp/plugins/songs/forms/editsongdialog.py
+++ b/openlp/plugins/songs/forms/editsongdialog.py
@@ -23,9 +23,9 @@
 from PyQt5 import QtCore, QtGui, QtWidgets
 
 from openlp.core.common.i18n import UiStrings, translate
-from openlp.core.lib import build_icon
 from openlp.core.lib.ui import create_button_box, create_button
 from openlp.core.ui import SingleColumnTableWidget
+from openlp.core.ui.icons import UiIcons
 from openlp.plugins.songs.lib.ui import SongStrings
 
 
@@ -36,7 +36,7 @@ class Ui_EditSongDialog(object):
     """
     def setupUi(self, edit_song_dialog):
         edit_song_dialog.setObjectName('edit_song_dialog')
-        edit_song_dialog.setWindowIcon(build_icon(':/icon/openlp-logo.svg'))
+        edit_song_dialog.setWindowIcon(UiIcons().main_icon)
         edit_song_dialog.resize(900, 600)
         edit_song_dialog.setModal(True)
         self.dialog_layout = QtWidgets.QVBoxLayout(edit_song_dialog)
diff --git a/openlp/plugins/songs/forms/editversedialog.py b/openlp/plugins/songs/forms/editversedialog.py
index ef673e9dd..310bcad7d 100644
--- a/openlp/plugins/songs/forms/editversedialog.py
+++ b/openlp/plugins/songs/forms/editversedialog.py
@@ -24,7 +24,6 @@ from PyQt5 import QtWidgets
 
 from openlp.core.common.i18n import UiStrings, translate
 from openlp.core.common.settings import Settings
-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.core.widgets.edits import SpellTextEdit
@@ -34,7 +33,7 @@ from openlp.plugins.songs.lib import VerseType
 class Ui_EditVerseDialog(object):
     def setupUi(self, edit_verse_dialog):
         edit_verse_dialog.setObjectName('edit_verse_dialog')
-        edit_verse_dialog.setWindowIcon(build_icon(':/icon/openlp-logo.svg'))
+        edit_verse_dialog.setWindowIcon(UiIcons().main_icon)
         edit_verse_dialog.resize(400, 400)
         edit_verse_dialog.setModal(True)
         self.dialog_layout = QtWidgets.QVBoxLayout(edit_verse_dialog)
diff --git a/openlp/plugins/songs/forms/mediafilesdialog.py b/openlp/plugins/songs/forms/mediafilesdialog.py
index 93987b82a..4a7bffa8c 100644
--- a/openlp/plugins/songs/forms/mediafilesdialog.py
+++ b/openlp/plugins/songs/forms/mediafilesdialog.py
@@ -23,8 +23,8 @@
 from PyQt5 import QtCore, QtWidgets
 
 from openlp.core.common.i18n import translate
-from openlp.core.lib import build_icon
 from openlp.core.lib.ui import create_button_box
+from openlp.core.ui.icons import UiIcons
 
 
 class Ui_MediaFilesDialog(object):
@@ -36,7 +36,7 @@ class Ui_MediaFilesDialog(object):
         Set up the user interface.
         """
         media_files_dialog.setObjectName('media_files_dialog')
-        media_files_dialog.setWindowIcon(build_icon(':/icon/openlp-logo.svg'))
+        media_files_dialog.setWindowIcon(UiIcons().main_icon)
         media_files_dialog.setWindowModality(QtCore.Qt.ApplicationModal)
         media_files_dialog.resize(400, 300)
         media_files_dialog.setModal(True)
diff --git a/openlp/plugins/songs/forms/songbookdialog.py b/openlp/plugins/songs/forms/songbookdialog.py
index b9c2019af..00404aa71 100644
--- a/openlp/plugins/songs/forms/songbookdialog.py
+++ b/openlp/plugins/songs/forms/songbookdialog.py
@@ -23,8 +23,8 @@
 from PyQt5 import QtWidgets
 
 from openlp.core.common.i18n import translate
-from openlp.core.lib import build_icon
 from openlp.core.lib.ui import create_button_box
+from openlp.core.ui.icons import UiIcons
 
 
 class Ui_SongBookDialog(object):
@@ -36,7 +36,7 @@ class Ui_SongBookDialog(object):
         Set up the user interface.
         """
         song_book_dialog.setObjectName('song_book_dialog')
-        song_book_dialog.setWindowIcon(build_icon(':/icon/openlp-logo.svg'))
+        song_book_dialog.setWindowIcon(UiIcons().main_icon)
         song_book_dialog.resize(300, 10)
         self.dialog_layout = QtWidgets.QVBoxLayout(song_book_dialog)
         self.dialog_layout.setObjectName('dialog_layout')
diff --git a/openlp/plugins/songs/forms/songmaintenancedialog.py b/openlp/plugins/songs/forms/songmaintenancedialog.py
index 1dbebc1d5..05cd92239 100644
--- a/openlp/plugins/songs/forms/songmaintenancedialog.py
+++ b/openlp/plugins/songs/forms/songmaintenancedialog.py
@@ -38,7 +38,7 @@ class Ui_SongMaintenanceDialog(object):
         Set up the user interface for the song maintenance dialog
         """
         song_maintenance_dialog.setObjectName('song_maintenance_dialog')
-        song_maintenance_dialog.setWindowIcon(build_icon(':/icon/openlp-logo.svg'))
+        song_maintenance_dialog.setWindowIcon(UiIcons().main_icon)
         song_maintenance_dialog.setWindowModality(QtCore.Qt.ApplicationModal)
         song_maintenance_dialog.resize(600, 600)
         self.dialog_layout = QtWidgets.QGridLayout(song_maintenance_dialog)
diff --git a/openlp/plugins/songs/forms/topicsdialog.py b/openlp/plugins/songs/forms/topicsdialog.py
index bd80548b9..889f80b36 100644
--- a/openlp/plugins/songs/forms/topicsdialog.py
+++ b/openlp/plugins/songs/forms/topicsdialog.py
@@ -23,8 +23,8 @@
 from PyQt5 import QtWidgets
 
 from openlp.core.common.i18n import translate
-from openlp.core.lib import build_icon
 from openlp.core.lib.ui import create_button_box
+from openlp.core.ui.icons import UiIcons
 
 
 class Ui_TopicsDialog(object):
@@ -36,7 +36,7 @@ class Ui_TopicsDialog(object):
         Set up the user interface for the topics dialog.
         """
         topics_dialog.setObjectName('topics_dialog')
-        topics_dialog.setWindowIcon(build_icon(':/icon/openlp-logo.svg'))
+        topics_dialog.setWindowIcon(UiIcons().main_icon)
         topics_dialog.resize(300, 10)
         self.dialog_layout = QtWidgets.QVBoxLayout(topics_dialog)
         self.dialog_layout.setObjectName('dialog_layout')
diff --git a/openlp/plugins/songusage/forms/songusagedeletedialog.py b/openlp/plugins/songusage/forms/songusagedeletedialog.py
index 59f2ef042..82196bf48 100644
--- a/openlp/plugins/songusage/forms/songusagedeletedialog.py
+++ b/openlp/plugins/songusage/forms/songusagedeletedialog.py
@@ -23,8 +23,8 @@
 from PyQt5 import QtCore, QtWidgets
 
 from openlp.core.common.i18n import translate
-from openlp.core.lib import build_icon
 from openlp.core.lib.ui import create_button_box
+from openlp.core.ui.icons import UiIcons
 
 
 class Ui_SongUsageDeleteDialog(object):
@@ -38,7 +38,7 @@ class Ui_SongUsageDeleteDialog(object):
         :param song_usage_delete_dialog:
         """
         song_usage_delete_dialog.setObjectName('song_usage_delete_dialog')
-        song_usage_delete_dialog.setWindowIcon(build_icon(':/icon/openlp-logo.svg'))
+        song_usage_delete_dialog.setWindowIcon(UiIcons().main_icon)
         song_usage_delete_dialog.resize(291, 243)
         self.vertical_layout = QtWidgets.QVBoxLayout(song_usage_delete_dialog)
         self.vertical_layout.setSpacing(8)
diff --git a/openlp/plugins/songusage/forms/songusagedetaildialog.py b/openlp/plugins/songusage/forms/songusagedetaildialog.py
index ead4d7b3d..5e9e57872 100644
--- a/openlp/plugins/songusage/forms/songusagedetaildialog.py
+++ b/openlp/plugins/songusage/forms/songusagedetaildialog.py
@@ -22,8 +22,8 @@
 from PyQt5 import QtCore, QtWidgets
 
 from openlp.core.common.i18n import translate
-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.core.widgets.edits import PathEdit
 from openlp.core.widgets.enums import PathEditType
 
@@ -39,7 +39,7 @@ class Ui_SongUsageDetailDialog(object):
         :param song_usage_detail_dialog:
         """
         song_usage_detail_dialog.setObjectName('song_usage_detail_dialog')
-        song_usage_detail_dialog.setWindowIcon(build_icon(':/icon/openlp-logo.svg'))
+        song_usage_detail_dialog.setWindowIcon(UiIcons().main_icon)
         song_usage_detail_dialog.resize(609, 413)
         self.vertical_layout = QtWidgets.QVBoxLayout(song_usage_detail_dialog)
         self.vertical_layout.setSpacing(8)