diff --git a/bin/themes/windows/images/goto.svg b/bin/themes/windows/images/goto.svg
new file mode 100644
index 000000000..08cda2e39
--- /dev/null
+++ b/bin/themes/windows/images/goto.svg
@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#4d4d4d;
+      }
+      </style>
+  </defs>
+ <path style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="M 3.7480469 2 L 3 2.71875 L 7.2988281 6.84375 L 8.5351562 8 L 7.2988281 9.15625 L 3 13.28125 L 3.7480469 14 L 8.046875 9.875 L 10 8 L 3.7480469 2 z M 12 7 A 1 1 0 0 0 11 8 A 1 1 0 0 0 12 9 A 1 1 0 0 0 13 8 A 1 1 0 0 0 12 7 z "
+     class="ColorScheme-Text"
+     />
+</svg>
diff --git a/bin/themes/windows/images/menu.svg b/bin/themes/windows/images/menu.svg
new file mode 100644
index 000000000..67dd4d951
--- /dev/null
+++ b/bin/themes/windows/images/menu.svg
@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#4d4d4d;
+      }
+      </style>
+  </defs>
+ <path style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="M 2 3 L 2 5 L 14 5 L 14 3 L 2 3 z M 2 7 L 2 9 L 14 9 L 14 7 L 2 7 z M 2 11 L 2 13 L 14 13 L 14 11 L 2 11 z "
+     class="ColorScheme-Text"
+     />
+</svg>
diff --git a/bin/themes/windows/images/star-a.svg b/bin/themes/windows/images/star-a.svg
new file mode 100644
index 000000000..9432f9f21
--- /dev/null
+++ b/bin/themes/windows/images/star-a.svg
@@ -0,0 +1,17 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Highlight {
+        color:#3daee9;
+      }
+      </style>
+  </defs>
+  <g
+     transform="translate(-421.71429,-531.79074)">
+    <path
+       style="fill:currentColor;fill-opacity:1;stroke:none" 
+       d="m 429.74391,532.79074 -2.1875,4.59602 -4.84212,0.72462 3.47949,3.59343 -0.85449,5.05858 4.33854,-2.37663 4.31348,2.40398 -0.79753,-5.06315 3.52051,-3.57291 -4.83301,-0.75196 z"
+       id="path4277"
+       class="ColorScheme-Highlight" />
+  </g>
+</svg>
diff --git a/bin/themes/windows/images/star.svg b/bin/themes/windows/images/star.svg
new file mode 100644
index 000000000..bcf6e3512
--- /dev/null
+++ b/bin/themes/windows/images/star.svg
@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#4d4d4d;
+      }
+      </style>
+  </defs>
+    <path
+       style="fill:currentColor;fill-opacity:0.6;stroke:none" 
+       d="m8.03 2l-1.875 3.939-4.15.621 2.982 3.08-.732 4.336 3.719-2.037 3.697 2.061-.684-4.34 3.02-3.062-4.143-.645zm-.008 2l1.221 2.635 2.762.432-2.01 2.041.455 2.893-2.463-1.373-2.48 1.357.488-2.891-1.988-2.055 2.766-.412z"
+       class="ColorScheme-Text" />
+</svg>
diff --git a/bin/themes/windows/images/tab-close-a.svg b/bin/themes/windows/images/tab-close-a.svg
new file mode 100644
index 000000000..0d1f44efa
--- /dev/null
+++ b/bin/themes/windows/images/tab-close-a.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 9 9">
+ <path 
+     d="M 1.2726002,0 0,1.2726 3.2274005,4.4999998 0,7.727401 1.2726002,9 4.5000005,5.772599 7.7274004,9 9.0000004,7.727401 5.7726007,4.4999998 9.0000004,1.2726 7.7274004,0 4.5000005,3.2273999"
+      style="fill:#e10c0c;fill-opacity:1;stroke:none" 
+    />
+</svg>
diff --git a/bin/themes/windows/images/tab-close-h.svg b/bin/themes/windows/images/tab-close-h.svg
new file mode 100644
index 000000000..425017dcf
--- /dev/null
+++ b/bin/themes/windows/images/tab-close-h.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 9 9">
+ <path 
+     d="M 1.2726002,0 0,1.2726 3.2274005,4.4999998 0,7.727401 1.2726002,9 4.5000005,5.772599 7.7274004,9 9.0000004,7.727401 5.7726007,4.4999998 9.0000004,1.2726 7.7274004,0 4.5000005,3.2273999"
+      style="fill:#e73c3c;fill-opacity:1;stroke:none" 
+    />
+</svg>
diff --git a/bin/themes/windows/images/tab-close.svg b/bin/themes/windows/images/tab-close.svg
new file mode 100644
index 000000000..cbec9ace4
--- /dev/null
+++ b/bin/themes/windows/images/tab-close.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 9 9">
+ <path 
+     d="M 1.2726002,0 0,1.2726 3.2274005,4.4999998 0,7.727401 1.2726002,9 4.5000005,5.772599 7.7274004,9 9.0000004,7.727401 5.7726007,4.4999998 9.0000004,1.2726 7.7274004,0 4.5000005,3.2273999"
+      style="fill:#a09e9e;fill-opacity:1;stroke:none" 
+    />
+</svg>
diff --git a/bin/themes/windows/images/tab-left-arrow.svg b/bin/themes/windows/images/tab-left-arrow.svg
new file mode 100644
index 000000000..9cc1823aa
--- /dev/null
+++ b/bin/themes/windows/images/tab-left-arrow.svg
@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#4d4d4d;
+      }
+      </style>
+  </defs>
+ <path style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="m5 8l6.251-6 .749.719-4.298 4.125-1.237 1.156 1.237 1.156 4.298 4.125-.749.719-4.298-4.125z"
+     class="ColorScheme-Text"
+     />
+</svg>
diff --git a/bin/themes/windows/images/tab-right-arrow.svg b/bin/themes/windows/images/tab-right-arrow.svg
new file mode 100644
index 000000000..f9568d173
--- /dev/null
+++ b/bin/themes/windows/images/tab-right-arrow.svg
@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#4d4d4d;
+      }
+      </style>
+  </defs>
+ <path style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="m12 8l-6.251-6-.749.719 4.298 4.125 1.237 1.156-1.237 1.156-4.298 4.125.749.719 4.298-4.125z"
+     class="ColorScheme-Text"
+     />
+</svg>
diff --git a/bin/themes/windows/images/user.svg b/bin/themes/windows/images/user.svg
new file mode 100644
index 000000000..c3930096d
--- /dev/null
+++ b/bin/themes/windows/images/user.svg
@@ -0,0 +1,14 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#4d4d4d;
+      }
+      </style>
+  </defs>
+ <path style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="m429.71429 533.79074a3 3 0 0 0 -3 3 3 3 0 0 0 3 3 3 3 0 0 0 3 -3 3 3 0 0 0 -3 -3m0 1a2 2 0 0 1 2 2 2 2 0 0 1 -2 2 2 2 0 0 1 -2 -2 2 2 0 0 1 2 -2m0 6a5 4.5 0 0 0 -5 4.5 5 4.5 0 0 0 .0332 .5h9.93a5 4.5 0 0 0 .0371 -.5 5 4.5 0 0 0 -5 -4.5m.00005 1a4 3.5 0 0 1 3.95508 3h-7.91a4 3.5 0 0 1 3.95508 -3" 
+     transform="translate(-421.71-531.79)"
+     class="ColorScheme-Text"
+     />
+</svg>
diff --git a/themes/windows/images/gotoaddress.png b/themes/windows/images/gotoaddress.png
deleted file mode 100644
index 96b5874df..000000000
Binary files a/themes/windows/images/gotoaddress.png and /dev/null differ
diff --git a/themes/windows/images/key.png b/themes/windows/images/key.png
deleted file mode 100644
index 39f558db2..000000000
Binary files a/themes/windows/images/key.png and /dev/null differ
diff --git a/themes/windows/images/lineedit-bg.png b/themes/windows/images/lineedit-bg.png
deleted file mode 100644
index 09f162f53..000000000
Binary files a/themes/windows/images/lineedit-bg.png and /dev/null differ
diff --git a/themes/windows/images/navigation-addtab.png b/themes/windows/images/navigation-addtab.png
deleted file mode 100644
index d89095db7..000000000
Binary files a/themes/windows/images/navigation-addtab.png and /dev/null differ
diff --git a/themes/windows/images/navigation-back.png b/themes/windows/images/navigation-back.png
deleted file mode 100644
index bf1fa5552..000000000
Binary files a/themes/windows/images/navigation-back.png and /dev/null differ
diff --git a/themes/windows/images/navigation-dropdown.png b/themes/windows/images/navigation-dropdown.png
deleted file mode 100644
index fa14a3d7d..000000000
Binary files a/themes/windows/images/navigation-dropdown.png and /dev/null differ
diff --git a/themes/windows/images/navigation-forward.png b/themes/windows/images/navigation-forward.png
deleted file mode 100644
index 87c7194e4..000000000
Binary files a/themes/windows/images/navigation-forward.png and /dev/null differ
diff --git a/themes/windows/images/navigation-home.png b/themes/windows/images/navigation-home.png
deleted file mode 100644
index 567424961..000000000
Binary files a/themes/windows/images/navigation-home.png and /dev/null differ
diff --git a/themes/windows/images/navigation-reload.png b/themes/windows/images/navigation-reload.png
deleted file mode 100644
index c760292b5..000000000
Binary files a/themes/windows/images/navigation-reload.png and /dev/null differ
diff --git a/themes/windows/images/navigation-stop.png b/themes/windows/images/navigation-stop.png
deleted file mode 100644
index 6753ca2b2..000000000
Binary files a/themes/windows/images/navigation-stop.png and /dev/null differ
diff --git a/themes/windows/images/navigation-supermenu.png b/themes/windows/images/navigation-supermenu.png
deleted file mode 100644
index 59b2b2e82..000000000
Binary files a/themes/windows/images/navigation-supermenu.png and /dev/null differ
diff --git a/themes/windows/images/search-icon.png b/themes/windows/images/search-icon.png
deleted file mode 100644
index 1f4bebb8c..000000000
Binary files a/themes/windows/images/search-icon.png and /dev/null differ
diff --git a/themes/windows/images/searchbar-provider-bg.png b/themes/windows/images/searchbar-provider-bg.png
deleted file mode 100644
index 4838ed890..000000000
Binary files a/themes/windows/images/searchbar-provider-bg.png and /dev/null differ
diff --git a/themes/windows/images/siteicon-bg.png b/themes/windows/images/siteicon-bg.png
deleted file mode 100644
index b39c93889..000000000
Binary files a/themes/windows/images/siteicon-bg.png and /dev/null differ
diff --git a/themes/windows/images/siteicon-secure-bg.png b/themes/windows/images/siteicon-secure-bg.png
deleted file mode 100644
index bb2d91296..000000000
Binary files a/themes/windows/images/siteicon-secure-bg.png and /dev/null differ
diff --git a/themes/windows/images/star-a.png b/themes/windows/images/star-a.png
deleted file mode 100644
index 410d9dfb1..000000000
Binary files a/themes/windows/images/star-a.png and /dev/null differ
diff --git a/themes/windows/images/star.png b/themes/windows/images/star.png
deleted file mode 100644
index 2e3418ee8..000000000
Binary files a/themes/windows/images/star.png and /dev/null differ
diff --git a/themes/windows/images/tab-active-bg.png b/themes/windows/images/tab-active-bg.png
deleted file mode 100644
index 660d8378b..000000000
Binary files a/themes/windows/images/tab-active-bg.png and /dev/null differ
diff --git a/themes/windows/images/tab-deactive-bg.png b/themes/windows/images/tab-deactive-bg.png
deleted file mode 100644
index acc280842..000000000
Binary files a/themes/windows/images/tab-deactive-bg.png and /dev/null differ
diff --git a/themes/windows/images/tab-deactive-hover-bg.png b/themes/windows/images/tab-deactive-hover-bg.png
deleted file mode 100644
index 72d74b8ef..000000000
Binary files a/themes/windows/images/tab-deactive-hover-bg.png and /dev/null differ
diff --git a/themes/windows/images/tab-left-arrow.png b/themes/windows/images/tab-left-arrow.png
deleted file mode 100644
index 9b8070de0..000000000
Binary files a/themes/windows/images/tab-left-arrow.png and /dev/null differ
diff --git a/themes/windows/images/tab-right-arrow.png b/themes/windows/images/tab-right-arrow.png
deleted file mode 100644
index c0685ee03..000000000
Binary files a/themes/windows/images/tab-right-arrow.png and /dev/null differ
diff --git a/themes/windows/images/tabbar-addtab-outside.png b/themes/windows/images/tabbar-addtab-outside.png
deleted file mode 100644
index ecb2bf8b7..000000000
Binary files a/themes/windows/images/tabbar-addtab-outside.png and /dev/null differ
diff --git a/themes/windows/images/tabbar-addtab.png b/themes/windows/images/tabbar-addtab.png
deleted file mode 100644
index 769f2ef68..000000000
Binary files a/themes/windows/images/tabbar-addtab.png and /dev/null differ
diff --git a/themes/windows/images/tabbar-addtab_rtl.png b/themes/windows/images/tabbar-addtab_rtl.png
deleted file mode 100644
index dc50b8294..000000000
Binary files a/themes/windows/images/tabbar-addtab_rtl.png and /dev/null differ
diff --git a/themes/windows/images/tabs-bg.png b/themes/windows/images/tabs-bg.png
deleted file mode 100644
index 9b5f07541..000000000
Binary files a/themes/windows/images/tabs-bg.png and /dev/null differ
diff --git a/themes/windows/images/tabs-list-button.png b/themes/windows/images/tabs-list-button.png
deleted file mode 100644
index 23c93dba2..000000000
Binary files a/themes/windows/images/tabs-list-button.png and /dev/null differ
diff --git a/themes/windows/images/toolbar-bg.png b/themes/windows/images/toolbar-bg.png
deleted file mode 100644
index 365313313..000000000
Binary files a/themes/windows/images/toolbar-bg.png and /dev/null differ
diff --git a/themes/windows/images/user-trash-full.png b/themes/windows/images/user-trash-full.png
deleted file mode 100644
index ab2d20427..000000000
Binary files a/themes/windows/images/user-trash-full.png and /dev/null differ
diff --git a/themes/windows/linux.css b/themes/windows/linux.css
deleted file mode 100644
index f80f30d7a..000000000
--- a/themes/windows/linux.css
+++ /dev/null
@@ -1,11 +0,0 @@
-/*TabWidget*/
-#tabbarwidget
-{
-    background-image: url(images/tabs-bg.png);
-    background-repeat: repeat-x;
-}
-
-#tabbar::tab
-{
-    max-height: 26px;
-}
diff --git a/themes/windows/main.css b/themes/windows/main.css
index 784cbf4ee..84bf4b858 100644
--- a/themes/windows/main.css
+++ b/themes/windows/main.css
@@ -13,41 +13,7 @@
 /*MainWindow*/
 #mainwindow
 {
-    background : #dee3f4 url(images/toolbar-bg.png) repeat-x;
-}
-
-#mainwindow-menubar
-{
-    background-image:url(images/transp.png);
-    border:none;
-}
-
-#mainwindow-menubar:item
-{
-    color: black;
-    spacing: 5px;
-    padding: 2px 6px;
-    background: transparent;
-}
-
-#mainwindow-menubar::item:pressed
-{
-    background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1,stop:0 #a1c0e6, stop:1 #86abd9);
-    border: 1px solid #4b6e99;
-    border-top-left-radius: 4px;
-    border-top-right-radius: 4px;
-    border-bottom: none;
-}
-
-#mainwindow-statusbar
-{
-    background: transparent;
-}
-
-#mainwindow QToolBar
-{
-    background-image:url(images/transp.png);
-    border:none;
+    background : #ffffff;
 }
 
 #statusbar-ip-label
