diff --git a/theme/icons/application-x-addon-symbolic.svg b/theme/icons/application-x-addon-symbolic.svg
index d650258..8c54f61 100644
--- a/theme/icons/application-x-addon-symbolic.svg
+++ b/theme/icons/application-x-addon-symbolic.svg
@@ -1,3 +1,3 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16">
-    <path d="M6.5 1C5.669 1 5 1.669 5 2.5V4H2c-.554 0-1 .446-1 1v3h1.5C3.331 8 4 8.669 4 9.5S3.331 11 2.5 11H1v3c0 .554.446 1 1 1h3v-1.5c0-.831.669-1.5 1.5-1.5s1.5.669 1.5 1.5V15h3c.554 0 1-.446 1-1v-3h1.5c.831 0 1.5-.669 1.5-1.5S14.331 8 13.5 8H12V5c0-.554-.446-1-1-1H8V2.5C8 1.669 7.331 1 6.5 1z" style="isolation:auto;mix-blend-mode:normal;marker:none" color="#000" overflow="visible" fill="#474747"/>
+    <path d="M6.5 1C5.669 1 5 1.669 5 2.5V4H2c-.554 0-1 .446-1 1v3h1.5C3.331 8 4 8.669 4 9.5S3.331 11 2.5 11H1v3c0 .554.446 1 1 1h3v-1.5c0-.831.669-1.5 1.5-1.5s1.5.669 1.5 1.5V15h3c.554 0 1-.446 1-1v-3h1.5c.831 0 1.5-.669 1.5-1.5S14.331 8 13.5 8H12V5c0-.554-.446-1-1-1H8V2.5C8 1.669 7.331 1 6.5 1z" style="isolation:auto;mix-blend-mode:normal;marker:none" color="#000" overflow="visible" fill="context-fill" stroke="context-stroke" fill-opacity="context-fill-opacity" stroke-opacity="context-stroke-opacity"/>
 </svg>
diff --git a/theme/icons/applications-engineering-symbolic.svg b/theme/icons/applications-engineering-symbolic.svg
index 57f1b1d..ce62262 100644
--- a/theme/icons/applications-engineering-symbolic.svg
+++ b/theme/icons/applications-engineering-symbolic.svg
@@ -1,5 +1,5 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16">
-    <g fill="#2e3436">
+    <g fill="context-fill" stroke="context-stroke" fill-opacity="context-fill-opacity" stroke-opacity="context-stroke-opacity">
         <path d="M7.997 8c-3.999 0-5.998 3-5.998 6H.25C0 14 0 14.157 0 14.25v1.5c0 .25.138.25.25.25h15.494c.195.006.25-.13.25-.25v-1.5c.021-.146 0-.25-.25-.25h-1.75c0-3-1.999-6-5.997-6zm0 3c2.35 0 2.999 1.762 2.999 3H4.998c0-1.198.703-3 2.999-3z" fill-rule="evenodd"/>
         <path d="M14.989.6a3.652 3.652 0 0 0-.967-.561l-.021 2.232c-.005.458-.452.729-1.006.729h-1c-.553-.007-1.003-.31-.998-.768L11.018 0c-.345.133-.689.304-.977.536-1.377 1.114-1.395 2.95-.04 4.098.284.24.624.42.967.562.028.011.028 2.054.028 2.054C12.486 8 13.346 9 13.995 10V5.252a3.55 3.55 0 0 0 .954-.554c1.377-1.114 1.395-2.949.04-4.098z" style="line-height:normal;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration-line:none;text-transform:none;marker:none" color="#000" font-weight="400" font-family="Sans" overflow="visible"/>
     </g>
diff --git a/theme/icons/checkbox-checked-symbolic.svg b/theme/icons/checkbox-checked-symbolic.svg
index 2890c82..8c3422e 100644
--- a/theme/icons/checkbox-checked-symbolic.svg
+++ b/theme/icons/checkbox-checked-symbolic.svg
@@ -1,5 +1,5 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16">
-    <g color="#000" font-weight="400" fill="#474747">
+    <g color="#000" font-weight="400" fill="context-fill" stroke="context-stroke" fill-opacity="context-fill-opacity" stroke-opacity="context-stroke-opacity">
         <path d="M3.5 1A2.506 2.506 0 0 0 1 3.5v9C1 13.876 2.124 15 3.5 15h9c1.376 0 2.5-1.124 2.5-2.5v-9C15 2.124 13.876 1 12.5 1zm0 1h9c.84 0 1.5.66 1.5 1.5v9c0 .84-.66 1.5-1.5 1.5h-9c-.84 0-1.5-.66-1.5-1.5v-9C2 2.66 2.66 2 3.5 2z" style="line-height:normal;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000;text-transform:none;text-orientation:mixed;shape-padding:0;isolation:auto;mix-blend-mode:normal;marker:none" font-family="sans-serif" white-space="normal" overflow="visible"/>
         <path d="M14.5 2.5l-6 6-2-2-2 2 4 4 6-6z" style="line-height:normal;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration-line:none;text-transform:none;marker:none" font-family="Sans" overflow="visible"/>
     </g>
diff --git a/theme/icons/checkbox-symbolic.svg b/theme/icons/checkbox-symbolic.svg
index 554e927..b92f34e 100644
--- a/theme/icons/checkbox-symbolic.svg
+++ b/theme/icons/checkbox-symbolic.svg
@@ -1,3 +1,3 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16">
-    <path d="M3.5 1A2.506 2.506 0 0 0 1 3.5v9C1 13.876 2.124 15 3.5 15h9c1.376 0 2.5-1.124 2.5-2.5v-9C15 2.124 13.876 1 12.5 1zm0 1h9c.84 0 1.5.66 1.5 1.5v9c0 .84-.66 1.5-1.5 1.5h-9c-.84 0-1.5-.66-1.5-1.5v-9C2 2.66 2.66 2 3.5 2z" style="line-height:normal;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000;text-transform:none;text-orientation:mixed;shape-padding:0;isolation:auto;mix-blend-mode:normal;marker:none" color="#000" font-weight="400" font-family="sans-serif" white-space="normal" overflow="visible" fill="#474747"/>
+    <path d="M3.5 1A2.506 2.506 0 0 0 1 3.5v9C1 13.876 2.124 15 3.5 15h9c1.376 0 2.5-1.124 2.5-2.5v-9C15 2.124 13.876 1 12.5 1zm0 1h9c.84 0 1.5.66 1.5 1.5v9c0 .84-.66 1.5-1.5 1.5h-9c-.84 0-1.5-.66-1.5-1.5v-9C2 2.66 2.66 2 3.5 2z" style="line-height:normal;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000;text-transform:none;text-orientation:mixed;shape-padding:0;isolation:auto;mix-blend-mode:normal;marker:none" color="#000" font-weight="400" font-family="sans-serif" white-space="normal" overflow="visible" fill="context-fill" stroke="context-stroke" fill-opacity="context-fill-opacity" stroke-opacity="context-stroke-opacity"/>
 </svg>
diff --git a/theme/icons/edit-copy-symbolic.svg b/theme/icons/edit-copy-symbolic.svg
index 9ecd15a..5a756d1 100644
--- a/theme/icons/edit-copy-symbolic.svg
+++ b/theme/icons/edit-copy-symbolic.svg
@@ -1,5 +1,5 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16">
-    <g fill="#474747">
+    <g fill="context-fill" stroke="context-stroke" fill-opacity="context-fill-opacity" stroke-opacity="context-stroke-opacity">
         <path d="M7 7v6.969h5l1.99-1.987L13.97 7H7z"/>
         <path d="M2 2v7.969L6 10V6h3l-.031-4H2z"/>
     </g>
