diff --git a/.bzrignore b/.bzrignore
index 6377150e0..a0c3f0b4f 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -32,3 +32,4 @@ tests.kdev4
 *.orig
 __pycache__
 *.dll
+.directory
diff --git a/MANIFEST.in b/MANIFEST.in
index 35e83e30f..be81efb23 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -5,6 +5,8 @@ recursive-include openlp *.html
 recursive-include openlp *.js
 recursive-include openlp *.css
 recursive-include openlp *.png
+recursive-include openlp *.ps
+recursive-include openlp *.json
 recursive-include documentation *
 recursive-include resources *
 recursive-include scripts *
diff --git a/README.txt b/README.txt
index b937e1d5f..04294b1b8 100644
--- a/README.txt
+++ b/README.txt
@@ -1,16 +1,15 @@
-OpenLP 2.0
-==========
+OpenLP
+======
 
 You're probably reading this because you've just downloaded the source code for
-OpenLP 2.0. If you are looking for the installer file, please go to the download
+OpenLP. If you are looking for the installer file, please go to the download
 page on the web site::
 
-    http://openlp.org/en/download.html
+    http://openlp.org/download
 
 If you're looking for how to contribute to OpenLP, then please look at the
 OpenLP wiki::
 
     http://wiki.openlp.org/
 
-Thanks for downloading OpenLP 2.0!
-
+Thanks for downloading OpenLP!
diff --git a/openlp/core/ui/aboutdialog.py b/openlp/core/ui/aboutdialog.py
index 276a073bb..251e0657c 100644
--- a/openlp/core/ui/aboutdialog.py
+++ b/openlp/core/ui/aboutdialog.py
@@ -44,7 +44,7 @@ class Ui_AboutDialog(object):
         Set up the UI for the dialog.
         """
         about_dialog.setObjectName('about_dialog')
-        about_dialog.setWindowIcon(build_icon(':/icon/openlp-logo-16x16.png'))
+        about_dialog.setWindowIcon(build_icon(':/icon/openlp-logo.svg'))
         self.about_dialog_layout = QtGui.QVBoxLayout(about_dialog)
         self.about_dialog_layout.setObjectName('about_dialog_layout')
         self.logo_label = QtGui.QLabel(about_dialog)
diff --git a/openlp/core/ui/exceptiondialog.py b/openlp/core/ui/exceptiondialog.py
index b8b3941cd..329ed7797 100644
--- a/openlp/core/ui/exceptiondialog.py
+++ b/openlp/core/ui/exceptiondialog.py
@@ -32,7 +32,7 @@ The GUI widgets of the exception dialog.
 
 from PyQt4 import QtGui
 
-from openlp.core.lib import translate
+from openlp.core.lib import translate, build_icon
 from openlp.core.lib.ui import create_button, create_button_box
 
 
@@ -45,6 +45,7 @@ class Ui_ExceptionDialog(object):
         Set up the UI.
         """
         exception_dialog.setObjectName('exception_dialog')
+        exception_dialog.setWindowIcon(build_icon(u':/icon/openlp-logo.svg'))
         self.exception_layout = QtGui.QVBoxLayout(exception_dialog)
         self.exception_layout.setObjectName('exception_layout')
         self.message_layout = QtGui.QHBoxLayout()
diff --git a/openlp/core/ui/filerenamedialog.py b/openlp/core/ui/filerenamedialog.py
index 0900b82c3..4a316aece 100644
--- a/openlp/core/ui/filerenamedialog.py
+++ b/openlp/core/ui/filerenamedialog.py
@@ -31,7 +31,7 @@ The UI widgets for the rename dialog
 """
 from PyQt4 import QtCore, QtGui
 
-from openlp.core.lib import translate
+from openlp.core.lib import translate, build_icon
 from openlp.core.lib.ui import create_button_box
 
 
@@ -44,6 +44,7 @@ class Ui_FileRenameDialog(object):
         Set up the UI
         """
         file_rename_dialog.setObjectName('file_rename_dialog')
+        file_rename_dialog.setWindowIcon(build_icon(u':/icon/openlp-logo.svg'))
         file_rename_dialog.resize(300, 10)
         self.dialog_layout = QtGui.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 10b341c2c..b4263e498 100644
--- a/openlp/core/ui/firsttimelanguagedialog.py
+++ b/openlp/core/ui/firsttimelanguagedialog.py
@@ -32,6 +32,7 @@ The UI widgets of the language selection dialog.
 from PyQt4 import QtGui
 
 from openlp.core.common import translate
+from openlp.core.lib import build_icon
 from openlp.core.lib.ui import create_button_box
 
 
@@ -44,6 +45,7 @@ class Ui_FirstTimeLanguageDialog(object):
         Set up the UI.
         """
         language_dialog.setObjectName('language_dialog')
+        language_dialog.setWindowIcon(build_icon(u':/icon/openlp-logo.svg'))
         language_dialog.resize(300, 50)
         self.dialog_layout = QtGui.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 1a270f931..35623ded2 100644
--- a/openlp/core/ui/firsttimewizard.py
+++ b/openlp/core/ui/firsttimewizard.py
@@ -34,6 +34,7 @@ from PyQt4 import QtCore, QtGui
 import sys
 
 from openlp.core.common import translate
+from openlp.core.lib import build_icon
 from openlp.core.lib.ui import add_welcome_page
 
 
@@ -60,6 +61,7 @@ class Ui_FirstTimeWizard(object):
         Set up the UI.
         """
         first_time_wizard.setObjectName('first_time_wizard')
+        first_time_wizard.setWindowIcon(build_icon(u':/icon/openlp-logo.svg'))
         first_time_wizard.resize(550, 386)
         first_time_wizard.setModal(True)
         first_time_wizard.setWizardStyle(QtGui.QWizard.ModernStyle)
diff --git a/openlp/core/ui/formattingtagdialog.py b/openlp/core/ui/formattingtagdialog.py
index 387bca0a7..569405a05 100644
--- a/openlp/core/ui/formattingtagdialog.py
+++ b/openlp/core/ui/formattingtagdialog.py
@@ -45,6 +45,7 @@ class Ui_FormattingTagDialog(object):
         Set up the UI
         """
         formatting_tag_dialog.setObjectName('formatting_tag_dialog')
+        formatting_tag_dialog.setWindowIcon(build_icon(u':/icon/openlp-logo.svg'))
         formatting_tag_dialog.resize(725, 548)
         self.list_data_grid_layout = QtGui.QVBoxLayout(formatting_tag_dialog)
         self.list_data_grid_layout.setMargin(8)
diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py
index 9c193b079..664c1a596 100644
--- a/openlp/core/ui/mainwindow.py
+++ b/openlp/core/ui/mainwindow.py
@@ -89,7 +89,7 @@ class Ui_MainWindow(object):
         Set up the user interface
         """
         main_window.setObjectName('MainWindow')
-        main_window.setWindowIcon(build_icon(':/icon/openlp-logo-64x64.png'))
+        main_window.setWindowIcon(build_icon(':/icon/openlp-logo.svg'))
         main_window.setDockNestingEnabled(True)
         # Set up the main container, which contains all the other form widgets.
         self.main_content = QtGui.QWidget(main_window)
@@ -320,14 +320,14 @@ class Ui_MainWindow(object):
         # i18n add Language Actions
         add_actions(self.settings_language_menu, (self.auto_language_item, None))
         add_actions(self.settings_language_menu, self.language_group.actions())
-        # Order things differently in OS X so that Preferences menu item in the
-        # app menu is correct (this gets picked up automatically by Qt).
+        # Qt on OS X looks for keywords in the menu items title to determine which menu items get added to the main
+        # menu. If we are running on Mac OS X the menu items whose title contains those keywords but don't belong in the
+        # main menu need to be marked as such with QAction.NoRole.
         if sys.platform == 'darwin':
-            add_actions(self.settings_menu, (self.settings_plugin_list_item, self.settings_language_menu.menuAction(),
-                        None, self.settings_configure_item, self.settings_shortcuts_item, self.formatting_tag_item))
-        else:
-            add_actions(self.settings_menu, (self.settings_plugin_list_item, self.settings_language_menu.menuAction(),
-                        None, self.formatting_tag_item, self.settings_shortcuts_item, self.settings_configure_item))
+            self.settings_shortcuts_item.setMenuRole(QtGui.QAction.NoRole)
+            self.formatting_tag_item.setMenuRole(QtGui.QAction.NoRole)
+        add_actions(self.settings_menu, (self.settings_plugin_list_item, self.settings_language_menu.menuAction(),
+                    None, self.formatting_tag_item, self.settings_shortcuts_item, self.settings_configure_item))
         add_actions(self.tools_menu, (self.tools_add_tool_item, None))
         add_actions(self.tools_menu, (self.tools_open_data_folder, None))
         add_actions(self.tools_menu, (self.tools_first_time_wizard, None))
diff --git a/openlp/core/ui/media/vlcplayer.py b/openlp/core/ui/media/vlcplayer.py
index c80bb6218..d02526b0e 100644
--- a/openlp/core/ui/media/vlcplayer.py
+++ b/openlp/core/ui/media/vlcplayer.py
@@ -34,6 +34,7 @@ from distutils.version import LooseVersion
 import logging
 import os
 import sys
+import threading
 
 from PyQt4 import QtGui
 
@@ -207,7 +208,7 @@ class VlcPlayer(MediaPlayer):
         start_time = 0
         if self.state != MediaState.Paused and controller.media_info.start_time > 0:
             start_time = controller.media_info.start_time
-        display.vlc_media_player.play()
+        threading.Thread(target=display.vlc_media_player.play).start()
         if not self.media_state_wait(display, vlc.State.Playing):
             return False
         self.volume(display, controller.media_info.volume)
@@ -233,7 +234,7 @@ class VlcPlayer(MediaPlayer):
         """
         Stop the current item
         """
-        display.vlc_media_player.stop()
+        threading.Thread(target=display.vlc_media_player.stop).start()
         self.state = MediaState.Stopped
 
     def volume(self, display, vol):