@@ -67,38 +33,39 @@
     background-color:transparent;
 }
 
+#navigationbar QSplitter
+{
+    min-width: 8px;
+}
+
 #navigation-button-back
 {
-    qproperty-multiIcon: url(images/navigation-back.png);
+    qproperty-themeIcon: "go-previous";
 }
 
 #navigation-button-next
 {
-    qproperty-multiIcon: url(images/navigation-forward.png);
+    qproperty-themeIcon: "go-next";
 }
 
 #navigation-button-stop
 {
-    qproperty-icon: url(images/navigation-stop.png);
-    qproperty-iconSize: 23px 22px;
+    qproperty-themeIcon: "process-stop";
 }
 
 #navigation-button-reload
 {
-    qproperty-icon: url(images/navigation-reload.png);
-    qproperty-iconSize: 23px 22px;
+    qproperty-themeIcon: "view-refresh";
 }
 
 #navigation-button-home
 {
-    qproperty-icon: url(images/navigation-home.png);
-    qproperty-iconSize: 23px 22px;
+    qproperty-themeIcon: "go-home";
 }
 
 #navigation-button-addtab
 {
-    qproperty-icon: url(images/navigation-addtab.png);
-    qproperty-iconSize: 23px 22px;
+    qproperty-themeIcon: "list-add";
 }
 
 #navigation-button-tools