diff --git a/theme/icons/edit-cut-symbolic.svg b/theme/icons/edit-cut-symbolic.svg
index 3938d1e..2d27106 100644
--- a/theme/icons/edit-cut-symbolic.svg
+++ b/theme/icons/edit-cut-symbolic.svg
@@ -1,3 +1,3 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16">
-    <path d="M4.5 2.007a2.5 2.5 0 0 0 0 5c.446 0 .856-.14 1.218-.344l1.97 1.844-1.97 1.843a2.473 2.473 0 0 0-1.218-.343 2.5 2.5 0 1 0 2.5 2.5c0-.23-.036-.446-.094-.657L9.03 9.788l4.469 4.219H15v-1L6.906 5.163A2.46 2.46 0 0 0 7 4.507a2.5 2.5 0 0 0-2.5-2.5zm0 1.5a1 1 0 1 1 0 2 1 1 0 0 1 0-2zm9-.5L9.562 6.725l1.313 1.282 4.125-4v-1zm-9 8.5a1 1 0 1 1 0 2 1 1 0 0 1 0-2z" style="isolation:auto;mix-blend-mode:normal" color="#000" overflow="visible" fill="#474747"/>
+    <path d="M4.5 2.007a2.5 2.5 0 0 0 0 5c.446 0 .856-.14 1.218-.344l1.97 1.844-1.97 1.843a2.473 2.473 0 0 0-1.218-.343 2.5 2.5 0 1 0 2.5 2.5c0-.23-.036-.446-.094-.657L9.03 9.788l4.469 4.219H15v-1L6.906 5.163A2.46 2.46 0 0 0 7 4.507a2.5 2.5 0 0 0-2.5-2.5zm0 1.5a1 1 0 1 1 0 2 1 1 0 0 1 0-2zm9-.5L9.562 6.725l1.313 1.282 4.125-4v-1zm-9 8.5a1 1 0 1 1 0 2 1 1 0 0 1 0-2z" style="isolation:auto;mix-blend-mode:normal" color="#000" overflow="visible" fill="context-fill" stroke="context-stroke" fill-opacity="context-fill-opacity" stroke-opacity="context-stroke-opacity"/>
 </svg>
diff --git a/theme/icons/edit-find-symbolic.svg b/theme/icons/edit-find-symbolic.svg
index 8686f07..1bdef0f 100644
--- a/theme/icons/edit-find-symbolic.svg
+++ b/theme/icons/edit-find-symbolic.svg
@@ -1,5 +1,5 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16">
-    <g color="#000" font-weight="400" font-family="sans-serif" white-space="normal" fill="#474747">
+    <g color="#000" font-weight="400" font-family="sans-serif" white-space="normal" fill="context-fill" stroke="context-stroke" fill-opacity="context-fill-opacity" stroke-opacity="context-stroke-opacity">
         <path d="M6.508 1C3.48 1 1.002 3.474 1.002 6.5S3.48 12 6.508 12s5.505-2.474 5.505-5.5S9.536 1 6.508 1zm0 2a3.488 3.488 0 0 1 3.505 3.5c0 1.944-1.557 3.5-3.505 3.5a3.488 3.488 0 0 1-3.506-3.5c0-1.944 1.557-3.5 3.506-3.5z" style="line-height:normal;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000;text-transform:none;text-orientation:mixed;shape-padding:0;isolation:auto;mix-blend-mode:normal;marker:none" overflow="visible"/>
         <path d="M10 8.99a1 1 0 0 0-.696 1.717l4.004 4a1 1 0 1 0 1.414-1.414l-4.003-4a1 1 0 0 0-.72-.303z" style="line-height:normal;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000;text-transform:none;text-orientation:mixed;shape-padding:0;isolation:auto;mix-blend-mode:normal;marker:none" overflow="visible"/>
     </g>
diff --git a/theme/icons/edit-paste-symbolic.svg b/theme/icons/edit-paste-symbolic.svg
index c24d14e..b13b9e5 100644
--- a/theme/icons/edit-paste-symbolic.svg
+++ b/theme/icons/edit-paste-symbolic.svg
@@ -1,5 +1,5 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16.002">
-    <g fill="#474747">
+    <g fill="context-fill" stroke="context-stroke" fill-opacity="context-fill-opacity" stroke-opacity="context-stroke-opacity">
         <path d="M4.031 5.031V12h5l1.991-1.987L11 5.031H4.031zM5.53 0h4.002a.53.53 0 0 1 .53.53v2.94a.53.53 0 0 1-.53.53H5.53A.53.53 0 0 1 5 3.47V.53A.53.53 0 0 1 5.53 0z"/>
         <path d="M2.5 1c-.293 0-.658.038-1.012.314-.353.277-.52.767-.52 1.124v12.03c0 .385.132.804.442 1.114.31.31.78.453 1.19.412L2.5 16h9.969c.363 0 .746-.122 1.049-.4.302-.279.482-.717.482-1.131V2.375c0-.333-.133-.74-.42-1.01A1.4 1.4 0 0 0 12.625 1h-1.656v2H12v11H2.969V3h.968V1z" style="line-height:normal;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000;text-transform:none;text-orientation:mixed;shape-padding:0;isolation:auto;mix-blend-mode:normal;marker:none" color="#000" font-weight="400" font-family="sans-serif" white-space="normal" overflow="visible"/>
     </g>
diff --git a/theme/icons/go-next-symbolic.svg b/theme/icons/go-next-symbolic.svg
index 1666652..f5e035e 100644
--- a/theme/icons/go-next-symbolic.svg
+++ b/theme/icons/go-next-symbolic.svg
@@ -1,5 +1,5 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16">
-    <g color="#000" fill="#474747">
+    <g color="#000" fill="context-fill" stroke="context-stroke" fill-opacity="context-fill-opacity" stroke-opacity="context-stroke-opacity">
         <path d="M5.707 2.293L4.293 3.707 8.586 8l-4.293 4.293 1.414 1.414L11.414 8z" style="line-height:normal;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000;text-transform:none;text-orientation:mixed;shape-padding:0;isolation:auto;mix-blend-mode:normal;marker:none" font-weight="400" font-family="sans-serif" white-space="normal" overflow="visible"/>
         <path d="M5 13H4v1h1zM5 2H4v1h1z" style="marker:none" overflow="visible"/>
         <path d="M5 2c-.554 0-1 .446-1 1s.446 1 1 1 1-.446 1-1-.446-1-1-1zM5 12c-.554 0-1 .446-1 1s.446 1 1 1 1-.446 1-1-.446-1-1-1z" style="marker:none" overflow="visible"/>
diff --git a/theme/icons/go-previous-symbolic.svg b/theme/icons/go-previous-symbolic.svg
index ff5e136..72efd8f 100644
--- a/theme/icons/go-previous-symbolic.svg
+++ b/theme/icons/go-previous-symbolic.svg
@@ -1,5 +1,5 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16">
-    <g color="#000" fill="#474747">
+    <g color="#000" fill="context-fill" stroke="context-stroke" fill-opacity="context-fill-opacity" stroke-opacity="context-stroke-opacity">
         <path d="M10.293 2.293L4.586 8l5.707 5.707 1.414-1.414L7.414 8l4.293-4.293z" style="line-height:normal;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000;text-transform:none;text-orientation:mixed;shape-padding:0;isolation:auto;mix-blend-mode:normal;marker:none" font-weight="400" font-family="sans-serif" white-space="normal" overflow="visible"/>
         <path d="M11 13h1v1h-1zM11 2h1v1h-1z" style="marker:none" overflow="visible"/>
         <path d="M11 2c.554 0 1 .446 1 1s-.446 1-1 1-1-.446-1-1 .446-1 1-1zM11 12c.554 0 1 .446 1 1s-.446 1-1 1-1-.446-1-1 .446-1 1-1z" style="marker:none" overflow="visible"/>