diff --git a/openlp/core/ui/plugindialog.py b/openlp/core/ui/plugindialog.py
index f4d2d991b..40311677e 100644
--- a/openlp/core/ui/plugindialog.py
+++ b/openlp/core/ui/plugindialog.py
@@ -32,6 +32,7 @@ The UI widgets of the plugin view dialog
 from PyQt4 import QtCore, QtGui
 
 from openlp.core.common import UiStrings, translate
+from openlp.core.lib import build_icon
 from openlp.core.lib.ui import create_button_box
 
 
@@ -44,6 +45,7 @@ class Ui_PluginViewDialog(object):
         Set up the UI
         """
         pluginViewDialog.setObjectName('pluginViewDialog')
+        pluginViewDialog.setWindowIcon(build_icon(u':/icon/openlp-logo.svg'))
         pluginViewDialog.setWindowModality(QtCore.Qt.ApplicationModal)
         self.plugin_layout = QtGui.QVBoxLayout(pluginViewDialog)
         self.plugin_layout.setObjectName('plugin_layout')
diff --git a/openlp/core/ui/printservicedialog.py b/openlp/core/ui/printservicedialog.py
index f59dcb044..0873a0b4a 100644
--- a/openlp/core/ui/printservicedialog.py
+++ b/openlp/core/ui/printservicedialog.py
@@ -56,6 +56,7 @@ class Ui_PrintServiceDialog(object):
         Set up the UI
         """
         print_service_dialog.setObjectName('print_service_dialog')
+        print_service_dialog.setWindowIcon(build_icon(u':/icon/openlp-logo.svg'))
         print_service_dialog.resize(664, 594)
         self.main_layout = QtGui.QVBoxLayout(print_service_dialog)
         self.main_layout.setSpacing(0)
diff --git a/openlp/core/ui/serviceitemeditdialog.py b/openlp/core/ui/serviceitemeditdialog.py
index 76139c875..1fa19eb31 100644
--- a/openlp/core/ui/serviceitemeditdialog.py
+++ b/openlp/core/ui/serviceitemeditdialog.py
@@ -32,6 +32,7 @@ The UI widgets for the service item edit dialog
 from PyQt4 import QtGui
 
 from openlp.core.common import translate
+from openlp.core.lib import build_icon
 from openlp.core.lib.ui import create_button_box, create_button
 
 
@@ -44,6 +45,7 @@ class Ui_ServiceItemEditDialog(object):
         Set up the UI
         """
         serviceItemEditDialog.setObjectName('serviceItemEditDialog')
+        serviceItemEditDialog.setWindowIcon(build_icon(u':/icon/openlp-logo.svg'))
         self.dialog_layout = QtGui.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 f625680d6..fbac6a155 100644
--- a/openlp/core/ui/settingsdialog.py
+++ b/openlp/core/ui/settingsdialog.py
@@ -45,8 +45,8 @@ class Ui_SettingsDialog(object):
         Set up the UI
         """
         settings_dialog.setObjectName('settings_dialog')
+        settings_dialog.setWindowIcon(build_icon(u':/icon/openlp-logo.svg'))
         settings_dialog.resize(800, 500)
-        settings_dialog.setWindowIcon(build_icon(':/system/system_settings.png'))
         self.dialog_layout = QtGui.QGridLayout(settings_dialog)
         self.dialog_layout.setObjectName('dialog_layout')
         self.dialog_layout.setMargin(8)
diff --git a/openlp/core/ui/shortcutlistdialog.py b/openlp/core/ui/shortcutlistdialog.py
index 54433da24..ef2dc4056 100644
--- a/openlp/core/ui/shortcutlistdialog.py
+++ b/openlp/core/ui/shortcutlistdialog.py
@@ -66,6 +66,7 @@ class Ui_ShortcutListDialog(object):
         Set up the UI
         """
         shortcutListDialog.setObjectName('shortcutListDialog')
+        shortcutListDialog.setWindowIcon(build_icon(u':/icon/openlp-logo.svg'))
         shortcutListDialog.resize(500, 438)
         self.shortcut_list_layout = QtGui.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 54e0629a4..cfd507bb2 100644
--- a/openlp/core/ui/starttimedialog.py
+++ b/openlp/core/ui/starttimedialog.py
@@ -32,6 +32,7 @@ The UI widgets for the time dialog
 from PyQt4 import QtCore, QtGui
 
 from openlp.core.common import UiStrings, translate
+from openlp.core.lib import build_icon
 from openlp.core.lib.ui import create_button_box
 
 
@@ -44,6 +45,7 @@ class Ui_StartTimeDialog(object):
         Set up the UI
         """
         StartTimeDialog.setObjectName('StartTimeDialog')
+        StartTimeDialog.setWindowIcon(build_icon(u':/icon/openlp-logo.svg'))
         StartTimeDialog.resize(350, 10)
         self.dialog_layout = QtGui.QGridLayout(StartTimeDialog)
         self.dialog_layout.setObjectName('dialog_layout')
diff --git a/openlp/core/ui/themelayoutdialog.py b/openlp/core/ui/themelayoutdialog.py
index 023d6259c..d3fbeed2d 100644
--- a/openlp/core/ui/themelayoutdialog.py
+++ b/openlp/core/ui/themelayoutdialog.py
@@ -32,6 +32,7 @@ The layout of the theme
 from PyQt4 import QtGui
 
 from openlp.core.common import translate
+from openlp.core.lib import build_icon
 from openlp.core.lib.ui import create_button_box
 
 
@@ -44,6 +45,7 @@ class Ui_ThemeLayoutDialog(object):
         Set up the UI
         """
         themeLayoutDialog.setObjectName('themeLayoutDialogDialog')
+        themeLayoutDialog.setWindowIcon(build_icon(u':/icon/openlp-logo.svg'))
         self.preview_layout = QtGui.QVBoxLayout(themeLayoutDialog)
         self.preview_layout.setObjectName('preview_layout')
         self.preview_area = QtGui.QWidget(themeLayoutDialog)
diff --git a/openlp/core/ui/themewizard.py b/openlp/core/ui/themewizard.py
index 77ccb0663..bda52c807 100644
--- a/openlp/core/ui/themewizard.py
+++ b/openlp/core/ui/themewizard.py
@@ -46,6 +46,7 @@ class Ui_ThemeWizard(object):
         Set up the UI
         """
         themeWizard.setObjectName('OpenLP.ThemeWizard')
