diff --git a/openlp/core/lib/mediamanageritem.py b/openlp/core/lib/mediamanageritem.py
index f735065a3..7cfe63b09 100644
--- a/openlp/core/lib/mediamanageritem.py
+++ b/openlp/core/lib/mediamanageritem.py
@@ -131,6 +131,7 @@ class MediaManagerItem(QtGui.QWidget):
         It provides a default set and the plugin is able to override
         the if required.
         """
+        self.hasImportIcon = False
         self.hasNewIcon = True
         self.hasEditIcon = True
         self.hasFileIcon = False
@@ -207,48 +208,54 @@ class MediaManagerItem(QtGui.QWidget):
 
     def addMiddleHeaderBar(self):
         # Create buttons for the toolbar
+        ## Import Button ##
+        if self.hasImportIcon:
+            self.addToolbarButton(
+                u'Import %s' % self.PluginNameShort,
+                u'%s %s' % (self.trUtf8('Import a'), self.PluginNameVisible),
+                u':/general/general_import.png', self.onImportClick)
         ## File Button ##
         if self.hasFileIcon:
             self.addToolbarButton(
                 u'Load %s' % self.PluginNameShort,
                 u'%s %s' % (self.trUtf8('Load a new'), self.PluginNameVisible),
-                u':/%s_load.png' % self.IconPath, self.onFileClick)
+                u':/general/general_open.png', self.onFileClick)
         ## New Button ##
         if self.hasNewIcon:
             self.addToolbarButton(
                 u'New %s' % self.PluginNameShort,
                 u'%s %s' % (self.trUtf8('Add a new'), self.PluginNameVisible),
-                u':/%s_new.png' % self.IconPath, self.onNewClick)
+                u':/general/general_new.png', self.onNewClick)
         ## Edit Button ##
         if self.hasEditIcon:
             self.addToolbarButton(
                 u'Edit %s' % self.PluginNameShort,
                 u'%s %s' % (self.trUtf8('Edit the selected'),
                     self.PluginNameVisible),
-                u':/%s_edit.png' % self.IconPath, self.onEditClick)
+                u':/general/general_edit.png', self.onEditClick)
         ## Delete Button ##
         if self.hasDeleteIcon:
             self.addToolbarButton(
                 u'Delete %s' % self.PluginNameShort,
                 self.trUtf8('Delete the selected item'),
-                u':/%s_delete.png' % self.IconPath, self.onDeleteClick)
+                u':/general/general_delete.png', self.onDeleteClick)
         ## Separator Line ##
         self.addToolbarSeparator()
         ## Preview ##
         self.addToolbarButton(
             u'Preview %s' % self.PluginNameShort,
             self.trUtf8('Preview the selected item'),
-            u':/system/system_preview.png', self.onPreviewClick)
+            u':/general/general_preview.png', self.onPreviewClick)
         ## Live  Button ##
         self.addToolbarButton(
             u'Go Live',
             self.trUtf8('Send the selected item live'),
-            u':/system/system_live.png', self.onLiveClick)
+            u':/general/general_live.png', self.onLiveClick)
         ## Add to service Button ##
         self.addToolbarButton(
             u'Add %s to Service' % self.PluginNameShort,
             self.trUtf8('Add the selected item(s) to the service'),
-            u':/system/system_add.png', self.onAddClick)
+            u':/general/general_add.png', self.onAddClick)
 
     def addListViewToToolBar(self):
         #Add the List widget
@@ -268,22 +275,22 @@ class MediaManagerItem(QtGui.QWidget):
         if self.hasEditIcon:
             self.ListView.addAction(
                 contextMenuAction(
-                    self.ListView, u':/%s_new.png' % self.IconPath,
+                    self.ListView, u':/general/general_edit.png',
                     u'%s %s' % (self.trUtf8('&Edit'), self.PluginNameVisible),
                     self.onEditClick))
             self.ListView.addAction(contextMenuSeparator(self.ListView))
         self.ListView.addAction(
             contextMenuAction(
-                self.ListView, u':/system/system_preview.png',
+                self.ListView, u':/general/general_preview.png',
                 u'%s %s' % (self.trUtf8('&Preview'), self.PluginNameVisible),
                 self.onPreviewClick))
         self.ListView.addAction(
             contextMenuAction(
-                self.ListView, u':/system/system_live.png',
+                self.ListView, u':/general/general_live.png',
                 self.trUtf8('&Show Live'), self.onLiveClick))
         self.ListView.addAction(
             contextMenuAction(
-                self.ListView, u':/system/system_add.png',
+                self.ListView, u':/general/general_add.png',
                 self.trUtf8('&Add to Service'), self.onAddClick))
         QtCore.QObject.connect(
             self.ListView, QtCore.SIGNAL(u'doubleClicked(QModelIndex)'),
@@ -313,7 +320,7 @@ class MediaManagerItem(QtGui.QWidget):
         files = QtGui.QFileDialog.getOpenFileNames(
             self, self.OnNewPrompt,
             self.parent.config.get_last_dir(), self.OnNewFileMasks)
-        log.info(u'New files(s)%s', unicode(files))
+        log.info(u'New files(s) %s', unicode(files))
         if files:
             self.loadList(files)
             dir, filename = os.path.split(unicode(files[0]))
@@ -353,8 +360,8 @@ class MediaManagerItem(QtGui.QWidget):
     def onPreviewClick(self):
         if not self.ListView.selectedIndexes() and not self.remoteTriggered:
             QtGui.QMessageBox.information(self,
-                self.trUtf8('No items selected...'),
-                self.trUtf8('You must select one or more items'))
+                self.trUtf8('No Items Selected'),
+                self.trUtf8('You must select one or more items.'))
         else:
             log.debug(self.PluginNameShort + u' Preview requested')
             service_item = self.buildServiceItem()
@@ -365,8 +372,8 @@ class MediaManagerItem(QtGui.QWidget):
     def onLiveClick(self):
         if not self.ListView.selectedIndexes():
             QtGui.QMessageBox.information(self,
-                self.trUtf8('No items selected...'),
-                self.trUtf8('You must select one or more items'))
+                self.trUtf8('No Items Selected'),
+                self.trUtf8('You must select one or more items.'))
         else:
             log.debug(self.PluginNameShort + u' Live requested')
             service_item = self.buildServiceItem()
@@ -377,8 +384,8 @@ class MediaManagerItem(QtGui.QWidget):
     def onAddClick(self):
         if not self.ListView.selectedIndexes() and not self.remoteTriggered:
             QtGui.QMessageBox.information(self,
-                self.trUtf8('No items selected...'),
-                self.trUtf8('You must select one or more items'))
+                self.trUtf8('No Items Selected'),
+                self.trUtf8('You must select one or more items.'))
         else:
             log.debug(self.PluginNameShort + u' Add requested')
             service_item = self.buildServiceItem()
diff --git a/openlp/core/ui/amendthemedialog.py b/openlp/core/ui/amendthemedialog.py
index e819392e2..65d675cd1 100644
--- a/openlp/core/ui/amendthemedialog.py
+++ b/openlp/core/ui/amendthemedialog.py
@@ -116,7 +116,7 @@ class Ui_AmendThemeDialog(object):
         self.ImageLineEdit.setObjectName(u'ImageLineEdit')
         self.horizontalLayout_2.addWidget(self.ImageLineEdit)
         self.ImageToolButton = QtGui.QToolButton(self.ImageFilenameWidget)
-        icon1 = build_icon(u':/images/image_load.png')
+        icon1 = build_icon(u':/general/general_open.png')
         self.ImageToolButton.setIcon(icon1)
         self.ImageToolButton.setObjectName(u'ImageToolButton')
         self.horizontalLayout_2.addWidget(self.ImageToolButton)
diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py
index 45bf0eb6d..89166316e 100644
--- a/openlp/core/ui/servicemanager.py
+++ b/openlp/core/ui/servicemanager.py
@@ -114,13 +114,13 @@ class ServiceManager(QtGui.QWidget):
         # Create the top toolbar
         self.Toolbar = OpenLPToolbar(self)
         self.Toolbar.addToolbarButton(
-            self.trUtf8('New Service'), u':/services/service_new.png',
+            self.trUtf8('New Service'), u':/general/general_new.png',
             self.trUtf8('Create a new service'), self.onNewService)
         self.Toolbar.addToolbarButton(
-            self.trUtf8('Open Service'), u':/services/service_open.png',
+            self.trUtf8('Open Service'), u':/general/general_open.png',
             self.trUtf8('Load an existing service'), self.onLoadService)
         self.Toolbar.addToolbarButton(
-            self.trUtf8('Save Service'), u':/services/service_save.png',
+            self.trUtf8('Save Service'), u':/general/general_save.png',
             self.trUtf8('Save this service'), self.onSaveService)
         self.Toolbar.addSeparator()
         self.ThemeLabel = QtGui.QLabel(self.trUtf8('Theme:'),
@@ -171,7 +171,7 @@ class ServiceManager(QtGui.QWidget):
             self.trUtf8('Move to end'), self.onServiceEnd)
         self.OrderToolbar.addSeparator()
         self.OrderToolbar.addToolbarButton(
-            self.trUtf8('&Delete From Service'), u':/services/service_delete.png',
+            self.trUtf8('&Delete From Service'), u':/general/general_delete.png',
             self.trUtf8('Delete From Service'), self.onDeleteFromService)
         self.Layout.addWidget(self.OrderToolbar)
         # Connect up our signals and slots
@@ -201,17 +201,17 @@ class ServiceManager(QtGui.QWidget):
         #build the context menu
         self.menu = QtGui.QMenu()
         self.editAction = self.menu.addAction(self.trUtf8('&Edit Item'))
-        self.editAction.setIcon(build_icon(u':/services/service_edit.png'))
+        self.editAction.setIcon(build_icon(u':/general/general_edit.png'))
         self.notesAction = self.menu.addAction(self.trUtf8('&Notes'))
         self.notesAction.setIcon(build_icon(u':/services/service_notes.png'))
         self.deleteAction = self.menu.addAction(self.trUtf8('&Delete From Service'))
-        self.deleteAction.setIcon(build_icon(u':/services/service_delete.png'))
+        self.deleteAction.setIcon(build_icon(u':/general/general_delete.png'))
         self.sep1 = self.menu.addAction(u'')
         self.sep1.setSeparator(True)
         self.previewAction = self.menu.addAction(self.trUtf8('&Preview Verse'))
-        self.previewAction.setIcon(build_icon(u':/system/system_preview.png'))
+        self.previewAction.setIcon(build_icon(u':/general/general_preview.png'))
         self.liveAction = self.menu.addAction(self.trUtf8('&Live Verse'))
-        self.liveAction.setIcon(build_icon(u':/system/system_live.png'))
+        self.liveAction.setIcon(build_icon(u':/general/general_live.png'))
         self.sep2 = self.menu.addAction(u'')
         self.sep2.setSeparator(True)
         self.themeMenu = QtGui.QMenu(self.trUtf8(u'&Change Item Theme'))
diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py
index ecba32d8e..c03a65a51 100644
--- a/openlp/core/ui/slidecontroller.py
+++ b/openlp/core/ui/slidecontroller.py
@@ -177,11 +177,11 @@ class SlideController(QtGui.QWidget):
         if not self.isLive:
             self.Toolbar.addToolbarSeparator(u'Close Separator')
             self.Toolbar.addToolbarButton(
-                u'Go Live', u':/system/system_live.png',
+                u'Go Live', u':/general/general_live.png',
                 self.trUtf8('Move to live'), self.onGoLive)
             self.Toolbar.addToolbarSeparator(u'Close Separator')
             self.Toolbar.addToolbarButton(
-                u'Edit Song', u':/services/service_edit.png',
+                u'Edit Song', u':/general/general_edit.png',
                 self.trUtf8('Edit and re-preview Song'), self.onEditSong)
         if isLive:
             self.Toolbar.addToolbarSeparator(u'Loop Separator')
diff --git a/openlp/core/ui/thememanager.py b/openlp/core/ui/thememanager.py
index 3b211de28..e35afa9a7 100644
--- a/openlp/core/ui/thememanager.py
+++ b/openlp/core/ui/thememanager.py
@@ -59,14 +59,14 @@ class ThemeManager(QtGui.QWidget):
             self.trUtf8('Edit Theme'), u':/themes/theme_edit.png',
             self.trUtf8('Edit a theme'), self.onEditTheme)
         self.Toolbar.addToolbarButton(
-            self.trUtf8('Delete Theme'), u':/themes/theme_delete.png',
+            self.trUtf8('Delete Theme'), u':/general/general_delete.png',
             self.trUtf8('Delete a theme'), self.onDeleteTheme)
         self.Toolbar.addSeparator()
         self.Toolbar.addToolbarButton(
-            self.trUtf8('Import Theme'), u':/themes/theme_import.png',
+            self.trUtf8('Import Theme'), u':/general/general_import.png',
             self.trUtf8('Import a theme'), self.onImportTheme)
         self.Toolbar.addToolbarButton(
-            self.trUtf8('Export Theme'), u':/themes/theme_export.png',
+            self.trUtf8('Export Theme'), u':/general/general_export.png',
             self.trUtf8('Export a theme'), self.onExportTheme)
         self.ThemeWidget = QtGui.QWidgetAction(self.Toolbar)
         self.Layout.addWidget(self.Toolbar)
@@ -82,17 +82,17 @@ class ThemeManager(QtGui.QWidget):
             contextMenuSeparator(self.ThemeListWidget))
         self.ThemeListWidget.addAction(
             contextMenuAction(self.ThemeListWidget,
-                u':/themes/theme_delete.png',
+                u':/general/general_delete.png',
                 self.trUtf8('Delete theme'),
             self.onDeleteTheme))
         self.ThemeListWidget.addAction(
             contextMenuAction(self.ThemeListWidget,
-                u':/themes/theme_export.png',
+                u':/general/general_export.png',
                 self.trUtf8('Make Global'),
             self.changeGlobalFromScreen))
         self.ThemeListWidget.addAction(
             contextMenuAction(self.ThemeListWidget,
-                u':/themes/theme_export.png',
+                u':/general/general_export.png',
                 self.trUtf8('Export theme'),
             self.onExportTheme))
         self.ThemeListWidget.addAction(
diff --git a/openlp/migration/migratebibles.py b/openlp/migration/migratebibles.py
index b73b016cf..c0d47fdb8 100644
--- a/openlp/migration/migratebibles.py
+++ b/openlp/migration/migratebibles.py
@@ -27,9 +27,9 @@ import os
 import sys
 import sqlite3
 
-from sqlalchemy import  *
+from sqlalchemy import *
 from sqlalchemy import create_engine
-from sqlalchemy.orm import scoped_session, sessionmaker, mapper, relation
+from sqlalchemy.orm import scoped_session, sessionmaker, mapper
 
 from openlp.core.lib import PluginConfig
 from openlp.plugins.bibles.lib.models import *
@@ -223,4 +223,3 @@ class MigrateBibles():
         conn.commit()
         conn.execute(u'vacuum;')
         conn.commit()
-
diff --git a/openlp/plugins/bibles/forms/bibleimportwizard.py b/openlp/plugins/bibles/forms/bibleimportwizard.py
index 2313072d3..7b42ed26d 100644
--- a/openlp/plugins/bibles/forms/bibleimportwizard.py
+++ b/openlp/plugins/bibles/forms/bibleimportwizard.py
@@ -104,7 +104,7 @@ class Ui_BibleImportWizard(object):
         self.OsisFileButton = QtGui.QToolButton(self.OsisPage)
         self.OsisFileButton.setMaximumSize(QtCore.QSize(32, 16777215))
         icon = QtGui.QIcon()
-        icon.addPixmap(QtGui.QPixmap(u':/imports/import_load.png'),
+        icon.addPixmap(QtGui.QPixmap(u':/general/general_open.png'),
             QtGui.QIcon.Normal, QtGui.QIcon.Off)
         self.OsisFileButton.setIcon(icon)
         self.OsisFileButton.setObjectName(u'OsisFileButton')
diff --git a/openlp/plugins/bibles/forms/importwizardform.py b/openlp/plugins/bibles/forms/importwizardform.py
index 2efbcdf1e..a717a4f44 100644
--- a/openlp/plugins/bibles/forms/importwizardform.py
+++ b/openlp/plugins/bibles/forms/importwizardform.py
@@ -37,7 +37,7 @@ from openlp.plugins.bibles.lib.manager import BibleFormat
 
 log = logging.getLogger(__name__)
 
-class DownloadLocation(object):
+class WebDownload(object):
     Unknown = -1
     Crosswalk = 0
     BibleGateway = 1
@@ -282,7 +282,7 @@ class ImportWizardForm(QtGui.QWizard, Ui_BibleImportWizard):
         self.setField(u'csv_booksfile', QtCore.QVariant(''))
         self.setField(u'csv_versefile', QtCore.QVariant(''))
         self.setField(u'opensong_file', QtCore.QVariant(''))
-        self.setField(u'web_location', QtCore.QVariant(DownloadLocation.Crosswalk))
+        self.setField(u'web_location', QtCore.QVariant(WebDownload.Crosswalk))
         self.setField(u'web_biblename', QtCore.QVariant(self.BibleComboBox))
         self.setField(u'proxy_server',
             QtCore.QVariant(self.config.get_config(u'proxy address', '')))
@@ -293,7 +293,7 @@ class ImportWizardForm(QtGui.QWizard, Ui_BibleImportWizard):
         self.setField(u'license_version', QtCore.QVariant(self.VersionNameEdit))
         self.setField(u'license_copyright', QtCore.QVariant(self.CopyrightEdit))
         self.setField(u'license_permission', QtCore.QVariant(self.PermissionEdit))
-        self.onLocationComboBoxChanged(DownloadLocation.Crosswalk)
+        self.onLocationComboBoxChanged(WebDownload.Crosswalk)
 
     def loadWebBibles(self):
         """
