diff --git a/openlp/core/ui/fonts/OpenLP.ttf b/openlp/core/ui/fonts/OpenLP.ttf
new file mode 100644
index 000000000..056333ffe
Binary files /dev/null and b/openlp/core/ui/fonts/OpenLP.ttf differ
diff --git a/openlp/core/ui/fonts/openlp-charmap.json b/openlp/core/ui/fonts/openlp-charmap.json
new file mode 100644
index 000000000..43f94601d
--- /dev/null
+++ b/openlp/core/ui/fonts/openlp-charmap.json
@@ -0,0 +1,4 @@
+{
+    "users": "0041", 
+    "file-text": "0042"
+}
diff --git a/openlp/core/ui/icons.py b/openlp/core/ui/icons.py
index 1cce3030d..311b09dee 100644
--- a/openlp/core/ui/icons.py
+++ b/openlp/core/ui/icons.py
@@ -26,6 +26,7 @@ import qtawesome as qta
 
 from PyQt5 import QtGui, QtWidgets
 
+from openlp.core.common.applocation import AppLocation
 from openlp.core.lib import build_icon
 
 
@@ -48,6 +49,9 @@ class UiIcons(object):
         """
         These are the font icons used in the code.
         """
+        font_path = AppLocation.get_directory(AppLocation.AppDir) / 'core' / 'ui' / 'fonts' / 'OpenLP.ttf'
+        charmap_path = AppLocation.get_directory(AppLocation.AppDir) / 'core' / 'ui' / 'fonts' / 'openlp-charmap.json'
+        qta.load_font('op', font_path, charmap_path)
         palette = QtWidgets.QApplication.palette()
         qta.set_defaults(color=palette.color(QtGui.QPalette.Active,
                                              QtGui.QPalette.ButtonText),
@@ -112,13 +116,13 @@ class UiIcons(object):
             'sort': {'icon': 'fa.sort'},
             'stop': {'icon': 'fa.stop'},
             'square': {'icon': 'fa.square'},
-            'text': {'icon': 'fa.file-text'},
+            'text': {'icon': 'op.file-text'},
             'theme': {'icon': 'fa.file-image-o'},
             'top': {'icon': 'fa.angle-double-up'},
             'undo': {'icon': 'fa.undo'},
             'upload': {'icon': 'fa.cloud-upload'},
             'user': {'icon': 'fa.user'},
-            'usermo': {'icon': 'fa.user-md'},
+            'usermo': {'icon': 'op.users'},
             'users': {'icon': 'fa.users'},
             'video': {'icon': 'fa.file-video-o'}
         }