+        themeWizard.setWindowIcon(build_icon(u':/icon/openlp-logo.svg'))
         themeWizard.setModal(True)
         themeWizard.setWizardStyle(QtGui.QWizard.ModernStyle)
         themeWizard.setOptions(QtGui.QWizard.IndependentPages |
diff --git a/openlp/core/ui/wizard.py b/openlp/core/ui/wizard.py
index 37070092b..23bc0a9e1 100644
--- a/openlp/core/ui/wizard.py
+++ b/openlp/core/ui/wizard.py
@@ -119,6 +119,7 @@ class OpenLPWizard(QtGui.QWizard, RegistryProperties):
         """
         Set up the wizard UI.
         """
+        self.setWindowIcon(build_icon(u':/icon/openlp-logo.svg'))
         self.setModal(True)
         self.setWizardStyle(QtGui.QWizard.ModernStyle)
         self.setOptions(QtGui.QWizard.IndependentPages |
diff --git a/openlp/plugins/alerts/forms/alertdialog.py b/openlp/plugins/alerts/forms/alertdialog.py
index e4fd29a39..47e61365a 100644
--- a/openlp/plugins/alerts/forms/alertdialog.py
+++ b/openlp/plugins/alerts/forms/alertdialog.py
@@ -46,7 +46,7 @@ class Ui_AlertDialog(object):
         """
         alert_dialog.setObjectName('alert_dialog')
         alert_dialog.resize(400, 300)
-        alert_dialog.setWindowIcon(build_icon(':/icon/openlp-logo-16x16.png'))
+        alert_dialog.setWindowIcon(build_icon(u':/icon/openlp-logo.svg'))
         self.alert_dialog_layout = QtGui.QGridLayout(alert_dialog)
         self.alert_dialog_layout.setObjectName('alert_dialog_layout')
         self.alert_text_layout = QtGui.QFormLayout()
diff --git a/openlp/plugins/bibles/forms/booknamedialog.py b/openlp/plugins/bibles/forms/booknamedialog.py
index 5903391c3..120caeff0 100644
--- a/openlp/plugins/bibles/forms/booknamedialog.py
+++ b/openlp/plugins/bibles/forms/booknamedialog.py
@@ -30,12 +30,14 @@
 from PyQt4 import QtCore, QtGui
 
 from openlp.core.common import translate
+from openlp.core.lib import build_icon
 from openlp.core.lib.ui import create_button_box
 
 
 class Ui_BookNameDialog(object):
     def setupUi(self, book_name_dialog):
         book_name_dialog.setObjectName('book_name_dialog')
+        book_name_dialog.setWindowIcon(build_icon(u':/icon/openlp-logo.svg'))
         book_name_dialog.resize(400, 271)
         self.book_name_layout = QtGui.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 1fbaa2f1e..e9e39a053 100644
--- a/openlp/plugins/bibles/forms/editbibledialog.py
+++ b/openlp/plugins/bibles/forms/editbibledialog.py
@@ -39,8 +39,8 @@ from openlp.plugins.bibles.lib.db import BiblesResourcesDB
 class Ui_EditBibleDialog(object):
     def setupUi(self, edit_bible_dialog):
         edit_bible_dialog.setObjectName('edit_bible_dialog')
+        edit_bible_dialog.setWindowIcon(build_icon(u':/icon/openlp-logo.svg'))
         edit_bible_dialog.resize(520, 400)
-        edit_bible_dialog.setWindowIcon(build_icon(':/icon/openlp-logo-16x16.png'))
         edit_bible_dialog.setModal(True)
         self.dialog_layout = QtGui.QVBoxLayout(edit_bible_dialog)
         self.dialog_layout.setSpacing(8)
diff --git a/openlp/plugins/bibles/forms/languagedialog.py b/openlp/plugins/bibles/forms/languagedialog.py
index 10382ea13..ab40503d2 100644
--- a/openlp/plugins/bibles/forms/languagedialog.py
+++ b/openlp/plugins/bibles/forms/languagedialog.py
@@ -30,12 +30,14 @@
 from PyQt4 import QtGui
 
 from openlp.core.common import translate
+from openlp.core.lib import build_icon
 from openlp.core.lib.ui import create_button_box
 
 
 class Ui_LanguageDialog(object):
     def setupUi(self, language_dialog):
         language_dialog.setObjectName('language_dialog')
+        language_dialog.setWindowIcon(build_icon(u':/icon/openlp-logo.svg'))
         language_dialog.resize(400, 165)
         self.language_layout = QtGui.QVBoxLayout(language_dialog)
         self.language_layout.setSpacing(8)
diff --git a/openlp/plugins/bibles/lib/mediaitem.py b/openlp/plugins/bibles/lib/mediaitem.py
index dd14c6409..76f91071a 100644
--- a/openlp/plugins/bibles/lib/mediaitem.py
+++ b/openlp/plugins/bibles/lib/mediaitem.py
@@ -60,7 +60,6 @@ class BibleMediaItem(MediaManagerItem):
     log.info('Bible Media Item loaded')
 
     def __init__(self, parent, plugin):
-        self.icon_path = 'songs/song'
         self.lock_icon = build_icon(':/bibles/bibles_search_lock.png')
         self.unlock_icon = build_icon(':/bibles/bibles_search_unlock.png')
         MediaManagerItem.__init__(self, parent, plugin)
@@ -172,6 +171,7 @@ class BibleMediaItem(MediaManagerItem):
         self.page_layout.addWidget(tab)
         tab.setVisible(False)
         lock_button.toggled.connect(self.on_lock_button_toggled)
+        second_combo_box.currentIndexChanged.connect(self.on_second_bible_combobox_index_changed)
         setattr(self, prefix + 'VersionLabel', version_label)
         setattr(self, prefix + 'VersionComboBox', version_combo_box)
         setattr(self, prefix + 'SecondLabel', second_label)
@@ -263,11 +263,15 @@ class BibleMediaItem(MediaManagerItem):
     def config_update(self):
         log.debug('config_update')
         if Settings().value(self.settings_section + '/second bibles'):
+            self.quickSecondLabel.setVisible(True)
+            self.quickSecondComboBox.setVisible(True)
             self.advancedSecondLabel.setVisible(True)
             self.advancedSecondComboBox.setVisible(True)
             self.quickSecondLabel.setVisible(True)
             self.quickSecondComboBox.setVisible(True)
         else:
+            self.quickSecondLabel.setVisible(False)
+            self.quickSecondComboBox.setVisible(False)
             self.advancedSecondLabel.setVisible(False)
             self.advancedSecondComboBox.setVisible(False)
             self.quickSecondLabel.setVisible(False)
@@ -459,6 +463,17 @@ class BibleMediaItem(MediaManagerItem):
                 books.sort(key=get_locale_key)
         set_case_insensitive_completer(books, self.quick_search_edit)
 
+    def on_second_bible_combobox_index_changed(self, selection):
+        """
+        Activate the style combobox only when no second bible is selected
+        """
+        if selection == 0:
+            self.quickStyleComboBox.setEnabled(True)
+            self.advancedStyleComboBox.setEnabled(True)
+        else:
+            self.quickStyleComboBox.setEnabled(False)
+            self.advancedStyleComboBox.setEnabled(False)
+
     def on_import_click(self):
         if not hasattr(self, 'import_wizard'):
             self.import_wizard = BibleImportForm(self, self.plugin.manager, self.plugin)
diff --git a/openlp/plugins/custom/forms/editcustomdialog.py b/openlp/plugins/custom/forms/editcustomdialog.py
index 22a33d921..5ed92f95e 100644
--- a/openlp/plugins/custom/forms/editcustomdialog.py
+++ b/openlp/plugins/custom/forms/editcustomdialog.py
@@ -41,8 +41,8 @@ class Ui_CustomEditDialog(object):
         :param custom_edit_dialog: The Dialog
         """
         custom_edit_dialog.setObjectName('custom_edit_dialog')
+        custom_edit_dialog.setWindowIcon(build_icon(u':/icon/openlp-logo.svg'))
         custom_edit_dialog.resize(450, 350)
-        custom_edit_dialog.setWindowIcon(build_icon(':/icon/openlp-logo-16x16.png'))
         self.dialog_layout = QtGui.QVBoxLayout(custom_edit_dialog)
         self.dialog_layout.setObjectName('dialog_layout')
         self.title_layout = QtGui.QHBoxLayout()
diff --git a/openlp/plugins/custom/forms/editcustomslidedialog.py b/openlp/plugins/custom/forms/editcustomslidedialog.py
index 3b74566fc..c59cc4cd1 100644
--- a/openlp/plugins/custom/forms/editcustomslidedialog.py
+++ b/openlp/plugins/custom/forms/editcustomslidedialog.py
@@ -30,13 +30,14 @@
 from PyQt4 import QtGui
 
 from openlp.core.common import UiStrings, translate
-from openlp.core.lib import SpellTextEdit
+from openlp.core.lib import SpellTextEdit, build_icon
 from openlp.core.lib.ui import create_button, create_button_box
 
 
 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(u':/icon/openlp-logo.svg'))
         custom_slide_edit_dialog.resize(350, 300)
         self.dialog_layout = QtGui.QVBoxLayout(custom_slide_edit_dialog)
         self.slide_text_edit = SpellTextEdit(self)
diff --git a/openlp/plugins/images/lib/mediaitem.py b/openlp/plugins/images/lib/mediaitem.py
index c28f1e834..36df55dac 100644
--- a/openlp/plugins/images/lib/mediaitem.py
+++ b/openlp/plugins/images/lib/mediaitem.py
@@ -353,7 +353,7 @@ class ImageMediaItem(MediaManagerItem):
                     icon = build_icon(thumb)
                 else:
                     icon = create_thumb(imageFile.filename, thumb)
-            item_name = QtGui.QTreeWidgetItem(filename)
+            item_name = QtGui.QTreeWidgetItem([filename])
             item_name.setText(0, filename)
             item_name.setIcon(0, icon)
             item_name.setToolTip(0, imageFile.filename)
diff --git a/openlp/plugins/media/lib/mediaitem.py b/openlp/plugins/media/lib/mediaitem.py
index 92426334a..0780b175d 100644
--- a/openlp/plugins/media/lib/mediaitem.py
+++ b/openlp/plugins/media/lib/mediaitem.py
@@ -229,7 +229,7 @@ class MediaMediaItem(MediaManagerItem, RegistryProperties):
         self.service_path = os.path.join(AppLocation.get_section_data_path(self.settings_section), 'thumbnails')
         check_directory_exists(self.service_path)
         self.load_list(Settings().value(self.settings_section + '/media files'))
-        self.populate_display_types()
+        self.rebuild_players()
 
     def rebuild_players(self):
         """
diff --git a/openlp/plugins/songs/forms/authorsdialog.py b/openlp/plugins/songs/forms/authorsdialog.py
index 65fb169b0..7bca76ca6 100644
--- a/openlp/plugins/songs/forms/authorsdialog.py
+++ b/openlp/plugins/songs/forms/authorsdialog.py
@@ -43,8 +43,8 @@ class Ui_AuthorsDialog(object):
         Set up the UI for the dialog.
         """
         authors_dialog.setObjectName('authors_dialog')
+        authors_dialog.setWindowIcon(build_icon(u':/icon/openlp-logo.svg'))
         authors_dialog.resize(300, 10)
-        authors_dialog.setWindowIcon(build_icon(':/icon/openlp-logo-16x16.png'))
         authors_dialog.setModal(True)
         self.dialog_layout = QtGui.QVBoxLayout(authors_dialog)
         self.dialog_layout.setObjectName('dialog_layout')
diff --git a/openlp/plugins/songs/forms/editsongdialog.py b/openlp/plugins/songs/forms/editsongdialog.py
index d0fb51a2d..a9ca71946 100644
--- a/openlp/plugins/songs/forms/editsongdialog.py
+++ b/openlp/plugins/songs/forms/editsongdialog.py
@@ -43,8 +43,8 @@ class Ui_EditSongDialog(object):
     """
     def setupUi(self, edit_song_dialog):
         edit_song_dialog.setObjectName('edit_song_dialog')
+        edit_song_dialog.setWindowIcon(build_icon(u':/icon/openlp-logo.svg'))
         edit_song_dialog.resize(650, 400)
-        edit_song_dialog.setWindowIcon(build_icon(':/icon/openlp-logo-16x16.png'))
         edit_song_dialog.setModal(True)
         self.dialog_layout = QtGui.QVBoxLayout(edit_song_dialog)
         self.dialog_layout.setSpacing(8)
diff --git a/openlp/plugins/songs/forms/editsongform.py b/openlp/plugins/songs/forms/editsongform.py
index 1814655ea..ae47a110f 100644
--- a/openlp/plugins/songs/forms/editsongform.py
+++ b/openlp/plugins/songs/forms/editsongform.py
@@ -107,6 +107,7 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog, RegistryProperties):
         self.audio_list_widget.setAlternatingRowColors(True)
         self.find_verse_split = re.compile('---\[\]---\n', re.UNICODE)
         self.whitespace = re.compile(r'\W+', re.UNICODE)
+        self.find_tags = re.compile(u'\{/?\w+\}', re.UNICODE)
 
     def _load_objects(self, cls, combo, cache):
         """
@@ -234,8 +235,57 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog, RegistryProperties):
                 self.manager.save_object(book)
             else:
                 return False