@@ -108,8 +75,8 @@
 
 #navigation-button-supermenu
 {
-    qproperty-icon: url(images/navigation-supermenu.png);
-    qproperty-iconSize: 23px 22px;
+    qproperty-themeIcon: "application-menu";
+    qproperty-fallbackIcon: url(images/menu.svg);
 }
 
 #navigation-toolbutton-badge
@@ -122,20 +89,22 @@
 /*TabWidget*/
 #tabbar-button-right
 {
-    qproperty-icon: url(images/tab-right-arrow.png);
+    qproperty-themeIcon: "arrow-right";
+    qproperty-fallbackIcon: url(images/tab-right-arrow.svg);
     qproperty-fixedsize: 15px 25px;
 }
 
 #tabbar-button-left
 {
-    qproperty-icon: url(images/tab-left-arrow.png);
+    qproperty-themeIcon: "arrow-left";
+    qproperty-fallbackIcon: url(images/tab-left-arrow.svg);
     qproperty-fixedsize: 15px 25px;
 }
 
 #tabwidget-button-opentabs
 {
-    qproperty-icon: url(images/tabs-list-button.png);
-    qproperty-fixedsize: 18px 28px;
+    qproperty-themeIcon: "go-down";
+    qproperty-fixedsize: 22px 28px;
 }
 
 #tabwidget-button-closedtabs