diff --git a/theme/icons/mail-unread-symbolic.svg b/theme/icons/mail-unread-symbolic.svg
index 9cc6693..a220186 100644
--- a/theme/icons/mail-unread-symbolic.svg
+++ b/theme/icons/mail-unread-symbolic.svg
@@ -1,5 +1,5 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16">
-    <g color="#000" font-weight="400" font-family="sans-serif" white-space="normal" fill="#474747">
+    <g color="#000" font-weight="400" font-family="sans-serif" white-space="normal" fill="context-fill" stroke="context-stroke" fill-opacity="context-fill-opacity" stroke-opacity="context-stroke-opacity">
         <path d="M2.979 3.99a1 1 0 0 0-.604 1.791L8 10.281l5.625-4.5a1 1 0 1 0-1.25-1.562L8 7.719l-4.375-3.5a1 1 0 0 0-.646-.229z" style="line-height:normal;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000;text-transform:none;text-orientation:mixed;shape-padding:0;isolation:auto;mix-blend-mode:normal" overflow="visible"/>
         <path d="M2 3a1 1 0 0 0-1 1v9a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1V4a1 1 0 0 0-1-1zm1 2h10v7H3z" style="line-height:normal;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000;text-transform:none;text-orientation:mixed;shape-padding:0;isolation:auto;mix-blend-mode:normal;marker:none" overflow="visible"/>
     </g>
diff --git a/theme/icons/open-menu-symbolic.svg b/theme/icons/open-menu-symbolic.svg
index 2cd2011..570de3c 100644
--- a/theme/icons/open-menu-symbolic.svg
+++ b/theme/icons/open-menu-symbolic.svg
@@ -1,5 +1,5 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16">
-    <g color="#bebebe" fill="#474747">
+    <g color="#bebebe" fill="context-fill" stroke="context-stroke" fill-opacity="context-fill-opacity" stroke-opacity="context-stroke-opacity">
         <path d="M3 3h10v2H3zM3 7h10v2H3zM3 11h10v2H3z" style="marker:none" overflow="visible"/>
     </g>
 </svg>
diff --git a/theme/icons/pan-down-symbolic.svg b/theme/icons/pan-down-symbolic.svg
index 27a58fe..4a85bff 100644
--- a/theme/icons/pan-down-symbolic.svg
+++ b/theme/icons/pan-down-symbolic.svg
@@ -1,3 +1,3 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16">
-    <path d="M13 6l-5 5-5-5z" fill="#2e3436"/>
+    <path d="M13 6l-5 5-5-5z" fill="context-fill" stroke="context-stroke" fill-opacity="context-fill-opacity" stroke-opacity="context-stroke-opacity"/>
 </svg>
diff --git a/theme/icons/pan-end-symbolic.svg b/theme/icons/pan-end-symbolic.svg
index f30b850..00ff454 100644
--- a/theme/icons/pan-end-symbolic.svg
+++ b/theme/icons/pan-end-symbolic.svg
@@ -1,3 +1,3 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16">
-    <path d="M6 13l5-5-5-5z" fill="#2e3436"/>
+    <path d="M6 13l5-5-5-5z" fill="context-fill" stroke="context-stroke" fill-opacity="context-fill-opacity" stroke-opacity="context-stroke-opacity"/>
 </svg>
diff --git a/theme/icons/pan-start-symbolic.svg b/theme/icons/pan-start-symbolic.svg
index c750fbd..39a1a5d 100644
--- a/theme/icons/pan-start-symbolic.svg
+++ b/theme/icons/pan-start-symbolic.svg
@@ -1,3 +1,3 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16">
-    <path d="M10 13L5 8l5-5z" fill="#2e3436"/>
+    <path d="M10 13L5 8l5-5z" fill="context-fill" stroke="context-stroke" fill-opacity="context-fill-opacity" stroke-opacity="context-stroke-opacity"/>
 </svg>
diff --git a/theme/icons/pan-up-symbolic.svg b/theme/icons/pan-up-symbolic.svg
index e3bd8ac..ed3ac79 100644
--- a/theme/icons/pan-up-symbolic.svg
+++ b/theme/icons/pan-up-symbolic.svg
@@ -1,3 +1,3 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16">
-    <path d="M13 10L8 5l-5 5z" fill="#2e3436"/>
+    <path d="M13 10L8 5l-5 5z" fill="context-fill" stroke="context-stroke" fill-opacity="context-fill-opacity" stroke-opacity="context-stroke-opacity"/>
 </svg>
diff --git a/theme/icons/preferences-system-symbolic.svg b/theme/icons/preferences-system-symbolic.svg
index c21ae12..1c63844 100644
--- a/theme/icons/preferences-system-symbolic.svg
+++ b/theme/icons/preferences-system-symbolic.svg
@@ -1,5 +1,5 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16">
-    <g color="#000" font-weight="400" font-family="Sans" fill="#474747">
+    <g color="#000" font-weight="400" font-family="Sans" fill="context-fill" stroke="context-stroke" fill-opacity="context-fill-opacity" stroke-opacity="context-stroke-opacity">
         <path d="M3.549.09a3.5 3.5 0 0 0-1.143.216l1.885 1.88c.387.386.387 1 0 1.387l-.711.708a.98.98 0 0 1-1.39 0L.303 2.401a3.473 3.473 0 0 0-.216 1.14 3.456 3.456 0 0 0 3.46 3.452 3.5 3.5 0 0 0 1.144-.216l1.174 1.171a2.472 2.465 0 0 1 .062 0l2.07-2.064-1.205-1.202c.125-.356.217-.742.217-1.14A3.456 3.456 0 0 0 3.549.09zm6.55 7.89l-2.07 2.064a2.472 2.465 0 0 1 .031.092l1.144 1.14a3.474 3.474 0 0 0-.217 1.14 3.456 3.456 0 0 0 3.461 3.452c.434 0 .854-.102 1.236-.247l-2.008-2.003a1.01 1.01 0 0 1 0-1.417l.68-.678c.193-.193.457-.308.71-.308.253 0 .517.115.71.308l1.947 1.941c.105-.33.186-.683.186-1.047a3.456 3.456 0 0 0-3.46-3.452 3.5 3.5 0 0 0-1.144.216L10.1 7.979z" style="line-height:normal;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration-line:none;text-transform:none;marker:none" overflow="visible"/>
         <path d="M13.858 0l-1.542 1.438c-.452.42-.53 1.148-.267 1.706L6.161 9.14a1.492 1.488 0 0 0-.031 0 1.492 1.488 0 0 0-.84-.148 1.492 1.488 0 0 0-.867.44L.477 13.43a1.494 1.49 0 1 0 2.13 2.09l3.946-3.997a1.492 1.488 0 0 0 .297-1.738l5.888-5.965c.558.249 1.273.147 1.707-.292l1.417-1.56L13.858 0z" style="line-height:normal;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration-line:none;text-transform:none;marker:none" overflow="visible"/>
     </g>
