diff --git a/src/lib/downloads/downloadmanager.ui b/src/lib/downloads/downloadmanager.ui
index 9f4093ce5..ccfa22ccd 100644
--- a/src/lib/downloads/downloadmanager.ui
+++ b/src/lib/downloads/downloadmanager.ui
@@ -23,16 +23,7 @@
    <property name="spacing">
     <number>0</number>
    </property>
-   <property name="leftMargin">
-    <number>0</number>
-   </property>
-   <property name="topMargin">
-    <number>0</number>
-   </property>
-   <property name="rightMargin">
-    <number>0</number>
-   </property>
-   <property name="bottomMargin">
+   <property name="margin">
     <number>0</number>
    </property>
    <item>
@@ -48,13 +39,6 @@
      </property>
     </widget>
    </item>
-   <item>
-    <widget class="Line" name="line">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-    </widget>
-   </item>
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
diff --git a/themes/chrome/main.css b/themes/chrome/main.css
index cd75b2a53..0320ae343 100644
--- a/themes/chrome/main.css
+++ b/themes/chrome/main.css
@@ -275,18 +275,6 @@ IconProvider
     qproperty-fixedsize: 37px 27px;
 }
 
-/*SourceViewer*/
-#sourceviewer-textedit
-{
-    border:none;
-}
-
-/*SourceViewerSearch*/
-SourceViewerSearch #lineEdit[notfound="true"]
-{
-    background:#ff6666;
-}
-
 /*SearchToolbar*/
 SearchToolBar #lineEdit[notfound="true"]
 {
@@ -296,31 +284,35 @@ SearchToolBar #lineEdit[notfound="true"]
 /*AboutDialog*/
 AboutDialog #label
 {
-    background:white;
+    background: palette(window);
 }
 
 AboutDialog #textBrowser
 {
-    border:none;
-    margin-top: -2px; /* Workarounding rounded border on KDE */
+    background: palette(window);
 }
 
 /*DesktopNotification*/
 DesktopNotification
 {
-    background: transparent;
+    background: #31363b;
 }
+
 DesktopNotification #frame
 {
-    border: 2px solid darkblue;
-    border-radius: 20px;
-    background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1,stop:0 #e4ecf1, stop:1 #d3e5f1);
+    border: 1px solid #696d71;
+    padding: 10px;
 }
 
 DesktopNotification #heading
 {
     font: bold;
-    font-size: 13pt;
+    color: #c2c7c7;
+}
+
+DesktopNotification #text
+{
+    color: #e7ebeb;
 }
 
 /*BrowsingLibrary*/
@@ -334,17 +326,6 @@ BrowsingLibrary #frame
     background: url(images/library-bg.png);
 }
 
-/*Downloads*/
-DownloadItem #fileName
-{
-    font-size: 13pt;
-}
-
-DownloadManager #list
-{
-    border: none;
-}
-
 /*JavaScript Dialogs*/
 #jsFrame
 {
diff --git a/themes/chrome/windows.css b/themes/chrome/windows.css
index e4eac862c..ea252b109 100644
--- a/themes/chrome/windows.css
+++ b/themes/chrome/windows.css
@@ -15,9 +15,3 @@
 {
     height: 26px;
 }
-
-/*Downloads*/
-DownloadItem #progressBar
-{
-    border: 1px solid;
-}
diff --git a/themes/linux/main.css b/themes/linux/main.css
index 16cc00560..1bf19b398 100644
--- a/themes/linux/main.css
+++ b/themes/linux/main.css
@@ -213,32 +213,35 @@ SearchToolBar #lineEdit[notfound="true"]
 /*AboutDialog*/
 AboutDialog #label
 {
-    background: white;
+    background: palette(window);
 }
 
 AboutDialog #textBrowser
 {
-    border: none;
-    margin-top: -2px; /* Workarounding rounded border on KDE */
+    background: palette(window);
 }
 
 /*DesktopNotification*/
 DesktopNotification
 {
-    background: transparent;
+    background: #31363b;
 }
 
 DesktopNotification #frame
 {
-    border: 2px solid darkblue;
-    border-radius: 20px;
-    background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1,stop:0 #e4ecf1, stop:1 #d3e5f1);
+    border: 1px solid #696d71;
+    padding: 10px;
 }
 
 DesktopNotification #heading
 {
     font: bold;
-    font-size: 13pt;
+    color: #c2c7c7;
+}
+
+DesktopNotification #text
+{
+    color: #e7ebeb;
 }
 
 /*BrowsingLibrary*/
@@ -252,17 +255,6 @@ BrowsingLibrary #frame
     background: url(images/library-bg.png);
 }
 
-/*Downloads*/
-DownloadItem #fileName
-{
-    font-size: 13pt;
-}
-
-DownloadManager #list
-{
-    border: none;
-}
-
 /*JavaScript Dialogs*/
 #jsFrame
 {
diff --git a/themes/mac/main.css b/themes/mac/main.css
index b17ed190f..6e453c71f 100644
--- a/themes/mac/main.css
+++ b/themes/mac/main.css
@@ -279,18 +279,6 @@ IconProvider
     qproperty-fixedsize: 42px 23px;
 }
 