@@ -144,76 +113,177 @@
     qproperty-fixedsize: 22px 28px;
 }
 
-#tabwidget-button-addtab
+#tabwidget-button-addtab[outside-tabbar="false"]
 {
-    qproperty-multiIcon: url(images/tabbar-addtab.png);
+    background : #dddddd;
+    border: 1px solid #b2b2b2;
+    border-bottom: none;
+    border-left: none;
+    qproperty-fixedsize: 28px 28px;
+    qproperty-themeIcon: "list-add";
 }
 
 #tabwidget-button-addtab[outside-tabbar="true"]
 {
-    qproperty-icon: url(images/tabbar-addtab-outside.png);
+    qproperty-themeIcon: "list-add";
+    qproperty-fixedsize: 22px 28px;
+}
+
+/*TabWidget*/
+#tabbar
+{
+    min-height: 30px;
+    max-height: 30px;
+}
+
+#tab-icon
+{
+    padding-right: 3px;
+    padding-left: 3px;
+    min-width: 16px;
+    max-width: 16px;
+}
+
+#combotabbar_tabs_close_button
+{
+    max-width: 11px;
+    max-height: 9px;
+    min-width: 11px;
+    min-height: 9px;
+    padding-right: 2px;
+}
+
+#tabbar::close-button
+{
+    image: url(images/tab-close.svg);
+}
+
+#tabbar::close-button:hover
+{
+    image: url(images/tab-close-h.svg);
+}
+
+#tabbar::close-button:pressed
+{
+    image: url(images/tab-close-a.svg);
+}
+
+#tabbar::tab
+{
+    height: 28px;
+}
+
+#tabbar::tab:selected
+{
+    background : #ffffff;
+    border: 1px solid #b2b2b2;
+    border-bottom: none;
+}
+
+#tabbar::tab:!selected
+{
+    background : #dddddd;
+    border: 1px solid #b2b2b2;
+    border-bottom: none;
+}
+
+#tabbar::tab:!selected:hover
+{
+    background: #f3f3f3;
+    border: 1px solid #b2b2b2;
+    border-bottom: none;
+}
+
+#tabbar::tab:selected:!first
+{
+    margin-left: -1px;
+}
+
+#tabbar::tab:!selected:!first
+{
+    margin-left: -1px;
+}
+
+#tabbar::tab:!selected:!first:hover
+{
+    margin-left: -1px;
+}
+
+#tabbar::tab:selected:first
+{
+    margin-left: 0;
+}
+
+#tabbar::tab:!selected:first
+{
+    margin-left: 0;
+}
+
+#tabbar::tab:selected:only-one
+{
+    margin-left: 0;
 }
 
 /*IconProvider*/
 IconProvider
 {
-    qproperty-bookmarkIcon: url(images/star-a.png);
+    qproperty-bookmarkIcon: url(images/star-a.svg);
 }
 
 /*LocationBar*/
 #locationbar
 {
     background: transparent;
-    border-image: url(images/lineedit-bg.png);
-    border-width: 3px;
-    color:black;
-    padding-right: -3px;
-    padding-left: -3px;
-    padding-top: -2px;
-    padding-bottom: -2px;
-    qproperty-fixedheight: 22;
-    qproperty-leftMargin: 29;
+    border: 1px solid #b2b2b2;
+    min-height: 25px;
+    qproperty-leftMargin: 27;
+}
+
+#locationbar::focus
+{
+    border-color: #0078d7;
 }
 
 #locationbar-bookmarkicon
 {
-    margin-left: 3px;
-    qproperty-pixmap: url(images/star.png);
+    qproperty-themeIcon: "rating-unrated";
+    qproperty-fallbackIcon: url(images/star.svg);
+    qproperty-fixedsize: 16px 16px;
 }
 
 #locationbar-bookmarkicon[bookmarked="true"]
 {
-    qproperty-pixmap: url(images/star-a.png);
+    qproperty-themeIcon: "rating";
+    qproperty-fallbackIcon: url(images/star-a.svg);
+    qproperty-fixedsize: 16px 16px;
 }
 
 #locationbar-siteicon
 {
-    border-image: url(images/siteicon-bg.png);
-    qproperty-fixedsize:28px 22px;
+    border-image: url(images/transp.png);
+    qproperty-fixedwidth: 30;
+    min-height: 25px;
     padding-left: 0px;
 }
 