diff --git a/theme/icons/preferences-system-time-symbolic.svg b/theme/icons/preferences-system-time-symbolic.svg
index a3b63a8..930d641 100644
--- a/theme/icons/preferences-system-time-symbolic.svg
+++ b/theme/icons/preferences-system-time-symbolic.svg
@@ -1,5 +1,5 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16">
-    <g color="#000" font-weight="400" font-family="sans-serif" white-space="normal" fill="#474747">
+    <g color="#000" font-weight="400" font-family="sans-serif" white-space="normal" fill="context-fill" stroke="context-stroke" fill-opacity="context-fill-opacity" stroke-opacity="context-stroke-opacity">
         <path d="M7.5 0C3.37 0 0 3.37 0 7.5S3.37 15 7.5 15 15 11.63 15 7.5 11.63 0 7.5 0zm0 2C10.55 2 13 4.45 13 7.5S10.55 13 7.5 13 2 10.55 2 7.5 4.45 2 7.5 2z" style="line-height:normal;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000;text-transform:none;text-orientation:mixed;shape-padding:0;isolation:auto;mix-blend-mode:normal;marker:none" overflow="visible"/>
         <path d="M4.428 3.963a.5.5 0 0 0-.34.863L7.2 7.871A.5.5 0 0 0 7.686 8H10.5a.5.5 0 1 0 0-1H7.738l-2.95-2.889a.5.5 0 0 0-.36-.148z" style="line-height:normal;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000;text-transform:none;text-orientation:mixed;shape-padding:0;isolation:auto;mix-blend-mode:normal;marker:none" overflow="visible"/>
     </g>
diff --git a/theme/icons/printer-symbolic.svg b/theme/icons/printer-symbolic.svg
index 608df1f..69087d8 100644
--- a/theme/icons/printer-symbolic.svg
+++ b/theme/icons/printer-symbolic.svg
@@ -1,5 +1,5 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16">
-    <g fill="#474747">
+    <g fill="context-fill" stroke="context-stroke" fill-opacity="context-fill-opacity" stroke-opacity="context-stroke-opacity">
         <path d="M2 4c-.5 0-1 .5-1 1v4c0 .5.5 1 1 1h1V8h10v2h1c.5 0 1-.5 1-1V5c0-.5-.5-1-1-1zM4 1v2h8V1z"/>
         <path d="M4 9v5h8V9z"/>
     </g>
diff --git a/theme/icons/radio-checked-symbolic.svg b/theme/icons/radio-checked-symbolic.svg
index 17d4942..981c40c 100644
--- a/theme/icons/radio-checked-symbolic.svg
+++ b/theme/icons/radio-checked-symbolic.svg
@@ -1,5 +1,5 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16">
-    <g color="#bebebe" font-weight="400" font-family="Andale Mono" fill="#474747">
+    <g color="#bebebe" font-weight="400" font-family="Andale Mono"fill="context-fill" stroke="context-stroke" fill-opacity="context-fill-opacity" stroke-opacity="context-stroke-opacity">
         <path d="M8 5C6.344 5 5 6.344 5 8s1.344 3 3 3 3-1.344 3-3-1.344-3-3-3z" style="line-height:normal;text-indent:0;text-align:start;text-decoration-line:none;text-transform:none;marker:none" overflow="visible"/>
         <path d="M8.004 1C4.144 1 1 4.144 1 8.004c0 3.86 3.144 7.006 7.004 7.006 3.86 0 7.006-3.146 7.006-7.006C15.01 4.144 11.864 1 8.004 1zm0 1a6.002 6.002 0 0 1 6.006 6.004 6.004 6.004 0 0 1-6.006 6.006A6.002 6.002 0 0 1 2 8.004 6 6 0 0 1 8.004 2z" style="line-height:normal;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000;text-transform:none;text-orientation:mixed;shape-padding:0;isolation:auto;mix-blend-mode:normal;marker:none" white-space="normal" overflow="visible"/>
     </g>
diff --git a/theme/icons/radio-symbolic.svg b/theme/icons/radio-symbolic.svg
index c7e082c..2a1b356 100644
--- a/theme/icons/radio-symbolic.svg
+++ b/theme/icons/radio-symbolic.svg
@@ -1,3 +1,3 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16">
-    <path d="M8 1C4.142 1 1 4.142 1 8s3.142 7 7 7 7-3.142 7-7-3.142-7-7-7zm0 1c3.316 0 6 2.684 6 6s-2.684 6-6 6-6-2.684-6-6 2.684-6 6-6z" style="line-height:normal;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000;text-transform:none;text-orientation:mixed;shape-padding:0;isolation:auto;mix-blend-mode:normal;marker:none" color="#bebebe" font-weight="400" font-family="Andale Mono" white-space="normal" overflow="visible" fill="#474747"/>
+    <path d="M8 1C4.142 1 1 4.142 1 8s3.142 7 7 7 7-3.142 7-7-3.142-7-7-7zm0 1c3.316 0 6 2.684 6 6s-2.684 6-6 6-6-2.684-6-6 2.684-6 6-6z" style="line-height:normal;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000;text-transform:none;text-orientation:mixed;shape-padding:0;isolation:auto;mix-blend-mode:normal;marker:none" color="#bebebe" font-weight="400" font-family="Andale Mono" white-space="normal" overflow="visible" fill="context-fill" stroke="context-stroke" fill-opacity="context-fill-opacity" stroke-opacity="context-stroke-opacity"/>
 </svg>
diff --git a/theme/icons/starred-symbolic.svg b/theme/icons/starred-symbolic.svg
index 3b43344..588ab4d 100644
--- a/theme/icons/starred-symbolic.svg
+++ b/theme/icons/starred-symbolic.svg
@@ -43,13 +43,11 @@
      id="title8473">Gnome Symbolic Icons</title>
   <defs
      id="defs7386" />