+        # Validate tags (lp#1199639)
+        misplaced_tags = []
+        verse_tags = []
+        for i in range(self.verse_list_widget.rowCount()):
+            item = self.verse_list_widget.item(i, 0)
+            tags = self.find_tags.findall(item.text())
+            field = item.data(QtCore.Qt.UserRole)
+            verse_tags.append(field)
+            if not self._validate_tags(tags):
+                misplaced_tags.append('%s %s' % (VerseType.translated_name(field[0]), field[1:]))
+        if misplaced_tags:
+            critical_error_message_box(
+                message=translate('SongsPlugin.EditSongForm',
+                                  'There are misplaced formatting tags in the following verses:\n\n%s\n\n'
+                                  'Please correct these tags before continuing.' % ', '.join(misplaced_tags)))
+            return False
+        for tag in verse_tags:
+            if verse_tags.count(tag) > 26:
+                # lp#1310523: OpenLyrics allows only a-z variants of one verse:
+                # http://openlyrics.info/dataformat.html#verse-name
+                critical_error_message_box(message=translate(
+                    'SongsPlugin.EditSongForm', 'You have %(count)s verses named %(name)s %(number)s. '
+                                                'You can have at most 26 verses with the same name' %
+                                                {'count': verse_tags.count(tag),
+                                                 'name': VerseType.translated_name(tag[0]),
+                                                 'number': tag[1:]}))
+                return False
         return True
 
+    def _validate_tags(self, tags):
+        """
+        Validates a list of tags
+        Deletes the first affiliated tag pair which is located side by side in the list
+        and call itself recursively with the shortened tag list.
+        If there is any misplaced tag in the list, either the length of the tag list is not even,
+        or the function won't find any tag pairs side by side.
+        If there is no misplaced tag, the length of the list will be zero on any recursive run.
+
+        :param tags: A list of tags
+        :return: True if the function can't find any mismatched tags. Else False.
+        """
+        if len(tags) == 0:
+            return True
+        if len(tags) % 2 != 0:
+            return False
+        for i in range(len(tags)-1):
+            if tags[i+1] == "{/" + tags[i][1:]:
+                del tags[i:i+2]
+                return self._validate_tags(tags)
+        return False
+
     def _process_lyrics(self):
         """
         Process the lyric data entered by the user into the OpenLP XML format.
diff --git a/openlp/plugins/songs/forms/editversedialog.py b/openlp/plugins/songs/forms/editversedialog.py
index f1901b203..1dc3d9182 100644
--- a/openlp/plugins/songs/forms/editversedialog.py
+++ b/openlp/plugins/songs/forms/editversedialog.py
@@ -37,6 +37,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(u':/icon/openlp-logo.svg'))
         edit_verse_dialog.resize(400, 400)
         edit_verse_dialog.setModal(True)
         self.dialog_layout = QtGui.QVBoxLayout(edit_verse_dialog)
diff --git a/openlp/plugins/songs/forms/mediafilesdialog.py b/openlp/plugins/songs/forms/mediafilesdialog.py
index 3a1db39ed..495e08883 100644
--- a/openlp/plugins/songs/forms/mediafilesdialog.py
+++ b/openlp/plugins/songs/forms/mediafilesdialog.py
@@ -42,10 +42,10 @@ class Ui_MediaFilesDialog(object):
         Set up the user interface.
         """
         media_files_dialog.setObjectName('media_files_dialog')
+        media_files_dialog.setWindowIcon(build_icon(u':/icon/openlp-logo.svg'))
         media_files_dialog.setWindowModality(QtCore.Qt.ApplicationModal)
         media_files_dialog.resize(400, 300)
         media_files_dialog.setModal(True)
-        media_files_dialog.setWindowIcon(build_icon(':/icon/openlp-logo-16x16.png'))
         self.files_vertical_layout = QtGui.QVBoxLayout(media_files_dialog)
         self.files_vertical_layout.setSpacing(8)
         self.files_vertical_layout.setMargin(8)
diff --git a/openlp/plugins/songs/forms/songbookdialog.py b/openlp/plugins/songs/forms/songbookdialog.py
index 8cacef1a2..1ed79a4eb 100644
--- a/openlp/plugins/songs/forms/songbookdialog.py
+++ b/openlp/plugins/songs/forms/songbookdialog.py
@@ -29,7 +29,7 @@
 
 from PyQt4 import QtGui
 
-from openlp.core.lib import translate
+from openlp.core.lib import translate, build_icon
 from openlp.core.lib.ui import create_button_box
 
 
@@ -42,6 +42,7 @@ class Ui_SongBookDialog(object):
         Set up the user interface.
         """
         song_book_dialog.setObjectName('song_book_dialog')
+        song_book_dialog.setWindowIcon(build_icon(u':/icon/openlp-logo.svg'))
         song_book_dialog.resize(300, 10)
         self.dialog_layout = QtGui.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 84e3535d3..893ae9c1c 100644
--- a/openlp/plugins/songs/forms/songmaintenancedialog.py
+++ b/openlp/plugins/songs/forms/songmaintenancedialog.py
@@ -44,6 +44,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(u':/icon/openlp-logo.svg'))
         song_maintenance_dialog.setWindowModality(QtCore.Qt.ApplicationModal)
         song_maintenance_dialog.resize(10, 350)
         self.dialog_layout = QtGui.QGridLayout(song_maintenance_dialog)
diff --git a/openlp/plugins/songs/forms/topicsdialog.py b/openlp/plugins/songs/forms/topicsdialog.py
index eb6229bf6..ffa7da333 100644
--- a/openlp/plugins/songs/forms/topicsdialog.py
+++ b/openlp/plugins/songs/forms/topicsdialog.py
@@ -29,7 +29,7 @@
 
 from PyQt4 import QtGui
 
-from openlp.core.lib import translate
+from openlp.core.lib import translate, build_icon
 from openlp.core.lib.ui import create_button_box
 
 
@@ -42,6 +42,7 @@ class Ui_TopicsDialog(object):
         Set up the user interface for the topics dialog.
         """
         topics_dialog.setObjectName('topics_dialog')
+        topics_dialog.setWindowIcon(build_icon(u':/icon/openlp-logo.svg'))
         topics_dialog.resize(300, 10)
         self.dialog_layout = QtGui.QVBoxLayout(topics_dialog)
         self.dialog_layout.setObjectName('dialog_layout')
diff --git a/openlp/plugins/songs/lib/__init__.py b/openlp/plugins/songs/lib/__init__.py
index 95868ffa7..ec14175ac 100644
--- a/openlp/plugins/songs/lib/__init__.py
+++ b/openlp/plugins/songs/lib/__init__.py
@@ -206,14 +206,14 @@ class VerseType(object):
         Return the VerseType for a given tag
 
         :param verse_tag: The string to return a VerseType for
-        :param default: Default return value if no matching tag is found
+        :param default: Default return value if no matching tag is found (a valid VerseType or None)
         :return: A VerseType of the tag
         """
         verse_tag = verse_tag[0].lower()
         for num, tag in enumerate(VerseType.tags):
             if verse_tag == tag:
                 return num
-        if len(VerseType.names) > default:
+        if default in range(0, len(VerseType.names)) or default is None:
             return default
         else:
             return VerseType.Other
@@ -231,7 +231,7 @@ class VerseType(object):
         for num, tag in enumerate(VerseType.translated_tags):
             if verse_tag == tag:
                 return num
-        if len(VerseType.names) > default:
+        if default in range(0, len(VerseType.names)) or default is None:
             return default
         else:
             return VerseType.Other
diff --git a/openlp/plugins/songs/lib/ewimport.py b/openlp/plugins/songs/lib/ewimport.py
index faa4122c8..b08193672 100644
--- a/openlp/plugins/songs/lib/ewimport.py
+++ b/openlp/plugins/songs/lib/ewimport.py
@@ -74,6 +74,7 @@ class EasyWorshipSongImport(SongImport):
     """
     def __init__(self, manager, **kwargs):
         super(EasyWorshipSongImport, self).__init__(manager, **kwargs)