-#locationbar-siteicon[secured="true"]
-{
-    border-image: url(images/siteicon-secure-bg.png);
-}
-
 #locationbar-goicon
 {
-    margin-left: 3px;
-    qproperty-pixmap: url(images/gotoaddress.png);
+    qproperty-themeIcon: "go-jump-locationbar";
+    qproperty-fallbackIcon: url(images/goto.svg);
+    qproperty-fixedsize: 16px 16px;
 }
 
 #locationbar-down-icon
 {
-    margin-right: -4px;
-    margin-bottom: 1px;
-    qproperty-pixmap: url(images/navigation-dropdown.png);
+    qproperty-themeIcon: "go-down";
+    qproperty-fixedsize: 12px 16px;
 }
 
 #locationbar-autofillicon
 {
-    qproperty-pixmap: url(images/key.png);
+    qproperty-themeIcon: "user-identity";
+    qproperty-fallbackIcon: url(images/user.svg);
+    qproperty-fixedsize: 16px 16px;
 }
 
 /*BookmarksToolbar*/
@@ -239,26 +309,28 @@ IconProvider
 #websearchbar
 {
     background: transparent;
-    border-image: url(images/lineedit-bg.png);
-    border-width: 3px;
-    color:black;
-    padding-right: -3px;
-    padding-top: -2px;
-    padding-bottom: -2px;
-    qproperty-fixedheight: 22;
-    qproperty-leftMargin: 30;
+    border: 1px solid #b2b2b2 solid;
+    min-height: 25px;
+    qproperty-leftMargin: 27;
+}
+
+#websearchbar::focus
+{
+    border-color: #0078d7;
 }
 
 #websearchbar-searchbutton
 {
-    qproperty-pixmap: url(images/search-icon.png);
+    qproperty-fixedsize: 22px 16px;
+    qproperty-themeIcon: "edit-find";
 }
 
 #websearchbar-searchprovider-comobobox
 {
-    border-image: url(images/searchbar-provider-bg.png);
-    padding-left:-8px;
-    qproperty-fixedsize: 32px 22px;
+    border-image: url(images/transp.png);
+    qproperty-fixedwidth: 25;
+    min-height: 25px;
+    padding-left: 4px;
 }
 
 /*SourceViewer*/