-  <g
-     transform="translate(-12.000002,-188)"
-     id="layer1">
+  <g transform="translate(-12.000002,-188)" id="layer1" fill="context-fill" stroke="context-stroke" fill-opacity="context-fill-opacity" stroke-opacity="context-stroke-opacity">
     <path
        d="m 19.97406,188.1259 c -0.43023,0.009 -0.7807,0.21289 -1.00417,0.412 -0.22348,0.19912 -0.36802,0.40858 -0.49659,0.62361 -0.25715,0.43007 -0.44165,0.90049 -0.62087,1.36851 -0.17922,0.46802 -0.34617,0.93045 -0.49669,1.27064 -0.0834,0.18859 -0.0632,0.16208 -0.11163,0.23484 l -3.39829,-0.01 c -0.44993,-0.001 -0.84718,0.2831 -0.97707,0.6988 -0.23204,0.7425 0.0983,1.2254 0.36842,1.6456 0.27007,0.4203 0.61092,0.8149 0.95366,1.1987 0.34273,0.3838 0.68843,0.7519 0.94864,1.0562 0.26022,0.3043 0.42063,0.6067 0.39089,0.5178 -0.0815,-0.2441 -0.0158,0.043 -0.11596,0.392 -0.10012,0.3492 -0.26945,0.8072 -0.43224,1.2756 -0.16279,0.4685 -0.32364,0.9416 -0.40063,1.4271 -0.0385,0.2428 -0.0612,0.4915 -0.008,0.7878 0.0528,0.2963 0.22609,0.6899 0.59148,0.9348 0.36035,0.2414 0.77177,0.27 1.07415,0.2344 0.30238,-0.036 0.54731,-0.1239 0.78605,-0.2256 0.47748,-0.2035 0.92831,-0.4831 1.3724,-0.7641 0.44409,-0.281 0.87594,-0.5649 1.21712,-0.7592 0.34117,-0.1942 0.66538,-0.2352 0.44311,-0.2356 -0.25007,-6e-4 0.0726,0.036 0.40358,0.2325 0.33102,0.1962 0.7509,0.4834 1.18293,0.7673 0.43203,0.2839 0.86756,0.5663 1.33452,0.7734 0.23348,0.1036 0.47553,0.1948 0.78051,0.2314 0.305,0.037 0.73426,0 1.09071,-0.2629 0.0415,-0.03 0.0804,-0.064 0.11658,-0.1 0.51361,-0.5136 0.55625,-1.2149 0.4738,-1.7292 -0.0825,-0.5144 -0.26626,-0.9742 -0.4422,-1.4148 -0.17594,-0.4407 -0.3483,-0.859 -0.4421,-1.1845 -0.0935,-0.3245 -0.0735,-0.5301 -0.0765,-0.5222 -2e-5,1e-4 0,0 -10e-6,0 -0.0535,0.1599 0.0864,-0.1088 0.35858,-0.3721 0.27428,-0.2653 0.65145,-0.5942 1.02604,-0.9514 0.37458,-0.3572 0.75091,-0.7369 1.04667,-1.1946 0.29575,-0.4577 0.56011,-1.0989 0.31037,-1.7901 -0.14232,-0.3944 -0.52754,-0.6589 -0.96039,-0.6594 l -3.59523,-4e-4 c -0.0194,-0.032 -0.0201,-0.024 -0.0422,-0.0672 -0.14223,-0.27624 -0.31886,-0.74632 -0.49749,-1.23706 -0.17863,-0.49076 -0.35962,-1.00261 -0.59982,-1.46289 -0.1201,-0.23015 -0.24928,-0.45209 -0.4642,-0.67256 -0.21493,-0.22046 -0.59281,-0.48033 -1.08755,-0.47014 z"
        id="path10376"
-       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#2e3436;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
   </g>
   <g
      transform="translate(-12.000002,-188)"
diff --git a/theme/icons/tab-new-symbolic.svg b/theme/icons/tab-new-symbolic.svg
index c052b91..fdbc6b1 100644
--- a/theme/icons/tab-new-symbolic.svg
+++ b/theme/icons/tab-new-symbolic.svg
@@ -1,5 +1,5 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="16.009" height="16">
-    <g fill="#2e3436">
+    <g fill="context-fill" stroke="context-stroke" fill-opacity="context-fill-opacity" stroke-opacity="context-stroke-opacity">
         <path d="M4.003 1s-.709-.014-1.447.355C1.817 1.725 1.003 2.667 1.003 4v9h-1l-.004 2h.004l3 .01V15h13v-2h-1V4s.014-.709-.355-1.447C14.278 1.814 13.336 1 12.003 1zm0 2h8c.667 0 .725.186.855.447.131.262.145.553.145.553v9h-10V4c0-.667.186-.725.447-.855.262-.131.553-.145.553-.145z" style="line-height:normal;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000;text-transform:none;text-orientation:mixed;shape-padding:0;isolation:auto;mix-blend-mode:normal" color="#000" font-weight="400" font-family="sans-serif" white-space="normal" overflow="visible"/>
         <path d="M7.009 5v2h-2v2h2v2h2V9h2V7h-2V5z"/>
     </g>
diff --git a/theme/icons/toggle-right-sidebar-symbolic.svg b/theme/icons/toggle-right-sidebar-symbolic.svg
index 389ce3e..e160352 100644
--- a/theme/icons/toggle-right-sidebar-symbolic.svg
+++ b/theme/icons/toggle-right-sidebar-symbolic.svg
@@ -6,8 +6,8 @@
   <metadata id="metadata10536">
     
   </metadata>
-  <g id="layer1" transform="translate(45.205952,-342.50834)">
-    <path style="color:#bebebe;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:0.26458332;marker:none" d="m -41.766369,343.03751 c 0.288581,0 0.529167,0.24058 0.529167,0.52916 v 2.11667 0.52917 h -3.704167 v -0.52917 -2.11667 c 0,-0.28858 0.240585,-0.52916 0.529167,-0.52916 z m 0,0.52916 h -0.79375 v 2.11667 h 0.79375 z m -1.058333,0 h -1.5875 v 2.11667 h 1.5875 z" id="rect10509"/>
-    <rect transform="rotate(-90)" style="color:#bebebe;display:inline;overflow:visible;visibility:visible;opacity:0.35;fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:0.26458332;marker:none" id="rect10511" width="2.1166327" height="0.79374611" x="-345.68332" y="-42.560158"/>
+  <g id="layer1" transform="translate(45.205952,-342.50834)" fill="context-fill" stroke="context-stroke" fill-opacity="context-fill-opacity" stroke-opacity="context-stroke-opacity">
+    <path style="color:#bebebe;display:inline;overflow:visible;visibility:visible;opacity:1;stroke-width:0.26458332;marker:none" d="m -41.766369,343.03751 c 0.288581,0 0.529167,0.24058 0.529167,0.52916 v 2.11667 0.52917 h -3.704167 v -0.52917 -2.11667 c 0,-0.28858 0.240585,-0.52916 0.529167,-0.52916 z m 0,0.52916 h -0.79375 v 2.11667 h 0.79375 z m -1.058333,0 h -1.5875 v 2.11667 h 1.5875 z" id="rect10509"/>
+    <rect transform="rotate(-90)" style="color:#bebebe;display:inline;overflow:visible;visibility:visible;opacity:0.35;stroke-width:0.26458332;marker:none" id="rect10511" width="2.1166327" height="0.79374611" x="-345.68332" y="-42.560158"/>
   </g>
 </svg>
diff --git a/theme/icons/toggle-sidebar-symbolic.svg b/theme/icons/toggle-sidebar-symbolic.svg
index 9c17c16..94afecc 100644
--- a/theme/icons/toggle-sidebar-symbolic.svg
+++ b/theme/icons/toggle-sidebar-symbolic.svg
@@ -6,8 +6,8 @@
   <metadata id="metadata10536">
     
   </metadata>
-  <g id="layer1" transform="translate(45.205952,-342.50834)">
-    <path style="color:#bebebe;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:0.99999994;marker:none" d="M 3 2 C 1.9093002 2 1 2.9093039 1 4 L 1 12 L 1 14 L 15 14 L 15 12 L 15 4 C 15 2.9093039 14.090704 2 13 2 L 3 2 z M 3 4 L 6 4 L 6 12 L 3 12 L 3 4 z M 7 4 L 13 4 L 13 12 L 7 12 L 7 4 z " transform="matrix(0.26458333,0,0,0.26458333,-45.205952,342.50834)" id="rect10509"/>
-    <rect transform="matrix(0,-1,-1,0,0,0)" style="color:#bebebe;display:inline;overflow:visible;visibility:visible;opacity:0.35;fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:0.26458332;marker:none" id="rect10511" width="2.1166327" height="0.79374611" x="-345.68332" y="43.618412"/>
+  <g id="layer1" transform="translate(45.205952,-342.50834)" fill="context-fill" stroke="context-stroke" fill-opacity="context-fill-opacity" stroke-opacity="context-stroke-opacity">
+    <path style="color:#bebebe;display:inline;overflow:visible;visibility:visible;opacity:1;stroke-width:0.99999994;marker:none" d="M 3 2 C 1.9093002 2 1 2.9093039 1 4 L 1 12 L 1 14 L 15 14 L 15 12 L 15 4 C 15 2.9093039 14.090704 2 13 2 L 3 2 z M 3 4 L 6 4 L 6 12 L 3 12 L 3 4 z M 7 4 L 13 4 L 13 12 L 7 12 L 7 4 z " transform="matrix(0.26458333,0,0,0.26458333,-45.205952,342.50834)" id="rect10509"/>
+    <rect transform="matrix(0,-1,-1,0,0,0)" style="color:#bebebe;display:inline;overflow:visible;visibility:visible;opacity:0.35;stroke-width:0.26458332;marker:none" id="rect10511" width="2.1166327" height="0.79374611" x="-345.68332" y="43.618412"/>
   </g>
 </svg>