+        self.entry_error_log = ''
 
     def do_import(self):
         """
@@ -183,7 +184,12 @@ class EasyWorshipSongImport(SongImport):
             self.set_song_import_object(authors, inflated_content)
             if self.stop_import_flag:
                 break
-            if not self.finish():
+            if self.entry_error_log:
+                self.log_error(self.import_source,
+                               translate('SongsPlugin.EasyWorshipSongImport', '"%s" could not be imported. %s')
+                               % (self.title, self.entry_error_log))
+                self.entry_error_log = ''
+            elif not self.finish():
                 self.log_error(self.import_source)
             # Set file_pos for next entry
             file_pos += entry_length
@@ -281,7 +287,7 @@ class EasyWorshipSongImport(SongImport):
                 raw_record = db_file.read(record_size)
                 self.fields = self.record_structure.unpack(raw_record)
                 self.set_defaults()
-                self.title = self.get_field(fi_title).decode()
+                self.title = self.get_field(fi_title).decode('unicode-escape')
                 # Get remaining fields.
                 copy = self.get_field(fi_copy)
                 admin = self.get_field(fi_admin)
@@ -289,23 +295,28 @@ class EasyWorshipSongImport(SongImport):
                 authors = self.get_field(fi_author)
                 words = self.get_field(fi_words)
                 if copy:
-                    self.copyright = copy.decode()
+                    self.copyright = copy.decode('unicode-escape')
                 if admin:
                     if copy:
                         self.copyright += ', '
                     self.copyright += translate('SongsPlugin.EasyWorshipSongImport',
-                                                'Administered by %s') % admin.decode()
+                                                'Administered by %s') % admin.decode('unicode-escape')
                 if ccli:
-                    self.ccli_number = ccli.decode()
+                    self.ccli_number = ccli.decode('unicode-escape')
                 if authors:
-                    authors = authors.decode()
+                    authors = authors.decode('unicode-escape')
                 else:
                     authors = ''
                 # Set the SongImport object members.
                 self.set_song_import_object(authors, words)
                 if self.stop_import_flag:
                     break
-                if not self.finish():
+                if self.entry_error_log:
+                    self.log_error(self.import_source,
+                                   translate('SongsPlugin.EasyWorshipSongImport', '"%s" could not be imported. %s')
+                                   % (self.title, self.entry_error_log))
+                    self.entry_error_log = ''
+                elif not self.finish():
                     self.log_error(self.import_source)
         db_file.close()
         self.memo_file.close()
@@ -328,8 +339,19 @@ class EasyWorshipSongImport(SongImport):
                 self.add_author(author_name.strip())
         if words:
             # Format the lyrics
-            result = strip_rtf(words.decode(), self.encoding)
+            result = None
+            decoded_words = None
+            try:
+                decoded_words = words.decode()
+            except UnicodeDecodeError:
+                # The unicode chars in the rtf was not escaped in the expected manor
+                self.entry_error_log = translate('SongsPlugin.EasyWorshipSongImport',
+                                                 'Unexpected data formatting.')
+                return
+            result = strip_rtf(decoded_words, self.encoding)
             if result is None:
+                self.entry_error_log = translate('SongsPlugin.EasyWorshipSongImport',
+                                                 'No song text found.')
                 return
             words, self.encoding = result
             verse_type = VerseType.tags[VerseType.Verse]
diff --git a/openlp/plugins/songs/lib/mediaitem.py b/openlp/plugins/songs/lib/mediaitem.py
index 288711b06..bee0e0f0d 100644
--- a/openlp/plugins/songs/lib/mediaitem.py
+++ b/openlp/plugins/songs/lib/mediaitem.py
@@ -36,8 +36,8 @@ from PyQt4 import QtCore, QtGui
 from sqlalchemy.sql import or_
 
 from openlp.core.common import Registry, AppLocation, Settings, check_directory_exists, UiStrings, translate
-from openlp.core.lib import MediaManagerItem, ItemCapabilities, PluginStatus, ServiceItemContext, check_item_selected, \
-    create_separated_list
+from openlp.core.lib import MediaManagerItem, ItemCapabilities, PluginStatus, ServiceItem, ServiceItemContext, \
+    check_item_selected, create_separated_list
 from openlp.core.lib.ui import create_widget_action
 from openlp.plugins.songs.forms.editsongform import EditSongForm
 from openlp.plugins.songs.forms.songmaintenanceform import SongMaintenanceForm
@@ -124,7 +124,8 @@ class SongMediaItem(MediaManagerItem):
         log.debug('config_updated')
         self.search_as_you_type = Settings().value(self.settings_section + '/search as type')
         self.update_service_on_edit = Settings().value(self.settings_section + '/update service on edit')
-        self.add_song_from_service = Settings().value(self.settings_section + '/add song from service',)
+        self.add_song_from_service = Settings().value(self.settings_section + '/add song from service')
+        self.display_songbook = Settings().value(self.settings_section + '/display songbook')
 
     def retranslateUi(self):
         self.search_text_label.setText('%s:' % UiStrings().Search)
@@ -506,6 +507,8 @@ class SongMediaItem(MediaManagerItem):
             item.raw_footer.append("%s: %s" % (AuthorType.Types[AuthorType.Translation],
                                                create_separated_list(authors_translation)))
         item.raw_footer.append(song.copyright)
+        if self.display_songbook and song.book:
+            item.raw_footer.append("%s #%s" % (song.book.name, song.song_number))
         if Settings().value('core/ccli number'):
             item.raw_footer.append(translate('SongsPlugin.MediaItem',
                                              'CCLI License: ') + Settings().value('core/ccli number'))
diff --git a/openlp/plugins/songs/lib/songshowplusimport.py b/openlp/plugins/songs/lib/songshowplusimport.py
index 0a8dc4650..aebded029 100644
--- a/openlp/plugins/songs/lib/songshowplusimport.py
+++ b/openlp/plugins/songs/lib/songshowplusimport.py
@@ -121,7 +121,7 @@ class SongShowPlusImport(SongImport):
                     null, verse_no, = struct.unpack("BB", song_data.read(2))
                 elif block_key == CUSTOM_VERSE:
                     null, verse_name_length, = struct.unpack("BB", song_data.read(2))
-                    verse_name = song_data.read(verse_name_length)
+                    verse_name = self.decode(song_data.read(verse_name_length))
                 length_descriptor_size, = struct.unpack("B", song_data.read(1))
                 log.debug(length_descriptor_size)
                 # Detect if/how long the length descriptor is
@@ -147,7 +147,12 @@ class SongShowPlusImport(SongImport):
                 elif block_key == COPYRIGHT:
                     self.add_copyright(self.decode(data))
                 elif block_key == CCLI_NO:
-                    self.ccli_number = int(data)
+                    # Try to get the CCLI number even if the field contains additional text
+                    match = re.search(r'\d+', self.decode(data))
+                    if match:
+                        self.ccli_number = int(match.group())
+                    else:
+                        log.warn("Can't parse CCLI Number from string: %s" % self.decode(data))
                 elif block_key == VERSE:
                     self.add_verse(self.decode(data), "%s%s" % (VerseType.tags[VerseType.Verse], verse_no))
                 elif block_key == CHORUS:
diff --git a/openlp/plugins/songs/lib/songstab.py b/openlp/plugins/songs/lib/songstab.py
index bf74a4e7c..1cf06d047 100644
--- a/openlp/plugins/songs/lib/songstab.py
+++ b/openlp/plugins/songs/lib/songstab.py
@@ -59,6 +59,9 @@ class SongsTab(SettingsTab):
         self.add_from_service_check_box = QtGui.QCheckBox(self.mode_group_box)
         self.add_from_service_check_box.setObjectName('add_from_service_check_box')
         self.mode_layout.addWidget(self.add_from_service_check_box)
+        self.display_songbook_check_box = QtGui.QCheckBox(self.mode_group_box)
+        self.display_songbook_check_box.setObjectName('songbook_check_box')
+        self.mode_layout.addWidget(self.display_songbook_check_box)
         self.left_layout.addWidget(self.mode_group_box)
         self.left_layout.addStretch()
         self.right_layout.addStretch()
@@ -66,6 +69,7 @@ class SongsTab(SettingsTab):
         self.tool_bar_active_check_box.stateChanged.connect(self.on_tool_bar_active_check_box_changed)
         self.update_on_edit_check_box.stateChanged.connect(self.on_update_on_edit_check_box_changed)
         self.add_from_service_check_box.stateChanged.connect(self.on_add_from_service_check_box_changed)
+        self.display_songbook_check_box.stateChanged.connect(self.on_songbook_check_box_changed)
 
     def retranslateUi(self):
         self.mode_group_box.setTitle(translate('SongsPlugin.SongsTab', 'Songs Mode'))
@@ -75,6 +79,7 @@ class SongsTab(SettingsTab):
         self.update_on_edit_check_box.setText(translate('SongsPlugin.SongsTab', 'Update service from song edit'))
         self.add_from_service_check_box.setText(translate('SongsPlugin.SongsTab',
                                                           'Import missing songs from service files'))
+        self.display_songbook_check_box.setText(translate('SongsPlugin.SongsTab', 'Display songbook in footer'))
 
     def on_search_as_type_check_box_changed(self, check_state):
         self.song_search = (check_state == QtCore.Qt.Checked)
@@ -88,6 +93,9 @@ class SongsTab(SettingsTab):
     def on_add_from_service_check_box_changed(self, check_state):
         self.update_load = (check_state == QtCore.Qt.Checked)
 
+    def on_songbook_check_box_changed(self, check_state):
+        self.display_songbook = (check_state == QtCore.Qt.Checked)
+
     def load(self):
         settings = Settings()
         settings.beginGroup(self.settings_section)
@@ -95,10 +103,12 @@ class SongsTab(SettingsTab):
         self.tool_bar = settings.value('display songbar')
         self.update_edit = settings.value('update service on edit')
         self.update_load = settings.value('add song from service')
+        self.display_songbook = settings.value('display songbook')
         self.search_as_type_check_box.setChecked(self.song_search)
         self.tool_bar_active_check_box.setChecked(self.tool_bar)
         self.update_on_edit_check_box.setChecked(self.update_edit)
         self.add_from_service_check_box.setChecked(self.update_load)
+        self.display_songbook_check_box.setChecked(self.display_songbook)
         settings.endGroup()
 
     def save(self):
@@ -108,6 +118,7 @@ class SongsTab(SettingsTab):
         settings.setValue('display songbar', self.tool_bar)
         settings.setValue('update service on edit', self.update_edit)
         settings.setValue('add song from service', self.update_load)
+        settings.setValue('display songbook', self.display_songbook)
         settings.endGroup()
         if self.tab_visited:
             self.settings_form.register_post_process('songs_config_updated')
diff --git a/openlp/plugins/songs/lib/sundayplusimport.py b/openlp/plugins/songs/lib/sundayplusimport.py
index f22f8b058..5c5f73047 100644
--- a/openlp/plugins/songs/lib/sundayplusimport.py
+++ b/openlp/plugins/songs/lib/sundayplusimport.py
@@ -68,7 +68,7 @@ class SundayPlusImport(SongImport):
         for filename in self.import_source:
             if self.stop_import_flag:
                 return
-            song_file = open(filename)
+            song_file = open(filename, 'rb')
             self.do_import_file(song_file)
             song_file.close()
 
@@ -103,7 +103,7 @@ class SundayPlusImport(SongImport):
             # Now we are looking for the name.
             if data[i:i + 1] == '#':
                 name_end = data.find(':', i + 1)
-                name = data[i + 1:name_end]
+                name = data[i + 1:name_end].upper()
                 i = name_end + 1
                 while data[i:i + 1] == ' ':
                     i += 1
@@ -129,13 +129,13 @@ class SundayPlusImport(SongImport):
                     value = data[i:end]
                 # If we are in the main group.
                 if not cell:
-                    if name == 'title':
+                    if name == 'TITLE':
                         self.title = self.decode(self.unescape(value))
-                    elif name == 'Author':
+                    elif name == 'AUTHOR':
                         author = self.decode(self.unescape(value))
                         if len(author):
                             self.add_author(author)
-                    elif name == 'Copyright':
+                    elif name == 'COPYRIGHT':
                         self.copyright = self.decode(self.unescape(value))
                     elif name[0:4] == 'CELL':
                         self.parse(value, cell=name[4:])
@@ -147,12 +147,12 @@ class SundayPlusImport(SongImport):
                             verse_type = VerseType.tags[VerseType.from_loose_input(value[0])]
                             if len(value) >= 2 and value[-1] in ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9']:
                                 verse_type = "%s%s" % (verse_type, value[-1])
-                    elif name == 'Hotkey':
-                        # Hotkey always appears after MARKER_NAME, so it
+                    elif name == 'HOTKEY':
+                        # HOTKEY always appears after MARKER_NAME, so it
                         # effectively overrides MARKER_NAME, if present.
                         if len(value) and value in list(HOTKEY_TO_VERSE_TYPE.keys()):
                             verse_type = HOTKEY_TO_VERSE_TYPE[value]
-                    if name == 'rtf':
+                    if name == 'RTF':
                         value = self.unescape(value)
                         result = strip_rtf(value, self.encoding)
                         if result is None:
diff --git a/openlp/plugins/songs/lib/xml.py b/openlp/plugins/songs/lib/xml.py
index b856cb53f..87e5da21e 100644
--- a/openlp/plugins/songs/lib/xml.py
+++ b/openlp/plugins/songs/lib/xml.py
@@ -310,9 +310,9 @@ class OpenLyrics(object):
             verse_tag = verse[0]['type'][0].lower()
             verse_number = verse[0]['label']
             verse_def = verse_tag + verse_number
-            verse_tags.append(verse_def)
             # Create the letter from the number of duplicates
-            verse[0]['suffix'] = chr(96 + verse_tags.count(verse_def))
+            verse[0][u'suffix'] = chr(97 + (verse_tags.count(verse_def) % 26))
+            verse_tags.append(verse_def)
         # If the verse tag is a duplicate use the suffix letter
         for verse in verse_list:
             verse_tag = verse[0]['type'][0].lower()
diff --git a/openlp/plugins/songs/songsplugin.py b/openlp/plugins/songs/songsplugin.py
index b1ddaf412..79fc282a6 100644
--- a/openlp/plugins/songs/songsplugin.py
+++ b/openlp/plugins/songs/songsplugin.py
@@ -63,6 +63,7 @@ __default_settings__ = {
     'songs/search as type': False,
     'songs/add song from service': True,
     'songs/display songbar': True,
+    'songs/display songbook': False,
     'songs/last directory import': '',
     'songs/last directory export': '',
     'songs/songselect username': '',
diff --git a/openlp/plugins/songusage/forms/songusagedeletedialog.py b/openlp/plugins/songusage/forms/songusagedeletedialog.py
index 01597a790..190292678 100644
--- a/openlp/plugins/songusage/forms/songusagedeletedialog.py
+++ b/openlp/plugins/songusage/forms/songusagedeletedialog.py
@@ -30,6 +30,7 @@
 from PyQt4 import QtCore, QtGui
 
 from openlp.core.common import translate
+from openlp.core.lib import build_icon
 from openlp.core.lib.ui import create_button_box
 
 
@@ -44,6 +45,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(u':/icon/openlp-logo.svg'))
         song_usage_delete_dialog.resize(291, 243)
         self.vertical_layout = QtGui.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 ede5075a0..9431c7894 100644
--- a/openlp/plugins/songusage/forms/songusagedetaildialog.py
+++ b/openlp/plugins/songusage/forms/songusagedetaildialog.py
@@ -45,6 +45,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(u':/icon/openlp-logo.svg'))
         song_usage_detail_dialog.resize(609, 413)
         self.vertical_layout = QtGui.QVBoxLayout(song_usage_detail_dialog)
         self.vertical_layout.setSpacing(8)
diff --git a/tests/functional/openlp_core_lib/test_image_manager.py b/tests/functional/openlp_core_lib/test_image_manager.py
index 37b6d6fdd..072978993 100644
--- a/tests/functional/openlp_core_lib/test_image_manager.py
+++ b/tests/functional/openlp_core_lib/test_image_manager.py
@@ -171,4 +171,4 @@ class TestImageManager(TestCase, TestMixin):
         self.lock.release()
         # The sleep time is adjusted in the test case.
         time.sleep(self.sleep_time)
-        return ''
\ No newline at end of file
+        return ''
diff --git a/tests/functional/openlp_core_lib/test_ui.py b/tests/functional/openlp_core_lib/test_ui.py
index 025b1a638..f1b8ee17a 100644
--- a/tests/functional/openlp_core_lib/test_ui.py
+++ b/tests/functional/openlp_core_lib/test_ui.py
@@ -82,6 +82,21 @@ class TestUi(TestCase):
         self.assertEqual(1, len(btnbox.buttons()))
         self.assertEqual(QtGui.QDialogButtonBox.HelpRole, btnbox.buttonRole(btnbox.buttons()[0]))
 
+    def test_create_horizontal_adjusting_combo_box(self):
+        """
+        Test creating a horizontal adjusting combo box
+        """
+        # GIVEN: A dialog
+        dialog = QtGui.QDialog()
+
+        # WHEN: We create the combobox
+        combo = create_horizontal_adjusting_combo_box(dialog, 'combo1')
+
+        # THEN: We should get a ComboBox
+        self.assertIsInstance(combo, QtGui.QComboBox)
+        self.assertEqual('combo1', combo.objectName())
+        self.assertEqual(QtGui.QComboBox.AdjustToMinimumContentsLength, combo.sizeAdjustPolicy())
+
     def test_create_button(self):
         """
         Test creating a button