-/*SourceViewer*/
-#sourceviewer-textedit
-{
-    border:none;
-}
-
-/*SourceViewerSearch*/
-SourceViewerSearch #lineEdit[notfound="true"]
-{
-    background:#ff6666;
-}
-
 /*SearchToolbar*/
 SearchToolBar #lineEdit[notfound="true"]
 {
@@ -300,31 +288,35 @@ SearchToolBar #lineEdit[notfound="true"]
 /*AboutDialog*/
 AboutDialog #label
 {
-    background:white;
+    background: palette(window);
 }
 
 AboutDialog #textBrowser
 {
-    border:none;
-    margin-top: -2px; /* Workarounding rounded border on KDE */
+    background: palette(window);
 }
 
 /*DesktopNotification*/
 DesktopNotification
 {
-    background: transparent;
+    background: #31363b;
 }
+
 DesktopNotification #frame
 {
-    border: 2px solid darkblue;
-    border-radius: 20px;
-    background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1,stop:0 #e4ecf1, stop:1 #d3e5f1);
+    border: 1px solid #696d71;
+    padding: 10px;
 }
 
 DesktopNotification #heading
 {
     font: bold;
-    font-size: 13pt;
+    color: #c2c7c7;
+}
+
+DesktopNotification #text
+{
+    color: #e7ebeb;
 }
 
 /*BrowsingLibrary*/
@@ -338,17 +330,6 @@ BrowsingLibrary #frame
     background: url(images/library-bg.png);
 }
 
-/*Downloads*/
-DownloadItem #fileName
-{
-    font-size: 13pt;
-}
-
-DownloadManager #list
-{
-    border: none;
-}
-
 /*JavaScript Dialogs*/
 #jsFrame
 {
diff --git a/themes/mac/windows.css b/themes/mac/windows.css
index e4eac862c..ea252b109 100644
--- a/themes/mac/windows.css
+++ b/themes/mac/windows.css
@@ -15,9 +15,3 @@
 {
     height: 26px;
 }
-
-/*Downloads*/
-DownloadItem #progressBar
-{
-    border: 1px solid;
-}
diff --git a/themes/windows/main.css b/themes/windows/main.css
index f28409eed..2f2bbf7f2 100644
--- a/themes/windows/main.css
+++ b/themes/windows/main.css
@@ -141,6 +141,11 @@ ToolButton[button-id="button-downloads"]
     qproperty-fixedsize: 22px 29px;
 }
 
+TabBarTabMetrics
+{
+    qproperty-pinnedWidth: 32;
+}
+
 #tabbar
 {
     min-height: 30px;
@@ -356,18 +361,6 @@ IconProvider
     padding-left: 4px;
 }
 
-/*SourceViewer*/
-#sourceviewer-textedit
-{
-    border:none;
-}
-
-/*SourceViewerSearch*/
-SourceViewerSearch #lineEdit[notfound="true"]
-{
-    background:#ff6666;
-}
-
 /*SearchToolbar*/
 SearchToolBar #lineEdit[notfound="true"]
 {
@@ -377,31 +370,35 @@ SearchToolBar #lineEdit[notfound="true"]
 /*AboutDialog*/
 AboutDialog #label
 {
-    background:white;
+    background: palette(window);
 }
 
 AboutDialog #textBrowser
 {
-    border:none;
+    background: palette(window);
 }
 
 /*DesktopNotification*/
 DesktopNotification
 {
-    background: transparent;
+    background: #31363b;
 }
 
 DesktopNotification #frame
 {
-    border: 2px solid darkblue;
-    border-radius: 20px;
-    background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1,stop:0 #e4ecf1, stop:1 #d3e5f1);
+    border: 1px solid #696d71;
+    padding: 10px;
 }
 
 DesktopNotification #heading
 {
     font: bold;
-    font-size: 13pt;
+    color: #c2c7c7;
+}
+
+DesktopNotification #text
+{
+    color: #e7ebeb;
 }
 
 /*BrowsingLibrary*/
@@ -415,17 +412,6 @@ BrowsingLibrary #frame
     background: url(images/library-bg.png);
 }
 
-/*Downloads*/
-DownloadItem #fileName
-{
-    font-size: 13pt;
-}
-
-DownloadManager #list
-{
-    border: none;
-}
-
 /*JavaScript Dialogs*/
 #jsFrame
 {
diff --git a/themes/windows/windows.css b/themes/windows/windows.css
deleted file mode 100644
index fd19ff400..000000000
--- a/themes/windows/windows.css
+++ /dev/null
@@ -1,5 +0,0 @@
-/*Downloads*/
-DownloadItem #progressBar
-{
-    border: 1px solid;
-}