diff --git a/theme/icons/user-home-symbolic.svg b/theme/icons/user-home-symbolic.svg
index df5d679..064227f 100644
--- a/theme/icons/user-home-symbolic.svg
+++ b/theme/icons/user-home-symbolic.svg
@@ -1,5 +1,5 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="16.023" height="16">
-    <g fill="#474747">
+    <g fill="context-fill" stroke="context-stroke" fill-opacity="context-fill-opacity" stroke-opacity="context-stroke-opacity">
         <path d="M3.008 4.986A1 1 0 0 0 2.023 6v7a1 1 0 0 0 1 1h10a1 1 0 0 0 1-1V6a1 1 0 1 0-2 0v6h-8V6a1 1 0 0 0-1.015-1.014z" style="line-height:normal;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000;text-transform:none;text-orientation:mixed;shape-padding:0;isolation:auto;mix-blend-mode:normal" color="#000" font-weight="400" font-family="sans-serif" white-space="normal" overflow="visible"/>
         <path d="M8.031 1a1 1 0 0 0-.601.186l-7 5a1.001 1.001 0 1 0 1.164 1.628L8.012 3.23l6.418 4.585a1.001 1.001 0 1 0 1.164-1.628l-7-5A1 1 0 0 0 8.03 1z" style="line-height:normal;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000;text-transform:none;text-orientation:mixed;shape-padding:0;isolation:auto;mix-blend-mode:normal" color="#000" font-weight="400" font-family="sans-serif" white-space="normal" overflow="visible"/>
         <path d="M6.012 8.01h3.03V13h-3.03z" style="marker:none" color="#bebebe" overflow="visible"/>
diff --git a/theme/icons/user-not-tracked.svg b/theme/icons/user-not-tracked.svg
index d4e0c01..e67e724 100644
--- a/theme/icons/user-not-tracked.svg
+++ b/theme/icons/user-not-tracked.svg
@@ -1,5 +1,5 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16.001">
-    <g fill="#2e3436">
+    <g fill="context-fill" stroke="context-stroke" fill-opacity="context-fill-opacity" stroke-opacity="context-stroke-opacity">
         <path d="M9.295 0a.5.5 0 0 1 .437.641l-.425 1.543c.424.11.838.263 1.238.457L11.566.876a.5.5 0 1 1 .867.502l-1.017 1.757c.338.218.666.451.977.704l1.253-1.254a.5.5 0 1 1 .708.707l-1.221 1.22c.281.267.547.525.793.793l.72-.72a.5.5 0 1 1 .708.707l-.764.763C15.475 7.131 16 8.001 16 8.001s-.872 1.45-2.275 2.923l-1.108-1.107C13.514 8.883 14 8.001 14 8.001s-2.134-4-6-4c-.38 0-.737.047-1.082.117L5.451 2.65c.256-.125.516-.24.783-.332L5.664.673a.5.5 0 1 1 .943-.329l.598 1.721c.262-.041.527-.064.795-.064.105 0 .208.018.313.025l.455-1.65A.5.5 0 0 1 9.295 0zM1.01 4.435c.13.004.253.058.344.15l.72.721c.061-.066.13-.132.194-.197l1.097 1.096C2.481 7.13 2 8 2 8s2.134 4 6 4c.368 0 .715-.046 1.05-.112l1.48 1.479C9.733 13.753 8.884 14 8 14c-4.418 0-8-6-8-6s.525-.87 1.41-1.946l-.764-.763a.5.5 0 0 1 .364-.858zM8 5.001a3 3 0 0 1 3 3c0 .062-.014.12-.018.181L9.14 6.34a.675.675 0 0 0-.477-.477l-.844-.844c.062-.004.12-.017.182-.017zM5.016 7.854l3.132 3.131c-.05.002-.097.016-.148.016a3 3 0 0 1-3-3c0-.05.013-.097.016-.147z" opacity=".35"/>
         <path d="M1.531.47L.47 1.53l14 14 1.062-1.061z"/>
     </g>
diff --git a/theme/icons/view-fullscreen-symbolic.svg b/theme/icons/view-fullscreen-symbolic.svg
index 35a9102..1c32d8c 100644
--- a/theme/icons/view-fullscreen-symbolic.svg
+++ b/theme/icons/view-fullscreen-symbolic.svg
@@ -1,5 +1,5 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16">
-    <g color="#000" fill="#474747">
+    <g color="#000" fill="context-fill" stroke="context-stroke" fill-opacity="context-fill-opacity" stroke-opacity="context-stroke-opacity">
         <path d="M1.984 8.986A1 1 0 0 0 1 10v4a1 1 0 0 0 1 1h4a1 1 0 1 0 0-2H3v-3a1 1 0 0 0-1.016-1.014z" style="line-height:normal;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000;text-transform:none;text-orientation:mixed;shape-padding:0;isolation:auto;mix-blend-mode:normal;marker:none" font-weight="400" font-family="sans-serif" white-space="normal" overflow="visible"/>
         <path d="M6.48 8.49a1 1 0 0 0-.687.303l-4.5 4.5a1 1 0 1 0 1.414 1.414l4.5-4.5A1 1 0 0 0 6.48 8.49z" style="line-height:normal;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000;text-transform:none;text-orientation:mixed;shape-padding:0;isolation:auto;mix-blend-mode:normal;marker:none" font-weight="400" font-family="sans-serif" white-space="normal" overflow="visible"/>
         <path d="M1 14h1v1H1z" style="marker:none" overflow="visible"/>
diff --git a/theme/icons/view-more-horizontal-symbolic.svg b/theme/icons/view-more-horizontal-symbolic.svg
index 27775b5..78bbfce 100644
--- a/theme/icons/view-more-horizontal-symbolic.svg
+++ b/theme/icons/view-more-horizontal-symbolic.svg
@@ -1,5 +1,5 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16">
-    <g color="#000" fill="#474747">
+    <g color="#000" fill="context-fill" stroke="context-stroke" fill-opacity="context-fill-opacity" stroke-opacity="context-stroke-opacity">
         <path d="M16 6.384v3.231c0 .213-.224.385-.502.385h-2.996c-.278 0-.502-.172-.502-.385v-3.23c0-.214.224-.385.502-.385h2.996c.278 0 .502.171.502.384zM10 6.384v3.231c0 .213-.224.385-.502.385H6.502C6.224 10 6 9.828 6 9.615v-3.23C6 6.17 6.224 6 6.502 6h2.996c.278 0 .502.171.502.384zM4 6.384v3.231c0 .213-.224.385-.502.385H.502C.224 10 0 9.828 0 9.615v-3.23C0 6.17.224 6 .502 6h2.996C3.776 6 4 6.17 4 6.384z" style="marker:none" overflow="visible"/>
     </g>
 </svg>