@@ -114,38 +129,6 @@ class TestUi(TestCase):
         self.assertEqual('my_btn', btn.objectName())
         self.assertTrue(btn.isEnabled())
 
-    def test_create_valign_selection_widgets(self):
-        """
-        Test creating a combo box for valign selection
-        """
-        # GIVEN: A dialog
-        dialog = QtGui.QDialog()
-
-        # WHEN: We create the widgets
-        label, combo = create_valign_selection_widgets(dialog)
-
-        # THEN: We should get a label and a combobox.
-        self.assertEqual(translate('OpenLP.Ui', '&Vertical Align:'), label.text())
-        self.assertIsInstance(combo, QtGui.QComboBox)
-        self.assertEqual(combo, label.buddy())
-        for text in [UiStrings().Top, UiStrings().Middle, UiStrings().Bottom]:
-            self.assertTrue(combo.findText(text) >= 0)
-
-    def test_create_horizontal_adjusting_combo_box(self):
-        """
-        Test creating a horizontal adjusting combo box
-        """
-        # GIVEN: A dialog
-        dialog = QtGui.QDialog()
-
-        # WHEN: We create the combobox
-        combo = create_horizontal_adjusting_combo_box(dialog, 'combo1')
-
-        # THEN: We should get a ComboBox
-        self.assertIsInstance(combo, QtGui.QComboBox)
-        self.assertEqual('combo1', combo.objectName())
-        self.assertEqual(QtGui.QComboBox.AdjustToMinimumContentsLength, combo.sizeAdjustPolicy())
-
     def test_create_action(self):
         """
         Test creating an action
@@ -170,3 +153,47 @@ class TestUi(TestCase):
         self.assertIsInstance(action.icon(), QtGui.QIcon)
         self.assertEqual('my tooltip', action.toolTip())
         self.assertEqual('my statustip', action.statusTip())
+
+    def test_create_valign_selection_widgets(self):
+        """
+        Test creating a combo box for valign selection
+        """
+        # GIVEN: A dialog
+        dialog = QtGui.QDialog()
+
+        # WHEN: We create the widgets
+        label, combo = create_valign_selection_widgets(dialog)
+
+        # THEN: We should get a label and a combobox.
+        self.assertEqual(translate('OpenLP.Ui', '&Vertical Align:'), label.text())
+        self.assertIsInstance(combo, QtGui.QComboBox)
+        self.assertEqual(combo, label.buddy())
+        for text in [UiStrings().Top, UiStrings().Middle, UiStrings().Bottom]:
+            self.assertTrue(combo.findText(text) >= 0)
+
+    def test_find_and_set_in_combo_box(self):
+        """
+        Test finding a string in a combo box and setting it as the selected item if present
+        """
+        # GIVEN: A ComboBox
+        combo = QtGui.QComboBox()
+        combo.addItems(['One', 'Two', 'Three'])
+        combo.setCurrentIndex(1)
+
+        # WHEN: We call the method with a non-existing value and set_missing=False
+        find_and_set_in_combo_box(combo, 'Four', set_missing=False)
+
+        # THEN: The index should not have changed
+        self.assertEqual(1, combo.currentIndex())
+
+        # WHEN: We call the method with a non-existing value
+        find_and_set_in_combo_box(combo, 'Four')
+
+        # THEN: The index should have been reset
+        self.assertEqual(0, combo.currentIndex())
+
+        # WHEN: We call the method with the default behavior
+        find_and_set_in_combo_box(combo, 'Three')
+
+        # THEN: The index should have changed
+        self.assertEqual(2, combo.currentIndex())
diff --git a/tests/functional/openlp_core_ui/test_firsttimeform.py b/tests/functional/openlp_core_ui/test_firsttimeform.py
index 9fc6f5137..2e26c286a 100644
--- a/tests/functional/openlp_core_ui/test_firsttimeform.py
+++ b/tests/functional/openlp_core_ui/test_firsttimeform.py
@@ -31,12 +31,12 @@ Package to test the openlp.core.ui.firsttimeform package.
 """
 from unittest import TestCase
 
-from tests.functional import MagicMock
-
-from tests.helpers.testmixin import TestMixin
 from openlp.core.common import Registry
 from openlp.core.ui.firsttimeform import FirstTimeForm
 
+from tests.functional import MagicMock
+from tests.helpers.testmixin import TestMixin
+
 
 class TestFirstTimeForm(TestCase, TestMixin):
 
diff --git a/tests/functional/openlp_core_ui/test_mainwindow.py b/tests/functional/openlp_core_ui/test_mainwindow.py
index 0b17828b9..b348f8f80 100644
--- a/tests/functional/openlp_core_ui/test_mainwindow.py
+++ b/tests/functional/openlp_core_ui/test_mainwindow.py
@@ -34,6 +34,7 @@ import os
 from unittest import TestCase
 
 from openlp.core.ui.mainwindow import MainWindow
+from openlp.core.lib.ui import UiStrings
 from openlp.core.common.registry import Registry
 from tests.utils.constants import TEST_RESOURCES_PATH
 from tests.helpers.testmixin import TestMixin