@@ -304,14 +304,19 @@ class ImportWizardForm(QtGui.QWizard, Ui_BibleImportWizard):
         filepath = os.path.join(filepath, u'bibles', u'resources')
         fbibles = None
         try:
-            self.web_bible_list[DownloadLocation.Crosswalk] = {}
+            self.web_bible_list[WebDownload.Crosswalk] = {}
             books_file = open(os.path.join(filepath, u'crosswalkbooks.csv'), 'r')
             dialect = csv.Sniffer().sniff(books_file.read(1024))
             books_file.seek(0)
             books_reader = csv.reader(books_file, dialect)
             for line in books_reader:
-                self.web_bible_list[DownloadLocation.Crosswalk][line[0]] = \
-                    unicode(line[1], u'utf8').strip()
+                ver = line[0]
+                name = line[1]
+                if not isinstance(ver, unicode):
+                    ver = unicode(ver, u'utf8')
+                if not isinstance(name, unicode):
+                    name = unicode(name, u'utf8')
+                self.web_bible_list[WebDownload.Crosswalk][ver] = name.strip()
         except:
             log.exception(u'Crosswalk resources missing')
         finally:
@@ -319,14 +324,19 @@ class ImportWizardForm(QtGui.QWizard, Ui_BibleImportWizard):
                 books_file.close()
         #Load and store BibleGateway Bibles
         try:
-            self.web_bible_list[DownloadLocation.BibleGateway] = {}
+            self.web_bible_list[WebDownload.BibleGateway] = {}
             books_file = open(os.path.join(filepath, u'biblegateway.csv'), 'r')
             dialect = csv.Sniffer().sniff(books_file.read(1024))
             books_file.seek(0)
             books_reader = csv.reader(books_file, dialect)
             for line in books_reader:
-                self.web_bible_list[DownloadLocation.BibleGateway][line[0]] = \
-                    unicode(line[1], u'utf-8').strip()
+                ver = line[0]
+                name = line[1]
+                if not isinstance(ver, unicode):
+                    ver = unicode(ver, u'utf8')
+                if not isinstance(name, unicode):
+                    name = unicode(name, u'utf8')
+                self.web_bible_list[WebDownload.BibleGateway][ver] = name.strip()
         except:
             log.exception(u'Biblegateway resources missing')
         finally:
@@ -383,16 +393,17 @@ class ImportWizardForm(QtGui.QWizard, Ui_BibleImportWizard):
             # Import a bible from the web
             self.ImportProgressBar.setMaximum(1)
             download_location = self.field(u'web_location').toInt()[0]
-            if download_location == DownloadLocation.Crosswalk:
-                bible = self.web_bible_list[DownloadLocation.Crosswalk][
-                    unicode(self.BibleComboBox.currentText(), u'utf8')]
-            elif download_location == DownloadLocation.BibleGateway:
-                bible = self.web_bible_list[DownloadLocation.BibleGateway][
-                    unicode(self.BibleComboBox.currentText(), u'utf8')]
+            bible_version = self.BibleComboBox.currentText()
+            if not isinstance(bible_version, unicode):
+                bible_version = unicode(bible_version, u'utf8')
+            if download_location == WebDownload.Crosswalk:
+                bible = self.web_bible_list[WebDownload.Crosswalk][bible_version]
+            elif download_location == WebDownload.BibleGateway:
+                bible = self.web_bible_list[WebDownload.BibleGateway][bible_version]
             importer = self.manager.import_bible(
                 BibleFormat.WebDownload,
                 name=license_version,
-                download_source=DownloadLocation.get_name(download_location),
+                download_source=WebDownload.get_name(download_location),
                 download_name=bible,
                 proxy_server=variant_to_unicode(self.field(u'proxy_server')),
                 proxy_username=variant_to_unicode(self.field(u'proxy_username')),
diff --git a/openlp/plugins/bibles/lib/mediaitem.py b/openlp/plugins/bibles/lib/mediaitem.py
index 2d6233a6c..3bcc0b426 100644
--- a/openlp/plugins/bibles/lib/mediaitem.py
+++ b/openlp/plugins/bibles/lib/mediaitem.py
@@ -76,6 +76,8 @@ class BibleMediaItem(MediaManagerItem):
 
     def requiredIcons(self):
         MediaManagerItem.requiredIcons(self)
+        self.hasImportIcon = True
+        self.hasNewIcon = False
         self.hasEditIcon = False
         self.hasDeleteIcon = False
 
@@ -251,6 +253,8 @@ class BibleMediaItem(MediaManagerItem):
         QtCore.QObject.connect(Receiver.get_receiver(),
             QtCore.SIGNAL(u'config_updated'), self.configUpdated)
         # Other stuff
+        QtCore.QObject.connect(self.QuickSearchEdit,
+            QtCore.SIGNAL(u'returnPressed()'), self.onQuickSearchButton)
         QtCore.QObject.connect(Receiver.get_receiver(),
             QtCore.SIGNAL(u'bible_showprogress'), self.onSearchProgressShow)
         QtCore.QObject.connect(Receiver.get_receiver(),
@@ -373,7 +377,7 @@ class BibleMediaItem(MediaManagerItem):
             unicode(self.AdvancedBookComboBox.currentText()),
             self.AdvancedBookComboBox.itemData(item).toInt()[0])
 
-    def onNewClick(self):
+    def onImportClick(self):
         self.bibleimportform = ImportWizardForm(self, self.parent.config,
             self.parent.manager, self.parent)
         self.bibleimportform.exec_()
diff --git a/openlp/plugins/presentations/lib/impresscontroller.py b/openlp/plugins/presentations/lib/impresscontroller.py
index 637e629c0..14e98273e 100644
--- a/openlp/plugins/presentations/lib/impresscontroller.py
+++ b/openlp/plugins/presentations/lib/impresscontroller.py
@@ -147,9 +147,8 @@ class ImpressController(PresentationController):
         Called at system exit to clean up any running presentations
         """
         log.debug(u'Kill OpenOffice')
-        for i in range(len(self.docs)):
-           self.docs[0].close_presentation()  # Yes, always the zeroth one
-                                               # as close removes item from array
+        while self.docs:
+            self.docs[0].close_presentation()
         if os.name != u'nt':
             desktop = self.get_uno_desktop()
         else:
diff --git a/openlp/plugins/presentations/lib/powerpointcontroller.py b/openlp/plugins/presentations/lib/powerpointcontroller.py
index 3dedcec75..67870574d 100644
--- a/openlp/plugins/presentations/lib/powerpointcontroller.py
+++ b/openlp/plugins/presentations/lib/powerpointcontroller.py
@@ -82,9 +82,8 @@ class PowerpointController(PresentationController):
             Called at system exit to clean up any running presentations
             """
             log.debug(u'Kill powerpoint')
-            for i in range(len(self.docs)):
-               self.docs[0].close_presentation()  # Yes, always the zeroth one
-                                                   # as close removes item from array
+            while self.docs:
+                self.docs[0].close_presentation()
             if self.process is None:
                 return
             if self.process.Presentations.Count > 0:
diff --git a/openlp/plugins/presentations/lib/pptviewcontroller.py b/openlp/plugins/presentations/lib/pptviewcontroller.py
index 5646c7258..455e1c601 100644
--- a/openlp/plugins/presentations/lib/pptviewcontroller.py
+++ b/openlp/plugins/presentations/lib/pptviewcontroller.py
@@ -89,9 +89,8 @@ class PptviewController(PresentationController):
             Called at system exit to clean up any running presentations
             """
             log.debug(u'Kill pptviewer')
-            for i in range(len(self.docs)):
-               self.docs[0].close_presentation()  # Yes, always the zeroth one
-                                                   # as close removes item from array
+            while self.docs:
+                self.docs[0].close_presentation()
 
         def add_doc(self, name):
             log.debug(u'Add Doc PPTView')
diff --git a/openlp/plugins/songs/forms/editsongform.py b/openlp/plugins/songs/forms/editsongform.py
index f6e0c11f5..976ee1e78 100644
--- a/openlp/plugins/songs/forms/editsongform.py
+++ b/openlp/plugins/songs/forms/editsongform.py
@@ -498,7 +498,6 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
             sxml = SongXMLBuilder()
             sxml.new_document()
             sxml.add_lyrics_to_song()
-            count = 1
             text = u' '
             for i in range (0, self.VerseListWidget.count()):
                 item = self.VerseListWidget.item(i)
@@ -506,7 +505,6 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
                 bits = verseId.split(u':')
                 sxml.add_verse_to_lyrics(bits[0], bits[1], unicode(item.text()))
                 text = text + unicode(self.VerseListWidget.item(i).text()) + u' '
-                count += 1
             text = text.replace(u'\'', u'')
             text = text.replace(u',', u'')
             text = text.replace(u';', u'')
diff --git a/openlp/plugins/songs/forms/openlpexportdialog.py b/openlp/plugins/songs/forms/openlpexportdialog.py
index ca7a77153..2236d9ed3 100644
--- a/openlp/plugins/songs/forms/openlpexportdialog.py
+++ b/openlp/plugins/songs/forms/openlpexportdialog.py
@@ -54,7 +54,7 @@ class Ui_OpenLPExportDialog(object):
         self.horizontalLayout.addWidget(self.ExportFileLineEdit)
         self.ExportFileSelectPushButton = QtGui.QPushButton(self.ExportFileWidget)
         icon1 = QtGui.QIcon()
-        icon1.addPixmap(QtGui.QPixmap(u':/exports/export_load.png'), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        icon1.addPixmap(QtGui.QPixmap(u':/general/general_load.png'), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         self.ExportFileSelectPushButton.setIcon(icon1)
         self.ExportFileSelectPushButton.setObjectName(u'ExportFileSelectPushButton')
         self.horizontalLayout.addWidget(self.ExportFileSelectPushButton)
diff --git a/openlp/plugins/songs/lib/mediaitem.py b/openlp/plugins/songs/lib/mediaitem.py
index 151dc8118..c7b29afd9 100644
--- a/openlp/plugins/songs/lib/mediaitem.py
+++ b/openlp/plugins/songs/lib/mediaitem.py
@@ -282,7 +282,7 @@ class SongMediaItem(MediaManagerItem):
         raw_footer = []
         author_list = u''
         author_audit = []
-        ccl = u''
+        ccli = u''
         if self.remoteTriggered is None:
             item = self.ListView.currentItem()
             if item is None:
diff --git a/openlp/plugins/songusage/forms/songusagedetaildialog.py b/openlp/plugins/songusage/forms/songusagedetaildialog.py
index b2f7c0389..13b4fe18d 100644
--- a/openlp/plugins/songusage/forms/songusagedetaildialog.py
+++ b/openlp/plugins/songusage/forms/songusagedetaildialog.py
@@ -60,7 +60,8 @@ class Ui_SongUsageDetailDialog(object):
         self.horizontalLayout.addWidget(self.FileLineEdit)
         self.SaveFilePushButton = QtGui.QPushButton(self.FileGroupBox)
         icon = QtGui.QIcon()
-        icon.addPixmap(QtGui.QPixmap(u':/exports/export_load.png'), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        icon.addPixmap(QtGui.QPixmap(u':/general/general_load.png'),
+            QtGui.QIcon.Normal, QtGui.QIcon.Off)
         self.SaveFilePushButton.setIcon(icon)
         self.SaveFilePushButton.setObjectName(u'SaveFilePushButton')
         self.horizontalLayout.addWidget(self.SaveFilePushButton)
diff --git a/resources/images/openlp-2.qrc b/resources/images/openlp-2.qrc
index bba088c2b..98de90f09 100644
--- a/resources/images/openlp-2.qrc
+++ b/resources/images/openlp-2.qrc
@@ -13,14 +13,22 @@
     <file>book_maintenance.png</file>
     <file>author_maintenance.png</file>
     <file>topic_maintenance.png</file>
-    <file>song_delete.png</file>
-    <file>song_edit.png</file>
-    <file>song_export.png</file>
-    <file>song_new.png</file>
     <file>song_author_edit.png</file>
     <file>song_topic_edit.png</file>
     <file>song_book_edit.png</file>
   </qresource>
+  <qresource prefix="general" >
+    <file>general_preview.png</file>
+    <file>general_live.png</file>
+    <file>general_add.png</file>
+    <file>general_delete.png</file>
+    <file>general_edit.png</file>
+    <file>general_export.png</file>
+    <file>general_import.png</file>
+    <file>general_new.png</file>
+    <file>general_open.png</file>
+    <file>general_save.png</file>
+  </qresource>
   <qresource prefix="slides" >
     <file>slide_close.png</file>
     <file>slide_first.png</file>
@@ -58,47 +66,22 @@
     <file>export_load.png</file>
     <file>export_move_to_list.png</file>
   </qresource>
-  <qresource prefix="custom" >
-    <file>custom_new.png</file>
-    <file>custom_edit.png</file>
-    <file>custom_delete.png</file>
-  </qresource>
   <qresource prefix="wizards" >
     <file>wizard_importbible.bmp</file>
   </qresource>
-  <qresource prefix="presentations" >
-    <file>presentation_delete.png</file>
-    <file>presentation_load.png</file>
-  </qresource>
-  <qresource prefix="videos" >
-    <file>video_delete.png</file>
-    <file>video_load.png</file>
-  </qresource>
-  <qresource prefix="images" >
-    <file>image_delete.png</file>
-    <file>image_load.png</file>
-  </qresource>
   <qresource prefix="services" >
-    <file>service_edit.png</file>
     <file>service_notes.png</file>
     <file>service_item_notes.png</file>
     <file>service_bottom.png</file>
     <file>service_down.png</file>
     <file>service_top.png</file>
     <file>service_up.png</file>
-    <file>service_delete.png</file>
-    <file>service_new.png</file>
-    <file>service_open.png</file>
-    <file>service_save.png</file>
   </qresource>
   <qresource prefix="system" >
     <file>system_close.png</file>
     <file>system_about.png</file>
     <file>system_help_contents.png</file>
-    <file>system_add.png</file>
-    <file>system_preview.png</file>
     <file>system_mediamanager.png</file>
-    <file>system_live.png</file>
     <file>system_contribute.png</file>
     <file>system_servicemanager.png</file>
     <file>system_thememanager.png</file>
@@ -129,7 +112,5 @@
     <file>theme_delete.png</file>
     <file>theme_new.png</file>
     <file>theme_edit.png</file>
-    <file>theme_export.png</file>
-    <file>theme_import.png</file>
   </qresource>
 </RCC>
diff --git a/scripts/bible-1to2-converter.py b/scripts/bible-1to2-converter.py
index b1604764f..6fe1f1df4 100755
--- a/scripts/bible-1to2-converter.py
+++ b/scripts/bible-1to2-converter.py
@@ -206,7 +206,6 @@ def import_bible():
     rows = old_cursor.fetchall()
     if debug or verbose:
         print 'done.'
-    song_map = {}
     for row in rows:
         book_id = int(row[1])
         chapter = int(row[2])