diff --git a/theme/icons/view-restore-symbolic.svg b/theme/icons/view-restore-symbolic.svg
index e7b5965..f8cdf1f 100644
--- a/theme/icons/view-restore-symbolic.svg
+++ b/theme/icons/view-restore-symbolic.svg
@@ -1,5 +1,5 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="16.014" height="16.01">
-    <g color="#000" fill="#474747">
+    <g color="#000" fill="context-fill" stroke="context-stroke" fill-opacity="context-fill-opacity" stroke-opacity="context-stroke-opacity">
         <path d="M12 1.006l-2 .008.018 4.996H15v-2h-2.99z" style="line-height:normal;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000;text-transform:none;text-orientation:mixed;shape-padding:0;isolation:auto;mix-blend-mode:normal;marker:none" font-weight="400" font-family="sans-serif" white-space="normal" overflow="visible"/>
         <path d="M14.979 0a1 1 0 0 0-.688.305l-3.984 4a1 1 0 1 0 1.416 1.41l3.986-4A1 1 0 0 0 14.979 0zM1.014 6.01a1 1 0 0 0-1 1v8a1 1 0 0 0 1 1h8a1 1 0 0 0 1-1v-8a1 1 0 0 0-1-1zm1 2h6v6h-6z" style="line-height:normal;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000;text-transform:none;text-orientation:mixed;shape-padding:0;isolation:auto;mix-blend-mode:normal;marker:none" font-weight="400" font-family="sans-serif" white-space="normal" overflow="visible"/>
         <path d="M1.014 8.01a1 1 0 1 0 0 2h8a1 1 0 1 0 0-2z" style="line-height:normal;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000;text-transform:none;text-orientation:mixed;shape-padding:0;isolation:auto;mix-blend-mode:normal;marker:none" font-weight="400" font-family="sans-serif" white-space="normal" overflow="visible" fill-rule="evenodd"/>
diff --git a/theme/icons/window-close-symbolic.svg b/theme/icons/window-close-symbolic.svg
index 00c4fff..b8fc52d 100644
--- a/theme/icons/window-close-symbolic.svg
+++ b/theme/icons/window-close-symbolic.svg
@@ -1,81 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   width="16"
-   version="1.1"
-   style="enable-background:new"
-   id="svg7384"
-   height="16">
-  <metadata
-     id="metadata90">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Gnome Symbolic Icons</dc:title>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Reproduction" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Distribution" />
-        <cc:requires
-           rdf:resource="http://creativecommons.org/ns#Notice" />
-        <cc:requires
-           rdf:resource="http://creativecommons.org/ns#Attribution" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
-        <cc:requires
-           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <title
-     id="title8473">Gnome Symbolic Icons</title>
-  <defs
-     id="defs7386" />
-  <g
-     transform="translate(-12.005853,-888)"
-     id="layer1" />
-  <g
-     transform="translate(-12.005853,-888)"
-     id="layer7" />
-  <g
-     transform="translate(-12.005853,-888)"
-     id="layer6" />
-  <g
-     transform="translate(-12.005853,-888)"
-     id="layer5" />
-  <g
-     transform="translate(-12.005853,-888)"
-     id="layer9" />
-  <g
-     transform="translate(-12.005853,-888)"
-     id="layer2" />
-  <g
-     transform="translate(-12.005853,-888)"
-     id="layer8" />
-  <g
-     transform="translate(-12.005853,-888)"
-     id="layer3" />
-  <g
-     transform="translate(-12.005853,-888)"
-     id="layer4" />
-  <g
-     transform="translate(-12.005853,-952)"
-     id="layer10">
-    <path
-       d="m 16.005853,956 h 1 c 0.01037,-1.2e-4 0.02079,-4.6e-4 0.03125,0 0.254951,0.0112 0.50987,0.12858 0.6875,0.3125 l 2.28125,2.28125 2.3125,-2.28125 c 0.265625,-0.2305 0.446672,-0.3055 0.6875,-0.3125 h 1 v 1 c 0,0.28647 -0.03434,0.55065 -0.25,0.75 l -2.28125,2.28125 2.25,2.25 c 0.188188,0.18817 0.281242,0.45345 0.28125,0.71875 v 1 h -1 c -0.265301,-10e-6 -0.530586,-0.0931 -0.71875,-0.28125 l -2.28125,-2.28125 -2.28125,2.28125 C 17.536439,963.90694 17.271143,964 17.005853,964 h -1 v -1 c -3e-6,-0.26529 0.09306,-0.53058 0.28125,-0.71875 l 2.28125,-2.25 -2.28125,-2.28125 c -0.210742,-0.19463 -0.30316,-0.46925 -0.28125,-0.75 z"
-       id="path10839-9"
-       style="color:#bebebe;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Andale Mono';-inkscape-font-specification:'Andale Mono';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#2e3436;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.78124988;marker:none;enable-background:new" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path d="M4 4h1.031c.255.011.51.129.688.313L8 6.592l2.312-2.28c.266-.231.447-.306.688-.313h1v1c0 .286-.034.55-.25.75L9.469 8.031l2.25 2.25c.188.188.281.454.281.719v1h-1c-.265 0-.53-.093-.719-.281L8 9.438l-2.281 2.28A1.015 1.015 0 015 12H4v-1c0-.265.093-.53.281-.719l2.281-2.25-2.28-2.281A.909.909 0 014 5z" style="line-height:normal;-inkscape-font-specification:'Andale Mono';text-indent:0;text-align:start;text-decoration-line:none;text-transform:none;marker:none" color="#bebebe" font-weight="400" font-family="Andale Mono" overflow="visible" fill="context-fill" stroke="context-stroke" fill-opacity="context-fill-opacity" stroke-opacity="context-stroke-opacity"/></svg>
\ No newline at end of file
diff --git a/theme/icons/window-maximize-symbolic.svg b/theme/icons/window-maximize-symbolic.svg
index 92b3f9f..3718373 100644
--- a/theme/icons/window-maximize-symbolic.svg
+++ b/theme/icons/window-maximize-symbolic.svg
@@ -1,81 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   width="16"
-   version="1.1"
-   style="enable-background:new"
-   id="svg7384"
-   height="16">
-  <metadata
-     id="metadata90">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Gnome Symbolic Icons</dc:title>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Reproduction" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Distribution" />
-        <cc:requires
-           rdf:resource="http://creativecommons.org/ns#Notice" />
-        <cc:requires
-           rdf:resource="http://creativecommons.org/ns#Attribution" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
-        <cc:requires
-           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <title
-     id="title8473">Gnome Symbolic Icons</title>
-  <defs
-     id="defs7386" />
-  <g
-     transform="translate(-52.005853,-888)"
-     id="layer1" />
-  <g
-     transform="translate(-52.005853,-888)"
-     id="layer7" />
-  <g
-     transform="translate(-52.005853,-888)"
-     id="layer6" />
-  <g
-     transform="translate(-52.005853,-888)"
-     id="layer5" />
-  <g
-     transform="translate(-52.005853,-888)"
-     id="layer9" />
-  <g
-     transform="translate(-52.005853,-888)"
-     id="layer2" />
-  <g
-     transform="translate(-52.005853,-888)"
-     id="layer8" />
-  <g
-     transform="translate(-52.005853,-888)"
-     id="layer3" />
-  <g
-     transform="translate(-52.005853,-888)"
-     id="layer4" />
-  <g
-     transform="translate(-52.005853,-952)"
-     id="layer10">
-    <path
-       id="rect9057"
-       d="m 55.994141,955.99219 v 1 7.01172 h 8.011718 v -8.01172 z m 2,2 h 4.011718 v 4.01172 h -4.011718 z"
-       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#2e3436;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path d="M3.988 3.992v8.012H12V3.992zm2 2H10v4.012H5.988z" style="line-height:normal;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000;text-transform:none;text-orientation:mixed;white-space:normal;shape-padding:0;isolation:auto;mix-blend-mode:normal;solid-color:#000;solid-opacity:1;marker:none" color="#000" font-weight="400" font-family="sans-serif" overflow="visible" fill="context-fill" stroke="context-stroke" fill-opacity="context-fill-opacity" stroke-opacity="context-stroke-opacity"/></svg>
\ No newline at end of file
diff --git a/theme/icons/window-minimize-symbolic.svg b/theme/icons/window-minimize-symbolic.svg
index 5faa7c6..8fc1f82 100644
--- a/theme/icons/window-minimize-symbolic.svg
+++ b/theme/icons/window-minimize-symbolic.svg
@@ -1,81 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   width="16"
-   version="1.1"
-   style="enable-background:new"
-   id="svg7384"
-   height="16">
-  <metadata
-     id="metadata90">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Gnome Symbolic Icons</dc:title>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Reproduction" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Distribution" />
-        <cc:requires
-           rdf:resource="http://creativecommons.org/ns#Notice" />
-        <cc:requires
-           rdf:resource="http://creativecommons.org/ns#Attribution" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
-        <cc:requires
-           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <title
-     id="title8473">Gnome Symbolic Icons</title>
-  <defs
-     id="defs7386" />
-  <g
-     transform="translate(-32.005853,-888)"
-     id="layer1" />
-  <g
-     transform="translate(-32.005853,-888)"
-     id="layer7" />
-  <g
-     transform="translate(-32.005853,-888)"
-     id="layer6" />
-  <g
-     transform="translate(-32.005853,-888)"
-     id="layer5" />
-  <g
-     transform="translate(-32.005853,-888)"
-     id="layer9" />
-  <g
-     transform="translate(-32.005853,-888)"
-     id="layer2" />
-  <g
-     transform="translate(-32.005853,-888)"
-     id="layer8" />
-  <g
-     transform="translate(-32.005853,-888)"
-     id="layer3" />
-  <g
-     transform="translate(-32.005853,-888)"
-     id="layer4" />
-  <g
-     transform="translate(-32.005853,-952)"
-     id="layer10">
-    <path
-       id="rect8269"
-       d="m 36.005852,962.00891 h 8 v 1.98874 h -8 z"
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#2e3436;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path d="M4 10.009h8v1.989H4z" style="marker:none" color="#000" overflow="visible" fill="context-fill" stroke="context-stroke" fill-opacity="context-fill-opacity" stroke-opacity="context-stroke-opacity" fill-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/theme/icons/window-new-symbolic.svg b/theme/icons/window-new-symbolic.svg
index 3837f4a..c9ee77f 100644
--- a/theme/icons/window-new-symbolic.svg
+++ b/theme/icons/window-new-symbolic.svg
@@ -1,5 +1,5 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16">
-    <g fill="#2e3436">
+    <g fill="context-fill" stroke="context-stroke" fill-opacity="context-fill-opacity" stroke-opacity="context-stroke-opacity">
         <path d="M2.994 1.008C1.994 1.008.988 2 .988 3v12.02h7.006v-2H2.988V5H13v3h2V3c0-1-1.006-1.992-2.006-1.992z" style="line-height:normal;text-indent:0;text-align:start;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000;text-transform:none;white-space:normal;isolation:auto;mix-blend-mode:normal;solid-color:#000;solid-opacity:1;marker:none" color="#000" font-weight="400" font-family="sans-serif" overflow="visible"/>
         <path d="M12 10v2h-2v2h2v2h2v-2h2v-2h-2v-2z"/>
     </g>