@@ -95,3 +96,41 @@ class TestMainWindow(TestCase, TestMixin):
 
             # THEN the file should not be opened
             assert not mocked_load_path.called, 'load_path should not have been called'
+
+    def main_window_title_test(self):
+        """
+        Test that running a new instance of OpenLP set the window title correctly
+        """
+        # GIVEN a newly opened OpenLP instance
+
+        # WHEN no changes are made to the service
+
+        # THEN the main window's title shoud be the same as the OLPV2x string in the UiStrings class
+        self.assertEqual(self.main_window.windowTitle(), UiStrings().OLPV2x,
+                         'The main window\'s title should be the same as the OLPV2x string in UiStrings class')
+
+    def set_service_modifed_test(self):
+        """
+        Test that when setting the service's title the main window's title is set correctly
+        """
+        # GIVEN a newly opened OpenLP instance
+
+        # WHEN set_service_modified is called with with the modified flag set true and a file name
+        self.main_window.set_service_modified(True, 'test.osz')
+
+        # THEN the main window's title should be set to the
+        self.assertEqual(self.main_window.windowTitle(), '%s - %s*' % (UiStrings().OLPV2x, 'test.osz'),
+                         'The main window\'s title should be set to "<the contents of UiStrings().OLPV2x> - test.osz*"')
+
+    def set_service_unmodified_test(self):
+        """
+        Test that when setting the service's title the main window's title is set correctly
+        """
+        # GIVEN a newly opened OpenLP instance
+
+        # WHEN set_service_modified is called with with the modified flag set False and a file name
+        self.main_window.set_service_modified(False, 'test.osz')
+
+        # THEN the main window's title should be set to the
+        self.assertEqual(self.main_window.windowTitle(), '%s - %s' % (UiStrings().OLPV2x, 'test.osz'),
+                         'The main window\'s title should be set to "<the contents of UiStrings().OLPV2x> - test.osz"')
diff --git a/tests/functional/openlp_core_ui/test_media.py b/tests/functional/openlp_core_ui/test_media.py
index d59690949..4c6fa7f86 100644
--- a/tests/functional/openlp_core_ui/test_media.py
+++ b/tests/functional/openlp_core_ui/test_media.py
@@ -125,4 +125,4 @@ class TestMedia(TestCase, TestMixin):
 
             # THEN: the used_players should be an empty list, and the overridden player should be an empty string
             self.assertEqual(['vlc', 'webkit', 'phonon'], used_players, 'Used players should be correct')
-            self.assertEqual('vlc,webkit,phonon', overridden_player, 'Overridden player should be a string of players')
\ No newline at end of file
+            self.assertEqual('vlc,webkit,phonon', overridden_player, 'Overridden player should be a string of players')
diff --git a/tests/functional/openlp_core_ui/test_slidecontroller.py b/tests/functional/openlp_core_ui/test_slidecontroller.py
index 56d87c511..104c83750 100644
--- a/tests/functional/openlp_core_ui/test_slidecontroller.py
+++ b/tests/functional/openlp_core_ui/test_slidecontroller.py
@@ -33,7 +33,7 @@ from unittest import TestCase
 
 from openlp.core.ui import SlideController
 
-from tests.interfaces import MagicMock, patch
+from tests.interfaces import MagicMock
 
 
 class TestSlideController(TestCase):
diff --git a/tests/functional/openlp_plugins/remotes/test_router.py b/tests/functional/openlp_plugins/remotes/test_router.py
index 9e13a448b..037169b88 100644
--- a/tests/functional/openlp_plugins/remotes/test_router.py
+++ b/tests/functional/openlp_plugins/remotes/test_router.py
@@ -32,7 +32,7 @@ This module contains tests for the lib submodule of the Remotes plugin.
 import os
 from unittest import TestCase
 
-from openlp.core.common import Settings
+from openlp.core.common import Settings, Registry
 from openlp.plugins.remotes.lib.httpserver import HttpRouter
 from tests.functional import MagicMock, patch, mock_open
 from tests.helpers.testmixin import TestMixin
@@ -92,15 +92,14 @@ class TestRouter(TestCase, TestMixin):
         Test the router control functionality
         """
         # GIVEN: A testing set of Routes
-        router = HttpRouter()
         mocked_function = MagicMock()
         test_route = [
             (r'^/stage/api/poll$', {'function': mocked_function, 'secure': False}),
         ]
-        router.routes = test_route
+        self.router.routes = test_route
 
         # WHEN: called with a poll route
-        function, args = router.process_http_request('/stage/api/poll', None)
+        function, args = self.router.process_http_request('/stage/api/poll', None)
 
         # THEN: the function should have been called only once
         self.assertEqual(mocked_function, function['function'], 'The mocked function should match defined value.')
@@ -126,6 +125,25 @@ class TestRouter(TestCase, TestMixin):
             # THEN: all types should match
             self.assertEqual(content_type, header[1], 'Mismatch of content type')
 
+    def main_poll_test(self):
+        """
+        Test the main poll logic
+        """
+        # GIVEN: a defined router with two slides
+        Registry().register('live_controller', MagicMock)
+        router = HttpRouter()
+        router.send_response = MagicMock()
+        router.send_header = MagicMock()
+        router.end_headers = MagicMock()
+        router.live_controller.slide_count = 2
+
+        # WHEN: main poll called
+        results = router.main_poll()
+
+        # THEN: the correct response should be returned
+        self.assertEqual(results.decode('utf-8'), '{"results": {"slide_count": 2}}',
+                         'The resulting json strings should match')
+
     def serve_file_without_params_test(self):
         """
         Test the serve_file method without params
diff --git a/tests/functional/openlp_plugins/songs/test_ewimport.py b/tests/functional/openlp_plugins/songs/test_ewimport.py
index 49bc367cd..8d9302015 100644
--- a/tests/functional/openlp_plugins/songs/test_ewimport.py
+++ b/tests/functional/openlp_plugins/songs/test_ewimport.py
@@ -67,7 +67,21 @@ SONG_TEST_DATA = [
        'Just to learn from His lips, words of comfort,\nIn the beautiful garden of prayer.', 'v2'),
       ('There\'s a garden where Jesus is waiting,\nAnd He bids you to come meet Him there,\n'
        'Just to bow and receive a new blessing,\nIn the beautiful garden of prayer.', 'v3')],
