diff --git a/openlp/core/lib/mediamanageritem.py b/openlp/core/lib/mediamanageritem.py
index 9c54e05e1..77b45b0c0 100644
--- a/openlp/core/lib/mediamanageritem.py
+++ b/openlp/core/lib/mediamanageritem.py
@@ -113,8 +113,8 @@ class MediaManagerItem(QtGui.QWidget):
             self.title = title
         self.Toolbar = None
         self.PageLayout = QtGui.QVBoxLayout(self)
-        self.PageLayout.setSpacing(4)
-        self.PageLayout.setMargin(0)
+        self.PageLayout.setSpacing(0)
+        self.PageLayout.setContentsMargins(4, 0, 4, 0)
         self.requiredIcons()
         self.setupUi()
         self.retranslateUi()
diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py
index 5459df9d7..cac0b8e0a 100644
--- a/openlp/core/ui/mainwindow.py
+++ b/openlp/core/ui/mainwindow.py
@@ -35,6 +35,22 @@ from openlp.core.lib import translate, RenderManager, PluginConfig, \
     buildIcon
 from openlp.core.utils import check_latest_version
 
+media_manager_style = """
+  QToolBox::tab {
+    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
+        stop: 0 palette(midlight), stop: 1.0 palette(dark));
+    border-width: 1px;
+    border-style: outset;
+    border-color: palette(midlight);
+    border-radius: 5px;
+  }
+  QToolBox::tab:selected {
+    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
+        stop: 0 palette(light), stop: 1.0 palette(dark));
+    border-color: palette(light);
+  }
+"""
+
 class Ui_MainWindow(object):
     def setupUi(self, MainWindow):
         """
@@ -107,15 +123,7 @@ class Ui_MainWindow(object):
         self.MediaManagerDock = OpenLPDockWidget(MainWindow)
         MediaManagerIcon = buildIcon(u':/system/system_mediamanager.png')
         self.MediaManagerDock.setWindowIcon(MediaManagerIcon)
-        self.MediaManagerDock.setStyleSheet("""
- QToolBox::tab {
-     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
-                                 stop: 0 palette(light), stop: 1.0 palette(dark));
-     border: none;
-     border-radius: 5px;
-     margin: 0;
- }
-        """)
+        self.MediaManagerDock.setStyleSheet(media_manager_style)
         self.MediaManagerDock.setMinimumWidth(
             self.settingsmanager.mainwindow_left)
         self.MediaManagerDock.setObjectName(u'MediaManagerDock')
diff --git a/openlp/plugins/songs/lib/mediaitem.py b/openlp/plugins/songs/lib/mediaitem.py
index 7f1a9c234..d30d36df4 100644
--- a/openlp/plugins/songs/lib/mediaitem.py
+++ b/openlp/plugins/songs/lib/mediaitem.py
@@ -93,7 +93,7 @@ class SongMediaItem(MediaManagerItem):
         self.SearchLayout.setWidget(
             1, QtGui.QFormLayout.FieldRole, self.SearchTypeComboBox)
         self.PageLayout.addLayout(self.SearchLayout)
-        self.SearchButtonLayout = QtGui.QHBoxLayout(self)
+        self.SearchButtonLayout = QtGui.QHBoxLayout()
         self.SearchButtonLayout.setMargin(0)
         self.SearchButtonLayout.setSpacing(4)
         self.SearchButtonLayout.setObjectName(u'SearchButtonLayout')