diff --git a/theme/icons/window-restore-symbolic.svg b/theme/icons/window-restore-symbolic.svg
index 92cb991..60f4ac7 100644
--- a/theme/icons/window-restore-symbolic.svg
+++ b/theme/icons/window-restore-symbolic.svg
@@ -1 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path d="M4.988 4.992v6.012H11V4.992zm2 2H9v2.012H6.988z" style="line-height:normal;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000;text-transform:none;text-orientation:mixed;white-space:normal;shape-padding:0;isolation:auto;mix-blend-mode:normal;solid-color:#000;solid-opacity:1;marker:none" color="#000" font-weight="400" font-family="sans-serif" overflow="visible" fill="#2e3436"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16">
+    <path d="M4.988 4.992v6.012H11V4.992zm2 2H9v2.012H6.988z" style="line-height:normal;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000;text-transform:none;text-orientation:mixed;white-space:normal;shape-padding:0;isolation:auto;mix-blend-mode:normal;solid-color:#000;solid-opacity:1;marker:none" color="#000" font-weight="400" font-family="sans-serif" overflow="visible" fill="context-fill" stroke="context-stroke" fill-opacity="context-fill-opacity" stroke-opacity="context-stroke-opacity"/>
+</svg>
\ No newline at end of file
diff --git a/theme/icons/zoom-in-symbolic.svg b/theme/icons/zoom-in-symbolic.svg
index 13bb659..1ced8b4 100644
--- a/theme/icons/zoom-in-symbolic.svg
+++ b/theme/icons/zoom-in-symbolic.svg
@@ -1,3 +1,3 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="15.982" height="16">
-    <path d="M3.188 2C2.524 2 2 2.549 2 3.219v9.562C2 13.451 2.525 14 3.188 14h9.624c.663 0 1.188-.549 1.188-1.219V3.22C14 2.549 13.475 2 12.812 2zM7 5h2v2h2v2H9v2H7V9H5V7h2z" style="marker:none" color="#bebebe" overflow="visible" fill="#474747"/>
+    <path d="M3.188 2C2.524 2 2 2.549 2 3.219v9.562C2 13.451 2.525 14 3.188 14h9.624c.663 0 1.188-.549 1.188-1.219V3.22C14 2.549 13.475 2 12.812 2zM7 5h2v2h2v2H9v2H7V9H5V7h2z" style="marker:none" color="#bebebe" overflow="visible" fill="context-fill" stroke="context-stroke" fill-opacity="context-fill-opacity" stroke-opacity="context-stroke-opacity"/>
 </svg>
diff --git a/theme/icons/zoom-out-symbolic.svg b/theme/icons/zoom-out-symbolic.svg
index 84026cf..7aad2d3 100644
--- a/theme/icons/zoom-out-symbolic.svg
+++ b/theme/icons/zoom-out-symbolic.svg
@@ -1,3 +1,3 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="15.982" height="16">
-    <path d="M3.188 2C2.524 2 2 2.549 2 3.219v9.562C2 13.451 2.525 14 3.188 14h9.624c.663 0 1.188-.549 1.188-1.219V3.22C14 2.549 13.475 2 12.812 2zM5 7h6v2H5z" style="marker:none" color="#bebebe" overflow="visible" fill="#474747"/>
+    <path d="M3.188 2C2.524 2 2 2.549 2 3.219v9.562C2 13.451 2.525 14 3.188 14h9.624c.663 0 1.188-.549 1.188-1.219V3.22C14 2.549 13.475 2 12.812 2zM5 7h6v2H5z" style="marker:none" color="#bebebe" overflow="visible" fill="context-fill" stroke="context-stroke" fill-opacity="context-fill-opacity" stroke-opacity="context-stroke-opacity"/>
 </svg>