@@ -288,7 +360,6 @@ AboutDialog #label
 AboutDialog #textBrowser
 {
     border:none;
-    margin-top: -2px; /* Workarounding rounded border on KDE */
 }
 
 /*DesktopNotification*/
@@ -296,6 +367,7 @@ DesktopNotification
 {
     background: transparent;
 }
+
 DesktopNotification #frame
 {
     border: 2px solid darkblue;
diff --git a/themes/windows/windows.css b/themes/windows/windows.css
index 3a54ce262..fd19ff400 100644
--- a/themes/windows/windows.css
+++ b/themes/windows/windows.css
@@ -1,62 +1,3 @@
-/*TabWidget*/
-#tabbar
-{
-    min-height: 27px;
-    max-height: 27px;
-}
-
-#tabbarwidget
-{
-    background-image: url(images/tabs-bg.png);
-    background-repeat: repeat-x;
-}
-
-#tab-icon
-{
-    padding-right: 3px;
-    padding-left: 3px;
-    min-width: 16px;
-    max-width: 16px;
-}
-
-#tabbar::tab
-{
-    height: 26px;
-    padding-right: -1px;
-    padding-left: -1px;
-}
-
-#tabbar::tab:selected
-{
-    background : url(images/tab-active-bg.png) repeat-x;
-    border-top-left-radius: 3px;
-    border-top-right-radius: 3px;
-    border: 1px solid #606060;
-    border-bottom: none;
-}
-
-#tabbar::tab:!selected
-{
-    background: url(images/tab-deactive-bg.png) repeat-x;
-    margin-top: 2px;
-    margin-bottom: -3px;
-    border: 1px solid #a6a6a6;
-}
-
-#tabbar::tab:!selected:hover
-{
-    background: url(images/tab-deactive-hover-bg.png) repeat-x;
-    margin-top: 2px;
-    margin-bottom: -3px;
-    border: 1px solid #3c7fb1;
-}
-
-#tabbar::tab:last
-{
-    margin-right: -1px;
-}
-
-
 /*Downloads*/
 DownloadItem #progressBar
 {