-     'verse_order_list': []}]
+     'verse_order_list': []},
+    {'title': 'Vi pløjed og vi så\'de',
+     'authors': ['Matthias Claudius'],
+     'copyright': 'Public Domain',
+     'ccli_number': 0,
+     'verses':
+        [('Vi pløjed og vi så\'de\nvor sæd i sorten jord,\nså bad vi ham os hjælpe,\nsom højt i Himlen bor,\n'
+          'og han lod snefald hegne\nmod frosten barsk og hård,\nhan lod det tø og regne\nog varme mildt i vår.',
+          'v1'),
+         ('Alle gode gaver\nde kommer ovenned,\nså tak da Gud, ja, pris dog Gud\nfor al hans kærlighed!', 'c1'),
+         ('Han er jo den, hvis vilje\nopholder alle ting,\nhan klæder markens lilje\nog runder himlens ring,\n'
+          'ham lyder vind og vove,\nham rører ravnes nød,\nhvi skulle ej hans småbørn\nda og få dagligt brød?', 'v2'),
+         ('Ja, tak, du kære Fader,\nså mild, så rig, så rund,\nfor korn i hæs og lader,\nfor godt i allen stund!\n'
+          'Vi kan jo intet give,\nsom nogen ting er værd,\nmen tag vort stakkels hjerte,\nså ringe som det er!', 'v3')],
+        'verse_order_list': []}]
 
 EWS_SONG_TEST_DATA =\
     {'title': 'Vi pløjed og vi så\'de',
@@ -139,6 +153,7 @@ class TestEasyWorshipSongImport(TestCase):
     """
     Test the functions in the :mod:`ewimport` module.
     """
+
     def create_field_desc_entry_test(self):
         """
         Test creating an instance of the :class`FieldDescEntry` class.
@@ -467,3 +482,22 @@ class TestEasyWorshipSongImport(TestCase):
             for verse_text, verse_tag in EWS_SONG_TEST_DATA['verses']:
                 mocked_add_verse.assert_any_call(verse_text, verse_tag)
             mocked_finish.assert_called_with()
+
+    def import_rtf_unescaped_unicode_test(self):
+        """
+        Test import of rtf without the expected escaping of unicode
+        """
+
+        # GIVEN: A mocked out SongImport class, a mocked out "manager" and mocked out "author" method.
+        with patch('openlp.plugins.songs.lib.ewimport.SongImport'):
+            mocked_manager = MagicMock()
+            mocked_add_author = MagicMock()
+            importer = EasyWorshipSongImportLogger(mocked_manager)
+            importer.add_author = mocked_add_author
+            importer.encoding = 'cp1252'
+
+            # WHEN: running set_song_import_object on a verse string without the needed escaping
+            importer.set_song_import_object('Test Author', b'Det som var fr\x86n begynnelsen')
+
+            # THEN: The import should fail
+            self.assertEquals(importer.entry_error_log, 'Unexpected data formatting.', 'Import should fail')
diff --git a/tests/functional/openlp_plugins/songs/test_lib.py b/tests/functional/openlp_plugins/songs/test_lib.py
index b67c1a4be..140126f26 100644
--- a/tests/functional/openlp_plugins/songs/test_lib.py
+++ b/tests/functional/openlp_plugins/songs/test_lib.py
@@ -445,9 +445,9 @@ class TestVerseType(TestCase):
             # THEN: The result should be VerseType.Chorus
             self.assertEqual(result, VerseType.Chorus, 'The result should be VerseType.Chorus, but was "%s"' % result)
 
-    def from_tag_with_invalid_default_test(self):
+    def from_tag_with_invalid_intdefault_test(self):
         """
-        Test that the from_tag() method returns a sane default when passed an invalid tag and an invalid default.
+        Test that the from_tag() method returns a sane default when passed an invalid tag and an invalid int default.
         """
         # GIVEN: A mocked out translate() function that just returns what it was given
         with patch('openlp.plugins.songs.lib.translate') as mocked_translate:
@@ -458,3 +458,31 @@ class TestVerseType(TestCase):
 
             # THEN: The result should be VerseType.Other
             self.assertEqual(result, VerseType.Other, 'The result should be VerseType.Other, but was "%s"' % result)
+
+    def from_tag_with_invalid_default_test(self):
+        """
+        Test that the from_tag() method returns a sane default when passed an invalid tag and an invalid default.
+        """
+        # GIVEN: A mocked out translate() function that just returns what it was given
+        with patch('openlp.plugins.songs.lib.translate') as mocked_translate:
+            mocked_translate.side_effect = lambda x, y: y
+
+            # WHEN: We run the from_tag() method with an invalid verse type, we get the specified default back
+            result = VerseType.from_tag('@', 'asdf')
+
+            # THEN: The result should be VerseType.Other
+            self.assertEqual(result, VerseType.Other, 'The result should be VerseType.Other, but was "%s"' % result)
+
+    def from_tag_with_none_default_test(self):
+        """
+        Test that the from_tag() method returns a sane default when passed an invalid tag and None as default.
+        """
+        # GIVEN: A mocked out translate() function that just returns what it was given
+        with patch('openlp.plugins.songs.lib.translate') as mocked_translate:
+            mocked_translate.side_effect = lambda x, y: y
+
+            # WHEN: We run the from_tag() method with an invalid verse type, we get the specified default back
+            result = VerseType.from_tag('m', None)
+
+            # THEN: The result should be None
+            self.assertIsNone(result, 'The result should be None, but was "%s"' % result)
diff --git a/tests/functional/openlp_plugins/songs/test_mediaitem.py b/tests/functional/openlp_plugins/songs/test_mediaitem.py
index 308881c2e..22291c6a6 100644
--- a/tests/functional/openlp_plugins/songs/test_mediaitem.py
+++ b/tests/functional/openlp_plugins/songs/test_mediaitem.py
@@ -1,8 +1,6 @@
 """
 This module contains tests for the lib submodule of the Songs plugin.
 """
-import os
-from tempfile import mkstemp
 from unittest import TestCase
 
 from PyQt4 import QtCore, QtGui
@@ -29,6 +27,7 @@ class TestMediaItem(TestCase, TestMixin):
         with patch('openlp.core.lib.mediamanageritem.MediaManagerItem._setup'), \
                 patch('openlp.plugins.songs.forms.editsongform.EditSongForm.__init__'):
             self.media_item = SongMediaItem(None, MagicMock())
+            self.media_item.display_songbook = False
         self.get_application()
         self.build_settings()
         QtCore.QLocale.setDefault(QtCore.QLocale('en_GB'))
@@ -128,3 +127,29 @@ class TestMediaItem(TestCase, TestMixin):
         # THEN: I would get an amended footer string
         self.assertEqual(service_item.raw_footer, ['My Song', 'My copyright', 'CCLI License: 4321'],
                          'The array should be returned correctly with a song, an author, copyright and amended ccli')
+
+    def build_song_footer_base_songbook_test(self):
+        """
+        Test build songs footer with basic song and a songbook
+        """
+        # GIVEN: A Song and a Service Item
+        mock_song = MagicMock()
+        mock_song.title = 'My Song'
+        mock_song.copyright = 'My copyright'
+        mock_song.book = MagicMock()
+        mock_song.book.name = "My songbook"
+        mock_song.song_number = 12
+        service_item = ServiceItem(None)
+
+        # WHEN: I generate the Footer with default settings
+        self.media_item.generate_footer(service_item, mock_song)
+
+        # THEN: The songbook should not be in the footer
+        self.assertEqual(service_item.raw_footer, ['My Song', 'My copyright'])
+
+        # WHEN: I activate the "display songbook" option
+        self.media_item.display_songbook = True
+        self.media_item.generate_footer(service_item, mock_song)
+
+        # THEN: The songbook should be in the footer
+        self.assertEqual(service_item.raw_footer, ['My Song', 'My copyright', 'My songbook #12'])
diff --git a/tests/functional/openlp_plugins/songs/test_songshowplusimport.py b/tests/functional/openlp_plugins/songs/test_songshowplusimport.py
index 7292bb2b0..08400fdc5 100644
--- a/tests/functional/openlp_plugins/songs/test_songshowplusimport.py
+++ b/tests/functional/openlp_plugins/songs/test_songshowplusimport.py
@@ -57,6 +57,8 @@ class TestSongShowPlusFileImport(SongImportTestHelper):
                          self.load_external_result_data(os.path.join(TEST_PATH, 'Amazing Grace.json')))
         self.file_import(os.path.join(TEST_PATH, 'Beautiful Garden Of Prayer.sbsong'),
                          self.load_external_result_data(os.path.join(TEST_PATH, 'Beautiful Garden Of Prayer.json')))
+        self.file_import(os.path.join(TEST_PATH, 'a mighty fortress is our god.sbsong'),
+                         self.load_external_result_data(os.path.join(TEST_PATH, 'a mighty fortress is our god.json')))
 
 
 class TestSongShowPlusImport(TestCase):
diff --git a/tests/interfaces/openlp_core_common/test_historycombobox.py b/tests/interfaces/openlp_core_common/test_historycombobox.py
index 00a63f15f..c0131e46c 100644
--- a/tests/interfaces/openlp_core_common/test_historycombobox.py
+++ b/tests/interfaces/openlp_core_common/test_historycombobox.py
@@ -62,4 +62,4 @@ class TestHistoryComboBox(TestCase, TestMixin):
         self.combo.addItem('test2')
 
         # THEN: The list of items should contain both strings.
-        self.assertEqual(self.combo.getItems(), ['test1', 'test2'])
\ No newline at end of file
+        self.assertEqual(self.combo.getItems(), ['test1', 'test2'])
diff --git a/tests/interfaces/openlp_core_ui/test_shortcutlistform.py b/tests/interfaces/openlp_core_ui/test_shortcutlistform.py
index 472bce03f..29c365194 100644
--- a/tests/interfaces/openlp_core_ui/test_shortcutlistform.py
+++ b/tests/interfaces/openlp_core_ui/test_shortcutlistform.py
@@ -75,4 +75,4 @@ class TestShortcutform(TestCase, TestMixin):
             # THEN: The button should be changed.
             self.assertEqual(button.text(), text, "The text should match.")
             mocked_check_method.assert_called_once_with(True)
-            self.assertEqual(button.isEnabled(), enabled, "The button should be disabled.")
\ No newline at end of file
+            self.assertEqual(button.isEnabled(), enabled, "The button should be disabled.")
diff --git a/tests/resources/easyworshipsongs/Songs.DB b/tests/resources/easyworshipsongs/Songs.DB
index 8c9679b86..347695057 100644
Binary files a/tests/resources/easyworshipsongs/Songs.DB and b/tests/resources/easyworshipsongs/Songs.DB differ
diff --git a/tests/resources/easyworshipsongs/Songs.MB b/tests/resources/easyworshipsongs/Songs.MB
index b46323005..949d7755c 100644
Binary files a/tests/resources/easyworshipsongs/Songs.MB and b/tests/resources/easyworshipsongs/Songs.MB differ
diff --git a/tests/resources/songshowplussongs/a mighty fortress is our god.json b/tests/resources/songshowplussongs/a mighty fortress is our god.json
new file mode 100644
index 000000000..2788ad05c
--- /dev/null
+++ b/tests/resources/songshowplussongs/a mighty fortress is our god.json	
@@ -0,0 +1,31 @@
+{
+    "authors": [
+        "Martin Luther"
+    ],
+    "ccli_number": 12456,
+    "comments": "",
+    "copyright": "Public Domain",
+    "song_number": 0,
+    "title": "A Mighty Fortress is our God",
+    "topics": [],
+    "verse_order_list": [],
+    "verses": [
+        [
+            "A mighty fortress is our God, a bulwark never failing;\r\nOur helper He, amid the flood of mortal ills prevailing:\r\nFor still our ancient foe doth seek to work us woe;\r\nHis craft and power are great, and, armed with cruel hate,\r\nOn earth is not his equal.\r\n",
+            "v1"
+        ],
+        [
+            "Did we in our own strength confide, our striving would be losing;\r\nWere not the right Man on our side, the Man of God’s own choosing:\r\nDost ask who that may be? Christ Jesus, it is He;\r\nLord Sabaoth, His Name, from age to age the same,\r\nAnd He must win the battle.\r\n",
+            "v2"
+        ],
+        [
+            "And though this world, with devils filled, should threaten to undo us,\r\nWe will not fear, for God hath willed His truth to triumph through us:\r\nThe Prince of Darkness grim, we tremble not for him;\r\nHis rage we can endure, for lo, his doom is sure,\r\nOne little word shall fell him.\r\n",
+            "v3"
+        ],
+        [
+            "That word above all earthly powers, no thanks to them, abideth;\r\nThe Spirit and the gifts are ours through Him Who with us sideth:\r\nLet goods and kindred go, this mortal life also;\r\nThe body they may kill: God’s truth abideth still,\r\nHis kingdom is forever.\r\n",
+            "v4"
+        ]
+    ]
+}
+
diff --git a/tests/resources/songshowplussongs/a mighty fortress is our god.sbsong b/tests/resources/songshowplussongs/a mighty fortress is our god.sbsong
new file mode 100644
index 000000000..b66d52b2b
Binary files /dev/null and b/tests/resources/songshowplussongs/a mighty fortress is our god.sbsong differ
diff --git a/tests/utils/test_bzr_tags.py b/tests/utils/test_bzr_tags.py
index 95017e94f..393f4ce25 100644
--- a/tests/utils/test_bzr_tags.py
+++ b/tests/utils/test_bzr_tags.py
@@ -53,6 +53,7 @@ TAGS = [
     ['2.0.1', '?'],
     ['2.0.2', '?'],
     ['2.0.3', '?'],
+    ['2.0.4', '?'],
     ['2.1.0', '2119']
 ]