diff --git a/icons-dark/actions/12/transform-affect-gradient.svg b/icons-dark/actions/12/transform-affect-gradient.svg
--- a/icons-dark/actions/12/transform-affect-gradient.svg
+++ b/icons-dark/actions/12/transform-affect-gradient.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -23,7 +23,7 @@
      style="fill:currentColor;fill-opacity:1;stroke:none"
      d="m424.8 542.79l.367.379 1.621 1.621h-2.076v1h2.076l-1.621 1.621-.381.379h1.417l2.5-2.5-2.5-2.5zm-2.088 2v1h2v-1z"
      transform="translate(-421.71-535.79)"
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      id="path10" />
   <path
      style="fill:currentColor;fill-opacity:1;stroke:none"
diff --git a/icons-dark/actions/12/transform-affect-pattern.svg b/icons-dark/actions/12/transform-affect-pattern.svg
--- a/icons-dark/actions/12/transform-affect-pattern.svg
+++ b/icons-dark/actions/12/transform-affect-pattern.svg
@@ -4,16 +4,16 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
   </defs>
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="m424.8 542.79l.367.379 1.621 1.621h-2.076v1h2.076l-1.621 1.621-.381.379h1.417l2.5-2.5-2.5-2.5zm-2.088 2v1h2v-1z" 
      transform="translate(-421.71-535.79)"
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
diff --git a/icons-dark/actions/12/transform-affect-rounded-corners.svg b/icons-dark/actions/12/transform-affect-rounded-corners.svg
--- a/icons-dark/actions/12/transform-affect-rounded-corners.svg
+++ b/icons-dark/actions/12/transform-affect-rounded-corners.svg
@@ -4,15 +4,15 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
   </defs>
  <path style="fill:currentColor;fill-opacity:1;stroke:none" 
        d="m424.8 542.79l.367.379 1.621 1.621h-2.076v1h2.076l-1.621 1.621-.381.379h1.417l2.5-2.5-2.5-2.5zm-2.088 2v1h2v-1z" 
        transform="translate(-421.71-535.79)"
-       class="ColorScheme-Highlight"
+       class="olorScheme-ButtonFocus"
        />
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
diff --git a/icons-dark/actions/12/transform-affect-stroke.svg b/icons-dark/actions/12/transform-affect-stroke.svg
--- a/icons-dark/actions/12/transform-affect-stroke.svg
+++ b/icons-dark/actions/12/transform-affect-stroke.svg
@@ -4,15 +4,15 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
   </defs>
  <path style="fill:currentColor;fill-opacity:1;stroke:none" 
        d="m424.8 542.79l.367.379 1.621 1.621h-2.076v1h2.076l-1.621 1.621-.381.379h1.417l2.5-2.5-2.5-2.5zm-2.088 2v1h2v-1z" 
        transform="translate(-421.71-535.79)" 
-       class="ColorScheme-Highlight" 
+       class="olorScheme-ButtonFocus" 
        />
  <path style="fill:currentColor;fill-opacity:1;stroke:none" 
        d="m1 1v2h8v6h2v-8zm0 4v1h5v1h1v-2z"
diff --git a/icons-dark/actions/16/artifact.svg b/icons-dark/actions/16/artifact.svg
--- a/icons-dark/actions/16/artifact.svg
+++ b/icons-dark/actions/16/artifact.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -15,6 +15,6 @@
      />
  <path style="fill:currentColor;fill-opacity:1;stroke:none" 
        d="M 2 6 L 2 7 L 4 7 L 4 6 L 2 6 z M 7 6 L 7 7 L 9 7 L 9 6 L 7 6 z M 12 6 L 12 7 L 14 7 L 14 6 L 12 6 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/16/category2parent.svg b/icons-dark/actions/16/category2parent.svg
--- a/icons-dark/actions/16/category2parent.svg
+++ b/icons-dark/actions/16/category2parent.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path 
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="M 4,7 4,11 9,11 9,6 8,6 8,7 7,7 7,6 6,6 6,7 5,7 5,6 4,6 Z m 1,1 3,0 0,2 -3,0 z" 
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
         />
 </svg>
diff --git a/icons-dark/actions/16/child2category.svg b/icons-dark/actions/16/child2category.svg
--- a/icons-dark/actions/16/child2category.svg
+++ b/icons-dark/actions/16/child2category.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path 
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="M 10 9 L 10 10 L 10 14 L 15 14 L 15 9 L 14 9 L 14 10 L 13 10 L 13 9 L 12 9 L 12 10 L 11 10 L 11 9 L 10 9 z M 11 11 L 14 11 L 14 13 L 11 13 L 11 11 z "
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
         />
 </svg>
diff --git a/icons-dark/actions/16/curve-connector.svg b/icons-dark/actions/16/curve-connector.svg
--- a/icons-dark/actions/16/curve-connector.svg
+++ b/icons-dark/actions/16/curve-connector.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path 
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="M 12.5 3.0019531 A 1.5 1.5 0 0 0 11 4.5019531 A 1.5 1.5 0 0 0 12.5 6.0019531 A 1.5 1.5 0 0 0 14 4.5019531 A 1.5 1.5 0 0 0 12.5 3.0019531 z M 12.5 4.0019531 A 0.50000025 0.500001 0 0 1 13 4.5019531 A 0.50000025 0.500001 0 0 1 12.5 5.0019531 A 0.50000025 0.500001 0 0 1 12 4.5019531 A 0.50000025 0.500001 0 0 1 12.5 4.0019531 z M 3.5 11.001953 A 1.5 1.5 0 0 0 2 12.501953 A 1.5 1.5 0 0 0 3.5 14.001953 A 1.5 1.5 0 0 0 5 12.501953 A 1.5 1.5 0 0 0 3.5 11.001953 z M 3.5 12.001953 A 0.50000025 0.500001 0 0 1 4 12.501953 A 0.50000025 0.500001 0 0 1 3.5 13.001953 A 0.50000025 0.500001 0 0 1 3 12.501953 A 0.50000025 0.500001 0 0 1 3.5 12.001953 z "
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
         />
 </svg>
diff --git a/icons-dark/actions/16/deep-history.svg b/icons-dark/actions/16/deep-history.svg
--- a/icons-dark/actions/16/deep-history.svg
+++ b/icons-dark/actions/16/deep-history.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -15,6 +15,6 @@
      />
  <path style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="m10 10v1h2a1 1 0 0 1 1 1 1 1 0 0 1 -1 1v1a2 2 0 0 0 2 -2 2 2 0 0 0 -2 -2z"
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/16/dialog-tile-clones.svg b/icons-dark/actions/16/dialog-tile-clones.svg
--- a/icons-dark/actions/16/dialog-tile-clones.svg
+++ b/icons-dark/actions/16/dialog-tile-clones.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path 
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="M 11.5,8 A 1.5,1.5 0 0 0 10,9.5 l 0,1.5 -1,0 0,3 5,0 0,-3 -1,0 0,-1.5 A 1.5,1.5 0 0 0 11.5,8 m 0,1 A 0.5,0.5 0 0 1 12,9.5 l 0,1.5 -1,0 0,-1.5 A 0.5,0.5 0 0 1 11.5,9"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
         />
 </svg>
diff --git a/icons-dark/actions/16/document-compareright.svg b/icons-dark/actions/16/document-compareright.svg
--- a/icons-dark/actions/16/document-compareright.svg
+++ b/icons-dark/actions/16/document-compareright.svg
@@ -1,13 +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-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
   </defs>
   <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 9 2 L 7 3.5 L 9 5 L 9 4 L 10 4 C 10.552 4 11 4.448 11 5 L 11 11.087891 C 10.401411 11.299528 10.000895 11.865099 10 12.5 C 10.000008 13.328424 10.671576 13.999992 11.5 14 C 12.328424 13.999992 12.999992 13.328424 13 12.5 C 12.999105 11.865099 12.598589 11.299528 12 11.087891 L 12 5 C 12 3.895 11.105 3 10 3 L 9 3 L 9 2 z M 11.5 12 C 11.776142 12 12 12.223858 12 12.5 C 12 12.776142 11.776142 13 11.5 13 C 11.223858 13 11 12.776142 11 12.5 C 11 12.223858 11.223858 12 11.5 12 z "
-     class="ColorScheme-Highlight"/>
+     class="olorScheme-ButtonFocus"/>
 </svg>
diff --git a/icons-dark/actions/16/draw-connector.svg b/icons-dark/actions/16/draw-connector.svg
--- a/icons-dark/actions/16/draw-connector.svg
+++ b/icons-dark/actions/16/draw-connector.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path 
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="M 11 2 L 11 5 L 14 5 L 14 2 L 11 2 z M 12 3 L 13 3 L 13 4 L 12 4 L 12 3 z M 2 11 L 2 14 L 5 14 L 5 11 L 2 11 z M 3 12 L 4 12 L 4 13 L 3 13 L 3 12 z "
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
         />
 </svg>
diff --git a/icons-dark/actions/16/edit-select-original.svg b/icons-dark/actions/16/edit-select-original.svg
--- a/icons-dark/actions/16/edit-select-original.svg
+++ b/icons-dark/actions/16/edit-select-original.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path 
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="m 2,2 0,11 3,0 0,-1 -2,0 0,-9 8,0 0,1 1,0 0,-2 z"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
         />
 </svg>
diff --git a/icons-dark/actions/16/edit-table-cell-split.svg b/icons-dark/actions/16/edit-table-cell-split.svg
--- a/icons-dark/actions/16/edit-table-cell-split.svg
+++ b/icons-dark/actions/16/edit-table-cell-split.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       .ColorScheme-NegativeText {
diff --git a/icons-dark/actions/16/edit-table-insert-column-left.svg b/icons-dark/actions/16/edit-table-insert-column-left.svg
--- a/icons-dark/actions/16/edit-table-insert-column-left.svg
+++ b/icons-dark/actions/16/edit-table-insert-column-left.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path 
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="M 7,2 6,2 6,3.281 4.719,2 3.281,2 6,4.719 l 0,2.563 -3,-3 0,-2.281 -1,0 0,7 1.719,0 L 3,8.282 3,5.719 6,8.719 6,9 7,9 7,3 Z"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
         />
 </svg>
diff --git a/icons-dark/actions/16/edit-table-insert-column-right.svg b/icons-dark/actions/16/edit-table-insert-column-right.svg
--- a/icons-dark/actions/16/edit-table-insert-column-right.svg
+++ b/icons-dark/actions/16/edit-table-insert-column-right.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path 
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="M 9,2 10,2 10,3.281 11.281,2 12.719,2 10,4.719 l 0,2.563 3,-3 0,-2.281 1,0 0,7 -1.719,0 L 13,8.282 13,5.719 10,8.719 10,9 9,9 9,3 Z"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
         />
 </svg>
diff --git a/icons-dark/actions/16/edit-table-insert-row-above.svg b/icons-dark/actions/16/edit-table-insert-row-above.svg
--- a/icons-dark/actions/16/edit-table-insert-row-above.svg
+++ b/icons-dark/actions/16/edit-table-insert-row-above.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path 
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="M 2,7 2,6 3.281,6 2,4.719 2,3.281 4.719,6 l 2.563,0 -3,-3 -2.281,0 0,-1 7,0 0,1.719 L 8.282,3 5.719,3 8.719,6 9,6 9,7 3,7 Z"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
         />
 </svg>
diff --git a/icons-dark/actions/16/edit-table-insert-row-below.svg b/icons-dark/actions/16/edit-table-insert-row-below.svg
--- a/icons-dark/actions/16/edit-table-insert-row-below.svg
+++ b/icons-dark/actions/16/edit-table-insert-row-below.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path 
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="M 2,9 2,10 3.281,10 2,11.281 2,12.719 4.719,10 l 2.563,0 -3,3 -2.281,0 0,1 7,0 0,-1.719 L 8.282,13 5.719,13 8.719,10 9,10 9,9 3,9 Z"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
         />
 </svg>
diff --git a/icons-dark/actions/16/edit-table-insert-row-under.svg b/icons-dark/actions/16/edit-table-insert-row-under.svg
--- a/icons-dark/actions/16/edit-table-insert-row-under.svg
+++ b/icons-dark/actions/16/edit-table-insert-row-under.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path 
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="M 2,5 2,6 3.281,6 2,7.281 2,8.719 4.719,6 l 2.563,0 -3,3 -2.281,0 0,1 7,0 0,-1.719 L 8.282,9 5.719,9 8.719,6 9,6 9,5 3,5 Z" 
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
         />
 </svg>
diff --git a/icons-dark/actions/16/edit-text-frame-update.svg b/icons-dark/actions/16/edit-text-frame-update.svg
--- a/icons-dark/actions/16/edit-text-frame-update.svg
+++ b/icons-dark/actions/16/edit-text-frame-update.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path 
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="M 2,2 4,5 6,2 Z"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
         />
 </svg>
diff --git a/icons-dark/actions/16/escape-direction-all.svg b/icons-dark/actions/16/escape-direction-all.svg
--- a/icons-dark/actions/16/escape-direction-all.svg
+++ b/icons-dark/actions/16/escape-direction-all.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       .ColorScheme-NegativeText {
@@ -25,6 +25,6 @@
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
      d="m 8,6.005 c -1.10475,0 -2.00025,0.8955 -2.00025,2.00025 0,1.10475 0.8955,2.00025 2.00025,2.00025 1.10475,0 2.00025,-0.8955 2.00025,-2.00025 C 10.00025,6.9005 9.10475,6.005 8,6.005 m 0,0.99975 c 0.552,0 0.99975,0.44775 0.99975,0.99975 C 8.99975,8.5565 8.552,9.00425 8,9.00425 7.448,9.00425 7.00025,8.5565 7.00025,8.0045 7.00025,7.4525 7.448,7.00475 8,7.00475"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
 </svg>
diff --git a/icons-dark/actions/16/escape-direction-down.svg b/icons-dark/actions/16/escape-direction-down.svg
--- a/icons-dark/actions/16/escape-direction-down.svg
+++ b/icons-dark/actions/16/escape-direction-down.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       .ColorScheme-NegativeText {
@@ -25,6 +25,6 @@
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
      d="m 8,6.005 c -1.10475,0 -2.00025,0.8955 -2.00025,2.00025 0,1.10475 0.8955,2.00025 2.00025,2.00025 1.10475,0 2.00025,-0.8955 2.00025,-2.00025 C 10.00025,6.9005 9.10475,6.005 8,6.005 m 0,0.99975 c 0.552,0 0.99975,0.44775 0.99975,0.99975 C 8.99975,8.5565 8.552,9.00425 8,9.00425 7.448,9.00425 7.00025,8.5565 7.00025,8.0045 7.00025,7.4525 7.448,7.00475 8,7.00475"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
 </svg>
diff --git a/icons-dark/actions/16/escape-direction-horizontal.svg b/icons-dark/actions/16/escape-direction-horizontal.svg
--- a/icons-dark/actions/16/escape-direction-horizontal.svg
+++ b/icons-dark/actions/16/escape-direction-horizontal.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       .ColorScheme-NegativeText {
@@ -25,6 +25,6 @@
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
      d="m 8,6.005 c -1.10475,0 -2.00025,0.8955 -2.00025,2.00025 0,1.10475 0.8955,2.00025 2.00025,2.00025 1.10475,0 2.00025,-0.8955 2.00025,-2.00025 C 10.00025,6.9005 9.10475,6.005 8,6.005 m 0,0.99975 c 0.552,0 0.99975,0.44775 0.99975,0.99975 C 8.99975,8.5565 8.552,9.00425 8,9.00425 7.448,9.00425 7.00025,8.5565 7.00025,8.0045 7.00025,7.4525 7.448,7.00475 8,7.00475"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
 </svg>
diff --git a/icons-dark/actions/16/escape-direction-left.svg b/icons-dark/actions/16/escape-direction-left.svg
--- a/icons-dark/actions/16/escape-direction-left.svg
+++ b/icons-dark/actions/16/escape-direction-left.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       .ColorScheme-NegativeText {
@@ -25,6 +25,6 @@
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
      d="m 8,6.005 c -1.10475,0 -2.00025,0.8955 -2.00025,2.00025 0,1.10475 0.8955,2.00025 2.00025,2.00025 1.10475,0 2.00025,-0.8955 2.00025,-2.00025 C 10.00025,6.9005 9.10475,6.005 8,6.005 m 0,0.99975 c 0.552,0 0.99975,0.44775 0.99975,0.99975 C 8.99975,8.5565 8.552,9.00425 8,9.00425 7.448,9.00425 7.00025,8.5565 7.00025,8.0045 7.00025,7.4525 7.448,7.00475 8,7.00475"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
 </svg>
diff --git a/icons-dark/actions/16/escape-direction-right.svg b/icons-dark/actions/16/escape-direction-right.svg
--- a/icons-dark/actions/16/escape-direction-right.svg
+++ b/icons-dark/actions/16/escape-direction-right.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       .ColorScheme-NegativeText {
@@ -25,6 +25,6 @@
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
      d="m 8,6.005 c -1.10475,0 -2.00025,0.8955 -2.00025,2.00025 0,1.10475 0.8955,2.00025 2.00025,2.00025 1.10475,0 2.00025,-0.8955 2.00025,-2.00025 C 10.00025,6.9005 9.10475,6.005 8,6.005 m 0,0.99975 c 0.552,0 0.99975,0.44775 0.99975,0.99975 C 8.99975,8.5565 8.552,9.00425 8,9.00425 7.448,9.00425 7.00025,8.5565 7.00025,8.0045 7.00025,7.4525 7.448,7.00475 8,7.00475"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
 </svg>
diff --git a/icons-dark/actions/16/escape-direction-up.svg b/icons-dark/actions/16/escape-direction-up.svg
--- a/icons-dark/actions/16/escape-direction-up.svg
+++ b/icons-dark/actions/16/escape-direction-up.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       .ColorScheme-NegativeText {
@@ -25,6 +25,6 @@
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
      d="m 8,6.005 c -1.10475,0 -2.00025,0.8955 -2.00025,2.00025 0,1.10475 0.8955,2.00025 2.00025,2.00025 1.10475,0 2.00025,-0.8955 2.00025,-2.00025 C 10.00025,6.9005 9.10475,6.005 8,6.005 m 0,0.99975 c 0.552,0 0.99975,0.44775 0.99975,0.99975 C 8.99975,8.5565 8.552,9.00425 8,9.00425 7.448,9.00425 7.00025,8.5565 7.00025,8.0045 7.00025,7.4525 7.448,7.00475 8,7.00475"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
 </svg>
diff --git a/icons-dark/actions/16/escape-direction-vertical.svg b/icons-dark/actions/16/escape-direction-vertical.svg
--- a/icons-dark/actions/16/escape-direction-vertical.svg
+++ b/icons-dark/actions/16/escape-direction-vertical.svg
@@ -7,7 +7,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       .ColorScheme-NegativeText {
@@ -27,6 +27,6 @@
   <path
      style="fill:currentColor;fill-opacity:1;stroke:none"
      d="m 8,6.005 c -1.10475,0 -2.00025,0.8955 -2.00025,2.00025 0,1.10475 0.8955,2.00025 2.00025,2.00025 1.10475,0 2.00025,-0.8955 2.00025,-2.00025 C 10.00025,6.9005 9.10475,6.005 8,6.005 m 0,0.99975 c 0.552,0 0.99975,0.44775 0.99975,0.99975 C 8.99975,8.5565 8.552,9.00425 8,9.00425 7.448,9.00425 7.00025,8.5565 7.00025,8.0045 7.00025,7.4525 7.448,7.00475 8,7.00475"
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      id="path10" />
 </svg>
diff --git a/icons-dark/actions/16/filename-title-amarok.svg b/icons-dark/actions/16/filename-title-amarok.svg
--- a/icons-dark/actions/16/filename-title-amarok.svg
+++ b/icons-dark/actions/16/filename-title-amarok.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,7 +17,7 @@
   <path 
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="m426.71 535.79h6v2h-6z"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
         />
  </g>
 </svg>
diff --git a/icons-dark/actions/16/foreign_green.svg b/icons-dark/actions/16/foreign_green.svg
--- a/icons-dark/actions/16/foreign_green.svg
+++ b/icons-dark/actions/16/foreign_green.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons-dark/actions/16/foreign_red.svg b/icons-dark/actions/16/foreign_red.svg
--- a/icons-dark/actions/16/foreign_red.svg
+++ b/icons-dark/actions/16/foreign_red.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       .ColorScheme-NegativeText {
diff --git a/icons-dark/actions/16/format-break-node.svg b/icons-dark/actions/16/format-break-node.svg
--- a/icons-dark/actions/16/format-break-node.svg
+++ b/icons-dark/actions/16/format-break-node.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path 
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="m 5.99975,7.0025 2.00025,3 2.00025,-3 z"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
         />
 </svg>
diff --git a/icons-dark/actions/16/format-connect-node.svg b/icons-dark/actions/16/format-connect-node.svg
--- a/icons-dark/actions/16/format-connect-node.svg
+++ b/icons-dark/actions/16/format-connect-node.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path 
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="m 5.99975,7.0025 2.00025,3 2.00025,-3 z"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
         />
 </svg>
diff --git a/icons-dark/actions/16/format-disconnect-node.svg b/icons-dark/actions/16/format-disconnect-node.svg
--- a/icons-dark/actions/16/format-disconnect-node.svg
+++ b/icons-dark/actions/16/format-disconnect-node.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path 
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="m 5.99975,7.0025 2.00025,3 2.00025,-3 z"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
         />
 </svg>
diff --git a/icons-dark/actions/16/format-join-node.svg b/icons-dark/actions/16/format-join-node.svg
--- a/icons-dark/actions/16/format-join-node.svg
+++ b/icons-dark/actions/16/format-join-node.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path 
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="m 5.99975,7.0025 2.00025,3 2.00025,-3 z"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
         />
 </svg>
diff --git a/icons-dark/actions/16/format-precision-more.svg b/icons-dark/actions/16/format-precision-more.svg
--- a/icons-dark/actions/16/format-precision-more.svg
+++ b/icons-dark/actions/16/format-precision-more.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path
      style="fill:currentColor;fill-opacity:1;stroke:none"
      d="m 11,9 0,2 -2,0 0,1 2,0 0,2 1,0 0,-2 2,0 0,-1 -2,0 0,-2 z"
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
       />
 </svg>
diff --git a/icons-dark/actions/16/format-remove-node.svg b/icons-dark/actions/16/format-remove-node.svg
--- a/icons-dark/actions/16/format-remove-node.svg
+++ b/icons-dark/actions/16/format-remove-node.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       .ColorScheme-NegativeText {
diff --git a/icons-dark/actions/16/format-text-capitalize.svg b/icons-dark/actions/16/format-text-capitalize.svg
--- a/icons-dark/actions/16/format-text-capitalize.svg
+++ b/icons-dark/actions/16/format-text-capitalize.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path 
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="M 2,5 7,5 4.5,2 Z"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
         />
 </svg>
diff --git a/icons-dark/actions/16/format-text-lowercase.svg b/icons-dark/actions/16/format-text-lowercase.svg
--- a/icons-dark/actions/16/format-text-lowercase.svg
+++ b/icons-dark/actions/16/format-text-lowercase.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path 
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="m 9.49975,1.9975 5.00025,0 -2.49975,3 z"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
         />
 </svg>
diff --git a/icons-dark/actions/16/format-text-uppercase.svg b/icons-dark/actions/16/format-text-uppercase.svg
--- a/icons-dark/actions/16/format-text-uppercase.svg
+++ b/icons-dark/actions/16/format-text-uppercase.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path 
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="m 8.71,5 5,0 -2.5,-3 z"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
         />
 </svg>
diff --git a/icons-dark/actions/16/input-mouse-click-left.svg b/icons-dark/actions/16/input-mouse-click-left.svg
--- a/icons-dark/actions/16/input-mouse-click-left.svg
+++ b/icons-dark/actions/16/input-mouse-click-left.svg
@@ -3,10 +3,10 @@
         .ColorScheme-Text {
             color:#eff0f1;
         }
-        .ColorScheme-Highlight {
+        .olorScheme-ButtonFocus {
             color:#3daee9;
         }
     </style>
     <path d="M8 2a4 4 0 0 0-4 4v4a4 4 0 0 0 4 4h1a4 4 0 0 0 4-4V6a4 4 0 0 0-4-4zm0 1h1a3 3 0 0 1 3 3v4a3 3 0 0 1-3 3H8a3 3 0 0 1-3-3V6a3 3 0 0 1 3-3zm0 1v3h1V4z" fill="currentColor" class="ColorScheme-Text"/>
-    <path d="M8 3a3 3 0 0 0-3 3v2h3z" fill="currentColor" class="ColorScheme-Highlight"/>
+    <path d="M8 3a3 3 0 0 0-3 3v2h3z" fill="currentColor" class="olorScheme-ButtonFocus"/>
 </svg>
diff --git a/icons-dark/actions/16/input-mouse-click-middle.svg b/icons-dark/actions/16/input-mouse-click-middle.svg
--- a/icons-dark/actions/16/input-mouse-click-middle.svg
+++ b/icons-dark/actions/16/input-mouse-click-middle.svg
@@ -3,10 +3,10 @@
         .ColorScheme-Text {
             color:#eff0f1;
         }
-        .ColorScheme-Highlight {
+        .olorScheme-ButtonFocus {
             color:#3daee9;
         }
     </style>
     <path d="M8 2a4 4 0 0 0-4 4v4a4 4 0 0 0 4 4h1a4 4 0 0 0 4-4V6a4 4 0 0 0-4-4zm0 1h1a3 3 0 0 1 3 3v4a3 3 0 0 1-3 3H8a3 3 0 0 1-3-3V6a3 3 0 0 1 3-3z" fill="currentColor" class="ColorScheme-Text"/>
-    <path d="M8 3a3 3 0 0 0-1 .176V8h3V3.174A3 3 0 0 0 9 3zm0 1h1v3H8z" fill="currentColor" class="ColorScheme-Highlight"/>
+    <path d="M8 3a3 3 0 0 0-1 .176V8h3V3.174A3 3 0 0 0 9 3zm0 1h1v3H8z" fill="currentColor" class="olorScheme-ButtonFocus"/>
 </svg>
diff --git a/icons-dark/actions/16/input-mouse-click-right.svg b/icons-dark/actions/16/input-mouse-click-right.svg
--- a/icons-dark/actions/16/input-mouse-click-right.svg
+++ b/icons-dark/actions/16/input-mouse-click-right.svg
@@ -3,10 +3,10 @@
         .ColorScheme-Text {
             color:#eff0f1;
         }
-        .ColorScheme-Highlight {
+        .olorScheme-ButtonFocus {
             color:#3daee9;
         }
     </style>
     <path d="M8 2a4 4 0 0 0-4 4v4a4 4 0 0 0 4 4h1a4 4 0 0 0 4-4V6a4 4 0 0 0-4-4zm0 1h1a3 3 0 0 1 3 3v4a3 3 0 0 1-3 3H8a3 3 0 0 1-3-3V6a3 3 0 0 1 3-3zm0 1v3h1V4z" fill="currentColor" class="ColorScheme-Text"/>
-    <path d="M9 3a3 3 0 0 1 3 3v2H9z" fill="currentColor" class="ColorScheme-Highlight"/>
+    <path d="M9 3a3 3 0 0 1 3 3v2H9z" fill="currentColor" class="olorScheme-ButtonFocus"/>
 </svg>
diff --git a/icons-dark/actions/16/insert-button.svg b/icons-dark/actions/16/insert-button.svg
--- a/icons-dark/actions/16/insert-button.svg
+++ b/icons-dark/actions/16/insert-button.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons-dark/actions/16/insert-endnote.svg b/icons-dark/actions/16/insert-endnote.svg
--- a/icons-dark/actions/16/insert-endnote.svg
+++ b/icons-dark/actions/16/insert-endnote.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path 
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="M 13 8 L 13 9 L 14 9 L 14 8 L 13 8 z M 4 9 L 4 10 L 8 10 L 8 9 L 4 9 z M 13 10 L 13 14 L 14 14 L 14 10 L 13 10 z "
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
         />
 </svg>
diff --git a/icons-dark/actions/16/insert-footnote.svg b/icons-dark/actions/16/insert-footnote.svg
--- a/icons-dark/actions/16/insert-footnote.svg
+++ b/icons-dark/actions/16/insert-footnote.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path 
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="M 13 8 L 12 10 L 13 10 L 13 14 L 14 14 L 14 8 L 13 8 z M 4 11 L 4 12 L 8 12 L 8 11 L 4 11 z "
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
         />
 </svg>
diff --git a/icons-dark/actions/16/insert-more-mark.svg b/icons-dark/actions/16/insert-more-mark.svg
--- a/icons-dark/actions/16/insert-more-mark.svg
+++ b/icons-dark/actions/16/insert-more-mark.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path 
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="M 2,7 14,7 14,8 2,8 Z"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
         />
 </svg>
diff --git a/icons-dark/actions/16/insert-page-break.svg b/icons-dark/actions/16/insert-page-break.svg
--- a/icons-dark/actions/16/insert-page-break.svg
+++ b/icons-dark/actions/16/insert-page-break.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path 
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="M 2,6 2,7 4,7 4,6 2,6 Z M 7,6 7,7 9,7 9,6 7,6 Z m 5,0 0,1 2,0 0,-1 -2,0 z"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
         />
 </svg>
diff --git a/icons-dark/actions/16/insert-table-of-contents.svg b/icons-dark/actions/16/insert-table-of-contents.svg
--- a/icons-dark/actions/16/insert-table-of-contents.svg
+++ b/icons-dark/actions/16/insert-table-of-contents.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path 
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="M 11 3 L 11 4 L 12 4 L 12 6 L 11 6 L 11 7 L 14 7 L 14 6 L 13 6 L 13 4 L 14 4 L 14 3 L 11 3 z M 5 5 L 5 6 L 6 6 L 6 5 L 5 5 z M 7 5 L 7 6 L 8 6 L 8 5 L 7 5 z M 9 5 L 9 6 L 10 6 L 10 5 L 9 5 z M 9 9 L 9 10 L 10 10 L 10 12 L 9 12 L 9 13 L 14 13 L 14 12 L 13 12 L 13 10 L 14 10 L 14 9 L 11 9 L 9 9 z M 11 10 L 12 10 L 12 12 L 11 12 L 11 10 z M 3 11 L 3 12 L 4 12 L 4 11 L 3 11 z M 5 11 L 5 12 L 6 12 L 6 11 L 5 11 z M 7 11 L 7 12 L 8 12 L 8 11 L 7 11 z "
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
         />
 </svg>
diff --git a/icons-dark/actions/16/insert-table.svg b/icons-dark/actions/16/insert-table.svg
--- a/icons-dark/actions/16/insert-table.svg
+++ b/icons-dark/actions/16/insert-table.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons-dark/actions/16/kr_mountman.svg b/icons-dark/actions/16/kr_mountman.svg
--- a/icons-dark/actions/16/kr_mountman.svg
+++ b/icons-dark/actions/16/kr_mountman.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       .ColorScheme-PositiveText {
diff --git a/icons-dark/actions/16/kr_syncbrowse_off.svg b/icons-dark/actions/16/kr_syncbrowse_off.svg
--- a/icons-dark/actions/16/kr_syncbrowse_off.svg
+++ b/icons-dark/actions/16/kr_syncbrowse_off.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       .ColorScheme-PositiveText {
diff --git a/icons-dark/actions/16/kr_syncbrowse_on.svg b/icons-dark/actions/16/kr_syncbrowse_on.svg
--- a/icons-dark/actions/16/kr_syncbrowse_on.svg
+++ b/icons-dark/actions/16/kr_syncbrowse_on.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       .ColorScheme-NegativeText {
diff --git a/icons-dark/actions/16/layer-bottom.svg b/icons-dark/actions/16/layer-bottom.svg
--- a/icons-dark/actions/16/layer-bottom.svg
+++ b/icons-dark/actions/16/layer-bottom.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="m 11,14 3,-3 -6,0 -3,3 z"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
 </svg>
diff --git a/icons-dark/actions/16/layer-duplicate.svg b/icons-dark/actions/16/layer-duplicate.svg
--- a/icons-dark/actions/16/layer-duplicate.svg
+++ b/icons-dark/actions/16/layer-duplicate.svg
@@ -4,14 +4,14 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
   </defs>
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="M 5 5 L 2 8 L 11 8 L 14 5 L 5 5 z M 5 9 L 2 12 L 11 12 L 14 9 L 5 9 z "
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
 </svg>
diff --git a/icons-dark/actions/16/layer-lower.svg b/icons-dark/actions/16/layer-lower.svg
--- a/icons-dark/actions/16/layer-lower.svg
+++ b/icons-dark/actions/16/layer-lower.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="m 9,7 -3,3 5,0 3,-3 z"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
 </svg>
diff --git a/icons-dark/actions/16/layer-next.svg b/icons-dark/actions/16/layer-next.svg
--- a/icons-dark/actions/16/layer-next.svg
+++ b/icons-dark/actions/16/layer-next.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="M 11,6.8 8,10 5,6.8 5.75,6 8,8.4 10.25,6 Z"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
 </svg>
diff --git a/icons-dark/actions/16/layer-previous.svg b/icons-dark/actions/16/layer-previous.svg
--- a/icons-dark/actions/16/layer-previous.svg
+++ b/icons-dark/actions/16/layer-previous.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="M 11,9.2 8,6 5,9.2 5.75,10 8,7.6 10.25,10 Z"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
 </svg>
diff --git a/icons-dark/actions/16/layer-raise.svg b/icons-dark/actions/16/layer-raise.svg
--- a/icons-dark/actions/16/layer-raise.svg
+++ b/icons-dark/actions/16/layer-raise.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="m 5,7 -3,3 5,0 3,-3 z"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
 </svg>
diff --git a/icons-dark/actions/16/layer-top.svg b/icons-dark/actions/16/layer-top.svg
--- a/icons-dark/actions/16/layer-top.svg
+++ b/icons-dark/actions/16/layer-top.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="M 5,3 2,6 8,6 11,3 Z"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
 </svg>
diff --git a/icons-dark/actions/16/lines-connector.svg b/icons-dark/actions/16/lines-connector.svg
--- a/icons-dark/actions/16/lines-connector.svg
+++ b/icons-dark/actions/16/lines-connector.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="M 11 2 L 11 5 L 14 5 L 14 2 L 11 2 z M 12 3 L 13 3 L 13 4 L 12 4 L 12 3 z M 2 11 L 2 14 L 5 14 L 5 11 L 2 11 z M 3 12 L 4 12 L 4 13 L 3 13 L 3 12 z "
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
 </svg>
diff --git a/icons-dark/actions/16/media-show-active-track-amarok.svg b/icons-dark/actions/16/media-show-active-track-amarok.svg
--- a/icons-dark/actions/16/media-show-active-track-amarok.svg
+++ b/icons-dark/actions/16/media-show-active-track-amarok.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="M 14,12 14,7 11,9.5 Z"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
 </svg>
diff --git a/icons-dark/actions/16/media-track-queue-amarok.svg b/icons-dark/actions/16/media-track-queue-amarok.svg
--- a/icons-dark/actions/16/media-track-queue-amarok.svg
+++ b/icons-dark/actions/16/media-track-queue-amarok.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="M 14,11 9,11 11.5,8 Z"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
 </svg>
diff --git a/icons-dark/actions/16/mode1.svg b/icons-dark/actions/16/mode1.svg
--- a/icons-dark/actions/16/mode1.svg
+++ b/icons-dark/actions/16/mode1.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="m 12,11 2,1.5 -2,1.5 0,-1 -5,0 C 5.892,13 5,12.108 5,11 l 1,0 c 0,0.554 0.446,1 1,1 l 5,0 z"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
 </svg>
diff --git a/icons-dark/actions/16/mode2.svg b/icons-dark/actions/16/mode2.svg
--- a/icons-dark/actions/16/mode2.svg
+++ b/icons-dark/actions/16/mode2.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="M 7,7 5,8.5 7,10 7,9 12,9 c 0.554,0 1,0.446 1,1 l 1,0 C 14,8.892 13.108,8 12,8 L 7,8 Z"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
 </svg>
diff --git a/icons-dark/actions/16/mode3.svg b/icons-dark/actions/16/mode3.svg
--- a/icons-dark/actions/16/mode3.svg
+++ b/icons-dark/actions/16/mode3.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="m 12,7 0,1 -2,0 C 8.892,8 8,8.892 8,10 l 0,1 c 0,0.554 -0.446,1 -1,1 l -2,0 0,1 2,0 c 1.108,0 2,-0.892 2,-2 L 9,10 C 9,9.446 9.446,9 10,9 l 2,0 0,1 2,-1.5 z"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
 </svg>
diff --git a/icons-dark/actions/16/mode4.svg b/icons-dark/actions/16/mode4.svg
--- a/icons-dark/actions/16/mode4.svg
+++ b/icons-dark/actions/16/mode4.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="M 7,7 5,8.5 7,10 7,9 9,9 c 0.554,0 1,0.446 1,1 l 0,1 c 0,1.108 0.892,2 2,2 l 2,0 0,-1 -2,0 c -0.554,0 -1,-0.446 -1,-1 l 0,-1 C 11,8.892 10.108,8 9,8 L 7,8 Z"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
 </svg>
diff --git a/icons-dark/actions/16/mode5.svg b/icons-dark/actions/16/mode5.svg
--- a/icons-dark/actions/16/mode5.svg
+++ b/icons-dark/actions/16/mode5.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="M 6 7 L 4 8.5 L 6 10 L 6 9 L 8 9 C 8.554 9 9 9.446 9 10 L 9 11 C 9 12.108 9.892 13 11 13 L 13 13 L 13 12 L 11 12 C 10.446 12 10 11.554 10 11 L 10 10 C 10 8.892 9.108 8 8 8 L 6 8 L 6 7 z M 12 7 L 12 8 L 11 8 L 11 9 L 12 9 L 12 10 L 14 8.5 L 12 7 z M 5 12 L 5 13 L 8 13 L 8 12 L 5 12 z "
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
 </svg>
diff --git a/icons-dark/actions/16/node-segment-curve.svg b/icons-dark/actions/16/node-segment-curve.svg
--- a/icons-dark/actions/16/node-segment-curve.svg
+++ b/icons-dark/actions/16/node-segment-curve.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="m 11,3 a 8,8 0 0 0 -8,8 l 1,0 a 7,7 0 0 1 7,-7 z"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
 </svg>
diff --git a/icons-dark/actions/16/node-segment-line.svg b/icons-dark/actions/16/node-segment-line.svg
--- a/icons-dark/actions/16/node-segment-line.svg
+++ b/icons-dark/actions/16/node-segment-line.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 11,4.3175 4.31225,11.00525 5,11.00525 5,11.693 11.68775,5.00525 11,5.00525 Z"
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
  </svg>
diff --git a/icons-dark/actions/16/node-transform.svg b/icons-dark/actions/16/node-transform.svg
--- a/icons-dark/actions/16/node-transform.svg
+++ b/icons-dark/actions/16/node-transform.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="M 8 8 L 8 10 L 9 10 L 9 9 L 10 9 L 10 8 L 8 8 z M 12 8 L 12 9 L 13 9 L 13 10 L 14 10 L 14 8 L 12 8 z M 8 12 L 8 14 L 10 14 L 10 13 L 9 13 L 9 12 L 8 12 z M 13 12 L 13 13 L 12 13 L 12 14 L 14 14 L 14 12 L 13 12 z "
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
 </svg>
diff --git a/icons-dark/actions/16/node-type-auto-smooth.svg b/icons-dark/actions/16/node-type-auto-smooth.svg
--- a/icons-dark/actions/16/node-type-auto-smooth.svg
+++ b/icons-dark/actions/16/node-type-auto-smooth.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="m 8.00429,8.00074 a 2.499985,2.499985 0 0 0 -2.5,2.5 2.499985,2.499985 0 0 0 2.5,2.5 2.499985,2.499985 0 0 0 2.5,-2.5 2.499985,2.499985 0 0 0 -2.5,-2.5 m 0,1 a 1.5,1.5 0 0 1 1.5,1.5 1.5,1.5 0 0 1 -1.5,1.5 1.5,1.5 0 0 1 -1.5,-1.5 1.5,1.5 0 0 1 1.5,-1.5"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
 </svg>
diff --git a/icons-dark/actions/16/node-type-cusp.svg b/icons-dark/actions/16/node-type-cusp.svg
--- a/icons-dark/actions/16/node-type-cusp.svg
+++ b/icons-dark/actions/16/node-type-cusp.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="m 5.173145,10.827109 2.82844,2.82844 2.82844,-2.82844 -2.82844,-2.8284402 z m 1.41422,0 1.41422,-1.4142202 1.41422,1.4142202 -1.41422,1.41422 z"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
 </svg>
diff --git a/icons-dark/actions/16/node-type-smooth.svg b/icons-dark/actions/16/node-type-smooth.svg
--- a/icons-dark/actions/16/node-type-smooth.svg
+++ b/icons-dark/actions/16/node-type-smooth.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="m 6,9 0,4 4,0 0,-4 z m 1,1 2,0 0,2 -2,0 z"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
 </svg>
diff --git a/icons-dark/actions/16/node-type-symmetric.svg b/icons-dark/actions/16/node-type-symmetric.svg
--- a/icons-dark/actions/16/node-type-symmetric.svg
+++ b/icons-dark/actions/16/node-type-symmetric.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="m 8,8 -3,5 6,0 z m 0,2 1,2 -2,0 z"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
 </svg>
diff --git a/icons-dark/actions/16/object-to-path.svg b/icons-dark/actions/16/object-to-path.svg
--- a/icons-dark/actions/16/object-to-path.svg
+++ b/icons-dark/actions/16/object-to-path.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="M 11 2 L 11 6 L 15 6 L 15 2 L 11 2 z M 12 3 L 14 3 L 14 5 L 12 5 L 12 3 z M 2 10 L 2 14 L 6 14 L 6 10 L 2 10 z M 3 11 L 5 11 L 5 13 L 3 13 L 3 11 z "
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
 </svg>
diff --git a/icons-dark/actions/16/paint-pattern.svg b/icons-dark/actions/16/paint-pattern.svg
--- a/icons-dark/actions/16/paint-pattern.svg
+++ b/icons-dark/actions/16/paint-pattern.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons-dark/actions/16/path-break-apart.svg b/icons-dark/actions/16/path-break-apart.svg
--- a/icons-dark/actions/16/path-break-apart.svg
+++ b/icons-dark/actions/16/path-break-apart.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="M 9.5039062 2 A 4.5 4.5 0 0 0 5.0371094 6 L 2 6 L 2 14 L 10 14 L 10 10.970703 A 4.5 4.5 0 0 0 14.003906 6.5 A 4.5 4.5 0 0 0 9.5039062 2 z M 9.5039062 3 A 3.5 3.5 0 0 1 13.003906 6.5 A 3.5 3.5 0 0 1 10 9.9609375 L 10 6 L 6.0449219 6 A 3.5 3.5 0 0 1 9.5039062 3 z M 3 7 L 5.0351562 7 A 4.5 4.5 0 0 0 9 10.966797 L 9 13 L 3 13 L 3 7 z M 6.0429688 7 L 9 7 L 9 9.9589844 A 3.5 3.5 0 0 1 6.0429688 7 z "
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
 </svg>
diff --git a/icons-dark/actions/16/path-combine.svg b/icons-dark/actions/16/path-combine.svg
--- a/icons-dark/actions/16/path-combine.svg
+++ b/icons-dark/actions/16/path-combine.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="M 9.5039062 2 A 4.5 4.5 0 0 0 5.0371094 6 L 2 6 L 2 14 L 10 14 L 10 10.970703 A 4.5 4.5 0 0 0 14.003906 6.5 A 4.5 4.5 0 0 0 9.5039062 2 z M 9.5039062 3 A 3.5 3.5 0 0 1 13.003906 6.5 A 3.5 3.5 0 0 1 10 9.9609375 L 10 6 L 6.0449219 6 A 3.5 3.5 0 0 1 9.5039062 3 z M 3 7 L 5.0351562 7 A 4.5 4.5 0 0 0 9 10.966797 L 9 13 L 3 13 L 3 7 z M 6.0429688 7 L 9 7 L 9 9.9589844 A 3.5 3.5 0 0 1 6.0429688 7 z "
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
 </svg>
diff --git a/icons-dark/actions/16/path-cut.svg b/icons-dark/actions/16/path-cut.svg
--- a/icons-dark/actions/16/path-cut.svg
+++ b/icons-dark/actions/16/path-cut.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons-dark/actions/16/path-effect-parameter-next.svg b/icons-dark/actions/16/path-effect-parameter-next.svg
--- a/icons-dark/actions/16/path-effect-parameter-next.svg
+++ b/icons-dark/actions/16/path-effect-parameter-next.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="m 11,3 a 8,8 0 0 0 -8,8 l 1,0 a 7,7 0 0 1 7,-7 z"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
 </svg>
diff --git a/icons-dark/actions/16/path-inset.svg b/icons-dark/actions/16/path-inset.svg
--- a/icons-dark/actions/16/path-inset.svg
+++ b/icons-dark/actions/16/path-inset.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="m 14,8 a 6,6 0 0 0 -6,6 l 1,0 a 5,5 0 0 1 5,-5 z" 
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
 </svg>
diff --git a/icons-dark/actions/16/path-intersection.svg b/icons-dark/actions/16/path-intersection.svg
--- a/icons-dark/actions/16/path-intersection.svg
+++ b/icons-dark/actions/16/path-intersection.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="M 9,7 6.041,7.021 C 6.273,8.545 7.474,9.738 9,9.959 Z"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
 </svg>
diff --git a/icons-dark/actions/16/path-offset-dynamic.svg b/icons-dark/actions/16/path-offset-dynamic.svg
--- a/icons-dark/actions/16/path-offset-dynamic.svg
+++ b/icons-dark/actions/16/path-offset-dynamic.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="m 6,6 0,4 4,0 0,-4 z M 7,7 9,7 9,9 7,9 Z"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
 </svg>
diff --git a/icons-dark/actions/16/path-offset-linked.svg b/icons-dark/actions/16/path-offset-linked.svg
--- a/icons-dark/actions/16/path-offset-linked.svg
+++ b/icons-dark/actions/16/path-offset-linked.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="M 4,4 4,8 8,8 8,4 Z M 5,5 7,5 7,7 5,7 Z"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
 </svg>
diff --git a/icons-dark/actions/16/path-outset.svg b/icons-dark/actions/16/path-outset.svg
--- a/icons-dark/actions/16/path-outset.svg
+++ b/icons-dark/actions/16/path-outset.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="M 14,2 A 12.00001,12.00001 0 0 0 2,14 l 1,0 A 11,11 0 0 1 14,3 Z"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
 </svg>
diff --git a/icons-dark/actions/16/path-reverse.svg b/icons-dark/actions/16/path-reverse.svg
--- a/icons-dark/actions/16/path-reverse.svg
+++ b/icons-dark/actions/16/path-reverse.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="m 6,6 0,4 4,0 0,-4 z M 7,7 9,7 9,9 7,9 Z"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
 </svg>
diff --git a/icons-dark/actions/16/rectangle-make-corners-sharp.svg b/icons-dark/actions/16/rectangle-make-corners-sharp.svg
--- a/icons-dark/actions/16/rectangle-make-corners-sharp.svg
+++ b/icons-dark/actions/16/rectangle-make-corners-sharp.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -18,7 +18,7 @@
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="m423.71 533.79v1h11v11h1v-12z"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
   </g>
 </svg>
diff --git a/icons-dark/actions/16/selection-move-to-layer-above.svg b/icons-dark/actions/16/selection-move-to-layer-above.svg
--- a/icons-dark/actions/16/selection-move-to-layer-above.svg
+++ b/icons-dark/actions/16/selection-move-to-layer-above.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="M 11,11 11,6.96875 9.656,8.4065 8.99975,7.71875 11.312,5.219 11.4995,5 11.687,5.219 13.99925,7.71875 13.343,8.4065 11.999,6.96875 c 0,0.02325 0,2.90775 0,4.03125 z"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
 </svg>
diff --git a/icons-dark/actions/16/selection-move-to-layer-below.svg b/icons-dark/actions/16/selection-move-to-layer-below.svg
--- a/icons-dark/actions/16/selection-move-to-layer-below.svg
+++ b/icons-dark/actions/16/selection-move-to-layer-below.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="M 11,5 11,9.03 9.656,7.593 9,8.28 l 2.313,2.5 0.188,0.219 0.188,-0.219 2.313,-2.5 -0.656,-0.687 -1.344,1.437 c 0,-0.023 0,-2.908 0,-4.03 z" 
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
 </svg>
diff --git a/icons-dark/actions/16/show-node-handles.svg b/icons-dark/actions/16/show-node-handles.svg
--- a/icons-dark/actions/16/show-node-handles.svg
+++ b/icons-dark/actions/16/show-node-handles.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="M 3.5 2 A 1.5 1.500015 0 0 0 2 3.5 A 1.5 1.500015 0 0 0 3 4.9121094 L 3 7 L 4 7 L 4 4.9121094 A 1.5 1.500015 0 0 0 5 3.5 A 1.5 1.500015 0 0 0 3.5 2 z M 3.5 3 A 0.5 0.5 0 0 1 4 3.5 A 0.5 0.5 0 0 1 3.5 4 A 0.5 0.5 0 0 1 3 3.5 A 0.5 0.5 0 0 1 3.5 3 z M 3 8 L 3 9 L 4 9 L 4 8 L 3 8 z M 3 10 L 3 11 L 2 11 L 2 14 L 5 14 L 5 11 L 4 11 L 4 10 L 3 10 z M 3 12 L 4 12 L 4 13 L 3 13 L 3 12 z "
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
 </svg>
diff --git a/icons-dark/actions/16/similarartists-amarok.svg b/icons-dark/actions/16/similarartists-amarok.svg
--- a/icons-dark/actions/16/similarartists-amarok.svg
+++ b/icons-dark/actions/16/similarartists-amarok.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="M 11.5 2 A 2.5 2.5 0 0 0 9 4.5 A 2.5 2.5 0 0 0 11.5 7 A 2.5 2.5 0 0 0 14 4.5 A 2.5 2.5 0 0 0 11.5 2 z M 11.646484 8 A 3.499998 4 0 0 0 8.4921875 10.273438 A 4.5 5 0 0 1 9.6171875 12 L 15.150391 12 A 3.499998 4 0 0 0 11.646484 8 z M 11.646484 9 A 2.5 3 0 0 1 14 11 L 9.2929688 11 A 2.5 3 0 0 1 11.646484 9 z "
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
 </svg>
diff --git a/icons-dark/actions/16/snap-bounding-box-center.svg b/icons-dark/actions/16/snap-bounding-box-center.svg
--- a/icons-dark/actions/16/snap-bounding-box-center.svg
+++ b/icons-dark/actions/16/snap-bounding-box-center.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="M 8,6 A 2,2 0 0 0 6,8 2,2 0 0 0 8,10 2,2 0 0 0 10,8 2,2 0 0 0 8,6 M 8,7 A 1,1 0 0 1 9,8 1,1 0 0 1 8,9 1,1 0 0 1 7,8 1,1 0 0 1 8,7"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
 </svg>
diff --git a/icons-dark/actions/16/snap-bounding-box-corners.svg b/icons-dark/actions/16/snap-bounding-box-corners.svg
--- a/icons-dark/actions/16/snap-bounding-box-corners.svg
+++ b/icons-dark/actions/16/snap-bounding-box-corners.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -19,7 +19,7 @@
   <path 
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="m 431.71429,541.79074 0,4 4,0 0,-4 -4,0 z m 1,1 2,0 0,2 -2,0 0,-2 z"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
         />
   </g>
 </svg>
diff --git a/icons-dark/actions/16/snap-bounding-box-edges.svg b/icons-dark/actions/16/snap-bounding-box-edges.svg
--- a/icons-dark/actions/16/snap-bounding-box-edges.svg
+++ b/icons-dark/actions/16/snap-bounding-box-edges.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="M 8.0039062 7 A 2 2 0 0 0 6.0039062 9 A 2 2 0 0 0 8 11 A 2 2 0 0 0 6 13 A 2 2 0 0 0 8 15 A 2 2 0 0 0 10 13 A 2 2 0 0 0 8.0039062 11 A 2 2 0 0 0 10.003906 9 A 2 2 0 0 0 8.0039062 7 z M 8.0039062 8 A 1 1 0 0 1 9.0039062 9 A 1 1 0 0 1 8.0039062 10 A 1 1 0 0 1 7.0039062 9 A 1 1 0 0 1 8.0039062 8 z M 8 12 A 1 1 0 0 1 9 13 A 1 1 0 0 1 8 14 A 1 1 0 0 1 7 13 A 1 1 0 0 1 8 12 z "
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
 </svg>
diff --git a/icons-dark/actions/16/snap-bounding-box-midpoints.svg b/icons-dark/actions/16/snap-bounding-box-midpoints.svg
--- a/icons-dark/actions/16/snap-bounding-box-midpoints.svg
+++ b/icons-dark/actions/16/snap-bounding-box-midpoints.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -19,7 +19,7 @@
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="m431.71 537.79v4h4v-4zm1 1h2v2h-2z"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
   </g>
 </svg>
diff --git a/icons-dark/actions/16/snap-grid-guide-intersections.svg b/icons-dark/actions/16/snap-grid-guide-intersections.svg
--- a/icons-dark/actions/16/snap-grid-guide-intersections.svg
+++ b/icons-dark/actions/16/snap-grid-guide-intersections.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="m 5,8 0,4 5,0 0,-4 z m 1,1 3,0 0,2 -3,0 z"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
 </svg>
diff --git a/icons-dark/actions/16/snap-nodes-center.svg b/icons-dark/actions/16/snap-nodes-center.svg
--- a/icons-dark/actions/16/snap-nodes-center.svg
+++ b/icons-dark/actions/16/snap-nodes-center.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="M8 6A2 2 0 0 0 6 8 2 2 0 0 0 8 10 2 2 0 0 0 10 8 2 2 0 0 0 8 6M8 7A1 1 0 0 1 9 8 1 1 0 0 1 8 9 1 1 0 0 1 7 8 1 1 0 0 1 8 7"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
 </svg>
diff --git a/icons-dark/actions/16/snap-nodes-cusp.svg b/icons-dark/actions/16/snap-nodes-cusp.svg
--- a/icons-dark/actions/16/snap-nodes-cusp.svg
+++ b/icons-dark/actions/16/snap-nodes-cusp.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="M 2 2 L 2 5 L 5 5 L 5 2 L 2 2 z M 11 2 L 11 5 L 14 5 L 14 2 L 11 2 z M 3 3 L 4 3 L 4 4 L 3 4 L 3 3 z M 12 3 L 13 3 L 13 4 L 12 4 L 12 3 z M 2 11 L 2 14 L 5 14 L 5 11 L 2 11 z M 11 11 L 11 14 L 14 14 L 14 11 L 11 11 z M 3 12 L 4 12 L 4 13 L 3 13 L 3 12 z M 12 12 L 13 12 L 13 13 L 12 13 L 12 12 z "
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
 </svg>
diff --git a/icons-dark/actions/16/snap-nodes-intersection.svg b/icons-dark/actions/16/snap-nodes-intersection.svg
--- a/icons-dark/actions/16/snap-nodes-intersection.svg
+++ b/icons-dark/actions/16/snap-nodes-intersection.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="m6 6v4h4v-4zm1 1h2v2h-2z"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
 </svg>
diff --git a/icons-dark/actions/16/snap-nodes-midpoint.svg b/icons-dark/actions/16/snap-nodes-midpoint.svg
--- a/icons-dark/actions/16/snap-nodes-midpoint.svg
+++ b/icons-dark/actions/16/snap-nodes-midpoint.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="m 8,5 -3,6 6,0 z m 0,2.235 1.383,2.764 -2.766,0 z"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
 </svg>
diff --git a/icons-dark/actions/16/snap-nodes-path.svg b/icons-dark/actions/16/snap-nodes-path.svg
--- a/icons-dark/actions/16/snap-nodes-path.svg
+++ b/icons-dark/actions/16/snap-nodes-path.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="M 4.5039062 3 A 1.499998 1.499998 0 0 0 3.0039062 4.5 A 1.499998 1.499998 0 0 0 4.5039062 6 A 1.499998 1.499998 0 0 0 6.0039062 4.5 A 1.499998 1.499998 0 0 0 4.5039062 3 z M 4.5039062 4 A 0.5 0.5 0 0 1 5.0039062 4.5 A 0.5 0.5 0 0 1 4.5039062 5 A 0.5 0.5 0 0 1 4.0039062 4.5 A 0.5 0.5 0 0 1 4.5039062 4 z M 7.5039062 6 A 1.499998 1.499998 0 0 0 6.0039062 7.5 A 1.499998 1.499998 0 0 0 7.5039062 9 A 1.499998 1.499998 0 0 0 9.0039062 7.5 A 1.499998 1.499998 0 0 0 7.5039062 6 z M 7.5039062 7 A 0.5 0.5 0 0 1 8.0039062 7.5 A 0.5 0.5 0 0 1 7.5039062 8 A 0.5 0.5 0 0 1 7.0039062 7.5 A 0.5 0.5 0 0 1 7.5039062 7 z "
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
 </svg>
diff --git a/icons-dark/actions/16/snap-nodes-rotation-center.svg b/icons-dark/actions/16/snap-nodes-rotation-center.svg
--- a/icons-dark/actions/16/snap-nodes-rotation-center.svg
+++ b/icons-dark/actions/16/snap-nodes-rotation-center.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="m 10,8 a 2,2 0 0 0 -2,2 2,2 0 0 0 2,2 2,2 0 0 0 2,-2 2,2 0 0 0 -2,-2 m 0,1 a 1,1 0 0 1 1,1 1,1 0 0 1 -1,1 1,1 0 0 1 -1,-1 1,1 0 0 1 1,-1"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
 </svg>
diff --git a/icons-dark/actions/16/snap-nodes-smooth.svg b/icons-dark/actions/16/snap-nodes-smooth.svg
--- a/icons-dark/actions/16/snap-nodes-smooth.svg
+++ b/icons-dark/actions/16/snap-nodes-smooth.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="M 7 1 L 7 4 L 10 4 L 10 1 L 7 1 z M 8 2 L 9 2 L 9 3 L 8 3 L 8 2 z M 2 6 L 2 9 L 5 9 L 5 6 L 2 6 z M 12 6 L 12 9 L 15 9 L 15 6 L 12 6 z M 3 7 L 4 7 L 4 8 L 3 8 L 3 7 z M 13 7 L 14 7 L 14 8 L 13 8 L 13 7 z M 7 11 L 7 14 L 10 14 L 10 11 L 7 11 z M 8 12 L 9 12 L 9 13 L 8 13 L 8 12 z "
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
 </svg>
diff --git a/icons-dark/actions/16/snap-text-baseline.svg b/icons-dark/actions/16/snap-text-baseline.svg
--- a/icons-dark/actions/16/snap-text-baseline.svg
+++ b/icons-dark/actions/16/snap-text-baseline.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="m 2,10 0,4 4,0 0,-4 z m 1,1 2,0 0,2 -2,0 z"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
 </svg>
diff --git a/icons-dark/actions/16/snap.svg b/icons-dark/actions/16/snap.svg
--- a/icons-dark/actions/16/snap.svg
+++ b/icons-dark/actions/16/snap.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
      d="m 10,10 0,4 4,0 0,-4 z m 1,1 2,0 0,2 -2,0 z"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
 </svg>
diff --git a/icons-dark/actions/16/standard-connector.svg b/icons-dark/actions/16/standard-connector.svg
--- a/icons-dark/actions/16/standard-connector.svg
+++ b/icons-dark/actions/16/standard-connector.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
      d="M 3.5 2 A 1.499998 1.5 0 0 0 2 3.5 A 1.499998 1.5 0 0 0 3.5 5 A 1.499998 1.5 0 0 0 5 3.5 A 1.499998 1.5 0 0 0 3.5 2 z M 3.5 3 A 0.5 0.5 0 0 1 4 3.5 A 0.5 0.5 0 0 1 3.5 4 A 0.5 0.5 0 0 1 3 3.5 A 0.5 0.5 0 0 1 3.5 3 z M 12.503906 11 A 1.499998 1.5 0 0 0 11.003906 12.5 A 1.499998 1.5 0 0 0 12.503906 14 A 1.499998 1.5 0 0 0 14.003906 12.5 A 1.499998 1.5 0 0 0 12.503906 11 z M 12.503906 12 A 0.5 0.5 0 0 1 13.003906 12.5 A 0.5 0.5 0 0 1 12.503906 13 A 0.5 0.5 0 0 1 12.003906 12.5 A 0.5 0.5 0 0 1 12.503906 12 z "
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
 </svg>
diff --git a/icons-dark/actions/16/stroke-to-path.svg b/icons-dark/actions/16/stroke-to-path.svg
--- a/icons-dark/actions/16/stroke-to-path.svg
+++ b/icons-dark/actions/16/stroke-to-path.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -22,6 +22,6 @@
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
      d="M 10 2 L 10 6 L 14 6 L 14 2 L 10 2 z M 11 3 L 13 3 L 13 5 L 11 5 L 11 3 z M 2 10 L 2 14 L 6 14 L 6 10 L 2 10 z M 3 11 L 5 11 L 5 13 L 3 13 L 3 11 z "
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
 </svg>
diff --git a/icons-dark/actions/16/text-put-on-path.svg b/icons-dark/actions/16/text-put-on-path.svg
--- a/icons-dark/actions/16/text-put-on-path.svg
+++ b/icons-dark/actions/16/text-put-on-path.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -15,6 +15,6 @@
      />
  <path style="fill:currentColor;fill-opacity:1;stroke:none" 
        d="M 14 7 A 7 7 0 0 0 7 14 L 8 14 A 6 6 0 0 1 14 8 L 14 7 z "
-       class="ColorScheme-Highlight"
+       class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/16/text_line_spacing.svg b/icons-dark/actions/16/text_line_spacing.svg
--- a/icons-dark/actions/16/text_line_spacing.svg
+++ b/icons-dark/actions/16/text_line_spacing.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -16,5 +16,5 @@
   <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="m 12.5,2 -1.5,2 1,0 0,8 -1,0 1.5,2 1.5,-2 -1,0 0,-8 1,0 z"
-     class="ColorScheme-Highlight"/>
+     class="olorScheme-ButtonFocus"/>
 </svg>
diff --git a/icons-dark/actions/16/transform-affect-pattern.svg b/icons-dark/actions/16/transform-affect-pattern.svg
--- a/icons-dark/actions/16/transform-affect-pattern.svg
+++ b/icons-dark/actions/16/transform-affect-pattern.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -16,5 +16,5 @@
   <path
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="m 5.17,14.33 -0.707,-0.707 1.621,-1.621 -4.076,0 0,-1 4.076,0 L 4.463,9.381 5.17,8.674 7.998,11.502 7.291,12.209 Z" 
-     class="ColorScheme-Highlight"/>
+     class="olorScheme-ButtonFocus"/>
 </svg>
diff --git a/icons-dark/actions/16/transform-affect-rounded-corners.svg b/icons-dark/actions/16/transform-affect-rounded-corners.svg
--- a/icons-dark/actions/16/transform-affect-rounded-corners.svg
+++ b/icons-dark/actions/16/transform-affect-rounded-corners.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -16,5 +16,5 @@
   <path
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="m 5.17,14.33 -0.707,-0.707 1.621,-1.621 -4.076,0 0,-1 4.076,0 L 4.463,9.381 5.17,8.674 7.998,11.502 7.291,12.209 Z" 
-     class="ColorScheme-Highlight"/>
+     class="olorScheme-ButtonFocus"/>
 </svg>
diff --git a/icons-dark/actions/16/transform-affect-stroke.svg b/icons-dark/actions/16/transform-affect-stroke.svg
--- a/icons-dark/actions/16/transform-affect-stroke.svg
+++ b/icons-dark/actions/16/transform-affect-stroke.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -16,5 +16,5 @@
   <path
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="m 5.17,14.33 -0.707,-0.707 1.621,-1.621 -4.076,0 0,-1 4.076,0 L 4.463,9.381 5.17,8.674 7.998,11.502 7.291,12.209 Z"
-     class="ColorScheme-Highlight"/>
+     class="olorScheme-ButtonFocus"/>
 </svg>
diff --git a/icons-dark/actions/22/adjusthsl.svg b/icons-dark/actions/22/adjusthsl.svg
--- a/icons-dark/actions/22/adjusthsl.svg
+++ b/icons-dark/actions/22/adjusthsl.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>    
diff --git a/icons-dark/actions/22/atmosphere.svg b/icons-dark/actions/22/atmosphere.svg
--- a/icons-dark/actions/22/atmosphere.svg
+++ b/icons-dark/actions/22/atmosphere.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -18,6 +18,6 @@
  <path 
     style="fill:currentColor;fill-opacity:1;stroke:none"
      d="M11 3A8 8 0 0 0 3 11 8 8 0 0 0 11 19 8 8 0 0 0 19 11 8 8 0 0 0 11 3M11 4A7 7 0 0 1 18 11 7 7 0 0 1 11 18 7 7 0 0 1 4 11 7 7 0 0 1 11 4"
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/22/category2parent.svg b/icons-dark/actions/22/category2parent.svg
--- a/icons-dark/actions/22/category2parent.svg
+++ b/icons-dark/actions/22/category2parent.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 6 9 L 6 10 L 6 15 L 12 15 L 12 10 L 12 9 L 11 9 L 11 10 L 10 10 L 10 9 L 8 9 L 8 10 L 7 10 L 7 9 L 6 9 z M 7 11 L 11 11 L 11 14 L 7 14 L 7 11 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/22/check_constraint.svg b/icons-dark/actions/22/check_constraint.svg
--- a/icons-dark/actions/22/check_constraint.svg
+++ b/icons-dark/actions/22/check_constraint.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -19,7 +19,7 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
 	 d="m 434.71429,528.79074 3,4 3,-4 z"
-	 class="ColorScheme-Highlight"
+	 class="olorScheme-ButtonFocus"
      />
  </g>
 </svg>
diff --git a/icons-dark/actions/22/child2category.svg b/icons-dark/actions/22/child2category.svg
--- a/icons-dark/actions/22/child2category.svg
+++ b/icons-dark/actions/22/child2category.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 13 13 L 13 14 L 13 19 L 19 19 L 19 14 L 19 13 L 18 13 L 18 14 L 17 14 L 17 13 L 15 13 L 15 14 L 14 14 L 14 13 L 13 13 z M 14 15 L 18 15 L 18 18 L 14 18 L 14 15 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/22/colorfx.svg b/icons-dark/actions/22/colorfx.svg
--- a/icons-dark/actions/22/colorfx.svg
+++ b/icons-dark/actions/22/colorfx.svg
@@ -4,15 +4,15 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
   </defs>
      />
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 10.5 3 L 10.5 4.8125 L 11.5 4.8125 L 11.5 3 L 10.5 3 z M 5.6875 4.96875 L 4.96875 5.6875 L 6.25 7 L 6.96875 6.25 L 5.6875 4.96875 z M 16.3125 4.96875 L 15.03125 6.25 L 15.75 7 L 17.03125 5.6875 L 16.3125 4.96875 z M 11 6 C 8.23858 6 6 8.2386 6 11 C 6 13.7614 8.23858 16 11 16 C 13.76142 16 16 13.7614 16 11 C 16 8.2386 13.76142 6 11 6 z M 3 10.5 L 3 11.5 L 4.8125 11.5 L 4.8125 10.5 L 3 10.5 z M 17.1875 10.5 L 17.1875 11.5 L 19 11.5 L 19 10.5 L 17.1875 10.5 z M 6.25 15.03125 L 4.96875 16.3125 L 5.6875 17.03125 L 6.96875 15.75 L 6.25 15.03125 z M 15.75 15.03125 L 15.03125 15.75 L 16.3125 17.03125 L 17.03125 16.3125 L 15.75 15.03125 z M 10.5 17.1875 L 10.5 19 L 11.5 19 L 11.5 17.1875 L 10.5 17.1875 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/22/colorneg.svg b/icons-dark/actions/22/colorneg.svg
--- a/icons-dark/actions/22/colorneg.svg
+++ b/icons-dark/actions/22/colorneg.svg
@@ -4,14 +4,14 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
   </defs>
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
 	 transform="translate(-1-1)" d="m4 4v16h16v-16h-16m15 1v14h-14l3.46875-3.46875c-.904822-.904822-1.46875-2.150538-1.46875-3.53125 0-2.761424 2.238576-5 5-5 1.380712 0 2.626428.563928 3.53125 1.46875l3.46875-3.46875m-3.46875 3.46875l-7.0625 7.0625c.904822.904822 2.150538 1.46875 3.53125 1.46875 2.761424 0 5-2.238576 5-5 0-1.380712-.563928-2.626428-1.46875-3.53125z" 
-	 class="ColorScheme-Highlight"
+	 class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/22/curve-connector.svg b/icons-dark/actions/22/curve-connector.svg
--- a/icons-dark/actions/22/curve-connector.svg
+++ b/icons-dark/actions/22/curve-connector.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path
     style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 5.5 4 A 2.499996 2.499996 0 0 0 3 6.5 A 2.499996 2.499996 0 0 0 5.5 9 A 2.499996 2.499996 0 0 0 8 6.5 A 2.499996 2.499996 0 0 0 5.5 4 z M 5.5 5 A 1.5 1.5 0 0 1 7 6.5 A 1.5 1.5 0 0 1 5.5 8 A 1.5 1.5 0 0 1 4 6.5 A 1.5 1.5 0 0 1 5.5 5 z M 16.5 14 A 2.499996 2.499996 0 0 0 14 16.5 A 2.499996 2.499996 0 0 0 16.5 19 A 2.499996 2.499996 0 0 0 19 16.5 A 2.499996 2.499996 0 0 0 16.5 14 z M 16.5 15 A 1.5 1.5 0 0 1 18 16.5 A 1.5 1.5 0 0 1 16.5 18 A 1.5 1.5 0 0 1 15 16.5 A 1.5 1.5 0 0 1 16.5 15 z "
-	class="ColorScheme-Highlight"
+	class="olorScheme-ButtonFocus"
      id="path10" />
 </svg>
diff --git a/icons-dark/actions/22/database-change-key.svg b/icons-dark/actions/22/database-change-key.svg
--- a/icons-dark/actions/22/database-change-key.svg
+++ b/icons-dark/actions/22/database-change-key.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path
     style="fill:currentColor;fill-opacity:1;stroke:none" 
     d="M 16.5 2 A 3.499991 3.499991 0 0 0 13 5.5 A 3.499991 3.499991 0 0 0 13.699219 7.59375 L 14.416016 6.8769531 A 2.5 2.5 0 0 1 14 5.5 A 2.5 2.5 0 0 1 16.5 3 A 2.5 2.5 0 0 1 17.876953 3.4160156 L 18.59375 2.6992188 A 3.499991 3.499991 0 0 0 16.5 2 z M 19.300781 3.40625 L 18.583984 4.1230469 A 2.5 2.5 0 0 1 19 5.5 A 2.5 2.5 0 0 1 16.5 8 A 2.5 2.5 0 0 1 15.123047 7.5839844 L 14.40625 8.3007812 A 3.499991 3.499991 0 0 0 16.5 9 A 3.499991 3.499991 0 0 0 20 5.5 A 3.499991 3.499991 0 0 0 19.300781 3.40625 z "
-	class="ColorScheme-Highlight"
+	class="olorScheme-ButtonFocus"
      id="path10" />
 </svg>
diff --git a/icons-dark/actions/22/debug-step-into-instruction.svg b/icons-dark/actions/22/debug-step-into-instruction.svg
--- a/icons-dark/actions/22/debug-step-into-instruction.svg
+++ b/icons-dark/actions/22/debug-step-into-instruction.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons-dark/actions/22/debug-step-into.svg b/icons-dark/actions/22/debug-step-into.svg
--- a/icons-dark/actions/22/debug-step-into.svg
+++ b/icons-dark/actions/22/debug-step-into.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons-dark/actions/22/debug-step-out.svg b/icons-dark/actions/22/debug-step-out.svg
--- a/icons-dark/actions/22/debug-step-out.svg
+++ b/icons-dark/actions/22/debug-step-out.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons-dark/actions/22/debug-step-over.svg b/icons-dark/actions/22/debug-step-over.svg
--- a/icons-dark/actions/22/debug-step-over.svg
+++ b/icons-dark/actions/22/debug-step-over.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons-dark/actions/22/deep-history.svg b/icons-dark/actions/22/deep-history.svg
--- a/icons-dark/actions/22/deep-history.svg
+++ b/icons-dark/actions/22/deep-history.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path
     style="fill:currentColor;fill-opacity:1;stroke:none" 
     d="m13.65625 14v1h.845703 1.998047a1.5 1.5 0 0 1 1.5 1.5 1.5 1.5 0 0 1 -1.5 1.5v1a2.5 2.5 0 0 0 2.5 -2.5 2.5 2.5 0 0 0 -2.5 -2.5h-2.84375"
-	class="ColorScheme-Highlight"
+	class="olorScheme-ButtonFocus"
      id="path10" />
 </svg>
diff --git a/icons-dark/actions/22/distribute-graph-directed.svg b/icons-dark/actions/22/distribute-graph-directed.svg
--- a/icons-dark/actions/22/distribute-graph-directed.svg
+++ b/icons-dark/actions/22/distribute-graph-directed.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path
     style="fill:currentColor;fill-opacity:1;stroke:none" 
     d="M 4.5 3 A 1.4999959 1.5 0 0 0 3 4.5 A 1.4999959 1.5 0 0 0 4.5 6 A 1.4999959 1.5 0 0 0 6 4.5 A 1.4999959 1.5 0 0 0 4.5 3 z M 17.5 3 A 1.4999959 1.5 0 0 0 16 4.5 A 1.4999959 1.5 0 0 0 17.5 6 A 1.4999959 1.5 0 0 0 19 4.5 A 1.4999959 1.5 0 0 0 17.5 3 z M 11 10 A 1.4999959 1.5 0 0 0 9.5 11.5 A 1.4999959 1.5 0 0 0 11 13 A 1.4999959 1.5 0 0 0 12.5 11.5 A 1.4999959 1.5 0 0 0 11 10 z M 11 16 A 1.4999959 1.5 0 0 0 9.5 17.5 A 1.4999959 1.5 0 0 0 11 19 A 1.4999959 1.5 0 0 0 12.5 17.5 A 1.4999959 1.5 0 0 0 11 16 z "
-	class="ColorScheme-Highlight"
+	class="olorScheme-ButtonFocus"
      id="path10" />
 </svg>
diff --git a/icons-dark/actions/22/distribute-graph.svg b/icons-dark/actions/22/distribute-graph.svg
--- a/icons-dark/actions/22/distribute-graph.svg
+++ b/icons-dark/actions/22/distribute-graph.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path
     style="fill:currentColor;fill-opacity:1;stroke:none" 
     d="M 8.5 3 A 1.4999959 1.5 0 0 0 7 4.5 A 1.4999959 1.5 0 0 0 8.5 6 A 1.4999959 1.5 0 0 0 10 4.5 A 1.4999959 1.5 0 0 0 8.5 3 z M 19.5 3 A 1.4999959 1.5 0 0 0 18 4.5 A 1.4999959 1.5 0 0 0 19.5 6 A 1.4999959 1.5 0 0 0 21 4.5 A 1.4999959 1.5 0 0 0 19.5 3 z M 2.5 8 A 1.4999959 1.5 0 0 0 1 9.5 A 1.4999959 1.5 0 0 0 2.5 11 A 1.4999959 1.5 0 0 0 4 9.5 A 1.4999959 1.5 0 0 0 2.5 8 z M 14.5 10 A 1.4999959 1.5 0 0 0 13 11.5 A 1.4999959 1.5 0 0 0 14.5 13 A 1.4999959 1.5 0 0 0 16 11.5 A 1.4999959 1.5 0 0 0 14.5 10 z M 2.5 16 A 1.4999959 1.5 0 0 0 1 17.5 A 1.4999959 1.5 0 0 0 2.5 19 A 1.4999959 1.5 0 0 0 4 17.5 A 1.4999959 1.5 0 0 0 2.5 16 z M 9.5 16 A 1.4999959 1.5 0 0 0 8 17.5 A 1.4999959 1.5 0 0 0 9.5 19 A 1.4999959 1.5 0 0 0 11 17.5 A 1.4999959 1.5 0 0 0 9.5 16 z M 19.5 16 A 1.4999959 1.5 0 0 0 18 17.5 A 1.4999959 1.5 0 0 0 19.5 19 A 1.4999959 1.5 0 0 0 21 17.5 A 1.4999959 1.5 0 0 0 19.5 16 z "
-	class="ColorScheme-Highlight"
+	class="olorScheme-ButtonFocus"
      id="path10" />
 </svg>
diff --git a/icons-dark/actions/22/draw-connector.svg b/icons-dark/actions/22/draw-connector.svg
--- a/icons-dark/actions/22/draw-connector.svg
+++ b/icons-dark/actions/22/draw-connector.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 15 3 L 15 7 L 19 7 L 19 3 L 15 3 z M 16 4 L 18 4 L 18 6 L 16 6 L 16 4 z M 3 15 L 3 19 L 7 19 L 7 15 L 3 15 z M 4 16 L 6 16 L 6 18 L 4 18 L 4 16 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/22/edit-table-insert-column-left.svg b/icons-dark/actions/22/edit-table-insert-column-left.svg
--- a/icons-dark/actions/22/edit-table-insert-column-left.svg
+++ b/icons-dark/actions/22/edit-table-insert-column-left.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -16,6 +16,6 @@
     />  
   <path
      style="fill:currentColor;fill-opacity:1;stroke:none" 
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      d="M 3 3 L 3 4 L 3 12 L 3 13 L 9 13 L 9 12 L 9 9.2929688 L 9 4 L 9 3 L 3 3 z M 4 4 L 8 4 L 8 8.2929688 L 4 4.2929688 L 4 4 z M 4 5.7070312 L 8 9.7070312 L 8 12 L 7.7070312 12 L 4 8.2929688 L 4 5.7070312 z M 4 9.7070312 L 6.2929688 12 L 4 12 L 4 9.7070312 z " />
 </svg>
diff --git a/icons-dark/actions/22/edit-table-insert-column-right.svg b/icons-dark/actions/22/edit-table-insert-column-right.svg
--- a/icons-dark/actions/22/edit-table-insert-column-right.svg
+++ b/icons-dark/actions/22/edit-table-insert-column-right.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 13 3 L 13 4 L 13 9.2929688 L 13 12 L 13 13 L 19 13 L 19 12 L 19 4 L 19 3 L 13 3 z M 14 4 L 18 4 L 18 4.2929688 L 14 8.2929688 L 14 4 z M 18 5.7070312 L 18 8.2929688 L 14.292969 12 L 14 12 L 14 9.7070312 L 18 5.7070312 z M 18 9.7070312 L 18 12 L 15.707031 12 L 18 9.7070312 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/22/edit-table-insert-row-above.svg b/icons-dark/actions/22/edit-table-insert-row-above.svg
--- a/icons-dark/actions/22/edit-table-insert-row-above.svg
+++ b/icons-dark/actions/22/edit-table-insert-row-above.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 3 3 L 3 9 L 4 9 L 9.2929688 9 L 12 9 L 13 9 L 13 3 L 12 3 L 4 3 L 3 3 z M 4 4 L 4.2929688 4 L 8.2929688 8 L 4 8 L 4 4 z M 5.7070312 4 L 8.2929688 4 L 12 7.7070312 L 12 8 L 9.7070312 8 L 5.7070312 4 z M 9.7070312 4 L 12 4 L 12 6.2929688 L 9.7070312 4 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/22/edit-table-insert-row-below.svg b/icons-dark/actions/22/edit-table-insert-row-below.svg
--- a/icons-dark/actions/22/edit-table-insert-row-below.svg
+++ b/icons-dark/actions/22/edit-table-insert-row-below.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -16,6 +16,6 @@
     />  
   <path
      style="fill:currentColor;fill-opacity:1;stroke:none" 
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      d="M 4,13 9.29297,13 12,13 l 0,1 -2.29297,0 -4,4 2.58594,0 L 12,14.29297 12,15.70703 9.70703,18 12,18 l 0,1 -8,0 0,-1 0.29297,0 4,-4 L 4,14 4,13" />
 </svg>
diff --git a/icons-dark/actions/22/edit-table-insert-row-under.svg b/icons-dark/actions/22/edit-table-insert-row-under.svg
--- a/icons-dark/actions/22/edit-table-insert-row-under.svg
+++ b/icons-dark/actions/22/edit-table-insert-row-under.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -16,6 +16,6 @@
     />  
   <path
      style="fill:currentColor;fill-opacity:1;stroke:none" 
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      d="M 3,8 3,9 4,9 7.28125,9 4,12.28125 4,12.292969 3.292969,13 3,13 l 0,1 1,0 7,0 2,0 0,-1 -0.28125,0 L 13,12.71875 13,11.28125 11.28125,13 11,13 8.71875,13 11,10.71875 12.71875,9 13,9 13,8 11,8 8.292969,8 4,8 3,8 M 8.71875,9 11,9 11.28125,9 11,9.28125 7.28125,13 l -2.5625,0 4,-4" />
 </svg>
diff --git a/icons-dark/actions/22/edit-text-frame-update.svg b/icons-dark/actions/22/edit-text-frame-update.svg
--- a/icons-dark/actions/22/edit-text-frame-update.svg
+++ b/icons-dark/actions/22/edit-text-frame-update.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -16,6 +16,6 @@
     />  
   <path
      style="fill:currentColor;fill-opacity:1;stroke:none" 
-      class="ColorScheme-Highlight"
+      class="olorScheme-ButtonFocus"
      d="M 3,3 5,6 7,3 Z" />
 </svg>
diff --git a/icons-dark/actions/22/escape-direction-all.svg b/icons-dark/actions/22/escape-direction-all.svg
--- a/icons-dark/actions/22/escape-direction-all.svg
+++ b/icons-dark/actions/22/escape-direction-all.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -21,6 +21,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 11 8 C 9.34314 8 8 9.3431 8 11 C 8 12.6569 9.34314 14 11 14 C 12.65686 14 14 12.6569 14 11 C 14 9.3431 12.65686 8 11 8 z M 11 10 C 11.55228 10 12 10.4477 12 11 C 12 11.5523 11.55228 12 11 12 C 10.44772 12 10 11.5523 10 11 C 10 10.4477 10.44772 10 11 10 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/22/escape-direction-down.svg b/icons-dark/actions/22/escape-direction-down.svg
--- a/icons-dark/actions/22/escape-direction-down.svg
+++ b/icons-dark/actions/22/escape-direction-down.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,11 +17,11 @@
  <path 
      style="fill:#da4453;fill-opacity:1;stroke:none" 
      d="M 10 13 L 10 18 L 12 18 L 12 13 L 10 13 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      /> 
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 11 8 C 9.34314 8 8 9.3431 8 11 C 8 12.6569 9.34314 14 11 14 C 12.65686 14 14 12.6569 14 11 C 14 9.3431 12.65686 8 11 8 z M 11 10 C 11.55228 10 12 10.4477 12 11 C 12 11.5523 11.55228 12 11 12 C 10.44772 12 10 11.5523 10 11 C 10 10.4477 10.44772 10 11 10 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/22/escape-direction-horizontal.svg b/icons-dark/actions/22/escape-direction-horizontal.svg
--- a/icons-dark/actions/22/escape-direction-horizontal.svg
+++ b/icons-dark/actions/22/escape-direction-horizontal.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,11 +17,11 @@
  <path 
      style="fill:#da4453;fill-opacity:1;stroke:none" 
      d="M 4 10 L 4 12 L 9 12 L 9 10 L 4 10 z M 13 10 L 13 12 L 18 12 L 18 10 L 13 10 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      /> 
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 11 8 C 9.34314 8 8 9.3431 8 11 C 8 12.6569 9.34314 14 11 14 C 12.65686 14 14 12.6569 14 11 C 14 9.3431 12.65686 8 11 8 z M 11 10 C 11.55228 10 12 10.4477 12 11 C 12 11.5523 11.55228 12 11 12 C 10.44772 12 10 11.5523 10 11 C 10 10.4477 10.44772 10 11 10 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/22/escape-direction-left.svg b/icons-dark/actions/22/escape-direction-left.svg
--- a/icons-dark/actions/22/escape-direction-left.svg
+++ b/icons-dark/actions/22/escape-direction-left.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,11 +17,11 @@
  <path 
      style="fill:#da4453;fill-opacity:1;stroke:none" 
      d="M 4 10 L 4 12 L 9 12 L 9 10 L 4 10 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      /> 
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 11 8 C 9.34314 8 8 9.3431 8 11 C 8 12.6569 9.34314 14 11 14 C 12.65686 14 14 12.6569 14 11 C 14 9.3431 12.65686 8 11 8 z M 11 10 C 11.55228 10 12 10.4477 12 11 C 12 11.5523 11.55228 12 11 12 C 10.44772 12 10 11.5523 10 11 C 10 10.4477 10.44772 10 11 10 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/22/escape-direction-right.svg b/icons-dark/actions/22/escape-direction-right.svg
--- a/icons-dark/actions/22/escape-direction-right.svg
+++ b/icons-dark/actions/22/escape-direction-right.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,11 +17,11 @@
  <path 
      style="fill:#da4453;fill-opacity:1;stroke:none" 
      d="M 13 10 L 13 12 L 18 12 L 18 10 L 13 10 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      /> 
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 11 8 C 9.34314 8 8 9.3431 8 11 C 8 12.6569 9.34314 14 11 14 C 12.65686 14 14 12.6569 14 11 C 14 9.3431 12.65686 8 11 8 z M 11 10 C 11.55228 10 12 10.4477 12 11 C 12 11.5523 11.55228 12 11 12 C 10.44772 12 10 11.5523 10 11 C 10 10.4477 10.44772 10 11 10 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/22/escape-direction-up.svg b/icons-dark/actions/22/escape-direction-up.svg
--- a/icons-dark/actions/22/escape-direction-up.svg
+++ b/icons-dark/actions/22/escape-direction-up.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,11 +17,11 @@
  <path 
      style="fill:#da4453;fill-opacity:1;stroke:none" 
      d="M 10 4 L 10 9 L 12 9 L 12 4 L 10 4 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      /> 
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 11 8 C 9.34314 8 8 9.3431 8 11 C 8 12.6569 9.34314 14 11 14 C 12.65686 14 14 12.6569 14 11 C 14 9.3431 12.65686 8 11 8 z M 11 10 C 11.55228 10 12 10.4477 12 11 C 12 11.5523 11.55228 12 11 12 C 10.44772 12 10 11.5523 10 11 C 10 10.4477 10.44772 10 11 10 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/22/escape-direction-vertical.svg b/icons-dark/actions/22/escape-direction-vertical.svg
--- a/icons-dark/actions/22/escape-direction-vertical.svg
+++ b/icons-dark/actions/22/escape-direction-vertical.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,11 +17,11 @@
  <path 
      style="fill:#da4453;fill-opacity:1;stroke:none" 
      d="M 10 4 L 10 9 L 12 9 L 12 4 L 10 4 z M 10 13 L 10 18 L 12 18 L 12 13 L 10 13 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      /> 
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 11 8 C 9.34314 8 8 9.3431 8 11 C 8 12.6569 9.34314 14 11 14 C 12.65686 14 14 12.6569 14 11 C 14 9.3431 12.65686 8 11 8 z M 11 10 C 11.55228 10 12 10.4477 12 11 C 12 11.5523 11.55228 12 11 12 C 10.44772 12 10 11.5523 10 11 C 10 10.4477 10.44772 10 11 10 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/22/exchange-positions-clockwise.svg b/icons-dark/actions/22/exchange-positions-clockwise.svg
--- a/icons-dark/actions/22/exchange-positions-clockwise.svg
+++ b/icons-dark/actions/22/exchange-positions-clockwise.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,5 +17,5 @@
   <path
     style="fill:currentColor;fill-opacity:1;stroke:none" 
     d="m 15.5,12 a 3.499991,3.499991 0 0 0 -3.5,3.5 3.499991,3.499991 0 0 0 0.699219,2.0938 L 13.416016,16.877 A 2.5,2.5 0 0 1 13,15.5 2.5,2.5 0 0 1 15.5,13 2.5,2.5 0 0 1 16.876953,13.416 L 17.59375,12.6992 A 3.499991,3.499991 0 0 0 15.5,12 m 2.800781,1.4063 -0.716797,0.7167 A 2.5,2.5 0 0 1 18,15.5 2.5,2.5 0 0 1 15.5,18 2.5,2.5 0 0 1 14.123047,17.584 L 13.40625,18.3008 A 3.499991,3.499991 0 0 0 15.5,19 3.499991,3.499991 0 0 0 19,15.5 3.499991,3.499991 0 0 0 18.300781,13.4063 Z" 
-	class="ColorScheme-Highlight"/>
+	class="olorScheme-ButtonFocus"/>
 </svg>
diff --git a/icons-dark/actions/22/exchange-positions-zorder.svg b/icons-dark/actions/22/exchange-positions-zorder.svg
--- a/icons-dark/actions/22/exchange-positions-zorder.svg
+++ b/icons-dark/actions/22/exchange-positions-zorder.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,5 +17,5 @@
   <path
     style="fill:currentColor;fill-opacity:1;stroke:none" 
     d="M 13 12 L 12.792969 12.207031 L 11 14 L 11 15.414062 L 12.5 13.914062 L 12.5 18 L 13.5 18 L 13.5 13.914062 L 15 15.414062 L 15 14 L 13.207031 12.207031 L 13 12 z M 16.5 13 L 16.5 17.085938 L 15 15.585938 L 15 17 L 16.792969 18.792969 L 17 19 L 17.207031 18.792969 L 19 17 L 19 15.585938 L 17.5 17.085938 L 17.5 13 L 16.5 13 z "
-	class="ColorScheme-Highlight"/>
+	class="olorScheme-ButtonFocus"/>
 </svg>
diff --git a/icons-dark/actions/22/filename-initial-amarok.svg b/icons-dark/actions/22/filename-initial-amarok.svg
--- a/icons-dark/actions/22/filename-initial-amarok.svg
+++ b/icons-dark/actions/22/filename-initial-amarok.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -18,7 +18,7 @@
  <path 
     style="fill:currentColor;fill-opacity:1;stroke:none" 
     d="m 331.67226,537.3622 -4.84123,14 1.16897,0 1.73532,-4.66667 6.03963,0 1.72854,4.66667 1.32754,0 -4.90693,-14 -2.25184,0 z m 1.08967,1.20085 2.58033,6.96582 -5.17198,0 2.59165,-6.96582 z"
-    class="ColorScheme-Highlight"
+    class="olorScheme-ButtonFocus"
     />  
  </g>
 </svg>
diff --git a/icons-dark/actions/22/filename-title-amarok.svg b/icons-dark/actions/22/filename-title-amarok.svg
--- a/icons-dark/actions/22/filename-title-amarok.svg
+++ b/icons-dark/actions/22/filename-title-amarok.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 7 6 L 7 8 L 15 8 L 15 6 L 7 6 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/22/format-break-node.svg b/icons-dark/actions/22/format-break-node.svg
--- a/icons-dark/actions/22/format-break-node.svg
+++ b/icons-dark/actions/22/format-break-node.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 9 9.5 L 11 12.5 L 13 9.5 L 9 9.5 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/22/format-connect-node.svg b/icons-dark/actions/22/format-connect-node.svg
--- a/icons-dark/actions/22/format-connect-node.svg
+++ b/icons-dark/actions/22/format-connect-node.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 9 9.5 L 11 12.5 L 13 9.5 L 9 9.5 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/22/format-convert-to-path.svg b/icons-dark/actions/22/format-convert-to-path.svg
--- a/icons-dark/actions/22/format-convert-to-path.svg
+++ b/icons-dark/actions/22/format-convert-to-path.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 1 9 L 1 13 L 5 13 L 5 9 L 1 9 z M 9 9 L 9 13 L 13 13 L 13 9 L 9 9 z M 17 9 L 17 13 L 21 13 L 21 9 L 17 9 z M 2 10 L 4 10 L 4 12 L 2 12 L 2 10 z M 10 10 L 12 10 L 12 12 L 10 12 L 10 10 z M 18 10 L 20 10 L 20 12 L 18 12 L 18 10 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/22/format-disconnect-node.svg b/icons-dark/actions/22/format-disconnect-node.svg
--- a/icons-dark/actions/22/format-disconnect-node.svg
+++ b/icons-dark/actions/22/format-disconnect-node.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 9 9.5 L 11 12.5 L 13 9.5 L 9 9.5 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/22/format-insert-node.svg b/icons-dark/actions/22/format-insert-node.svg
--- a/icons-dark/actions/22/format-insert-node.svg
+++ b/icons-dark/actions/22/format-insert-node.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 16 14 L 16 16 L 14 16 L 14 17 L 16 17 L 16 19 L 17 19 L 17 17 L 19 17 L 19 16 L 17 16 L 17 14 L 16 14 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/22/format-join-node.svg b/icons-dark/actions/22/format-join-node.svg
--- a/icons-dark/actions/22/format-join-node.svg
+++ b/icons-dark/actions/22/format-join-node.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 9 9.5 L 11 12.5 L 13 9.5 L 9 9.5 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/22/format-node-corner.svg b/icons-dark/actions/22/format-node-corner.svg
--- a/icons-dark/actions/22/format-node-corner.svg
+++ b/icons-dark/actions/22/format-node-corner.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 4.5 3 A 1.5 1.5 0 0 0 3 4.5 A 1.5 1.5 0 0 0 4.5 6 A 1.5 1.5 0 0 0 6 4.5 A 1.5 1.5 0 0 0 4.5 3 z M 4.5 4 A 0.5 0.5 0 0 1 5 4.5 A 0.5 0.5 0 0 1 4.5 5 A 0.5 0.5 0 0 1 4 4.5 A 0.5 0.5 0 0 1 4.5 4 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/22/format-node-curve.svg b/icons-dark/actions/22/format-node-curve.svg
--- a/icons-dark/actions/22/format-node-curve.svg
+++ b/icons-dark/actions/22/format-node-curve.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 6 7 L 6 10 L 9 10 L 9 7 L 6 7 z M 7 8 L 8 8 L 8 9 L 7 9 L 7 8 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/22/format-node-line.svg b/icons-dark/actions/22/format-node-line.svg
--- a/icons-dark/actions/22/format-node-line.svg
+++ b/icons-dark/actions/22/format-node-line.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 9 10 L 9 13 L 12 13 L 12 10 L 9 10 z M 10 11 L 11 11 L 11 12 L 10 12 L 10 11 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/22/format-node-smooth.svg b/icons-dark/actions/22/format-node-smooth.svg
--- a/icons-dark/actions/22/format-node-smooth.svg
+++ b/icons-dark/actions/22/format-node-smooth.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 7 8 L 7 12 L 11 12 L 11 8 L 7 8 z M 8 9 L 10 9 L 10 11 L 8 11 L 8 9 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/22/format-node-symmetric.svg b/icons-dark/actions/22/format-node-symmetric.svg
--- a/icons-dark/actions/22/format-node-symmetric.svg
+++ b/icons-dark/actions/22/format-node-symmetric.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 9 8 L 9 10 L 6 10 L 6 11 L 9 11 L 9 12 L 13 12 L 13 11 L 16 11 L 16 10 L 13 10 L 13 8 L 9 8 z M 10 9 L 12 9 L 12 11 L 10 11 L 10 9 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/22/format-precision-more.svg b/icons-dark/actions/22/format-precision-more.svg
--- a/icons-dark/actions/22/format-precision-more.svg
+++ b/icons-dark/actions/22/format-precision-more.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 15 15 L 15 17 L 13 17 L 13 18 L 15 18 L 15 20 L 16 20 L 16 18 L 18 18 L 18 17 L 16 17 L 16 15 L 15 15 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/22/format-segment-curve.svg b/icons-dark/actions/22/format-segment-curve.svg
--- a/icons-dark/actions/22/format-segment-curve.svg
+++ b/icons-dark/actions/22/format-segment-curve.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path
     style="fill:currentColor;fill-opacity:1;stroke:none" 
     d="M16 4A12 12 0 0 0 4 16H5A11 11 0 0 1 16 5V4"
-	class="ColorScheme-Highlight"
+	class="olorScheme-ButtonFocus"
 	/>
 </svg>
diff --git a/icons-dark/actions/22/format-segment-line.svg b/icons-dark/actions/22/format-segment-line.svg
--- a/icons-dark/actions/22/format-segment-line.svg
+++ b/icons-dark/actions/22/format-segment-line.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 16 5.3125 L 5.3125 16 L 6 16 L 6 16.6875 L 16.6875 6 L 16 6 L 16 5.3125 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/22/format-text-capitalize.svg b/icons-dark/actions/22/format-text-capitalize.svg
--- a/icons-dark/actions/22/format-text-capitalize.svg
+++ b/icons-dark/actions/22/format-text-capitalize.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -19,7 +19,7 @@
  <path 
     style="fill:currentColor;fill-opacity:1;stroke:none" 
     d="m 424.71429,531.79074 3,-4 3,4 z"
-    class="ColorScheme-Highlight"
+    class="olorScheme-ButtonFocus"
     />  
  </g>
 </svg>
diff --git a/icons-dark/actions/22/format-text-lowercase.svg b/icons-dark/actions/22/format-text-lowercase.svg
--- a/icons-dark/actions/22/format-text-lowercase.svg
+++ b/icons-dark/actions/22/format-text-lowercase.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 13 3 L 16 7 L 19 3 L 13 3 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/22/format-text-uppercase.svg b/icons-dark/actions/22/format-text-uppercase.svg
--- a/icons-dark/actions/22/format-text-uppercase.svg
+++ b/icons-dark/actions/22/format-text-uppercase.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -19,7 +19,7 @@
  <path 
     style="fill:currentColor;fill-opacity:1;stroke:none" 
     d="m 434.71429,531.79074 3,-4 3,4 z"
-    class="ColorScheme-Highlight"
+    class="olorScheme-ButtonFocus"
     />  
  </g>
 </svg>
diff --git a/icons-dark/actions/22/input-mouse-click-left.svg b/icons-dark/actions/22/input-mouse-click-left.svg
--- a/icons-dark/actions/22/input-mouse-click-left.svg
+++ b/icons-dark/actions/22/input-mouse-click-left.svg
@@ -3,10 +3,10 @@
         .ColorScheme-Text {
             color:#eff0f1;
         }
-        .ColorScheme-Highlight {
+        .olorScheme-ButtonFocus {
             color:#3daee9;
         }
     </style>
     <path d="M10 3a5 5 0 0 0-5 5v6a5 5 0 0 0 5 5h2a5 5 0 0 0 5-5V8a5 5 0 0 0-5-5zm0 1h2a4 4 0 0 1 4 4v6a4 4 0 0 1-4 4h-2a4 4 0 0 1-4-4V8a4 4 0 0 1 4-4zm0 1v5h2V5z" fill="currentColor" class="ColorScheme-Text"/>
-    <path d="M10 4a4 4 0 0 0-4 4v3h4z" fill="currentColor" class="ColorScheme-Highlight"/>
+    <path d="M10 4a4 4 0 0 0-4 4v3h4z" fill="currentColor" class="olorScheme-ButtonFocus"/>
 </svg>
diff --git a/icons-dark/actions/22/input-mouse-click-middle.svg b/icons-dark/actions/22/input-mouse-click-middle.svg
--- a/icons-dark/actions/22/input-mouse-click-middle.svg
+++ b/icons-dark/actions/22/input-mouse-click-middle.svg
@@ -3,10 +3,10 @@
         .ColorScheme-Text {
             color:#eff0f1;
         }
-        .ColorScheme-Highlight {
+        .olorScheme-ButtonFocus {
             color:#3daee9;
         }
     </style>
     <path d="M10 3a5 5 0 0 0-5 5v6a5 5 0 0 0 5 5h2a5 5 0 0 0 5-5V8a5 5 0 0 0-5-5zm0 1h2a4 4 0 0 1 4 4v6a4 4 0 0 1-4 4h-2a4 4 0 0 1-4-4V8a4 4 0 0 1 4-4z" fill="currentColor" class="ColorScheme-Text"/>
-    <path d="M10 4a4 4 0 0 0-1 .133V11h4V4.13A4 4 0 0 0 12 4zm0 1h2v5h-2z" fill="currentColor" class="ColorScheme-Highlight"/>
+    <path d="M10 4a4 4 0 0 0-1 .133V11h4V4.13A4 4 0 0 0 12 4zm0 1h2v5h-2z" fill="currentColor" class="olorScheme-ButtonFocus"/>
 </svg>
diff --git a/icons-dark/actions/22/input-mouse-click-right.svg b/icons-dark/actions/22/input-mouse-click-right.svg
--- a/icons-dark/actions/22/input-mouse-click-right.svg
+++ b/icons-dark/actions/22/input-mouse-click-right.svg
@@ -3,10 +3,10 @@
         .ColorScheme-Text {
             color:#eff0f1;
         }
-        .ColorScheme-Highlight {
+        .olorScheme-ButtonFocus {
             color:#3daee9;
         }
     </style>
     <path d="M10 3a5 5 0 0 0-5 5v6a5 5 0 0 0 5 5h2a5 5 0 0 0 5-5V8a5 5 0 0 0-5-5zm0 1h2a4 4 0 0 1 4 4v6a4 4 0 0 1-4 4h-2a4 4 0 0 1-4-4V8a4 4 0 0 1 4-4zm0 1v5h2V5z" fill="currentColor" class="ColorScheme-Text"/>
-    <path d="M12 4v7h4V8a4 4 0 0 0-4-4z" fill="currentColor" class="ColorScheme-Highlight"/>
+    <path d="M12 4v7h4V8a4 4 0 0 0-4-4z" fill="currentColor" class="olorScheme-ButtonFocus"/>
 </svg>
diff --git a/icons-dark/actions/22/insert-endnote.svg b/icons-dark/actions/22/insert-endnote.svg
--- a/icons-dark/actions/22/insert-endnote.svg
+++ b/icons-dark/actions/22/insert-endnote.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 6 13 L 6 14 L 11 14 L 11 13 L 6 13 z M 17 13 L 17 14 L 18 14 L 18 13 L 17 13 z M 17 15 L 17 19 L 18 19 L 18 15 L 17 15 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/22/insert-footnote.svg b/icons-dark/actions/22/insert-footnote.svg
--- a/icons-dark/actions/22/insert-footnote.svg
+++ b/icons-dark/actions/22/insert-footnote.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 16 13 L 15 15 L 16 15 L 16 19 L 17 19 L 17 13 L 16 13 z M 6 15 L 6 16 L 13 16 L 13 15 L 6 15 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/22/insert-more-mark.svg b/icons-dark/actions/22/insert-more-mark.svg
--- a/icons-dark/actions/22/insert-more-mark.svg
+++ b/icons-dark/actions/22/insert-more-mark.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 3 10 L 3 11 L 19 11 L 19 10 L 3 10 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/22/insert-page-break.svg b/icons-dark/actions/22/insert-page-break.svg
--- a/icons-dark/actions/22/insert-page-break.svg
+++ b/icons-dark/actions/22/insert-page-break.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 5 10 L 5 11 L 7 11 L 7 10 L 5 10 z M 10 10 L 10 11 L 12 11 L 12 10 L 10 10 z M 15 10 L 15 11 L 17 11 L 17 10 L 15 10 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/22/insert-table-of-contents.svg b/icons-dark/actions/22/insert-table-of-contents.svg
--- a/icons-dark/actions/22/insert-table-of-contents.svg
+++ b/icons-dark/actions/22/insert-table-of-contents.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 16 3 L 16 4 L 17 4 L 17 6 L 16 6 L 16 7 L 17 7 L 18 7 L 19 7 L 19 6 L 18 6 L 18 4 L 19 4 L 19 3 L 18 3 L 17 3 L 16 3 z M 10 5 L 10 6 L 11 6 L 11 5 L 10 5 z M 12 5 L 12 6 L 13 6 L 13 5 L 12 5 z M 14 5 L 14 6 L 15 6 L 15 5 L 14 5 z M 14 9 L 14 10 L 15 10 L 15 12 L 14 12 L 14 13 L 19 13 L 19 12 L 18 12 L 18 10 L 19 10 L 19 9 L 14 9 z M 16 10 L 17 10 L 17 12 L 16 12 L 16 10 z M 8 11 L 8 12 L 9 12 L 9 11 L 8 11 z M 10 11 L 10 12 L 11 12 L 11 11 L 10 11 z M 12 11 L 12 12 L 13 12 L 13 11 L 12 11 z M 12 15 L 12 16 L 13 16 L 13 18 L 12 18 L 12 19 L 13 19 L 14 19 L 15 19 L 19 19 L 19 18 L 18 18 L 18 16 L 19 16 L 19 15 L 15 15 L 14 15 L 13 15 L 12 15 z M 14 16 L 15 16 L 15 18 L 14 18 L 14 16 z M 16 16 L 17 16 L 17 18 L 16 18 L 16 16 z M 6 17 L 6 18 L 7 18 L 7 17 L 6 17 z M 8 17 L 8 18 L 9 18 L 9 17 L 8 17 z M 10 17 L 10 18 L 11 18 L 11 17 L 10 17 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/22/insert-table.svg b/icons-dark/actions/22/insert-table.svg
--- a/icons-dark/actions/22/insert-table.svg
+++ b/icons-dark/actions/22/insert-table.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 4 4 L 4 7 L 4 9 L 9 9 L 9 7 L 9 4 L 7 4 L 4 4 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/22/item.svg b/icons-dark/actions/22/item.svg
--- a/icons-dark/actions/22/item.svg
+++ b/icons-dark/actions/22/item.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
     style="fill:currentColor;fill-opacity:1;stroke:none" 
     d="M 4.5,9 C 3.671573,8.9999999 3,9.671572 3,10.5 3,11.328428 3.671573,12.000001 4.5,12 5.328427,12 6,11.328428 6,10.5 6,9.671572 5.328427,8.999999 4.5,9 Z m 2.5,1 0,1 1,0 0,-1 z m 2,0 0,1 10,0 0,-1 z m 0,2 0,1 4,0 0,-1 z"
-    class="ColorScheme-Highlight"
+    class="olorScheme-ButtonFocus"
     />  
 </svg>
diff --git a/icons-dark/actions/22/kdenlive-insert-edit.svg b/icons-dark/actions/22/kdenlive-insert-edit.svg
--- a/icons-dark/actions/22/kdenlive-insert-edit.svg
+++ b/icons-dark/actions/22/kdenlive-insert-edit.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 8 9 L 8 14 L 14 14 L 14 9 L 8 9 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/22/kdenlive-normal-edit.svg b/icons-dark/actions/22/kdenlive-normal-edit.svg
--- a/icons-dark/actions/22/kdenlive-normal-edit.svg
+++ b/icons-dark/actions/22/kdenlive-normal-edit.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 8 4 L 8 9 L 14 9 L 14 4 L 8 4 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/22/kdenlive-overwrite-edit.svg b/icons-dark/actions/22/kdenlive-overwrite-edit.svg
--- a/icons-dark/actions/22/kdenlive-overwrite-edit.svg
+++ b/icons-dark/actions/22/kdenlive-overwrite-edit.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 8 8 L 8 13 L 14 13 L 14 8 L 8 8 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/22/know.svg b/icons-dark/actions/22/know.svg
--- a/icons-dark/actions/22/know.svg
+++ b/icons-dark/actions/22/know.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 19.306641 13 L 14.814453 17.591797 L 13.691406 16.445312 L 13 17.152344 L 14.806641 19 L 14.8125 18.992188 L 14.820312 19 L 20 13.707031 L 19.308594 13 L 19.306641 13 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/22/kstars_supernovae.svg b/icons-dark/actions/22/kstars_supernovae.svg
--- a/icons-dark/actions/22/kstars_supernovae.svg
+++ b/icons-dark/actions/22/kstars_supernovae.svg
@@ -55,7 +55,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons-dark/actions/22/kt-queue-manager.svg b/icons-dark/actions/22/kt-queue-manager.svg
--- a/icons-dark/actions/22/kt-queue-manager.svg
+++ b/icons-dark/actions/22/kt-queue-manager.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 4 3 L 4 4 L 5 4 L 5 6 L 4 6 L 4 7 L 7 7 L 7 6 L 6 6 L 6 4 L 7 4 L 7 3 L 4 3 z M 3 9 L 3 10 L 4 10 L 4 12 L 3 12 L 3 13 L 8 13 L 8 12 L 7 12 L 7 10 L 8 10 L 8 9 L 3 9 z M 5 10 L 6 10 L 6 12 L 5 12 L 5 10 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/22/labplot-1x-zoom.svg b/icons-dark/actions/22/labplot-1x-zoom.svg
--- a/icons-dark/actions/22/labplot-1x-zoom.svg
+++ b/icons-dark/actions/22/labplot-1x-zoom.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="m 19,19 -1,0 0,-8 c -0.508487,0.438772 -1.58039,1.423509 -2.094174,1.845943 L 15.334976,12.19775 18,10 l 1,0 z"
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/22/labplot-2x-zoom.svg b/icons-dark/actions/22/labplot-2x-zoom.svg
--- a/icons-dark/actions/22/labplot-2x-zoom.svg
+++ b/icons-dark/actions/22/labplot-2x-zoom.svg
@@ -4,15 +4,15 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
   </defs>
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="m 19.191702,18.828671 -5.87247,0 0,-0.910932 2.325911,-2.350202 q 1.050608,-1.062753 1.390689,-1.518219 0.340081,-0.455465 0.504048,-0.880567 0.170041,-0.425101 0.170041,-0.917004 0,-0.704453 -0.419029,-1.09919 -0.419028,-0.394737 -1.147773,-0.394737 -0.546559,0 -1.038462,0.182186 -0.48583,0.182187 -1.09919,0.661944 l -0.582996,-0.734818 q 1.244939,-1.0445346 2.720648,-1.0445346 1.238866,0 1.961539,0.6376516 0.728744,0.631579 0.728744,1.724697 0,0.582996 -0.21255,1.129554 -0.212551,0.540486 -0.637652,1.105264 -0.425101,0.558704 -1.427126,1.536437 l -1.852226,1.827935 0,0.04858 4.487854,0 0,0.995952 z"
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
diff --git a/icons-dark/actions/22/labplot-3x-zoom.svg b/icons-dark/actions/22/labplot-3x-zoom.svg
--- a/icons-dark/actions/22/labplot-3x-zoom.svg
+++ b/icons-dark/actions/22/labplot-3x-zoom.svg
@@ -4,15 +4,15 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
   </defs>
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="m 18.857694,12.027051 q 0,0.850202 -0.479757,1.396761 -0.473684,0.546559 -1.360324,0.728745 l 0,0.04858 q 1.062753,0.133603 1.58502,0.680162 0.52834,0.546559 0.52834,1.421053 0,1.26923 -0.880566,1.961538 -0.880567,0.686235 -2.526316,0.686235 -0.704454,0 -1.299596,-0.103239 -0.589068,-0.103239 -1.1417,-0.376518 l 0,-1.020243 q 0.564777,0.279352 1.208502,0.431174 0.643725,0.151822 1.244939,0.151822 2.246964,0 2.246964,-1.755061 0,-1.566802 -2.483806,-1.566802 l -0.862348,0 0,-0.929149 0.874494,0 q 1.044534,0 1.633603,-0.44332 0.589069,-0.449393 0.589069,-1.238867 0,-0.637651 -0.431174,-0.995951 -0.425101,-0.3583 -1.18421,-0.3583 -0.589069,0 -1.093118,0.163968 -0.497976,0.157895 -1.147773,0.582996 l -0.546559,-0.746964 q 0.546559,-0.431174 1.257085,-0.674089 0.716599,-0.2489876 1.518219,-0.2489876 1.299595,0 2.022267,0.5951416 0.728745,0.589069 0.728745,1.609312 z"
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
diff --git a/icons-dark/actions/22/labplot-4x-zoom.svg b/icons-dark/actions/22/labplot-4x-zoom.svg
--- a/icons-dark/actions/22/labplot-4x-zoom.svg
+++ b/icons-dark/actions/22/labplot-4x-zoom.svg
@@ -4,15 +4,15 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
   </defs>
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 20.287449,16.967346 19,16.967346 19,19 l -1.062754,0 0,-2.032654 -4.251012,0 0,-0.936734 L 17.864372,10 19,10 l 0,5.975509 1.287449,0 0,0.991837 z m -2.350203,-0.991837 0,-2.816326 q 0,-0.838775 0.0668,-1.983673 l -0.05466,0 q -0.0668,0.159183 -0.236842,0.477551 -0.163968,0.318367 -0.297571,0.502041 l -2.659919,3.820407 3.182186,0 z"
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
diff --git a/icons-dark/actions/22/labplot-5x-zoom.svg b/icons-dark/actions/22/labplot-5x-zoom.svg
--- a/icons-dark/actions/22/labplot-5x-zoom.svg
+++ b/icons-dark/actions/22/labplot-5x-zoom.svg
@@ -4,15 +4,15 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
   </defs>
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="m 16.143119,13.381302 c 0.927125,0 1.65587,0.232794 2.186235,0.698381 0.534413,0.465587 0.801619,1.103238 0.801619,1.912955 0,0.923077 -0.293522,1.647773 -0.880566,2.174089 -0.587045,0.522267 -1.40081,0.783401 -2.441296,0.783401 -0.991903,0 -1.759109,-0.159919 -2.30162,-0.479757 l 0,-1.032389 c 0.299595,0.178138 0.659919,0.319838 1.080972,0.425101 0.421053,0.105263 0.831984,0.157895 1.232794,0.157895 0.696356,0 1.234817,-0.165992 1.615384,-0.497976 0.380567,-0.331983 0.570851,-0.805667 0.570851,-1.421052 0,-1.198381 -0.740891,-1.797571 -2.222673,-1.797571 -0.477733,0 -0.983805,0.06073 -1.518218,0.182186 L 13.720042,14.140411 14,10 18.505467,9.9501278 18.505467,11 15,11 14.776722,13.520978 c 0.465587,-0.09312 0.921053,-0.139676 1.366397,-0.139676 z"
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
diff --git a/icons-dark/actions/22/labplot-matrix-new.svg b/icons-dark/actions/22/labplot-matrix-new.svg
--- a/icons-dark/actions/22/labplot-matrix-new.svg
+++ b/icons-dark/actions/22/labplot-matrix-new.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="m 5,5 0,5 5,0 0,-5 z m 7,0 0,5 5,0 0,-5 z M 6,6 9,6 9,9 6,9 Z m 7,0 3,0 0,3 -3,0 z m -8,6 0,5 5,0 0,-5 z m 7,0 0,3 1,0 0,-2 2,0 0,-1 z m -6,1 3,0 0,3 -3,0 z"
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/22/labplot-matrix.svg b/icons-dark/actions/22/labplot-matrix.svg
--- a/icons-dark/actions/22/labplot-matrix.svg
+++ b/icons-dark/actions/22/labplot-matrix.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 5 5 L 5 10 L 10 10 L 10 5 L 5 5 z M 12 5 L 12 10 L 17 10 L 17 5 L 12 5 z M 6 6 L 9 6 L 9 9 L 6 9 L 6 6 z M 13 6 L 16 6 L 16 9 L 13 9 L 13 6 z M 5 12 L 5 17 L 10 17 L 10 12 L 5 12 z M 12 12 L 12 17 L 17 17 L 17 12 L 12 12 z M 6 13 L 9 13 L 9 16 L 6 16 L 6 13 z M 13 13 L 16 13 L 16 16 L 13 16 L 13 13 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/22/labplot-plot-axis-points.svg b/icons-dark/actions/22/labplot-plot-axis-points.svg
--- a/icons-dark/actions/22/labplot-plot-axis-points.svg
+++ b/icons-dark/actions/22/labplot-plot-axis-points.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 3 2 L 3 5 L 6 5 L 6 2 L 3 2 z M 4 3 L 5 3 L 5 4 L 4 4 L 4 3 z M 3 16 L 3 19 L 6 19 L 6 16 L 3 16 z M 16 16 L 16 19 L 19 19 L 19 16 L 16 16 z M 4 17 L 5 17 L 5 18 L 4 18 L 4 17 z M 17 17 L 18 17 L 18 18 L 17 18 L 17 17 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/22/labplot-xy-fit-curve.svg b/icons-dark/actions/22/labplot-xy-fit-curve.svg
--- a/icons-dark/actions/22/labplot-xy-fit-curve.svg
+++ b/icons-dark/actions/22/labplot-xy-fit-curve.svg
@@ -4,15 +4,15 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
   </defs>
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 18.662109 3.6308594 L 8 13.404297 L 8 14 L 8.8300781 14 L 19.337891 4.3691406 L 18.662109 3.6308594 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
diff --git a/icons-dark/actions/22/labplot-xy-fourier-filter-curve.svg b/icons-dark/actions/22/labplot-xy-fourier-filter-curve.svg
--- a/icons-dark/actions/22/labplot-xy-fourier-filter-curve.svg
+++ b/icons-dark/actions/22/labplot-xy-fourier-filter-curve.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 11,5 C 10.09558,5 9.3630583,5.6034836 8.7695312,6.3652344 8.1760043,7.1269864 7.685626,8.095759 7.28125,9.056641 6.472498,10.978403 6.0136719,12.882813 6.0136719,12.882812 l 0.9726562,0.234376 c 0,0 0.4474039,-1.845591 1.2167969,-3.673829 C 8.587822,8.529241 9.0544716,7.6230136 9.5566406,6.9785156 10.056781,6.3366186 10.556129,6.0065983 10.994141,6.0039062 c 0.4208,0.01378 0.782978,0.1849888 1.15625,0.5429688 0.375823,0.360428 0.739876,0.9081416 1.076171,1.587891 0.643616,1.300928 1.184369,3.072232 1.722657,4.865234 l 1.046875,0 c -0.0052,-0.0174 -0.01041,-0.03338 -0.01563,-0.05078 C 15.41832,11.074493 14.857287,9.175514 14.123047,7.6914062 13.755927,6.9493522 13.345582,6.307366 12.841797,5.8242188 12.338012,5.3410719 11.715369,5.0192827 11.013672,5 l -0.0059,0 z"
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/22/labplot-xy-fourier-transform-curve.svg b/icons-dark/actions/22/labplot-xy-fourier-transform-curve.svg
--- a/icons-dark/actions/22/labplot-xy-fourier-transform-curve.svg
+++ b/icons-dark/actions/22/labplot-xy-fourier-transform-curve.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 7,3 C 6.0955801,3 5.3630583,3.6034832 4.7695312,4.3652344 4.1760042,5.1269856 3.6856261,6.0957593 3.28125,7.0566406 2.4724978,8.9784034 2.0136719,10.882812 2.0136719,10.882812 l 0.9726562,0.234376 c 0,0 0.4474039,-1.8455914 1.2167969,-3.6738286 0.3846965,-0.9141187 0.8513471,-1.820345 1.3535156,-2.4648438 0.5001406,-0.6418961 0.9994888,-0.9719176 1.4375,-0.9746094 0.4208002,0.013779 0.7829782,0.1849883 1.15625,0.5429688 0.3758235,0.3604276 0.7398764,0.9081422 1.0761719,1.5878906 0.6725911,1.3594969 1.2345245,3.2261636 1.7968755,5.1015624 0.56235,1.875399 1.123821,3.759112 1.859374,5.214844 0.367777,0.727866 0.778279,1.354826 1.28711,1.816406 0.50725,0.460146 1.13933,0.747934 1.83789,0.730469 0.876622,-0.0041 1.542608,-0.633925 2.03125,-1.402344 0.490232,-0.770918 0.856353,-1.740786 1.142579,-2.703125 0.572451,-1.924677 0.814453,-3.828125 0.814453,-3.828125 l -0.992188,-0.128906 c 0,0 -0.238349,1.846552 -0.78125,3.671875 -0.27145,0.912661 -0.623332,1.817793 -1.027344,2.453125 C 16.791301,17.695879 16.388448,18 16,18 l -0.0078,0 -0.0059,0 C 15.562694,18.01175 15.211514,17.860775 14.841797,17.525391 14.47208,17.190006 14.110323,16.662863 13.775391,16 13.105526,14.674274 12.542618,12.823945 11.980469,10.949219 11.41832,9.0744925 10.857287,7.175514 10.123047,5.6914062 9.7559266,4.9493524 9.3455816,4.3073656 8.8417969,3.8242188 8.3380121,3.3410719 7.7153687,3.0192827 7.0136719,3 L 7.0078125,3 7,3 Z"
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/22/labplot-xy-interpolation-curve.svg b/icons-dark/actions/22/labplot-xy-interpolation-curve.svg
--- a/icons-dark/actions/22/labplot-xy-interpolation-curve.svg
+++ b/icons-dark/actions/22/labplot-xy-interpolation-curve.svg
@@ -4,15 +4,15 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
   </defs>
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 10.216797,5.8339844 7.03125,14.324219 7.96875,14.675781 10.785156,7.1679688 17.302734,9.9609375 17.697266,9.0410156 10.216797,5.8339844 Z"
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
diff --git a/icons-dark/actions/22/labplot-xy-smoothing-curve.svg b/icons-dark/actions/22/labplot-xy-smoothing-curve.svg
--- a/icons-dark/actions/22/labplot-xy-smoothing-curve.svg
+++ b/icons-dark/actions/22/labplot-xy-smoothing-curve.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 18.996094 4 C 17.318298 4.0147218 15.882867 4.9286614 14.630859 6.1972656 C 13.378852 7.4658699 12.274223 9.1100804 11.208984 10.732422 C 10.143746 12.354763 9.117216 13.956734 8.0800781 15.123047 C 7.0429402 16.28936 6.0347103 16.977377 5 16.978516 L 5 17.978516 C 6.4652897 17.976903 7.7081101 17.048575 8.828125 15.789062 C 9.9481399 14.529551 10.984438 12.89635 12.044922 11.28125 C 13.105406 9.6661502 14.188096 8.0693852 15.341797 6.9003906 C 16.495498 5.731396 17.684591 5.0115764 19.003906 5 L 18.996094 4 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/22/lensautofix.svg b/icons-dark/actions/22/lensautofix.svg
--- a/icons-dark/actions/22/lensautofix.svg
+++ b/icons-dark/actions/22/lensautofix.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 11 4 A 7 7 0 0 0 4 11 A 7 7 0 0 0 11 18 A 7 7 0 0 0 18 11 A 7 7 0 0 0 11 4 z M 11 5 A 6 6 0 0 1 17 11 A 6 6 0 0 1 11 17 A 6 6 0 0 1 5 11 A 6 6 0 0 1 11 5 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/22/lines-connector.svg b/icons-dark/actions/22/lines-connector.svg
--- a/icons-dark/actions/22/lines-connector.svg
+++ b/icons-dark/actions/22/lines-connector.svg
@@ -4,16 +4,16 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
   </defs>
      />
     <path
        style="fill:currentColor;fill-opacity:1;stroke:none" 
        d="M 16 3 L 16 6 L 19 6 L 19 3 L 16 3 z M 17 4 L 18 4 L 18 5 L 17 5 L 17 4 z M 3 16 L 3 19 L 6 19 L 6 16 L 3 16 z M 4 17 L 5 17 L 5 18 L 4 18 L 4 17 z " 
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
         />
     <path
        style="fill:currentColor;fill-opacity:1;stroke:none" 
diff --git a/icons-dark/actions/22/media-show-active-track-amarok.svg b/icons-dark/actions/22/media-show-active-track-amarok.svg
--- a/icons-dark/actions/22/media-show-active-track-amarok.svg
+++ b/icons-dark/actions/22/media-show-active-track-amarok.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 19 8 L 15 11 L 19 14 L 19 8 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/22/media-track-queue-amarok.svg b/icons-dark/actions/22/media-track-queue-amarok.svg
--- a/icons-dark/actions/22/media-track-queue-amarok.svg
+++ b/icons-dark/actions/22/media-track-queue-amarok.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 16.5 9 L 14 12 L 19 12 L 16.5 9 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/22/mode1.svg b/icons-dark/actions/22/mode1.svg
--- a/icons-dark/actions/22/mode1.svg
+++ b/icons-dark/actions/22/mode1.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 11 16 C 11 17.10801 11.89199 18 13 18 L 18 18 L 18 19 L 20 17.5 L 18 16 L 18 17 L 13 17 C 12.446 17 12 16.554 12 16 L 11 16 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/22/mode2.svg b/icons-dark/actions/22/mode2.svg
--- a/icons-dark/actions/22/mode2.svg
+++ b/icons-dark/actions/22/mode2.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 13 12 L 11 13.5 L 13 15 L 13 14 L 18 14 C 18.554 14 19 14.446 19 15 L 20 15 C 20 13.89199 19.10801 13 18 13 L 13 13 L 13 12 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/22/mode3.svg b/icons-dark/actions/22/mode3.svg
--- a/icons-dark/actions/22/mode3.svg
+++ b/icons-dark/actions/22/mode3.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 18.009766 12 L 18.009766 13 L 17.009766 13 C 15.629056 12.99999 14.509766 14.11928 14.509766 15.5 C 14.509766 16.32843 13.838196 17 13.009766 17 L 10.978516 17 L 10.978516 18 L 13.009766 18 C 14.390476 18.00001 15.509766 16.88072 15.509766 15.5 C 15.509766 14.67157 16.181336 14 17.009766 14 L 18.009766 14 L 18.009766 15 L 20.009766 13.5 L 18.009766 12 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/22/mode4.svg b/icons-dark/actions/22/mode4.svg
--- a/icons-dark/actions/22/mode4.svg
+++ b/icons-dark/actions/22/mode4.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 13 12 L 11 13.5 L 13 15 L 13 14 L 14 14 C 14.82843 14 15.5 14.67157 15.5 15.5 C 15.5 16.88072 16.61929 18.00001 18 18 L 20.03125 18 L 20.03125 17 L 18 17 C 17.17157 17 16.5 16.32843 16.5 15.5 C 16.5 14.11928 15.38071 12.99999 14 13 L 13 13 L 13 12 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/22/mode5.svg b/icons-dark/actions/22/mode5.svg
--- a/icons-dark/actions/22/mode5.svg
+++ b/icons-dark/actions/22/mode5.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 12.5 12 L 10.5 13.5 L 12.5 15 L 12.5 14 L 13.5 14 C 14.32843 14 15 14.67157 15 15.5 C 15 16.88072 16.11929 18.00001 17.5 18 L 19.53125 18 L 19.53125 17 L 17.5 17 C 16.67157 17 16 16.32843 16 15.5 C 16 14.11928 14.88071 12.99999 13.5 13 L 12.5 13 L 12.5 12 z M 18.53125 12 L 18.53125 13 L 17.53125 13 C 17.037155 12.999996 16.579232 13.149125 16.191406 13.396484 A 2 2 0 0 1 16.822266 14.179688 A 2 2 0 0 1 16.828125 14.181641 C 17.038704 14.068834 17.275641 14 17.53125 14 L 18.53125 14 L 18.53125 15 L 20.53125 13.5 L 18.53125 12 z M 14.189453 16.841797 C 13.989891 16.940029 13.76871 17 13.53125 17 L 11.5 17 L 11.5 18 L 13.53125 18 C 14.012649 18.000003 14.460445 17.863343 14.839844 17.626953 A 2 2 0 0 1 14.189453 16.841797 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/22/node-segment-curve.svg b/icons-dark/actions/22/node-segment-curve.svg
--- a/icons-dark/actions/22/node-segment-curve.svg
+++ b/icons-dark/actions/22/node-segment-curve.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 16 4 A 12 12 0 0 0 4 16 L 5 16 A 11 11 0 0 1 16 5 L 16 4 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/22/node-segment-line.svg b/icons-dark/actions/22/node-segment-line.svg
--- a/icons-dark/actions/22/node-segment-line.svg
+++ b/icons-dark/actions/22/node-segment-line.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 16 3 L 16 6 L 19 6 L 19 3 L 16 3 z M 17 4 L 18 4 L 18 5 L 17 5 L 17 4 z M 3 16 L 3 19 L 6 19 L 6 16 L 3 16 z M 4 17 L 5 17 L 5 18 L 4 18 L 4 17 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/22/node-transform.svg b/icons-dark/actions/22/node-transform.svg
--- a/icons-dark/actions/22/node-transform.svg
+++ b/icons-dark/actions/22/node-transform.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 13 13 L 13 14 L 13 15 L 14 15 L 14 14 L 15 14 L 15 13 L 13 13 z M 17 13 L 17 14 L 18 14 L 18 15 L 19 15 L 19 13 L 18 13 L 17 13 z M 13 17 L 13 19 L 14 19 L 15 19 L 15 18 L 14 18 L 14 17 L 13 17 z M 18 17 L 18 18 L 17 18 L 17 19 L 19 19 L 19 18 L 19 17 L 18 17 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/22/node-type-auto-smooth.svg b/icons-dark/actions/22/node-type-auto-smooth.svg
--- a/icons-dark/actions/22/node-type-auto-smooth.svg
+++ b/icons-dark/actions/22/node-type-auto-smooth.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 11 14 A 2.5 2.5 0 0 0 8.5 16.5 A 2.5 2.5 0 0 0 11 19 A 2.5 2.5 0 0 0 13.5 16.5 A 2.5 2.5 0 0 0 11 14 z M 11 15 A 1.5 1.5 0 0 1 12.5 16.5 A 1.5 1.5 0 0 1 11 18 A 1.5 1.5 0 0 1 9.5 16.5 A 1.5 1.5 0 0 1 11 15 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/22/node-type-cusp.svg b/icons-dark/actions/22/node-type-cusp.svg
--- a/icons-dark/actions/22/node-type-cusp.svg
+++ b/icons-dark/actions/22/node-type-cusp.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 11 14.34375 L 8.171875 17.171875 L 11 20 L 13.828125 17.171875 L 11 14.34375 z M 11 15.757812 L 12.414062 17.171875 L 11 18.585938 L 9.5859375 17.171875 L 11 15.757812 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/22/node-type-smooth.svg b/icons-dark/actions/22/node-type-smooth.svg
--- a/icons-dark/actions/22/node-type-smooth.svg
+++ b/icons-dark/actions/22/node-type-smooth.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 8.5 14 L 8.5 19 L 13.5 19 L 13.5 14 L 8.5 14 z M 9.5 15 L 12.5 15 L 12.5 18 L 9.5 18 L 9.5 15 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/22/node-type-symmetric.svg b/icons-dark/actions/22/node-type-symmetric.svg
--- a/icons-dark/actions/22/node-type-symmetric.svg
+++ b/icons-dark/actions/22/node-type-symmetric.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 11 13 L 8 18 L 14 18 L 11 13 z M 11 15 L 12 17 L 10 17 L 11 15 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/22/object-group.svg b/icons-dark/actions/22/object-group.svg
--- a/icons-dark/actions/22/object-group.svg
+++ b/icons-dark/actions/22/object-group.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons-dark/actions/22/object-order-back.svg b/icons-dark/actions/22/object-order-back.svg
--- a/icons-dark/actions/22/object-order-back.svg
+++ b/icons-dark/actions/22/object-order-back.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons-dark/actions/22/object-order-front.svg b/icons-dark/actions/22/object-order-front.svg
--- a/icons-dark/actions/22/object-order-front.svg
+++ b/icons-dark/actions/22/object-order-front.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons-dark/actions/22/object-order-lower.svg b/icons-dark/actions/22/object-order-lower.svg
--- a/icons-dark/actions/22/object-order-lower.svg
+++ b/icons-dark/actions/22/object-order-lower.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons-dark/actions/22/object-order-raise.svg b/icons-dark/actions/22/object-order-raise.svg
--- a/icons-dark/actions/22/object-order-raise.svg
+++ b/icons-dark/actions/22/object-order-raise.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons-dark/actions/22/object-rotate-left.svg b/icons-dark/actions/22/object-rotate-left.svg
--- a/icons-dark/actions/22/object-rotate-left.svg
+++ b/icons-dark/actions/22/object-rotate-left.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons-dark/actions/22/object-rows.svg b/icons-dark/actions/22/object-rows.svg
--- a/icons-dark/actions/22/object-rows.svg
+++ b/icons-dark/actions/22/object-rows.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons-dark/actions/22/object-to-path.svg b/icons-dark/actions/22/object-to-path.svg
--- a/icons-dark/actions/22/object-to-path.svg
+++ b/icons-dark/actions/22/object-to-path.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 15 3 L 15 7 L 19 7 L 19 3 L 15 3 z M 16 4 L 18 4 L 18 6 L 16 6 L 16 4 z M 3 15 L 3 19 L 7 19 L 7 15 L 3 15 z M 4 16 L 6 16 L 6 18 L 4 18 L 4 16 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/22/object-ungroup.svg b/icons-dark/actions/22/object-ungroup.svg
--- a/icons-dark/actions/22/object-ungroup.svg
+++ b/icons-dark/actions/22/object-ungroup.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons-dark/actions/22/office-chart-bar-percentage.svg b/icons-dark/actions/22/office-chart-bar-percentage.svg
--- a/icons-dark/actions/22/office-chart-bar-percentage.svg
+++ b/icons-dark/actions/22/office-chart-bar-percentage.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons-dark/actions/22/office-chart-line-percentage.svg b/icons-dark/actions/22/office-chart-line-percentage.svg
--- a/icons-dark/actions/22/office-chart-line-percentage.svg
+++ b/icons-dark/actions/22/office-chart-line-percentage.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons-dark/actions/22/office-chart-line-stacked.svg b/icons-dark/actions/22/office-chart-line-stacked.svg
--- a/icons-dark/actions/22/office-chart-line-stacked.svg
+++ b/icons-dark/actions/22/office-chart-line-stacked.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons-dark/actions/22/office-chart-line.svg b/icons-dark/actions/22/office-chart-line.svg
--- a/icons-dark/actions/22/office-chart-line.svg
+++ b/icons-dark/actions/22/office-chart-line.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons-dark/actions/22/office-chart-polar-stacked.svg b/icons-dark/actions/22/office-chart-polar-stacked.svg
--- a/icons-dark/actions/22/office-chart-polar-stacked.svg
+++ b/icons-dark/actions/22/office-chart-polar-stacked.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons-dark/actions/22/office-chart-ring.svg b/icons-dark/actions/22/office-chart-ring.svg
--- a/icons-dark/actions/22/office-chart-ring.svg
+++ b/icons-dark/actions/22/office-chart-ring.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons-dark/actions/22/office-chart-scatter.svg b/icons-dark/actions/22/office-chart-scatter.svg
--- a/icons-dark/actions/22/office-chart-scatter.svg
+++ b/icons-dark/actions/22/office-chart-scatter.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons-dark/actions/22/overexposure.svg b/icons-dark/actions/22/overexposure.svg
--- a/icons-dark/actions/22/overexposure.svg
+++ b/icons-dark/actions/22/overexposure.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons-dark/actions/22/password-copy.svg b/icons-dark/actions/22/password-copy.svg
--- a/icons-dark/actions/22/password-copy.svg
+++ b/icons-dark/actions/22/password-copy.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons-dark/actions/22/path-clip-edit.svg b/icons-dark/actions/22/path-clip-edit.svg
--- a/icons-dark/actions/22/path-clip-edit.svg
+++ b/icons-dark/actions/22/path-clip-edit.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons-dark/actions/22/path-effect-parameter-next.svg b/icons-dark/actions/22/path-effect-parameter-next.svg
--- a/icons-dark/actions/22/path-effect-parameter-next.svg
+++ b/icons-dark/actions/22/path-effect-parameter-next.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 16 4 A 12 12 0 0 0 4 16 L 5 16 A 11 11 0 0 1 16 5 L 16 4 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/22/path-mask-edit.svg b/icons-dark/actions/22/path-mask-edit.svg
--- a/icons-dark/actions/22/path-mask-edit.svg
+++ b/icons-dark/actions/22/path-mask-edit.svg
@@ -7,7 +7,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons-dark/actions/22/path-mode-polyline-paraxial.svg b/icons-dark/actions/22/path-mode-polyline-paraxial.svg
--- a/icons-dark/actions/22/path-mode-polyline-paraxial.svg
+++ b/icons-dark/actions/22/path-mode-polyline-paraxial.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons-dark/actions/22/path-mode-polyline.svg b/icons-dark/actions/22/path-mode-polyline.svg
--- a/icons-dark/actions/22/path-mode-polyline.svg
+++ b/icons-dark/actions/22/path-mode-polyline.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons-dark/actions/22/path-reverse.svg b/icons-dark/actions/22/path-reverse.svg
--- a/icons-dark/actions/22/path-reverse.svg
+++ b/icons-dark/actions/22/path-reverse.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 9 9 L 9 13 L 13 13 L 13 9 L 9 9 z M 10 10 L 12 10 L 12 12 L 10 12 L 10 10 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/22/player-time.svg b/icons-dark/actions/22/player-time.svg
--- a/icons-dark/actions/22/player-time.svg
+++ b/icons-dark/actions/22/player-time.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons-dark/actions/22/send_signal.svg b/icons-dark/actions/22/send_signal.svg
--- a/icons-dark/actions/22/send_signal.svg
+++ b/icons-dark/actions/22/send_signal.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons-dark/actions/22/sharpenimage.svg b/icons-dark/actions/22/sharpenimage.svg
--- a/icons-dark/actions/22/sharpenimage.svg
+++ b/icons-dark/actions/22/sharpenimage.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons-dark/actions/22/show-node-handles.svg b/icons-dark/actions/22/show-node-handles.svg
--- a/icons-dark/actions/22/show-node-handles.svg
+++ b/icons-dark/actions/22/show-node-handles.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 4.9804688 3 A 2 2 0 0 0 3 5.0136719 A 2 2 0 0 0 4.5 6.9355469 L 4.5 9 L 5.5 9 L 5.5 6.9335938 A 2 2 0 0 0 7 5 L 7 4.9746094 A 2 2 0 0 0 4.9804688 3 z M 4.9902344 4 A 1 1 0 0 1 6 4.9863281 L 6 5 A 1 1 0 0 1 5.0039062 6 A 1 1 0 0 1 4 5.0058594 A 1 1 0 0 1 4.9902344 4 z M 4.5 10 L 4.5 11 L 5.5 11 L 5.5 10 L 4.5 10 z M 3 15 L 3 19 L 7 19 L 7 15 L 3 15 z M 4 16 L 6 16 L 6 18 L 4 18 L 4 16 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/22/show-path-outline.svg b/icons-dark/actions/22/show-path-outline.svg
--- a/icons-dark/actions/22/show-path-outline.svg
+++ b/icons-dark/actions/22/show-path-outline.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons-dark/actions/22/similarartists-amarok.svg b/icons-dark/actions/22/similarartists-amarok.svg
--- a/icons-dark/actions/22/similarartists-amarok.svg
+++ b/icons-dark/actions/22/similarartists-amarok.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 14 3 C 12.338 3 11 4.338 11 6 C 11 7.662 12.338 9 14 9 C 15.662 9 17 7.662 17 6 C 17 4.338 15.662 3 14 3 z M 14 10 C 13.353654 10 12.744006 10.134157 12.181641 10.361328 L 12.636719 11.275391 C 13.064535 11.114885 13.514485 11 14 11 C 16.21602 11 18 12.78398 18 15 L 14.5 15 L 15 16 L 19 16 L 19 15 C 19 12.22998 16.77002 10 14 10 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/22/skg-chart-bubble.svg b/icons-dark/actions/22/skg-chart-bubble.svg
--- a/icons-dark/actions/22/skg-chart-bubble.svg
+++ b/icons-dark/actions/22/skg-chart-bubble.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons-dark/actions/22/skrooge_type.svg b/icons-dark/actions/22/skrooge_type.svg
--- a/icons-dark/actions/22/skrooge_type.svg
+++ b/icons-dark/actions/22/skrooge_type.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons-dark/actions/22/snap-bounding-box-center.svg b/icons-dark/actions/22/snap-bounding-box-center.svg
--- a/icons-dark/actions/22/snap-bounding-box-center.svg
+++ b/icons-dark/actions/22/snap-bounding-box-center.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 11 9 A 2 2 0 0 0 9 11 A 2 2 0 0 0 11 13 A 2 2 0 0 0 13 11 A 2 2 0 0 0 11 9 z M 11 10 A 1 1 0 0 1 12 11 A 1 1 0 0 1 11 12 A 1 1 0 0 1 10 11 A 1 1 0 0 1 11 10 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/22/snap-bounding-box-corners.svg b/icons-dark/actions/22/snap-bounding-box-corners.svg
--- a/icons-dark/actions/22/snap-bounding-box-corners.svg
+++ b/icons-dark/actions/22/snap-bounding-box-corners.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 15 15 L 15 19 L 19 19 L 19 15 L 15 15 z M 16 16 L 18 16 L 18 18 L 16 18 L 16 16 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/22/snap-bounding-box-edges.svg b/icons-dark/actions/22/snap-bounding-box-edges.svg
--- a/icons-dark/actions/22/snap-bounding-box-edges.svg
+++ b/icons-dark/actions/22/snap-bounding-box-edges.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 11 12 A 2 2 0 0 0 9 14 A 2 2 0 0 0 11 16 A 2 2 0 0 0 13 14 A 2 2 0 0 0 11 12 z M 11 16 A 2 2 0 0 0 9 18 A 2 2 0 0 0 11 20 A 2 2 0 0 0 13 18 A 2 2 0 0 0 11 16 z M 11 13 A 1 1 0 0 1 12 14 A 1 1 0 0 1 11 15 A 1 1 0 0 1 10 14 A 1 1 0 0 1 11 13 z M 11 17 A 1 1 0 0 1 12 18 A 1 1 0 0 1 11 19 A 1 1 0 0 1 10 18 A 1 1 0 0 1 11 17 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/22/snap-bounding-box-midpoints.svg b/icons-dark/actions/22/snap-bounding-box-midpoints.svg
--- a/icons-dark/actions/22/snap-bounding-box-midpoints.svg
+++ b/icons-dark/actions/22/snap-bounding-box-midpoints.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 15 9 L 15 13 L 19 13 L 19 9 L 15 9 z M 16 10 L 18 10 L 18 12 L 16 12 L 16 10 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/22/snap-grid-guide-intersections.svg b/icons-dark/actions/22/snap-grid-guide-intersections.svg
--- a/icons-dark/actions/22/snap-grid-guide-intersections.svg
+++ b/icons-dark/actions/22/snap-grid-guide-intersections.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 9 11 L 9 15 L 13 15 L 13 11 L 9 11 z M 10 12 L 12 12 L 12 14 L 10 14 L 10 12 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/22/snap-nodes-center.svg b/icons-dark/actions/22/snap-nodes-center.svg
--- a/icons-dark/actions/22/snap-nodes-center.svg
+++ b/icons-dark/actions/22/snap-nodes-center.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 11 9 A 2 2 0 0 0 9 11 A 2 2 0 0 0 11 13 A 2 2 0 0 0 13 11 A 2 2 0 0 0 11 9 z M 11 10 A 1 1 0 0 1 12 11 A 1 1 0 0 1 11 12 A 1 1 0 0 1 10 11 A 1 1 0 0 1 11 10 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/22/snap-nodes-intersection.svg b/icons-dark/actions/22/snap-nodes-intersection.svg
--- a/icons-dark/actions/22/snap-nodes-intersection.svg
+++ b/icons-dark/actions/22/snap-nodes-intersection.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 9 9 L 9 13 L 13 13 L 13 9 L 9 9 z M 10 10 L 12 10 L 12 12 L 10 12 L 10 10 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/22/snap-nodes-rotation-center.svg b/icons-dark/actions/22/snap-nodes-rotation-center.svg
--- a/icons-dark/actions/22/snap-nodes-rotation-center.svg
+++ b/icons-dark/actions/22/snap-nodes-rotation-center.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 14 10 A 4 4 0 0 0 10 14 A 4 4 0 0 0 14 18 A 4 4 0 0 0 18 14 A 4 4 0 0 0 14 10 z M 14 11 A 3 3 0 0 1 17 14 A 3 3 0 0 1 14 17 A 3 3 0 0 1 11 14 A 3 3 0 0 1 14 11 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/22/snap-text-baseline.svg b/icons-dark/actions/22/snap-text-baseline.svg
--- a/icons-dark/actions/22/snap-text-baseline.svg
+++ b/icons-dark/actions/22/snap-text-baseline.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 3 15 L 3 19 L 7 19 L 7 15 L 3 15 z M 4 16 L 6 16 L 6 18 L 4 18 L 4 16 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/22/snap.svg b/icons-dark/actions/22/snap.svg
--- a/icons-dark/actions/22/snap.svg
+++ b/icons-dark/actions/22/snap.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 14 15 L 14 19 L 19 19 L 19 15 L 14 15 z M 15 16 L 18 16 L 18 18 L 15 18 L 15 16 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/22/standard-connector.svg b/icons-dark/actions/22/standard-connector.svg
--- a/icons-dark/actions/22/standard-connector.svg
+++ b/icons-dark/actions/22/standard-connector.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 4.5 3 A 1.4999979 1.5 0 0 0 3 4.5 A 1.4999979 1.5 0 0 0 4.5 6 A 1.4999979 1.5 0 0 0 6 4.5 A 1.4999979 1.5 0 0 0 4.5 3 z M 4.5 4 A 0.5 0.5 0 0 1 5 4.5 A 0.5 0.5 0 0 1 4.5 5 A 0.5 0.5 0 0 1 4 4.5 A 0.5 0.5 0 0 1 4.5 4 z M 17.5 16 A 1.4999979 1.5 0 0 0 16 17.5 A 1.4999979 1.5 0 0 0 17.5 19 A 1.4999979 1.5 0 0 0 19 17.5 A 1.4999979 1.5 0 0 0 17.5 16 z M 17.5 17 A 0.5 0.5 0 0 1 18 17.5 A 0.5 0.5 0 0 1 17.5 18 A 0.5 0.5 0 0 1 17 17.5 A 0.5 0.5 0 0 1 17.5 17 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/22/step_object_ChargedParticle.svg b/icons-dark/actions/22/step_object_ChargedParticle.svg
--- a/icons-dark/actions/22/step_object_ChargedParticle.svg
+++ b/icons-dark/actions/22/step_object_ChargedParticle.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons-dark/actions/22/step_object_CoulombForce.svg b/icons-dark/actions/22/step_object_CoulombForce.svg
--- a/icons-dark/actions/22/step_object_CoulombForce.svg
+++ b/icons-dark/actions/22/step_object_CoulombForce.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 15.5 12 A 3.4999979 3.5 0 0 0 12 15.5 A 3.4999979 3.5 0 0 0 15.5 19 A 3.4999979 3.5 0 0 0 17.972656 17.972656 L 17.267578 17.267578 A 2.5 2.5 0 0 1 15.5 18 A 2.5 2.5 0 0 1 13 15.5 A 2.5 2.5 0 0 1 15.5 13 A 2.5 2.5 0 0 1 17.267578 13.732422 L 17.972656 13.027344 A 3.4999979 3.5 0 0 0 15.5 12 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/22/step_object_GravitationForce.svg b/icons-dark/actions/22/step_object_GravitationForce.svg
--- a/icons-dark/actions/22/step_object_GravitationForce.svg
+++ b/icons-dark/actions/22/step_object_GravitationForce.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 15.5 12 C 13.567 12 12 13.567 12 15.5 C 12 17.433 13.567 19 15.5 19 C 17.23865 18.998 18.75163 17.72081 19 16 L 19 15 L 16 15 L 16 16 L 17.945312 16 C 17.708032 17.16244 16.68641 17.99802 15.5 18 C 14.11929 18 13 16.88071 13 15.5 C 13 14.11929 14.11929 13 15.5 13 C 16.163 13.0001 16.798808 13.263562 17.267578 13.732422 L 17.972656 13.027344 C 17.317176 12.370704 16.42781 12.00118 15.5 12 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/22/step_object_LinearMotor.svg b/icons-dark/actions/22/step_object_LinearMotor.svg
--- a/icons-dark/actions/22/step_object_LinearMotor.svg
+++ b/icons-dark/actions/22/step_object_LinearMotor.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons-dark/actions/22/step_object_WeightForce.svg b/icons-dark/actions/22/step_object_WeightForce.svg
--- a/icons-dark/actions/22/step_object_WeightForce.svg
+++ b/icons-dark/actions/22/step_object_WeightForce.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 11 13 L 11.052734 13.158203 L 13 19 L 14.054688 19 L 15.527344 14.582031 L 17 19 L 18.054688 19 L 20.001953 13.158203 L 20.054688 13 L 19 13 L 17.527344 17.417969 L 16.054688 13 L 15 13 L 13.527344 17.417969 L 12.054688 13 L 11 13 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/22/story-editor.svg b/icons-dark/actions/22/story-editor.svg
--- a/icons-dark/actions/22/story-editor.svg
+++ b/icons-dark/actions/22/story-editor.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons-dark/actions/22/stroke-to-path.svg b/icons-dark/actions/22/stroke-to-path.svg
--- a/icons-dark/actions/22/stroke-to-path.svg
+++ b/icons-dark/actions/22/stroke-to-path.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -22,6 +22,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 15 3 L 15 7 L 19 7 L 19 3 L 15 3 z M 16 4 L 18 4 L 18 6 L 16 6 L 16 4 z M 3 15 L 3 19 L 7 19 L 7 15 L 3 15 z M 4 16 L 6 16 L 6 18 L 4 18 L 4 16 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/22/svn-commit.svg b/icons-dark/actions/22/svn-commit.svg
--- a/icons-dark/actions/22/svn-commit.svg
+++ b/icons-dark/actions/22/svn-commit.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons-dark/actions/22/svn-update.svg b/icons-dark/actions/22/svn-update.svg
--- a/icons-dark/actions/22/svn-update.svg
+++ b/icons-dark/actions/22/svn-update.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons-dark/actions/22/table.svg b/icons-dark/actions/22/table.svg
--- a/icons-dark/actions/22/table.svg
+++ b/icons-dark/actions/22/table.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 4 4 L 4 7 L 4 9 L 9 9 L 9 7 L 9 4 L 7 4 L 4 4 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/22/tag-new.svg b/icons-dark/actions/22/tag-new.svg
--- a/icons-dark/actions/22/tag-new.svg
+++ b/icons-dark/actions/22/tag-new.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons-dark/actions/22/tag-recents.svg b/icons-dark/actions/22/tag-recents.svg
--- a/icons-dark/actions/22/tag-recents.svg
+++ b/icons-dark/actions/22/tag-recents.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons-dark/actions/22/tag.svg b/icons-dark/actions/22/tag.svg
--- a/icons-dark/actions/22/tag.svg
+++ b/icons-dark/actions/22/tag.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons-dark/actions/22/taxes-finances.svg b/icons-dark/actions/22/taxes-finances.svg
--- a/icons-dark/actions/22/taxes-finances.svg
+++ b/icons-dark/actions/22/taxes-finances.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons-dark/actions/22/text-flow-into-frame.svg b/icons-dark/actions/22/text-flow-into-frame.svg
--- a/icons-dark/actions/22/text-flow-into-frame.svg
+++ b/icons-dark/actions/22/text-flow-into-frame.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 11 12 L 11 13 L 15 13 L 15.5 13 C 16.885 13 18 14.115 18 15.5 C 18 16.3187 17.60449 17.035134 17 17.490234 L 17 16 L 16 16 L 16 17.949219 L 16 18 L 16 18.951172 L 16 19 L 17 19 L 19 19 L 19 18 L 17.923828 18 C 18.581798 17.3681 19 16.4903 19 15.5 C 19 13.561 17.439 12 15.5 12 L 11 12 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/22/text-unflow.svg b/icons-dark/actions/22/text-unflow.svg
--- a/icons-dark/actions/22/text-unflow.svg
+++ b/icons-dark/actions/22/text-unflow.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons-dark/actions/22/text-wrap.svg b/icons-dark/actions/22/text-wrap.svg
--- a/icons-dark/actions/22/text-wrap.svg
+++ b/icons-dark/actions/22/text-wrap.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 11 12 L 11 13 L 15 13 L 15.5 13 C 16.885 13 18 14.115 18 15.5 C 18 16.3187 17.604493 17.035134 17 17.490234 L 17 16 L 16 16 L 16 17.949219 L 16 18 L 16 18.951172 L 16 19 L 17 19 L 19 19 L 19 18 L 17.923828 18 C 18.581798 17.3681 19 16.4903 19 15.5 C 19 13.561 17.439 12 15.5 12 L 11 12 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/22/text_horz_kern.svg b/icons-dark/actions/22/text_horz_kern.svg
--- a/icons-dark/actions/22/text_horz_kern.svg
+++ b/icons-dark/actions/22/text_horz_kern.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
 	 d="M 9 3 L 5 6 L 9 9 L 9 3 z M 13 3 L 13 9 L 17 6 L 13 3 z "
-       class="ColorScheme-Highlight"
+       class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/22/text_letter_spacing.svg b/icons-dark/actions/22/text_letter_spacing.svg
--- a/icons-dark/actions/22/text_letter_spacing.svg
+++ b/icons-dark/actions/22/text_letter_spacing.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons-dark/actions/22/text_line_spacing.svg b/icons-dark/actions/22/text_line_spacing.svg
--- a/icons-dark/actions/22/text_line_spacing.svg
+++ b/icons-dark/actions/22/text_line_spacing.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 16 3 L 13 7 L 15 7 L 15 8 L 15 13 L 15 15 L 13 15 L 16 19 L 19 15 L 17 15 L 17 12 L 17 11 L 17 8 L 17 7 L 19 7 L 16 3 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/22/text_rotation.svg b/icons-dark/actions/22/text_rotation.svg
--- a/icons-dark/actions/22/text_rotation.svg
+++ b/icons-dark/actions/22/text_rotation.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
 	d="M 10 3 L 10 19 L 11 19 L 11 16.580078 L 20.359375 18.685547 L 20.591797 17.658203 L 11 15.5 L 11 3 L 10 3 z "
-       class="ColorScheme-Highlight"
+       class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/22/text_subscript.svg b/icons-dark/actions/22/text_subscript.svg
--- a/icons-dark/actions/22/text_subscript.svg
+++ b/icons-dark/actions/22/text_subscript.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons-dark/actions/22/text_superscript.svg b/icons-dark/actions/22/text_superscript.svg
--- a/icons-dark/actions/22/text_superscript.svg
+++ b/icons-dark/actions/22/text_superscript.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons-dark/actions/22/text_vert_kern.svg b/icons-dark/actions/22/text_vert_kern.svg
--- a/icons-dark/actions/22/text_vert_kern.svg
+++ b/icons-dark/actions/22/text_vert_kern.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
 	d="M 10 3 L 10 19 L 11 19 L 11 15 L 20 15 L 20 14 L 11 14 L 11 3 L 10 3 z "
-       class="ColorScheme-Highlight"
+       class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/22/text_word_spacing.svg b/icons-dark/actions/22/text_word_spacing.svg
--- a/icons-dark/actions/22/text_word_spacing.svg
+++ b/icons-dark/actions/22/text_word_spacing.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 10 3 L 6 6 L 10 9 L 10 3 z M 13 3 L 13 9 L 17 6 L 13 3 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/22/timeline-insert.svg b/icons-dark/actions/22/timeline-insert.svg
--- a/icons-dark/actions/22/timeline-insert.svg
+++ b/icons-dark/actions/22/timeline-insert.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,7 +17,7 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 7,5 10,8 13,5 7,5 Z"
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
@@ -27,6 +27,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="m 7,9 6,0 0,5 -6,0 z"
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/22/timeline-overwrite.svg b/icons-dark/actions/22/timeline-overwrite.svg
--- a/icons-dark/actions/22/timeline-overwrite.svg
+++ b/icons-dark/actions/22/timeline-overwrite.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,11 +17,11 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M8 8h6v5H8z"
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="m 8,4 3.000001,3 3,-3 L 8,4 Z"
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/22/tool_color_eraser.svg b/icons-dark/actions/22/tool_color_eraser.svg
--- a/icons-dark/actions/22/tool_color_eraser.svg
+++ b/icons-dark/actions/22/tool_color_eraser.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons-dark/actions/22/tool_curve.svg b/icons-dark/actions/22/tool_curve.svg
--- a/icons-dark/actions/22/tool_curve.svg
+++ b/icons-dark/actions/22/tool_curve.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons-dark/actions/22/tool_elliptical_selection.svg b/icons-dark/actions/22/tool_elliptical_selection.svg
--- a/icons-dark/actions/22/tool_elliptical_selection.svg
+++ b/icons-dark/actions/22/tool_elliptical_selection.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons-dark/actions/22/unmarkasblank.svg b/icons-dark/actions/22/unmarkasblank.svg
--- a/icons-dark/actions/22/unmarkasblank.svg
+++ b/icons-dark/actions/22/unmarkasblank.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons-dark/actions/22/user-group-delete.svg b/icons-dark/actions/22/user-group-delete.svg
--- a/icons-dark/actions/22/user-group-delete.svg
+++ b/icons-dark/actions/22/user-group-delete.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons-dark/actions/22/view-calendar-wedding-anniversary.svg b/icons-dark/actions/22/view-calendar-wedding-anniversary.svg
--- a/icons-dark/actions/22/view-calendar-wedding-anniversary.svg
+++ b/icons-dark/actions/22/view-calendar-wedding-anniversary.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons-dark/actions/22/view-categories-expenditures.svg b/icons-dark/actions/22/view-categories-expenditures.svg
--- a/icons-dark/actions/22/view-categories-expenditures.svg
+++ b/icons-dark/actions/22/view-categories-expenditures.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons-dark/actions/22/view-close.svg b/icons-dark/actions/22/view-close.svg
--- a/icons-dark/actions/22/view-close.svg
+++ b/icons-dark/actions/22/view-close.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons-dark/actions/22/view-left-close.svg b/icons-dark/actions/22/view-left-close.svg
--- a/icons-dark/actions/22/view-left-close.svg
+++ b/icons-dark/actions/22/view-left-close.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons-dark/actions/22/view-media-lyrics.svg b/icons-dark/actions/22/view-media-lyrics.svg
--- a/icons-dark/actions/22/view-media-lyrics.svg
+++ b/icons-dark/actions/22/view-media-lyrics.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons-dark/actions/22/view-pim-tasks-pending.svg b/icons-dark/actions/22/view-pim-tasks-pending.svg
--- a/icons-dark/actions/22/view-pim-tasks-pending.svg
+++ b/icons-dark/actions/22/view-pim-tasks-pending.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons-dark/actions/22/view-right-close.svg b/icons-dark/actions/22/view-right-close.svg
--- a/icons-dark/actions/22/view-right-close.svg
+++ b/icons-dark/actions/22/view-right-close.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons-dark/actions/22/view-time-schedule-baselined-add.svg b/icons-dark/actions/22/view-time-schedule-baselined-add.svg
--- a/icons-dark/actions/22/view-time-schedule-baselined-add.svg
+++ b/icons-dark/actions/22/view-time-schedule-baselined-add.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,7 +17,7 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="m 433.71432,532.79071 0.99995,0 c 10e-6,0 2e-5,10e-6 2e-5,3e-5 l 0,10.99994 c 0,2e-5 -1e-5,3e-5 -2e-5,3e-5 l -0.99995,0 c -10e-6,0 -3e-5,-10e-6 -3e-5,-3e-5 l 0,-10.99994 c 0,-2e-5 2e-5,-3e-5 3e-5,-3e-5 z"
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      transform="translate(-421.71429,-525.79074)"
      />
 </svg>
diff --git a/icons-dark/actions/22/view-time-schedule-baselined-remove.svg b/icons-dark/actions/22/view-time-schedule-baselined-remove.svg
--- a/icons-dark/actions/22/view-time-schedule-baselined-remove.svg
+++ b/icons-dark/actions/22/view-time-schedule-baselined-remove.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons-dark/actions/22/view-time-schedule-baselined.svg b/icons-dark/actions/22/view-time-schedule-baselined.svg
--- a/icons-dark/actions/22/view-time-schedule-baselined.svg
+++ b/icons-dark/actions/22/view-time-schedule-baselined.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,7 +17,7 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="m 433.71432,532.79071 0.99995,0 c 10e-6,0 2e-5,10e-6 2e-5,3e-5 l 0,10.99994 c 0,2e-5 -1e-5,3e-5 -2e-5,3e-5 l -0.99995,0 c -10e-6,0 -3e-5,-10e-6 -3e-5,-3e-5 l 0,-10.99994 c 0,-2e-5 2e-5,-3e-5 3e-5,-3e-5 z"
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      transform="translate(-421.71429,-525.79074)"
      />
 </svg>
diff --git a/icons-dark/actions/22/view-time-schedule-calculus.svg b/icons-dark/actions/22/view-time-schedule-calculus.svg
--- a/icons-dark/actions/22/view-time-schedule-calculus.svg
+++ b/icons-dark/actions/22/view-time-schedule-calculus.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons-dark/actions/22/view-time-schedule-edit.svg b/icons-dark/actions/22/view-time-schedule-edit.svg
--- a/icons-dark/actions/22/view-time-schedule-edit.svg
+++ b/icons-dark/actions/22/view-time-schedule-edit.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons-dark/actions/24/align-horizontal-node.svg b/icons-dark/actions/24/align-horizontal-node.svg
--- a/icons-dark/actions/24/align-horizontal-node.svg
+++ b/icons-dark/actions/24/align-horizontal-node.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 9 4 L 9 8 L 12 6 L 9 4 z M 16 10 L 13 12 L 16 14 L 16 10 z M 9 16 L 9 20 L 12 18 L 9 16 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/24/align-vertical-node.svg b/icons-dark/actions/24/align-vertical-node.svg
--- a/icons-dark/actions/24/align-vertical-node.svg
+++ b/icons-dark/actions/24/align-vertical-node.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 10 8 L 12 11 L 14 8 L 10 8 z M 6 12 L 4 15 L 8 15 L 6 12 z M 18 12 L 16 15 L 20 15 L 18 12 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/24/database-change-key.svg b/icons-dark/actions/24/database-change-key.svg
--- a/icons-dark/actions/24/database-change-key.svg
+++ b/icons-dark/actions/24/database-change-key.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 17.5 3 A 3.499991 3.499991 0 0 0 14 6.5 A 3.499991 3.499991 0 0 0 14.699219 8.59375 L 15.416016 7.8769531 A 2.5 2.5 0 0 1 15 6.5 A 2.5 2.5 0 0 1 17.5 4 A 2.5 2.5 0 0 1 18.876953 4.4160156 L 19.59375 3.6992188 A 3.499991 3.499991 0 0 0 17.5 3 z M 20.300781 4.40625 L 19.583984 5.1230469 A 2.5 2.5 0 0 1 20 6.5 A 2.5 2.5 0 0 1 17.5 9 A 2.5 2.5 0 0 1 16.123047 8.5839844 L 15.40625 9.3007812 A 3.499991 3.499991 0 0 0 17.5 10 A 3.499991 3.499991 0 0 0 21 6.5 A 3.499991 3.499991 0 0 0 20.300781 4.40625 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/24/distribute-graph-directed.svg b/icons-dark/actions/24/distribute-graph-directed.svg
--- a/icons-dark/actions/24/distribute-graph-directed.svg
+++ b/icons-dark/actions/24/distribute-graph-directed.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 5.5 4 A 1.4999959 1.5 0 0 0 4 5.5 A 1.4999959 1.5 0 0 0 5.5 7 A 1.4999959 1.5 0 0 0 7 5.5 A 1.4999959 1.5 0 0 0 5.5 4 z M 18.5 4 A 1.4999959 1.5 0 0 0 17 5.5 A 1.4999959 1.5 0 0 0 18.5 7 A 1.4999959 1.5 0 0 0 20 5.5 A 1.4999959 1.5 0 0 0 18.5 4 z M 12 11 A 1.4999959 1.5 0 0 0 10.5 12.5 A 1.4999959 1.5 0 0 0 12 14 A 1.4999959 1.5 0 0 0 13.5 12.5 A 1.4999959 1.5 0 0 0 12 11 z M 12 17 A 1.4999959 1.5 0 0 0 10.5 18.5 A 1.4999959 1.5 0 0 0 12 20 A 1.4999959 1.5 0 0 0 13.5 18.5 A 1.4999959 1.5 0 0 0 12 17 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/24/distribute-graph.svg b/icons-dark/actions/24/distribute-graph.svg
--- a/icons-dark/actions/24/distribute-graph.svg
+++ b/icons-dark/actions/24/distribute-graph.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 9.5 4 A 1.4999959 1.5 0 0 0 8 5.5 A 1.4999959 1.5 0 0 0 9.5 7 A 1.4999959 1.5 0 0 0 11 5.5 A 1.4999959 1.5 0 0 0 9.5 4 z M 20.5 4 A 1.4999959 1.5 0 0 0 19 5.5 A 1.4999959 1.5 0 0 0 20.5 7 A 1.4999959 1.5 0 0 0 22 5.5 A 1.4999959 1.5 0 0 0 20.5 4 z M 3.5 9 A 1.4999959 1.5 0 0 0 2 10.5 A 1.4999959 1.5 0 0 0 3.5 12 A 1.4999959 1.5 0 0 0 5 10.5 A 1.4999959 1.5 0 0 0 3.5 9 z M 15.5 11 A 1.4999959 1.5 0 0 0 14 12.5 A 1.4999959 1.5 0 0 0 15.5 14 A 1.4999959 1.5 0 0 0 17 12.5 A 1.4999959 1.5 0 0 0 15.5 11 z M 3.5 17 A 1.4999959 1.5 0 0 0 2 18.5 A 1.4999959 1.5 0 0 0 3.5 20 A 1.4999959 1.5 0 0 0 5 18.5 A 1.4999959 1.5 0 0 0 3.5 17 z M 10.5 17 A 1.4999959 1.5 0 0 0 9 18.5 A 1.4999959 1.5 0 0 0 10.5 20 A 1.4999959 1.5 0 0 0 12 18.5 A 1.4999959 1.5 0 0 0 10.5 17 z M 20.5 17 A 1.4999959 1.5 0 0 0 19 18.5 A 1.4999959 1.5 0 0 0 20.5 20 A 1.4999959 1.5 0 0 0 22 18.5 A 1.4999959 1.5 0 0 0 20.5 17 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/24/distribute-horizontal-node.svg b/icons-dark/actions/24/distribute-horizontal-node.svg
--- a/icons-dark/actions/24/distribute-horizontal-node.svg
+++ b/icons-dark/actions/24/distribute-horizontal-node.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 6 4 L 6 8 L 7 8 L 7 7 L 9 7 L 9 8 L 10 8 L 10 4 L 9 4 L 9 5 L 7 5 L 7 4 L 6 4 z M 14 4 L 14 8 L 15 8 L 15 7 L 17 7 L 17 8 L 18 8 L 18 4 L 17 4 L 17 5 L 15 5 L 15 4 L 14 4 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/24/distribute-vertical-node.svg b/icons-dark/actions/24/distribute-vertical-node.svg
--- a/icons-dark/actions/24/distribute-vertical-node.svg
+++ b/icons-dark/actions/24/distribute-vertical-node.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 10 6 L 10 7 L 11 7 L 11 9 L 10 9 L 10 10 L 14 10 L 14 9 L 13 9 L 13 7 L 14 7 L 14 6 L 10 6 z M 10 14 L 10 15 L 11 15 L 11 17 L 10 17 L 10 18 L 14 18 L 14 17 L 13 17 L 13 15 L 14 15 L 14 14 L 10 14 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/24/draw-connector.svg b/icons-dark/actions/24/draw-connector.svg
--- a/icons-dark/actions/24/draw-connector.svg
+++ b/icons-dark/actions/24/draw-connector.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 16 4 L 16 8 L 20 8 L 20 4 L 16 4 z M 17 5 L 19 5 L 19 7 L 17 7 L 17 5 z M 4 16 L 4 20 L 8 20 L 8 16 L 4 16 z M 5 17 L 7 17 L 7 19 L 5 19 L 5 17 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/24/edit-table-insert-column-left.svg b/icons-dark/actions/24/edit-table-insert-column-left.svg
--- a/icons-dark/actions/24/edit-table-insert-column-left.svg
+++ b/icons-dark/actions/24/edit-table-insert-column-left.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 4 4 L 4 5 L 4 13 L 4 14 L 10 14 L 10 13 L 10 10.292969 L 10 5 L 10 4 L 4 4 z M 5 5 L 9 5 L 9 9.2929688 L 5 5.2929688 L 5 5 z M 5 6.7070312 L 9 10.707031 L 9 13 L 8.7070312 13 L 5 9.2929688 L 5 6.7070312 z M 5 10.707031 L 7.2929688 13 L 5 13 L 5 10.707031 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/24/edit-table-insert-column-right.svg b/icons-dark/actions/24/edit-table-insert-column-right.svg
--- a/icons-dark/actions/24/edit-table-insert-column-right.svg
+++ b/icons-dark/actions/24/edit-table-insert-column-right.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 14 4 L 14 5 L 14 10.292969 L 14 13 L 14 14 L 20 14 L 20 13 L 20 5 L 20 4 L 14 4 z M 15 5 L 19 5 L 19 5.2929688 L 15 9.2929688 L 15 5 z M 19 6.7070312 L 19 9.2929688 L 15.292969 13 L 15 13 L 15 10.707031 L 19 6.7070312 z M 19 10.707031 L 19 13 L 16.707031 13 L 19 10.707031 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/24/edit-table-insert-row-above.svg b/icons-dark/actions/24/edit-table-insert-row-above.svg
--- a/icons-dark/actions/24/edit-table-insert-row-above.svg
+++ b/icons-dark/actions/24/edit-table-insert-row-above.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 4 4 L 4 10 L 5 10 L 10.292969 10 L 13 10 L 14 10 L 14 4 L 13 4 L 5 4 L 4 4 z M 5 5 L 5.2929688 5 L 9.2929688 9 L 5 9 L 5 5 z M 6.7070312 5 L 9.2929688 5 L 13 8.7070312 L 13 9 L 10.707031 9 L 6.7070312 5 z M 10.707031 5 L 13 5 L 13 7.2929688 L 10.707031 5 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/24/edit-table-insert-row-below.svg b/icons-dark/actions/24/edit-table-insert-row-below.svg
--- a/icons-dark/actions/24/edit-table-insert-row-below.svg
+++ b/icons-dark/actions/24/edit-table-insert-row-below.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 5 14 L 5 15 L 9.2929688 15 L 5.2929688 19 L 5 19 L 5 20 L 13 20 L 13 19 L 10.707031 19 L 13 16.707031 L 13 15.292969 L 9.2929688 19 L 6.7070312 19 L 10.707031 15 L 13 15 L 13 14 L 10.292969 14 L 5 14 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/24/edit-table-insert-row-under.svg b/icons-dark/actions/24/edit-table-insert-row-under.svg
--- a/icons-dark/actions/24/edit-table-insert-row-under.svg
+++ b/icons-dark/actions/24/edit-table-insert-row-under.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 4 9 L 4 10 L 5 10 L 8.28125 10 L 5 13.28125 L 5 13.292969 L 4.2929688 14 L 4 14 L 4 15 L 5 15 L 12 15 L 14 15 L 14 14 L 13.71875 14 L 14 13.71875 L 14 12.28125 L 12.28125 14 L 12 14 L 9.71875 14 L 12 11.71875 L 13.71875 10 L 14 10 L 14 9 L 12 9 L 9.2929688 9 L 5 9 L 4 9 z M 9.71875 10 L 12 10 L 12.28125 10 L 12 10.28125 L 8.28125 14 L 5.71875 14 L 9.71875 10 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/24/edit-text-frame-update.svg b/icons-dark/actions/24/edit-text-frame-update.svg
--- a/icons-dark/actions/24/edit-text-frame-update.svg
+++ b/icons-dark/actions/24/edit-text-frame-update.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 5 4 L 7 7 L 9 4 L 5 4 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/24/exchange-positions-clockwise.svg b/icons-dark/actions/24/exchange-positions-clockwise.svg
--- a/icons-dark/actions/24/exchange-positions-clockwise.svg
+++ b/icons-dark/actions/24/exchange-positions-clockwise.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 16.5 13 A 3.499991 3.499991 0 0 0 13 16.5 A 3.499991 3.499991 0 0 0 13.699219 18.59375 L 14.416016 17.876953 A 2.5 2.5 0 0 1 14 16.5 A 2.5 2.5 0 0 1 16.5 14 A 2.5 2.5 0 0 1 17.876953 14.416016 L 18.59375 13.699219 A 3.499991 3.499991 0 0 0 16.5 13 z M 19.300781 14.40625 L 18.583984 15.123047 A 2.5 2.5 0 0 1 19 16.5 A 2.5 2.5 0 0 1 16.5 19 A 2.5 2.5 0 0 1 15.123047 18.583984 L 14.40625 19.300781 A 3.499991 3.499991 0 0 0 16.5 20 A 3.499991 3.499991 0 0 0 20 16.5 A 3.499991 3.499991 0 0 0 19.300781 14.40625 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/24/exchange-positions-zorder.svg b/icons-dark/actions/24/exchange-positions-zorder.svg
--- a/icons-dark/actions/24/exchange-positions-zorder.svg
+++ b/icons-dark/actions/24/exchange-positions-zorder.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 14 13 L 13.792969 13.207031 L 12 15 L 12 16.414062 L 13.5 14.914062 L 13.5 19 L 14.5 19 L 14.5 14.914062 L 16 16.414062 L 16 15 L 14.207031 13.207031 L 14 13 z M 17.5 14 L 17.5 18.085938 L 16 16.585938 L 16 18 L 17.792969 19.792969 L 18 20 L 18.207031 19.792969 L 20 18 L 20 16.585938 L 18.5 18.085938 L 18.5 14 L 17.5 14 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/24/format-break-node.svg b/icons-dark/actions/24/format-break-node.svg
--- a/icons-dark/actions/24/format-break-node.svg
+++ b/icons-dark/actions/24/format-break-node.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 10 10.5 L 12 13.5 L 14 10.5 L 10 10.5 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/24/format-connect-node.svg b/icons-dark/actions/24/format-connect-node.svg
--- a/icons-dark/actions/24/format-connect-node.svg
+++ b/icons-dark/actions/24/format-connect-node.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 10 10.5 L 12 13.5 L 14 10.5 L 10 10.5 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/24/format-convert-to-path.svg b/icons-dark/actions/24/format-convert-to-path.svg
--- a/icons-dark/actions/24/format-convert-to-path.svg
+++ b/icons-dark/actions/24/format-convert-to-path.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 2 10 L 2 14 L 6 14 L 6 10 L 2 10 z M 10 10 L 10 14 L 14 14 L 14 10 L 10 10 z M 18 10 L 18 14 L 22 14 L 22 10 L 18 10 z M 3 11 L 5 11 L 5 13 L 3 13 L 3 11 z M 11 11 L 13 11 L 13 13 L 11 13 L 11 11 z M 19 11 L 21 11 L 21 13 L 19 13 L 19 11 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/24/format-disconnect-node.svg b/icons-dark/actions/24/format-disconnect-node.svg
--- a/icons-dark/actions/24/format-disconnect-node.svg
+++ b/icons-dark/actions/24/format-disconnect-node.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 10 10.5 L 12 13.5 L 14 10.5 L 10 10.5 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/24/format-insert-node.svg b/icons-dark/actions/24/format-insert-node.svg
--- a/icons-dark/actions/24/format-insert-node.svg
+++ b/icons-dark/actions/24/format-insert-node.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 17 15 L 17 17 L 15 17 L 15 18 L 17 18 L 17 20 L 18 20 L 18 18 L 20 18 L 20 17 L 18 17 L 18 15 L 17 15 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/24/format-join-node.svg b/icons-dark/actions/24/format-join-node.svg
--- a/icons-dark/actions/24/format-join-node.svg
+++ b/icons-dark/actions/24/format-join-node.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 10 10.5 L 12 13.5 L 14 10.5 L 10 10.5 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/24/format-node-corner.svg b/icons-dark/actions/24/format-node-corner.svg
--- a/icons-dark/actions/24/format-node-corner.svg
+++ b/icons-dark/actions/24/format-node-corner.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 5.5 4 A 1.5 1.5 0 0 0 4 5.5 A 1.5 1.5 0 0 0 5.5 7 A 1.5 1.5 0 0 0 7 5.5 A 1.5 1.5 0 0 0 5.5 4 z M 5.5 5 A 0.5 0.5 0 0 1 6 5.5 A 0.5 0.5 0 0 1 5.5 6 A 0.5 0.5 0 0 1 5 5.5 A 0.5 0.5 0 0 1 5.5 5 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/24/format-node-line.svg b/icons-dark/actions/24/format-node-line.svg
--- a/icons-dark/actions/24/format-node-line.svg
+++ b/icons-dark/actions/24/format-node-line.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 10 11 L 10 14 L 13 14 L 13 11 L 10 11 z M 11 12 L 12 12 L 12 13 L 11 13 L 11 12 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/24/format-node-smooth.svg b/icons-dark/actions/24/format-node-smooth.svg
--- a/icons-dark/actions/24/format-node-smooth.svg
+++ b/icons-dark/actions/24/format-node-smooth.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 8 9 L 8 13 L 12 13 L 12 9 L 8 9 z M 9 10 L 11 10 L 11 12 L 9 12 L 9 10 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/24/format-node-symmetric.svg b/icons-dark/actions/24/format-node-symmetric.svg
--- a/icons-dark/actions/24/format-node-symmetric.svg
+++ b/icons-dark/actions/24/format-node-symmetric.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 10 9 L 10 11 L 7 11 L 7 12 L 10 12 L 10 13 L 14 13 L 14 12 L 17 12 L 17 11 L 14 11 L 14 9 L 10 9 z M 11 10 L 13 10 L 13 12 L 11 12 L 11 10 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/24/format-precision-more.svg b/icons-dark/actions/24/format-precision-more.svg
--- a/icons-dark/actions/24/format-precision-more.svg
+++ b/icons-dark/actions/24/format-precision-more.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 16 16 L 16 18 L 14 18 L 14 19 L 16 19 L 16 21 L 17 21 L 17 19 L 19 19 L 19 18 L 17 18 L 17 16 L 16 16 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/24/format-segment-curve.svg b/icons-dark/actions/24/format-segment-curve.svg
--- a/icons-dark/actions/24/format-segment-curve.svg
+++ b/icons-dark/actions/24/format-segment-curve.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 17 5 A 12 12 0 0 0 5 17 L 6 17 A 11 11 0 0 1 17 6 L 17 5 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/24/format-segment-line.svg b/icons-dark/actions/24/format-segment-line.svg
--- a/icons-dark/actions/24/format-segment-line.svg
+++ b/icons-dark/actions/24/format-segment-line.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 17 6.3125 L 6.3125 17 L 7 17 L 7 17.6875 L 17.6875 7 L 17 7 L 17 6.3125 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/24/format-text-capitalize.svg b/icons-dark/actions/24/format-text-capitalize.svg
--- a/icons-dark/actions/24/format-text-capitalize.svg
+++ b/icons-dark/actions/24/format-text-capitalize.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 7 3 L 4 7 L 10 7 L 7 3 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/24/format-text-lowercase.svg b/icons-dark/actions/24/format-text-lowercase.svg
--- a/icons-dark/actions/24/format-text-lowercase.svg
+++ b/icons-dark/actions/24/format-text-lowercase.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 14 4 L 17 8 L 20 4 L 14 4 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/24/format-text-uppercase.svg b/icons-dark/actions/24/format-text-uppercase.svg
--- a/icons-dark/actions/24/format-text-uppercase.svg
+++ b/icons-dark/actions/24/format-text-uppercase.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 17 3 L 14 7 L 20 7 L 17 3 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/24/insert-page-break.svg b/icons-dark/actions/24/insert-page-break.svg
--- a/icons-dark/actions/24/insert-page-break.svg
+++ b/icons-dark/actions/24/insert-page-break.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 6 11 L 6 12 L 8 12 L 8 11 L 6 11 z M 11 11 L 11 12 L 13 12 L 13 11 L 11 11 z M 16 11 L 16 12 L 18 12 L 18 11 L 16 11 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/24/insert-table-of-contents.svg b/icons-dark/actions/24/insert-table-of-contents.svg
--- a/icons-dark/actions/24/insert-table-of-contents.svg
+++ b/icons-dark/actions/24/insert-table-of-contents.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 17 4 L 17 5 L 18 5 L 18 7 L 17 7 L 17 8 L 18 8 L 19 8 L 20 8 L 20 7 L 19 7 L 19 5 L 20 5 L 20 4 L 19 4 L 18 4 L 17 4 z M 11 6 L 11 7 L 12 7 L 12 6 L 11 6 z M 13 6 L 13 7 L 14 7 L 14 6 L 13 6 z M 15 6 L 15 7 L 16 7 L 16 6 L 15 6 z M 15 10 L 15 11 L 16 11 L 16 13 L 15 13 L 15 14 L 20 14 L 20 13 L 19 13 L 19 11 L 20 11 L 20 10 L 15 10 z M 17 11 L 18 11 L 18 13 L 17 13 L 17 11 z M 9 12 L 9 13 L 10 13 L 10 12 L 9 12 z M 11 12 L 11 13 L 12 13 L 12 12 L 11 12 z M 13 12 L 13 13 L 14 13 L 14 12 L 13 12 z M 13 16 L 13 17 L 14 17 L 14 19 L 13 19 L 13 20 L 14 20 L 15 20 L 16 20 L 20 20 L 20 19 L 19 19 L 19 17 L 20 17 L 20 16 L 16 16 L 15 16 L 14 16 L 13 16 z M 15 17 L 16 17 L 16 19 L 15 19 L 15 17 z M 17 17 L 18 17 L 18 19 L 17 19 L 17 17 z M 7 18 L 7 19 L 8 19 L 8 18 L 7 18 z M 9 18 L 9 19 L 10 19 L 10 18 L 9 18 z M 11 18 L 11 19 L 12 19 L 12 18 L 11 18 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/24/insert-table.svg b/icons-dark/actions/24/insert-table.svg
--- a/icons-dark/actions/24/insert-table.svg
+++ b/icons-dark/actions/24/insert-table.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 5 5 L 5 8 L 5 10 L 10 10 L 10 8 L 10 5 L 8 5 L 5 5 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/24/media-show-active-track-amarok.svg b/icons-dark/actions/24/media-show-active-track-amarok.svg
--- a/icons-dark/actions/24/media-show-active-track-amarok.svg
+++ b/icons-dark/actions/24/media-show-active-track-amarok.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 20 9 L 16 12 L 20 15 L 20 9 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/24/media-track-queue-amarok.svg b/icons-dark/actions/24/media-track-queue-amarok.svg
--- a/icons-dark/actions/24/media-track-queue-amarok.svg
+++ b/icons-dark/actions/24/media-track-queue-amarok.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 17.5 10 L 15 13 L 20 13 L 17.5 10 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/24/node-segment-curve.svg b/icons-dark/actions/24/node-segment-curve.svg
--- a/icons-dark/actions/24/node-segment-curve.svg
+++ b/icons-dark/actions/24/node-segment-curve.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 17 5 A 12 12 0 0 0 5 17 L 6 17 A 11 11 0 0 1 17 6 L 17 5 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/24/node-segment-line.svg b/icons-dark/actions/24/node-segment-line.svg
--- a/icons-dark/actions/24/node-segment-line.svg
+++ b/icons-dark/actions/24/node-segment-line.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 17 4 L 17 7 L 20 7 L 20 4 L 17 4 z M 18 5 L 19 5 L 19 6 L 18 6 L 18 5 z M 4 17 L 4 20 L 7 20 L 7 17 L 4 17 z M 5 18 L 6 18 L 6 19 L 5 19 L 5 18 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/24/node-transform.svg b/icons-dark/actions/24/node-transform.svg
--- a/icons-dark/actions/24/node-transform.svg
+++ b/icons-dark/actions/24/node-transform.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 14 14 L 14 15 L 14 16 L 15 16 L 15 15 L 16 15 L 16 14 L 14 14 z M 18 14 L 18 15 L 19 15 L 19 16 L 20 16 L 20 14 L 19 14 L 18 14 z M 14 18 L 14 20 L 15 20 L 16 20 L 16 19 L 15 19 L 15 18 L 14 18 z M 19 18 L 19 19 L 18 19 L 18 20 L 20 20 L 20 19 L 20 18 L 19 18 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/24/node-type-auto-smooth.svg b/icons-dark/actions/24/node-type-auto-smooth.svg
--- a/icons-dark/actions/24/node-type-auto-smooth.svg
+++ b/icons-dark/actions/24/node-type-auto-smooth.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 12 15 A 2.5 2.5 0 0 0 9.5 17.5 A 2.5 2.5 0 0 0 12 20 A 2.5 2.5 0 0 0 14.5 17.5 A 2.5 2.5 0 0 0 12 15 z M 12 16 A 1.5 1.5 0 0 1 13.5 17.5 A 1.5 1.5 0 0 1 12 19 A 1.5 1.5 0 0 1 10.5 17.5 A 1.5 1.5 0 0 1 12 16 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/24/node-type-cusp.svg b/icons-dark/actions/24/node-type-cusp.svg
--- a/icons-dark/actions/24/node-type-cusp.svg
+++ b/icons-dark/actions/24/node-type-cusp.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 12 15.34375 L 9.171875 18.171875 L 12 21 L 14.828125 18.171875 L 12 15.34375 z M 12 16.757812 L 13.414062 18.171875 L 12 19.585938 L 10.585938 18.171875 L 12 16.757812 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/24/node-type-smooth.svg b/icons-dark/actions/24/node-type-smooth.svg
--- a/icons-dark/actions/24/node-type-smooth.svg
+++ b/icons-dark/actions/24/node-type-smooth.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 9.5 15 L 9.5 20 L 14.5 20 L 14.5 15 L 9.5 15 z M 10.5 16 L 13.5 16 L 13.5 19 L 10.5 19 L 10.5 16 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/24/node-type-symmetric.svg b/icons-dark/actions/24/node-type-symmetric.svg
--- a/icons-dark/actions/24/node-type-symmetric.svg
+++ b/icons-dark/actions/24/node-type-symmetric.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 12 14 L 9 19 L 15 19 L 12 14 z M 12 16 L 13 18 L 11 18 L 12 16 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/24/object-to-path.svg b/icons-dark/actions/24/object-to-path.svg
--- a/icons-dark/actions/24/object-to-path.svg
+++ b/icons-dark/actions/24/object-to-path.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 16 4 L 16 8 L 20 8 L 20 4 L 16 4 z M 17 5 L 19 5 L 19 7 L 17 7 L 17 5 z M 4 16 L 4 20 L 8 20 L 8 16 L 4 16 z M 5 17 L 7 17 L 7 19 L 5 19 L 5 17 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/24/path-effect-parameter-next.svg b/icons-dark/actions/24/path-effect-parameter-next.svg
--- a/icons-dark/actions/24/path-effect-parameter-next.svg
+++ b/icons-dark/actions/24/path-effect-parameter-next.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 17 5 A 12 12 0 0 0 5 17 L 6 17 A 11 11 0 0 1 17 6 L 17 5 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/24/path-reverse.svg b/icons-dark/actions/24/path-reverse.svg
--- a/icons-dark/actions/24/path-reverse.svg
+++ b/icons-dark/actions/24/path-reverse.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 10 10 L 10 14 L 14 14 L 14 10 L 10 10 z M 11 11 L 13 11 L 13 13 L 11 13 L 11 11 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/24/show-node-handles.svg b/icons-dark/actions/24/show-node-handles.svg
--- a/icons-dark/actions/24/show-node-handles.svg
+++ b/icons-dark/actions/24/show-node-handles.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 5.9804688 4 A 2 2 0 0 0 4 6.0136719 A 2 2 0 0 0 5.5 7.9355469 L 5.5 10 L 6.5 10 L 6.5 7.9335938 A 2 2 0 0 0 8 6 L 8 5.9746094 A 2 2 0 0 0 5.9804688 4 z M 5.9902344 5 A 1 1 0 0 1 7 5.9863281 L 7 6 A 1 1 0 0 1 6.0039062 7 A 1 1 0 0 1 5 6.0058594 A 1 1 0 0 1 5.9902344 5 z M 5.5 11 L 5.5 12 L 6.5 12 L 6.5 11 L 5.5 11 z M 4 16 L 4 20 L 8 20 L 8 16 L 4 16 z M 5 17 L 7 17 L 7 19 L 5 19 L 5 17 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/24/snap-bounding-box-center.svg b/icons-dark/actions/24/snap-bounding-box-center.svg
--- a/icons-dark/actions/24/snap-bounding-box-center.svg
+++ b/icons-dark/actions/24/snap-bounding-box-center.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 12 10 A 2 2 0 0 0 10 12 A 2 2 0 0 0 12 14 A 2 2 0 0 0 14 12 A 2 2 0 0 0 12 10 z M 12 11 A 1 1 0 0 1 13 12 A 1 1 0 0 1 12 13 A 1 1 0 0 1 11 12 A 1 1 0 0 1 12 11 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/24/snap-bounding-box-corners.svg b/icons-dark/actions/24/snap-bounding-box-corners.svg
--- a/icons-dark/actions/24/snap-bounding-box-corners.svg
+++ b/icons-dark/actions/24/snap-bounding-box-corners.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 16 16 L 16 20 L 20 20 L 20 16 L 16 16 z M 17 17 L 19 17 L 19 19 L 17 19 L 17 17 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/24/snap-bounding-box-edges.svg b/icons-dark/actions/24/snap-bounding-box-edges.svg
--- a/icons-dark/actions/24/snap-bounding-box-edges.svg
+++ b/icons-dark/actions/24/snap-bounding-box-edges.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 12 13 A 2 2 0 0 0 10 15 A 2 2 0 0 0 12 17 A 2 2 0 0 0 14 15 A 2 2 0 0 0 12 13 z M 12 17 A 2 2 0 0 0 10 19 A 2 2 0 0 0 12 21 A 2 2 0 0 0 14 19 A 2 2 0 0 0 12 17 z M 12 14 A 1 1 0 0 1 13 15 A 1 1 0 0 1 12 16 A 1 1 0 0 1 11 15 A 1 1 0 0 1 12 14 z M 12 18 A 1 1 0 0 1 13 19 A 1 1 0 0 1 12 20 A 1 1 0 0 1 11 19 A 1 1 0 0 1 12 18 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/24/snap-bounding-box-midpoints.svg b/icons-dark/actions/24/snap-bounding-box-midpoints.svg
--- a/icons-dark/actions/24/snap-bounding-box-midpoints.svg
+++ b/icons-dark/actions/24/snap-bounding-box-midpoints.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 16 10 L 16 14 L 20 14 L 20 10 L 16 10 z M 17 11 L 19 11 L 19 13 L 17 13 L 17 11 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/24/snap-grid-guide-intersections.svg b/icons-dark/actions/24/snap-grid-guide-intersections.svg
--- a/icons-dark/actions/24/snap-grid-guide-intersections.svg
+++ b/icons-dark/actions/24/snap-grid-guide-intersections.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 10 12 L 10 16 L 14 16 L 14 12 L 10 12 z M 11 13 L 13 13 L 13 15 L 11 15 L 11 13 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/24/snap-nodes-center.svg b/icons-dark/actions/24/snap-nodes-center.svg
--- a/icons-dark/actions/24/snap-nodes-center.svg
+++ b/icons-dark/actions/24/snap-nodes-center.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 12 10 A 2 2 0 0 0 10 12 A 2 2 0 0 0 12 14 A 2 2 0 0 0 14 12 A 2 2 0 0 0 12 10 z M 12 11 A 1 1 0 0 1 13 12 A 1 1 0 0 1 12 13 A 1 1 0 0 1 11 12 A 1 1 0 0 1 12 11 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/24/snap-nodes-cusp.svg b/icons-dark/actions/24/snap-nodes-cusp.svg
--- a/icons-dark/actions/24/snap-nodes-cusp.svg
+++ b/icons-dark/actions/24/snap-nodes-cusp.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 3 3 L 3 7 L 7 7 L 7 3 L 3 3 z M 17 3 L 17 7 L 21 7 L 21 3 L 17 3 z M 4 4 L 6 4 L 6 6 L 4 6 L 4 4 z M 18 4 L 20 4 L 20 6 L 18 6 L 18 4 z M 3 17 L 3 21 L 7 21 L 7 17 L 3 17 z M 17 17 L 17 21 L 21 21 L 21 17 L 17 17 z M 4 18 L 6 18 L 6 20 L 4 20 L 4 18 z M 18 18 L 20 18 L 20 20 L 18 20 L 18 18 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/24/snap-nodes-intersection.svg b/icons-dark/actions/24/snap-nodes-intersection.svg
--- a/icons-dark/actions/24/snap-nodes-intersection.svg
+++ b/icons-dark/actions/24/snap-nodes-intersection.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 10 10 L 10 14 L 14 14 L 14 10 L 10 10 z M 11 11 L 13 11 L 13 13 L 11 13 L 11 11 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/24/snap-nodes-midpoint.svg b/icons-dark/actions/24/snap-nodes-midpoint.svg
--- a/icons-dark/actions/24/snap-nodes-midpoint.svg
+++ b/icons-dark/actions/24/snap-nodes-midpoint.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 12 9 L 9 15 L 15 15 L 12 9 z M 12 11.236328 L 13.382812 14 L 10.617188 14 L 12 11.236328 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/24/snap-nodes-path.svg b/icons-dark/actions/24/snap-nodes-path.svg
--- a/icons-dark/actions/24/snap-nodes-path.svg
+++ b/icons-dark/actions/24/snap-nodes-path.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 8 6 A 2 2 0 0 0 6 8 A 2 2 0 0 0 8 10 A 2 2 0 0 0 10 8 A 2 2 0 0 0 8 6 z M 8 7 A 1 1 0 0 1 9 8 A 1 1 0 0 1 8 9 A 1 1 0 0 1 7 8 A 1 1 0 0 1 8 7 z M 12 9 A 2 2 0 0 0 10 11 A 2 2 0 0 0 12 13 A 2 2 0 0 0 14 11 A 2 2 0 0 0 12 9 z M 12 10 A 1 1 0 0 1 13 11 A 1 1 0 0 1 12 12 A 1 1 0 0 1 11 11 A 1 1 0 0 1 12 10 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/24/snap-nodes-rotation-center.svg b/icons-dark/actions/24/snap-nodes-rotation-center.svg
--- a/icons-dark/actions/24/snap-nodes-rotation-center.svg
+++ b/icons-dark/actions/24/snap-nodes-rotation-center.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 15 11 A 4 4 0 0 0 11 15 A 4 4 0 0 0 15 19 A 4 4 0 0 0 19 15 A 4 4 0 0 0 15 11 z M 15 12 A 3 3 0 0 1 18 15 A 3 3 0 0 1 15 18 A 3 3 0 0 1 12 15 A 3 3 0 0 1 15 12 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/24/snap-nodes-smooth.svg b/icons-dark/actions/24/snap-nodes-smooth.svg
--- a/icons-dark/actions/24/snap-nodes-smooth.svg
+++ b/icons-dark/actions/24/snap-nodes-smooth.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 10 3 L 10 7 L 14 7 L 14 3 L 10 3 z M 11 4 L 13 4 L 13 6 L 11 6 L 11 4 z M 3 10 L 3 14 L 7 14 L 7 10 L 3 10 z M 17 10 L 17 14 L 21 14 L 21 10 L 17 10 z M 4 11 L 6 11 L 6 13 L 4 13 L 4 11 z M 18 11 L 20 11 L 20 13 L 18 13 L 18 11 z M 10 17 L 10 21 L 14 21 L 14 17 L 10 17 z M 11 18 L 13 18 L 13 20 L 11 20 L 11 18 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/24/snap-text-baseline.svg b/icons-dark/actions/24/snap-text-baseline.svg
--- a/icons-dark/actions/24/snap-text-baseline.svg
+++ b/icons-dark/actions/24/snap-text-baseline.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 4 16 L 4 20 L 8 20 L 8 16 L 4 16 z M 5 17 L 7 17 L 7 19 L 5 19 L 5 17 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/24/snap.svg b/icons-dark/actions/24/snap.svg
--- a/icons-dark/actions/24/snap.svg
+++ b/icons-dark/actions/24/snap.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 15 16 L 15 20 L 20 20 L 20 16 L 15 16 z M 16 17 L 19 17 L 19 19 L 16 19 L 16 17 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/24/stroke-to-path.svg b/icons-dark/actions/24/stroke-to-path.svg
--- a/icons-dark/actions/24/stroke-to-path.svg
+++ b/icons-dark/actions/24/stroke-to-path.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -22,6 +22,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 16 4 L 16 8 L 20 8 L 20 4 L 16 4 z M 17 5 L 19 5 L 19 7 L 17 7 L 17 5 z M 4 16 L 4 20 L 8 20 L 8 16 L 4 16 z M 5 17 L 7 17 L 7 19 L 5 19 L 5 17 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/24/table.svg b/icons-dark/actions/24/table.svg
--- a/icons-dark/actions/24/table.svg
+++ b/icons-dark/actions/24/table.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 5 5 L 5 8 L 5 10 L 10 10 L 10 8 L 10 5 L 8 5 L 5 5 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/24/text-flow-into-frame.svg b/icons-dark/actions/24/text-flow-into-frame.svg
--- a/icons-dark/actions/24/text-flow-into-frame.svg
+++ b/icons-dark/actions/24/text-flow-into-frame.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 12 13 L 12 14 L 16 14 L 16.5 14 C 17.885 14 19 15.115 19 16.5 C 19 17.3187 18.60449 18.035134 18 18.490234 L 18 17 L 17 17 L 17 18.949219 L 17 19 L 17 19.951172 L 17 20 L 18 20 L 20 20 L 20 19 L 18.923828 19 C 19.581798 18.3681 20 17.4903 20 16.5 C 20 14.561 18.439 13 16.5 13 L 12 13 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/24/text-wrap.svg b/icons-dark/actions/24/text-wrap.svg
--- a/icons-dark/actions/24/text-wrap.svg
+++ b/icons-dark/actions/24/text-wrap.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 12 13 L 12 14 L 16 14 L 16.5 14 C 17.885 14 19 15.115 19 16.5 C 19 17.3187 18.604493 18.035134 18 18.490234 L 18 17 L 17 17 L 17 18.949219 L 17 19 L 17 19.951172 L 17 20 L 18 20 L 20 20 L 20 19 L 18.923828 19 C 19.581798 18.3681 20 17.4903 20 16.5 C 20 14.561 18.439 13 16.5 13 L 12 13 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/24/text_horz_kern.svg b/icons-dark/actions/24/text_horz_kern.svg
--- a/icons-dark/actions/24/text_horz_kern.svg
+++ b/icons-dark/actions/24/text_horz_kern.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 10 4 L 6 7 L 10 10 L 10 4 z M 14 4 L 14 10 L 18 7 L 14 4 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/24/text_line_spacing.svg b/icons-dark/actions/24/text_line_spacing.svg
--- a/icons-dark/actions/24/text_line_spacing.svg
+++ b/icons-dark/actions/24/text_line_spacing.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 17 4 L 14 8 L 16 8 L 16 9 L 16 14 L 16 16 L 14 16 L 17 20 L 20 16 L 18 16 L 18 13 L 18 12 L 18 9 L 18 8 L 20 8 L 17 4 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/24/text_rotation.svg b/icons-dark/actions/24/text_rotation.svg
--- a/icons-dark/actions/24/text_rotation.svg
+++ b/icons-dark/actions/24/text_rotation.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 11 4 L 11 20 L 12 20 L 12 17.580078 L 21.359375 19.685547 L 21.591797 18.658203 L 12 16.5 L 12 4 L 11 4 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/24/text_vert_kern.svg b/icons-dark/actions/24/text_vert_kern.svg
--- a/icons-dark/actions/24/text_vert_kern.svg
+++ b/icons-dark/actions/24/text_vert_kern.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 11 4 L 11 20 L 12 20 L 12 16 L 21 16 L 21 15 L 12 15 L 12 4 L 11 4 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/24/text_word_spacing.svg b/icons-dark/actions/24/text_word_spacing.svg
--- a/icons-dark/actions/24/text_word_spacing.svg
+++ b/icons-dark/actions/24/text_word_spacing.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 11 4 L 7 7 L 11 10 L 11 4 z M 14 4 L 14 10 L 18 7 L 14 4 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/24/view-time-schedule-baselined-add.svg b/icons-dark/actions/24/view-time-schedule-baselined-add.svg
--- a/icons-dark/actions/24/view-time-schedule-baselined-add.svg
+++ b/icons-dark/actions/24/view-time-schedule-baselined-add.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -15,6 +15,6 @@
      />
  <path style="fill:currentColor;fill-opacity:1;stroke:none" 
        d="M 13 8 L 13 19 L 14 19 L 14 8 L 13 8 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/24/view-time-schedule-baselined.svg b/icons-dark/actions/24/view-time-schedule-baselined.svg
--- a/icons-dark/actions/24/view-time-schedule-baselined.svg
+++ b/icons-dark/actions/24/view-time-schedule-baselined.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -15,6 +15,6 @@
      />
  <path style="fill:currentColor;fill-opacity:1;stroke:none" 
        d="M 13 8 L 13 19 L 14 19 L 14 8 L 13 8 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/32/colors-luma.svg b/icons-dark/actions/32/colors-luma.svg
--- a/icons-dark/actions/32/colors-luma.svg
+++ b/icons-dark/actions/32/colors-luma.svg
@@ -7,7 +7,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons-dark/actions/32/configure.svg b/icons-dark/actions/32/configure.svg
--- a/icons-dark/actions/32/configure.svg
+++ b/icons-dark/actions/32/configure.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons-dark/actions/32/document-print-direct.svg b/icons-dark/actions/32/document-print-direct.svg
--- a/icons-dark/actions/32/document-print-direct.svg
+++ b/icons-dark/actions/32/document-print-direct.svg
@@ -7,7 +7,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -22,6 +22,6 @@
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      id="path10"
      d="M 24,28 29,23.5 24,19 Z" 
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/actions/32/document-print.svg b/icons-dark/actions/32/document-print.svg
--- a/icons-dark/actions/32/document-print.svg
+++ b/icons-dark/actions/32/document-print.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons-dark/actions/32/document-revert.svg b/icons-dark/actions/32/document-revert.svg
--- a/icons-dark/actions/32/document-revert.svg
+++ b/icons-dark/actions/32/document-revert.svg
@@ -7,7 +7,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons-dark/actions/symbolic/media-view-subtitles-symbolic.svg b/icons-dark/actions/symbolic/media-view-subtitles-symbolic.svg
--- a/icons-dark/actions/symbolic/media-view-subtitles-symbolic.svg
+++ b/icons-dark/actions/symbolic/media-view-subtitles-symbolic.svg
@@ -51,7 +51,7 @@
       .ColorScheme-Text {
         color:#bebebe;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -68,7 +68,7 @@
     <path
        style="color:#3daee9;fill:currentColor;fill-opacity:1;stroke:none"
        d="m 426.71,535.79 6,0 0,2 -6,0 z"
-       class="ColorScheme-Highlight"
+       class="olorScheme-ButtonFocus"
        id="path10"
        inkscape:connector-curvature="0" />
   </g>
diff --git a/icons-dark/applets/128/user-ada-lovelace.svg b/icons-dark/applets/128/user-ada-lovelace.svg
--- a/icons-dark/applets/128/user-ada-lovelace.svg
+++ b/icons-dark/applets/128/user-ada-lovelace.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#4d4d4d;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -23,7 +23,7 @@
      transform="translate(0,-924.36216)">
     <path
        style="fill:currentColor;fill-opacity:1;stroke:none" 
-       class="ColorScheme-Highlight"
+       class="olorScheme-ButtonFocus"
        d="M 0 0 L 0 128 L 128 128 L 128 0 L 0 0 z "
        transform="translate(0,924.36216)"
        id="rect5879" />
@@ -44,7 +44,7 @@
        style="opacity:0.1;fill:url(#linearGradient6626);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
     <path
        style="fill:currentColor;fill-opacity:1;stroke:none" 
-       class="ColorScheme-Highlight"
+       class="olorScheme-ButtonFocus"
        d="M 78.640625 7.6796875 L 61.439453 12.800781 C 64.783535 26.177103 84.629499 55.909717 96.462891 51.654297 C 95.713507 53.91554 96.029691 56.274464 96.517578 56.972656 C 95.062694 58.174186 92.674344 66.248965 93.755859 67.796875 C 92.300947 68.998025 91.553227 74.496872 92.634766 76.044922 C 91.179888 77.246422 90.342285 83.305616 91.423828 84.853516 C 89.968872 86.054916 88.027746 89.91685 92.015625 90.34375 C 98.523547 91.04195 101.28846 88.427434 101.47461 87.052734 C 102.92957 85.851034 107.66747 79.497019 106.58594 77.949219 C 108.04087 76.747819 112.77881 70.387754 111.69727 68.839844 C 113.15225 67.638314 116.63257 61.108364 115.54297 59.558594 C 116.99791 58.357064 116.09878 48.321142 105.62109 47.013672 C 103.85655 46.793581 102.40244 46.891515 101.20117 47.205078 C 111.16534 29.496031 78.640625 7.6796875 78.640625 7.6796875 z M 46.080078 10.240234 C 36.986099 10.532664 27.714469 9.4391906 20.925781 27.712891 L 26.214844 47.433594 C 25.155826 47.246586 23.926303 47.212967 22.486328 47.392578 C 12.008635 48.700128 11.109504 58.734027 12.564453 59.935547 C 11.474833 61.485327 14.953263 68.01722 16.408203 69.21875 C 15.326681 70.76653 20.066545 77.126625 21.521484 78.328125 C 20.439961 79.875925 25.177885 86.230041 26.632812 87.431641 C 26.818984 88.806441 29.581923 91.420856 36.089844 90.722656 C 40.077723 90.295756 38.136614 86.433922 36.681641 85.232422 C 37.763184 83.684522 36.925564 77.625228 35.470703 76.423828 C 36.552242 74.875748 35.806489 69.377061 34.351562 68.175781 C 35.433076 66.627871 33.044733 58.553083 31.589844 57.351562 C 32.236395 56.426315 32.580933 52.589676 30.53125 49.925781 C 30.066399 46.928728 28.696322 36.404901 32 32 C 35.840003 26.88 61.440861 24.320781 58.880859 12.800781 L 46.080078 10.240234 z M 47.037109 51.207031 C 45.341856 51.287982 43.654898 52.072176 43.279297 53.642578 C 42.778528 55.736388 43.91402 56.715623 45.990234 57.220703 C 48.066439 57.725723 51.079277 57.566436 51.580078 55.472656 C 52.080879 53.378796 50.761768 51.862482 48.685547 51.357422 C 48.166491 51.231154 47.602194 51.180048 47.037109 51.207031 z M 80.962891 51.207031 C 80.397806 51.180048 79.831556 51.231154 79.3125 51.357422 C 77.236279 51.862482 75.917168 53.378796 76.417969 55.472656 C 76.91877 57.566436 79.931607 57.725723 82.007812 57.220703 C 84.084027 56.715623 85.221472 55.736388 84.720703 53.642578 C 84.345102 52.072176 82.658144 51.287982 80.962891 51.207031 z "
        transform="translate(0,924.36216)"
        id="path6520" />
@@ -59,7 +59,7 @@
        />
     <path
        style="fill:currentColor;fill-opacity:1;stroke:none" 
-       class="ColorScheme-Highlight"
+       class="olorScheme-ButtonFocus"
        d="M 59.621094,86.943359 C 58.456249,86.994962 57.2,87.442797 56,88.591797 c -1.600001,1.532 -4.800781,0.640625 -4.800781,0.640625 1.600001,3.0639 6.400777,8.046875 12.800781,8.046875 6.400003,0 11.20078,-4.982975 12.800781,-8.046875 0,0 -3.20078,0.891375 -4.800781,-0.640625 -3.200001,-3.064 -6.799999,-1.1489 -8,0 -0.750001,-0.718063 -2.437499,-1.734443 -4.378906,-1.648438 z m -5.861328,3.296875 c 6.960101,1.055993 13.379804,0.666984 20.480468,0 0,0 -3.840231,3.839844 -10.240234,3.839844 -6.400004,0 -10.240234,-3.839844 -10.240234,-3.839844 z"
        transform="translate(0,924.36216)"
        />
diff --git a/icons-dark/applets/128/user-alice-in-wonderland.svg b/icons-dark/applets/128/user-alice-in-wonderland.svg
--- a/icons-dark/applets/128/user-alice-in-wonderland.svg
+++ b/icons-dark/applets/128/user-alice-in-wonderland.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#4d4d4d;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -48,16 +48,16 @@
        style="fill:currentColor;fill-opacity:1;stroke:none"
        d="M 0 0 L 0 128 L 128 128 L 128 0 L 0 0 z "
        transform="translate(0,924.36216)"
-       class="ColorScheme-Highlight"
+       class="olorScheme-ButtonFocus"
        id="rect5879" />
   </g>
   <path
      style="opacity:0.2;fill:url(#linearGradient4475);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
      d="m 98.56,11.775988 29.44,29.439944 0,86.783978 -51.2,0 z"
      />
   <path
      style="fill:currentColor;fill-opacity:1;stroke:none" 
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      d="M 64,-3.6072446e-5 C 19.2,-3.6072446e-5 16.64,31.999959 19.2,63.999916 21.80239,96.529702 12.8,121.59991 6.4,127.99991 l 115.2,0 c -6.4,-6.4 -15.40239,-31.470208 -12.8,-63.999994 C 111.36,31.999959 108.8,-3.6072446e-5 64,-3.6072446e-5 Z"
      />
   <path
@@ -70,12 +70,12 @@
      />
   <path
      style="fill:currentColor;fill-opacity:1;stroke:none" 
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      d="m 46.9525,53.527455 c -1.70873,0.09635 -3.40891,1.031025 -3.7875,2.9 -0.50475,2.491916 0.64228,3.656386 2.735,4.257499 2.09271,0.601075 5.12772,0.40934 5.6325,-2.082499 0.50478,-2.491981 -0.82477,-4.293912 -2.9175,-4.895 -0.52318,-0.150268 -1.09292,-0.212115 -1.6625,-0.18 z m 34.095,0 c -0.56958,-0.03212 -1.13932,0.02973 -1.6625,0.18 -2.09273,0.601088 -3.42228,2.403019 -2.9175,4.895 0.50478,2.491839 3.53979,2.683574 5.6325,2.082499 2.09272,-0.601113 3.23975,-1.765583 2.735,-4.257499 -0.37859,-1.868975 -2.07877,-2.803653 -3.7875,-2.9 z M 50.615,87.192451 c -0.0883,-0.02024 -0.20895,-0.01929 -0.3675,0.01 -0.18319,0.03383 -0.41714,0.105869 -0.715,0.224999 -2.38285,0.953216 -0.57425,1.947081 -0.2275,2.525001 1.02209,1.703476 1.07128,0.273577 1.02,-0.685001 1.27393,1.894322 4.83622,5.433142 13.675,5.452515 9.59053,0.02078 12.94495,-4.158529 13.9275,-5.872499 -0.0687,0.687967 -0.2585,3.189992 0.9925,1.105 0.34675,-0.57792 2.15785,-1.571784 -0.225,-2.525 -2.38285,-0.953088 -0.7425,1.145001 -0.7425,1.145001 0,0 2e-5,0.0099 0,0.01 C 77.71991,88.560767 67.16509,87.574983 64,87.574983 c -3.10066,0 -13.0803,0.925688 -13.7175,0.984999 0.0232,-0.02985 0.95087,-1.22583 0.3325,-1.367499 z M 64,88.66495 c 1.45454,0 6.4,0.315 6.4,0.315 -0.36364,0.475136 -1.83435,1.9128 -6.4,1.9 -4.56565,-0.0068 -6.03636,-1.424864 -6.4,-1.9 0,0 4.94546,-0.315 6.4,-0.315 z"
      />
   <path
      style="fill:currentColor;fill-opacity:1;stroke:none" 
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      d="m 72.825,4.3024632 c -2.62104,2.2150252 -4.92839,4.4746561 -6.905,6.7124988 -0.001,-0.0085 -0.001,-0.01652 -0.003,-0.025 l -30.617,2.29 -15.395,18.904997 8.625,12.712498 c 0,0 20.06291,-5.633824 30.845,-16.942497 1.26103,3.003397 4.66746,5.152183 10.77,5.914999 18.10193,2.262746 16.14642,14.084706 20.7875,17.622497 4.64108,3.537779 13.56297,6.617089 13.7225,-9.094999 C 104.92222,16.078511 72.825,4.3024632 72.825,4.3024632 Z"
      />
   <path
diff --git a/icons-dark/applets/128/user-grace-hopper.svg b/icons-dark/applets/128/user-grace-hopper.svg
--- a/icons-dark/applets/128/user-grace-hopper.svg
+++ b/icons-dark/applets/128/user-grace-hopper.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#4d4d4d;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -44,15 +44,15 @@
     <path
        style="fill:currentColor;fill-opacity:1;stroke:none"
        d="M 0 0 L 0 128 L 128 128 L 128 0 L 0 0 z "
-       class="ColorScheme-Highlight"
+       class="olorScheme-ButtonFocus"
        id="rect5879" />
   <path
      style="opacity:0.2;fill:url(#linearGradient4475-2);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
      d="M 98.560547 20.480469 L 76.800781 128 L 128 128 L 128 49.919922 L 98.560547 20.480469 z "
      id="path15" />
   <path
      style="fill:currentColor;fill-opacity:1;stroke:none"
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      d="m 64,6.3999544 c -32,0 -51.2,25.5999996 -44.8,57.5999996 6.275716,31.378582 14.08,25.6 7.68,32 -6.4,6.399996 0,12.799996 6.4,19.199996 6.4,6.4 17.92,6.4 17.92,6.4 l 12.8,0 12.8,0 c 0,0 11.52,0 17.92,-6.4 6.4,-6.4 12.8,-12.8 6.4,-19.199996 -6.4,-6.4 1.40428,-0.621418 7.68,-32 6.4,-32 -12.8,-57.5999996 -44.8,-57.5999996 z"
      id="path17" />
   <path
@@ -69,12 +69,12 @@
      id="path23" />
   <path
      style="fill:currentColor;fill-opacity:1;stroke:none"
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      d="m 47.035,52.487454 c -1.695252,0.08096 -3.379399,0.864604 -3.755,2.435 -0.500769,2.093811 0.633787,3.072425 2.710001,3.5775 2.076202,0.505024 5.089199,0.346286 5.589999,-1.747499 0.500801,-2.093863 -0.81628,-3.609938 -2.8925,-4.115 -0.519055,-0.12626 -1.087416,-0.176985 -1.6525,-0.150001 z m 33.93,0 c -0.565084,-0.02698 -1.133445,0.02373 -1.6525,0.150001 -2.07622,0.505062 -3.393301,2.021137 -2.8925,4.115 0.5008,2.093785 3.513797,2.252523 5.589999,1.747499 2.076213,-0.505075 3.21077,-1.483689 2.710001,-3.5775 -0.375601,-1.570396 -2.059748,-2.354046 -3.755,-2.435 z m -23.49,34.22 C 56.9,86.754699 56.4,86.929479 56,87.312455 c -1.600032,1.532032 -6.08,1.28 -6.08,1.28 0.8,1.531904 2.72,2.743571 5.24,3.572499 2.52,0.829056 5.64,2.555 8.84,2.555 3.2,0 6.32,-1.725944 8.84,-2.555 2.52,-0.828928 4.44,-2.040467 5.24,-3.572499 0,0 -4.479968,0.252032 -6.08,-1.28 -1.6,-1.531904 -4.8,0.2625 -8,0.2625 -2.4,0 -4.8,-1.009233 -6.525,-0.867501 z"
      id="path25" />
   <path
      style="fill:currentColor;fill-opacity:1;stroke:none"
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      d="M 102.19067,33.534828 C 88.8,7.5199544 62.668428,23.030534 62.668428,23.030534 c 0,0 -9.140452,-19.2551556 -26.116181,-1.229607 -12.909601,13.707955 -7.152781,14.019072 -7.152781,14.019072 L 33.278487,16.842015 54.959323,7.1217336 85.640513,11.013382 98.56,20.47998 l 7.3199,11.243392 z"
      id="path27" />
 </svg>
diff --git a/icons-dark/applets/128/user-leonardo-da-vinci.svg b/icons-dark/applets/128/user-leonardo-da-vinci.svg
--- a/icons-dark/applets/128/user-leonardo-da-vinci.svg
+++ b/icons-dark/applets/128/user-leonardo-da-vinci.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#4d4d4d;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -45,7 +45,7 @@
      inkscape:connector-curvature="0"
      id="rect5879"
      d="M 0,0 0,128 128,128 128,0 0,0 Z"
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      style="color:#3daee9;fill:currentColor;fill-opacity:1;stroke:none" />
   <path
      sodipodi:nodetypes="ccccc"
diff --git a/icons-dark/applets/128/user-mahatma-gandhi.svg b/icons-dark/applets/128/user-mahatma-gandhi.svg
--- a/icons-dark/applets/128/user-mahatma-gandhi.svg
+++ b/icons-dark/applets/128/user-mahatma-gandhi.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#4d4d4d;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -43,7 +43,7 @@
   </defs>
   <path
      style="fill:currentColor;fill-opacity:1;stroke:none" 
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      d="M 0 0 L 0 128 L 128 128 L 128 0 L 0 0 z "
      />
   <path
@@ -56,7 +56,7 @@
      />
   <path
      style="fill:currentColor;fill-opacity:1;stroke:none" 
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      d="m 47.0375,49.927454 c -1.695245,0.08095 -3.381901,0.864604 -3.7575,2.435 -0.500767,2.093799 0.636296,3.072425 2.7125,3.5775 2.076196,0.504999 5.086701,0.346274 5.5875,-1.747499 0.500797,-2.09385 -0.816288,-3.609951 -2.8925,-4.115 -0.519053,-0.12626 -1.084918,-0.176985 -1.65,-0.150001 z m 33.925,0 c -0.565082,-0.02698 -1.130947,0.02373 -1.65,0.150001 -2.076212,0.505049 -3.393297,2.02115 -2.8925,4.115 0.500799,2.093773 3.511304,2.252498 5.5875,1.747499 2.076204,-0.505075 3.213267,-1.483701 2.7125,-3.5775 -0.375599,-1.570396 -2.062255,-2.354049 -3.7575,-2.435 z M 64,71.679954 l -8.96,1.12 c -2.56,0 -6.4,2.56 -7.68,3.84 -1.28,1.28 -2.56,5.12 -1.28,6.4 1.28,1.28 3.84,1.28 8.96,0 5.12,-1.28 3.84,0 8.96,0 5.12,0 3.84,-1.28 8.96,0 5.12,1.28 7.68,1.28 8.96,0 1.28,-1.28 0,-5.12 -1.28,-6.4 -1.28,-1.28 -5.12,-3.84 -7.68,-3.84 l -8.96,-1.12 z m -10.275,12.157501 0,0.0026 a 0.640064,0.640064 0 0 0 -0.12,1.262499 c 0,0 5.168334,1.297501 10.395,1.297501 5.226666,0 10.395,-1.297501 10.395,-1.297501 a 0.64029412,0.64029412 0 0 0 -0.31,-1.242499 c 0,0 -5.071666,1.26 -10.085,1.26 -5.013334,0 -10.085,-1.26 -10.085,-1.26 a 0.640064,0.640064 0 0 0 -0.19,-0.0225 z"
      />
   <path
diff --git a/icons-dark/applets/128/user-man.svg b/icons-dark/applets/128/user-man.svg
--- a/icons-dark/applets/128/user-man.svg
+++ b/icons-dark/applets/128/user-man.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#4d4d4d;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -44,7 +44,7 @@
   <path
      style="fill:currentColor;fill-opacity:1;stroke:none"
      d="M 0 0 L 0 128 L 128 128 L 128 0 L 0 0 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      id="rect5879" />
   <path
      style="opacity:0.2;fill:url(#linearGradient4475-2);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
diff --git a/icons-dark/applets/128/user-mowgli.svg b/icons-dark/applets/128/user-mowgli.svg
--- a/icons-dark/applets/128/user-mowgli.svg
+++ b/icons-dark/applets/128/user-mowgli.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#4d4d4d;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -43,24 +43,24 @@
   </defs>
   <path
      style="fill:currentColor;fill-opacity:1;stroke:none" 
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      d="M 0 0 L 0 128 L 128 128 L 128 0 L 0 0 z "/>
   <path
      style="opacity:0.2;fill:url(#linearGradient4475);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
      d="M 98.56,2.8159982 128,32.255938 l 0,95.743962 -51.2,0 z"
      />
   <path
      style="fill:currentColor;fill-opacity:1;stroke:none" 
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      d="M 64,-2.6544892e-5 C 19.2,-2.6544892e-5 16.64,32.000002 19.2,63.999953 c 2.602387,32.529782 32,57.599987 25.6,63.999977 l 38.4,0 c -1.960777,-1.96077 -0.54191,-5.6892 2.4175,-10.83249 0.963388,1.67293 2.890117,4.7562 4.9425,6.35249 2.88,2.24 7.36,2.24 7.36,2.24 0,0 -0.928376,-8.49462 -0.86,-21.31749 3.00999,3.78079 11.42,-0.1225 11.42,-0.1225 0,0 -5.10777,-8.411901 -5.355,-17.847493 0.38735,-0.183813 0.82701,-0.410789 1.355,-0.7125 4.48,-2.56 7.84,-1.12 7.84,-1.12 0,0 -2.66472,-7.049268 -3.5725,-19.077494 3.64843,5.807192 6.7725,10.757497 6.7725,10.757497 0,0 6.24,-8.160036 5.76,-19.519994 -0.3129,-7.40535 -6.93943,-16.373308 -13.335,-25.309993 C 104.26203,13.384643 92.965887,-2.6544892e-5 64,-2.6544892e-5 Z"
      />
   <path
      style="color:#eff0f1;fill:currentColor;fill-opacity:1;stroke:none"
      d="m 66.385,12.752469 c -0.78059,8.4e-4 -1.575829,0.01575 -2.385,0.0475 -25.893472,1.015885 -37.12,14.079996 -35.84,26.879992 1.153336,11.53336 -4.668067,12.123375 -1.28,32.23999 3.840004,22.799993 6.4,25.359992 12.8,31.759989 2.286034,2.28603 5.338065,4.01173 8.565,5.2975 -1.405851,4.91509 -3.737521,11.92754 -7.285,19.02249 l 46.08,0 c -3.547479,-7.09495 -5.879149,-14.1074 -7.285,-19.02249 3.226935,-1.28577 6.278966,-3.01147 8.565,-5.2975 6.4,-6.399997 8.959996,-8.959996 12.8,-31.759989 3.38807,-20.116627 -2.433336,-20.70663 -1.28,-32.23999 C 101.08,27.279965 90.583308,12.726434 66.385,12.752469 Z M 19.0475,52.202457 c -0.351563,0.02812 -0.7275,0.1175 -1.1275,0.2775 -6.4,2.559999 1.628667,13.80774 2.56,15.359995 3.84,6.399998 3.84,-2.559999 3.84,-2.559999 0,0 9.37e-4,-13.499375 -5.2725,-13.077496 z m 89.905,0 c -5.27344,-0.421879 -5.2725,13.077496 -5.2725,13.077496 0,0 0,8.959997 3.84,2.559999 0.93133,-1.552255 8.96,-12.799996 2.56,-15.359995 -0.4,-0.16 -0.77594,-0.249375 -1.1275,-0.2775 z"
      />
   <path
      style="fill:currentColor;fill-opacity:1;stroke:none" 
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      d="m 45.4775,54.169956 c -1.443101,0.08137 -2.880266,0.869068 -3.2,2.4475 -0.426285,2.10455 0.542601,3.089838 2.31,3.597499 1.767392,0.507648 5.23869,1.252037 5.665,-0.8525 0.426313,-2.104576 -1.605095,-4.534851 -3.3725,-5.042499 -0.441851,-0.126911 -0.921466,-0.177121 -1.4025,-0.15 z m 37.045,0 c -0.481034,-0.02712 -0.960649,0.02309 -1.4025,0.15 -1.767405,0.507648 -3.798813,2.937923 -3.3725,5.042499 0.42631,2.104537 3.897608,1.360148 5.665,0.8525 1.767399,-0.507661 2.736285,-1.492962 2.31,-3.597499 -0.319734,-1.578442 -1.756899,-2.366131 -3.2,-2.4475 z m -34.465,30.462491 c -0.08841,-0.02127 -0.209709,-0.01961 -0.37,0.01 -0.183189,0.03383 -0.417144,0.105869 -0.715,0.225 -2.382851,0.953216 -0.574255,1.94708 -0.2275,2.525 1.041993,1.736651 1.076201,0.214298 1.02,-0.742501 1.577043,2.245876 7.145012,8.050089 16.235,8.070014 9.690287,0.02099 15.379265,-6.610856 16.489999,-8.457498 -0.06596,0.644855 -0.277257,3.242092 0.990001,1.130001 0.346755,-0.57792 2.157852,-1.571785 -0.225,-2.525001 -2.382852,-0.953087 -0.7425,1.145001 -0.7425,1.145001 0,0 -0.0023,0.03314 -0.0026,0.035 -0.241373,0.02767 -13.339235,1.527501 -16.51,1.527501 -3.119079,0 -15.632209,-1.428383 -16.28,-1.5025 -6.38e-4,-0.0054 -0.005,-0.05999 -0.005,-0.05999 0,0 0.961376,-1.231105 0.3425,-1.38 z"
      />
   <path
@@ -77,17 +77,17 @@
      />
   <path
      style="fill:currentColor;fill-opacity:1;stroke:none" 
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      d="m 75.495,6.6424713 c -2.242355,0.013215 -5.397267,4.1316897 -6.2125,5.2474987 l -12.375,-0.3075 c 0,0 -13.009658,0.791976 -16.177501,5.769999 -0.08755,0.137583 -0.164971,0.292647 -0.237499,0.454998 -0.293721,-1.739752 -0.689889,-3.607815 -1.235,-5.659997 l -5.11,6.347498 -7.71,1.46 c 0,0 1.470588,5.655205 1.81,15.384994 0.339411,9.729789 -4.18554,12.671438 -4.977499,22.627493 -0.791959,9.956042 2.884999,18.214994 2.884999,18.214994 0,0 1.02725,-1.145367 1.3,-3.054999 0.813342,2.404863 0.8925,4.932499 0.8925,4.932499 0,0 1.616497,-5.218227 0.6925,-8.552498 1.368552,2.678143 2.345,4.225 2.345,4.225 0,0 2.745639,-3.31982 2.6325,-10.447498 -0.08188,-5.158619 -2.99009,-18.492599 -2.327501,-31.214989 0.932881,2.24118 1.658077,4.984557 1.572501,8.022497 -0.226273,8.03274 4.185,9.049997 4.185,9.049997 0,0 -1.810242,-4.185597 0.4525,-10.294997 1.065632,-2.877204 2.273202,-5.765806 2.86,-9.517497 1.321583,7.205055 3.7025,14.722496 3.7025,14.722496 0,0 21.886751,-7.955339 25.5975,-27.257491 1.502469,8.324243 -0.1425,12.889995 -0.1425,12.889995 0,0 5.477729,-2.436006 7.2575,-11.679996 3.010736,11.465587 15.1825,17.562494 15.1825,17.562494 0,0 -1.018282,-8.938734 0.452499,-14.934995 C 94.121463,15.285733 80.756768,12.677926 77.7125,12.14747 77.709409,8.0599435 76.773933,6.6349346 75.495,6.6424713 Z M 92.96,8.3199709 c 0,0 5.12,22.3999931 12.48,23.1999931 7.36,0.799999 7.52,-15.039996 7.52,-15.039996 0,0 -7.04,2.4 -20,-8.1599971 z"
      />
   <path
      style="fill:currentColor;fill-opacity:1;stroke:none" 
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      d="m 86.08,111.99994 -10.56,6.4 8.6025,9.59999 3.307501,0 C 88.12741,124.93902 88.619256,119.41456 86.08,111.99994 Z"
      />
   <path
      style="fill:currentColor;fill-opacity:1;stroke:none" 
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      d="m 83.6,7.759971 c 6.52,0.2 15,-4.8799984 15,-4.8799984 0,0 4,9.2399974 0.8,11.2399964 C 96.2,16.119968 87.88,11.47997 87.88,11.47997 Z"
      />
   <path
diff --git a/icons-dark/applets/128/user-none.svg b/icons-dark/applets/128/user-none.svg
--- a/icons-dark/applets/128/user-none.svg
+++ b/icons-dark/applets/128/user-none.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#4d4d4d;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -34,7 +34,7 @@
     <path
        style="fill:currentColor;fill-opacity:1;stroke:none"
        d="M 0 0 L 0 128 L 128 128 L 128 0 L 0 0 z "
-       class="ColorScheme-Highlight"
+       class="olorScheme-ButtonFocus"
        id="rect5879" />
     <path
        style="opacity:0.2;fill:url(#linearGradient6632);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
diff --git a/icons-dark/applets/64/osd-duplicate.svg b/icons-dark/applets/64/osd-duplicate.svg
--- a/icons-dark/applets/64/osd-duplicate.svg
+++ b/icons-dark/applets/64/osd-duplicate.svg
@@ -7,7 +7,7 @@
       .ColorScheme-Text {
         color:#f2f2f2;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -20,6 +20,6 @@
   <path
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 30 18 L 30 24 L 32 24 L 32 22 L 50 22 L 50 31 L 40 31 L 40 33 L 52 33 L 52 18 L 30 18 z M 12 31 L 12 46 L 34 46 L 34 31 L 12 31 z M 14 35 L 32 35 L 32 44 L 14 44 L 14 35 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/applets/64/osd-rotate-ccw.svg b/icons-dark/applets/64/osd-rotate-ccw.svg
--- a/icons-dark/applets/64/osd-rotate-ccw.svg
+++ b/icons-dark/applets/64/osd-rotate-ccw.svg
@@ -7,7 +7,7 @@
       .ColorScheme-Text {
         color:#f2f2f2;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -20,6 +20,6 @@
   <path
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 32.691406 19 A 13.311049 13.330146 0 0 0 19.949219 28.566406 L 18 27.736328 L 19.691406 31.929688 L 23.880859 30.236328 L 21.916016 29.400391 A 11.181282 11.197323 0 0 1 32.691406 21.132812 A 11.181282 11.197323 0 0 1 43.873047 32.330078 A 11.181282 11.197323 0 0 1 38.564453 41.839844 L 39.945312 43.5 A 13.311049 13.330146 0 0 0 46 32.330078 A 13.311049 13.330146 0 0 0 32.691406 19 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/applets/64/osd-rotate-cw.svg b/icons-dark/applets/64/osd-rotate-cw.svg
--- a/icons-dark/applets/64/osd-rotate-cw.svg
+++ b/icons-dark/applets/64/osd-rotate-cw.svg
@@ -7,7 +7,7 @@
       .ColorScheme-Text {
         color:#f2f2f2;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -20,6 +20,6 @@
   <path
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 31.308594 19 A 13.311049 13.330146 0 0 0 18 32.330078 A 13.311049 13.330146 0 0 0 24.054688 43.5 L 25.435547 41.839844 A 11.181282 11.197323 0 0 1 20.126953 32.330078 A 11.181282 11.197323 0 0 1 31.308594 21.132812 A 11.181282 11.197323 0 0 1 42.083984 29.400391 L 40.119141 30.236328 L 44.308594 31.929688 L 46 27.736328 L 44.050781 28.566406 A 13.311049 13.330146 0 0 0 31.308594 19 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/applets/64/osd-rotate-flip.svg b/icons-dark/applets/64/osd-rotate-flip.svg
--- a/icons-dark/applets/64/osd-rotate-flip.svg
+++ b/icons-dark/applets/64/osd-rotate-flip.svg
@@ -7,7 +7,7 @@
       .ColorScheme-Text {
         color:#f2f2f2;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -20,6 +20,6 @@
   <path
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 32 20.798828 L 28.638672 24.160156 L 30.878906 24.160156 L 30.878906 39.839844 L 28.638672 39.839844 L 32 43.199219 L 35.359375 39.839844 L 33.119141 39.839844 L 33.119141 24.160156 L 35.359375 24.160156 L 32 20.798828 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/applets/64/osd-rotate-normal.svg b/icons-dark/applets/64/osd-rotate-normal.svg
--- a/icons-dark/applets/64/osd-rotate-normal.svg
+++ b/icons-dark/applets/64/osd-rotate-normal.svg
@@ -7,7 +7,7 @@
       .ColorScheme-Text {
         color:#f2f2f2;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -20,6 +20,6 @@
   <path
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 14 19 L 14 36.144531 L 37 36 L 37 19 L 14 19 z M 16 23 L 35 23 L 35 34 L 16 34 L 16 23 z M 49 25.855469 L 38 26 L 38 30 L 47 30 L 47 41 L 28 41 L 28 37 L 26 37 L 26 43 L 49 43 L 49 25.855469 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/applets/64/osd-sbs-left.svg b/icons-dark/applets/64/osd-sbs-left.svg
--- a/icons-dark/applets/64/osd-sbs-left.svg
+++ b/icons-dark/applets/64/osd-sbs-left.svg
@@ -7,7 +7,7 @@
       .ColorScheme-Text {
         color:#f2f2f2;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -20,6 +20,6 @@
   <path
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 18 27 L 18 38 L 27 38 L 27 37 L 20 37 L 20 30 L 27 30 L 27 27 L 18 27 z M 31 27 L 31 30 L 40 30 L 40 37 L 31 37 L 31 38 L 42 38 L 42 27 L 31 27 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/applets/64/osd-sbs-sright.svg b/icons-dark/applets/64/osd-sbs-sright.svg
--- a/icons-dark/applets/64/osd-sbs-sright.svg
+++ b/icons-dark/applets/64/osd-sbs-sright.svg
@@ -7,7 +7,7 @@
       .ColorScheme-Text {
         color:#f2f2f2;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -20,6 +20,6 @@
   <path
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 22.064453 25.935547 L 22 38 L 33 38 L 33 37 L 24 37 L 24 29 L 33 29 L 33 26 L 22.064453 25.935547 z M 37 26 L 37 29 L 44 29 L 44 37 L 37 37 L 37 38 L 46 38 L 46 26 L 37 26 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons-dark/applets/64/osd-shutd-laptop.svg b/icons-dark/applets/64/osd-shutd-laptop.svg
--- a/icons-dark/applets/64/osd-shutd-laptop.svg
+++ b/icons-dark/applets/64/osd-shutd-laptop.svg
@@ -7,7 +7,7 @@
       .ColorScheme-Text {
         color:#f2f2f2;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       .ColorScheme-NegativeText {
@@ -23,7 +23,7 @@
   <path
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 30 18 L 30 24 L 32 24 L 32 22 L 49 22 L 49 31 L 41 31 L 41 33 L 51 33 L 51 18 L 30 18 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
   <path
      style="fill:currentColor;fill-opacity:1;stroke:none" 
diff --git a/icons-dark/applets/64/osd-shutd-screen.svg b/icons-dark/applets/64/osd-shutd-screen.svg
--- a/icons-dark/applets/64/osd-shutd-screen.svg
+++ b/icons-dark/applets/64/osd-shutd-screen.svg
@@ -7,7 +7,7 @@
       .ColorScheme-Text {
         color:#f2f2f2;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       .ColorScheme-NegativeText {
@@ -23,7 +23,7 @@
   <path
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 12 30 L 12 45 L 34 45 L 34 30 L 12 30 z M 14 34 L 32 34 L 32 43 L 14 43 L 14 34 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
   <path
      style="fill:currentColor;fill-opacity:1;stroke:none" 
diff --git a/icons-dark/emblems/16/emblem-added.svg b/icons-dark/emblems/16/emblem-added.svg
--- a/icons-dark/emblems/16/emblem-added.svg
+++ b/icons-dark/emblems/16/emblem-added.svg
@@ -2,14 +2,14 @@
     <style
         type="text/css"
         id="current-color-scheme">
-        .ColorScheme-Highlight {
+        .olorScheme-ButtonFocus {
             color:#3daee9;
         }
         .ColorScheme-Text {
             color:#eff0f1;
         }
     </style>
-    <rect style="fill:currentColor;fill-opacity:1;stroke:none" class="ColorScheme-Highlight" height="16" rx="2" width="16"/>
+    <rect style="fill:currentColor;fill-opacity:1;stroke:none" class="olorScheme-ButtonFocus" height="16" rx="2" width="16"/>
     <path style="fill:currentColor;fill-opacity:0.6;stroke:none" class="ColorScheme-Text" d="M2 0C.892 0 0 .892 0 2v12c0 1.108.892 2 2 2h12c1.108 0 2-.892 2-2V2c0-1.108-.892-2-2-2zm0 1h12c.554 0 1 .446 1 1v12c0 .554-.446 1-1 1H2c-.554 0-1-.446-1-1V2c0-.554.446-1 1-1z"/>
     <path d="M7 2v5H2v2h5v5h2V9h5V7H9V2z" fill="#fff"/>
 </svg>
diff --git a/icons-dark/emblems/16/emblem-information.svg b/icons-dark/emblems/16/emblem-information.svg
--- a/icons-dark/emblems/16/emblem-information.svg
+++ b/icons-dark/emblems/16/emblem-information.svg
@@ -2,14 +2,14 @@
     <style
         type="text/css"
         id="current-color-scheme">
-        .ColorScheme-Highlight {
+        .olorScheme-ButtonFocus {
             color:#3daee9;
         }
         .ColorScheme-Text {
             color:#eff0f1;
         }
     </style>
-    <rect style="fill:currentColor;fill-opacity:1;stroke:none" class="ColorScheme-Highlight" height="16" rx="2" width="16"/>
+    <rect style="fill:currentColor;fill-opacity:1;stroke:none" class="olorScheme-ButtonFocus" height="16" rx="2" width="16"/>
     <path style="fill:currentColor;fill-opacity:0.6;stroke:none" class="ColorScheme-Text" d="M2 0C.892 0 0 .892 0 2v12c0 1.108.892 2 2 2h12c1.108 0 2-.892 2-2V2c0-1.108-.892-2-2-2zm0 1h12c.554 0 1 .446 1 1v12c0 .554-.446 1-1 1H2c-.554 0-1-.446-1-1V2c0-.554.446-1 1-1z"/>
     <path d="M7 2v2h2V2zm0 3v9h2V5z" fill="#fff"/>
 </svg>
diff --git a/icons-dark/emblems/16/emblem-remove.svg b/icons-dark/emblems/16/emblem-remove.svg
--- a/icons-dark/emblems/16/emblem-remove.svg
+++ b/icons-dark/emblems/16/emblem-remove.svg
@@ -2,14 +2,14 @@
     <style
         type="text/css"
         id="current-color-scheme">
-        .ColorScheme-Highlight {
+        .olorScheme-ButtonFocus {
             color:#3daee9;
         }
         .ColorScheme-Text {
             color:#eff0f1;
         }
     </style>
-    <rect style="fill:currentColor;fill-opacity:1;stroke:none" class="ColorScheme-Highlight" height="16" rx="2" width="16"/>
+    <rect style="fill:currentColor;fill-opacity:1;stroke:none" class="olorScheme-ButtonFocus" height="16" rx="2" width="16"/>
     <path style="fill:currentColor;fill-opacity:0.6;stroke:none" class="ColorScheme-Text" d="M2 0C.892 0 0 .892 0 2v12c0 1.108.892 2 2 2h12c1.108 0 2-.892 2-2V2c0-1.108-.892-2-2-2zm0 1h12c.554 0 1 .446 1 1v12c0 .554-.446 1-1 1H2c-.554 0-1-.446-1-1V2c0-.554.446-1 1-1z"/>
     <path d="M2 7v2h12V7z" fill="#fff"/>
 </svg>
diff --git a/icons-dark/emblems/16/emblem-shared.svg b/icons-dark/emblems/16/emblem-shared.svg
--- a/icons-dark/emblems/16/emblem-shared.svg
+++ b/icons-dark/emblems/16/emblem-shared.svg
@@ -2,14 +2,14 @@
     <style
         type="text/css"
         id="current-color-scheme">
-        .ColorScheme-Highlight {
+        .olorScheme-ButtonFocus {
             color:#3daee9;
         }
         .ColorScheme-Text {
             color:#eff0f1;
         }
     </style>
-    <rect style="fill:currentColor;fill-opacity:1;stroke:none" class="ColorScheme-Highlight" height="16" rx="2" width="16"/>
+    <rect style="fill:currentColor;fill-opacity:1;stroke:none" class="olorScheme-ButtonFocus" height="16" rx="2" width="16"/>
     <path style="fill:currentColor;fill-opacity:0.6;stroke:none" class="ColorScheme-Text" d="M2 0C.892 0 0 .892 0 2v12c0 1.108.892 2 2 2h12c1.108 0 2-.892 2-2V2c0-1.108-.892-2-2-2zm0 1h12c.554 0 1 .446 1 1v12c0 .554-.446 1-1 1H2c-.554 0-1-.446-1-1V2c0-.554.446-1 1-1z"/>
     <path d="M11.5 2a1.5 1.5 0 1 0 0 3 1.5 1.5 0 0 0 0-3zm-3 3a.5.5 0 1 0 0 1 .5.5 0 0 0 0-1zm-2 1a.5.5 0 1 0 0 1 .5.5 0 0 0 0-1zm-3 1a1.5 1.5 0 1 0 0 3 1.5 1.5 0 0 0 0-3zm3 3a.5.5 0 1 0 0 1 .5.5 0 0 0 0-1zm2 1a.5.5 0 1 0 0 1 .5.5 0 0 0 0-1zm3 0a1.5 1.5 0 1 0 0 3 1.5 1.5 0 0 0 0-3z" fill="#fff"/>
 </svg>
diff --git a/icons-dark/emblems/16/package-install-auto.svg b/icons-dark/emblems/16/package-install-auto.svg
--- a/icons-dark/emblems/16/package-install-auto.svg
+++ b/icons-dark/emblems/16/package-install-auto.svg
@@ -2,14 +2,14 @@
     <style
         type="text/css"
         id="current-color-scheme">
-        .ColorScheme-Highlight {
+        .olorScheme-ButtonFocus {
             color:#3daee9;
         }
         .ColorScheme-Text {
             color:#eff0f1;
         }
     </style>
-    <rect style="fill:currentColor;fill-opacity:1;stroke:none" class="ColorScheme-Highlight" height="16" rx="2" width="16"/>
+    <rect style="fill:currentColor;fill-opacity:1;stroke:none" class="olorScheme-ButtonFocus" height="16" rx="2" width="16"/>
     <path d="m2 0c-1.108 0-2 .892-2 2v12c0 1.108.892 2 2 2h12c1.108 0 2-.892 2-2v-12c0-1.108-.892-2-2-2zm0 1h12c.554 0 1 .446 1 1v12c0 .554-.446 1-1 1h-12c-.554 0-1-.446-1-1v-12c0-.554.446-1 1-1z" style="fill:currentColor;fill-opacity:0.6;stroke:none" class="ColorScheme-Text"/>
     <g fill="#fff">
         <path d="m7 2v4h-4v2h4v4h2v-4h4v-2h-4v-4z"/>
diff --git a/icons-dark/emblems/16/package-reinstall.svg b/icons-dark/emblems/16/package-reinstall.svg
--- a/icons-dark/emblems/16/package-reinstall.svg
+++ b/icons-dark/emblems/16/package-reinstall.svg
@@ -2,14 +2,14 @@
     <style
         type="text/css"
         id="current-color-scheme">
-        .ColorScheme-Highlight {
+        .olorScheme-ButtonFocus {
             color:#3daee9;
         }
         .ColorScheme-Text {
             color:#eff0f1;
         }
     </style>
-    <rect style="fill:currentColor;fill-opacity:1;stroke:none" class="ColorScheme-Highlight" height="16" rx="2" width="16"/>
+    <rect style="fill:currentColor;fill-opacity:1;stroke:none" class="olorScheme-ButtonFocus" height="16" rx="2" width="16"/>
     <path d="M2 0C.892 0 0 .892 0 2v12c0 1.108.892 2 2 2h12c1.108 0 2-.892 2-2V2c0-1.108-.892-2-2-2zm0 1h12c.554 0 1 .446 1 1v12c0 .554-.446 1-1 1H2c-.554 0-1-.446-1-1V2c0-.554.446-1 1-1z" style="fill:currentColor;fill-opacity:0.6;stroke:none" class="ColorScheme-Text"/>
     <path d="M8 1v2a5 5 0 0 0-5 5 5 5 0 0 0 5 5 5 5 0 0 0 5-5h-2a3 3 0 0 1-3 3 3 3 0 0 1-3-3 3 3 0 0 1 3-3v2l4-3z" fill="#fff"/>
 </svg>
diff --git a/icons-dark/emblems/16/package-upgrade-auto.svg b/icons-dark/emblems/16/package-upgrade-auto.svg
--- a/icons-dark/emblems/16/package-upgrade-auto.svg
+++ b/icons-dark/emblems/16/package-upgrade-auto.svg
@@ -2,14 +2,14 @@
     <style
         type="text/css"
         id="current-color-scheme">
-        .ColorScheme-Highlight {
+        .olorScheme-ButtonFocus {
             color:#3daee9;
         }
         .ColorScheme-Text {
             color:#eff0f1;
         }
     </style>
-    <rect style="fill:currentColor;fill-opacity:1;stroke:none" class="ColorScheme-Highlight" height="16" rx="2" width="16"/>
+    <rect style="fill:currentColor;fill-opacity:1;stroke:none" class="olorScheme-ButtonFocus" height="16" rx="2" width="16"/>
     <path d="M2 0C.892 0 0 .892 0 2v12c0 1.108.892 2 2 2h12c1.108 0 2-.892 2-2V2c0-1.108-.892-2-2-2zm0 1h12c.554 0 1 .446 1 1v12c0 .554-.446 1-1 1H2c-.554 0-1-.446-1-1V2c0-.554.446-1 1-1z" style="fill:currentColor;fill-opacity:0.6;stroke:none" class="ColorScheme-Text"/>
     
     <g fill="#fff">
diff --git a/icons-dark/emblems/16/package-upgrade.svg b/icons-dark/emblems/16/package-upgrade.svg
--- a/icons-dark/emblems/16/package-upgrade.svg
+++ b/icons-dark/emblems/16/package-upgrade.svg
@@ -2,14 +2,14 @@
     <style
         type="text/css"
         id="current-color-scheme">
-        .ColorScheme-Highlight {
+        .olorScheme-ButtonFocus {
             color:#3daee9;
         }
         .ColorScheme-Text {
             color:#eff0f1;
         }
     </style>
-    <rect style="fill:currentColor;fill-opacity:1;stroke:none" class="ColorScheme-Highlight" height="16" rx="2" width="16"/>
+    <rect style="fill:currentColor;fill-opacity:1;stroke:none" class="olorScheme-ButtonFocus" height="16" rx="2" width="16"/>
     <path d="M2 0C.892 0 0 .892 0 2v12c0 1.108.892 2 2 2h12c1.108 0 2-.892 2-2V2c0-1.108-.892-2-2-2zm0 1h12c.554 0 1 .446 1 1v12c0 .554-.446 1-1 1H2c-.554 0-1-.446-1-1V2c0-.554.446-1 1-1z" style="fill:currentColor;fill-opacity:0.6;stroke:none" class="ColorScheme-Text"/>
     <path d="M8 4l-6 6 1.414 1.414L8 6.828l4.586 4.586L14 10z" fill="#fff"/>
 </svg>
diff --git a/icons-dark/emblems/16/rating.svg b/icons-dark/emblems/16/rating.svg
--- a/icons-dark/emblems/16/rating.svg
+++ b/icons-dark/emblems/16/rating.svg
@@ -2,12 +2,12 @@
     <style
         type="text/css"
         id="current-color-scheme">
-        .ColorScheme-Highlight {
+        .olorScheme-ButtonFocus {
             color:#3daee9;
         }
         .ColorScheme-Text {
             color:#eff0f1;
         }
     </style>
-    <path style="fill:currentColor;fill-opacity:1;stroke:none" class="ColorScheme-Highlight" d="M8 .188l2.472 5.009L16 6l-4 3.899.944 5.506L8 12.805l-4.944 2.6L4 9.899 0 6l5.528-.803z"/>
+    <path style="fill:currentColor;fill-opacity:1;stroke:none" class="olorScheme-ButtonFocus" d="M8 .188l2.472 5.009L16 6l-4 3.899.944 5.506L8 12.805l-4.944 2.6L4 9.899 0 6l5.528-.803z"/>
 </svg>
diff --git a/icons-dark/emblems/16/vcs-added.svg b/icons-dark/emblems/16/vcs-added.svg
--- a/icons-dark/emblems/16/vcs-added.svg
+++ b/icons-dark/emblems/16/vcs-added.svg
@@ -2,14 +2,14 @@
     <style
         type="text/css"
         id="current-color-scheme">
-        .ColorScheme-Highlight {
+        .olorScheme-ButtonFocus {
             color:#3daee9;
         }
         .ColorScheme-Text {
             color:#eff0f1;
         }
     </style>
-    <path style="fill:currentColor;fill-opacity:1;stroke:none" class="ColorScheme-Highlight" d="M8 0a8 8 0 0 0-8 8 8 8 0 0 0 8 8 8 8 0 0 0 8-8 8 8 0 0 0-8-8z"/>
+    <path style="fill:currentColor;fill-opacity:1;stroke:none" class="olorScheme-ButtonFocus" d="M8 0a8 8 0 0 0-8 8 8 8 0 0 0 8 8 8 8 0 0 0 8-8 8 8 0 0 0-8-8z"/>
     <path style="fill:currentColor;fill-opacity:0.6;stroke:none" class="ColorScheme-Text" d="M8 0a8 8 0 0 0-8 8 8 8 0 0 0 8 8 8 8 0 0 0 8-8 8 8 0 0 0-8-8zm0 1a7 7 0 0 1 7 7 7 7 0 0 1-7 7 7 7 0 0 1-7-7 7 7 0 0 1 7-7z"/>
     <path d="M7 2v5H2v2h5v5h2V9h5V7H9V2z" fill="#fff"/>
 </svg>
diff --git a/icons-dark/emblems/16/vcs-locally-modified.svg b/icons-dark/emblems/16/vcs-locally-modified.svg
--- a/icons-dark/emblems/16/vcs-locally-modified.svg
+++ b/icons-dark/emblems/16/vcs-locally-modified.svg
@@ -2,14 +2,14 @@
     <style
         type="text/css"
         id="current-color-scheme">
-        .ColorScheme-Highlight {
+        .olorScheme-ButtonFocus {
             color:#3daee9;
         }
         .ColorScheme-Text {
             color:#eff0f1;
         }
     </style>
-    <circle style="fill:currentColor;fill-opacity:1;stroke:none" class="ColorScheme-Highlight" cx="8" cy="8" r="8"/>
+    <circle style="fill:currentColor;fill-opacity:1;stroke:none" class="olorScheme-ButtonFocus" cx="8" cy="8" r="8"/>
     <path style="fill:currentColor;fill-opacity:0.6;stroke:none" class="ColorScheme-Text" d="M8 0a8 8 0 0 0-8 8 8 8 0 0 0 8 8 8 8 0 0 0 8-8 8 8 0 0 0-8-8zm0 1a7 7 0 0 1 7 7 7 7 0 0 1-7 7 7 7 0 0 1-7-7 7 7 0 0 1 7-7z"/>
     <path d="M10 5v2H4a2 2 0 0 0-2 2v2.59a7 7 0 0 0 2 2.152V10a1 1 0 0 1 1-1h5v2l4-3z" fill="#fff"/>
 </svg>
diff --git a/icons-dark/emblems/22/emblem-added.svg b/icons-dark/emblems/22/emblem-added.svg
--- a/icons-dark/emblems/22/emblem-added.svg
+++ b/icons-dark/emblems/22/emblem-added.svg
@@ -2,14 +2,14 @@
     <style
         type="text/css"
         id="current-color-scheme">
-        .ColorScheme-Highlight {
+        .olorScheme-ButtonFocus {
             color:#3daee9;
         }
         .ColorScheme-Text {
             color:#eff0f1;
         }
     </style>
-    <rect style="fill:currentColor;fill-opacity:1;stroke:none" class="ColorScheme-Highlight" height="22" rx="2" width="22"/>
+    <rect style="fill:currentColor;fill-opacity:1;stroke:none" class="olorScheme-ButtonFocus" height="22" rx="2" width="22"/>
     <path d="M10 3v7H3v2h7v7h2v-7h7v-2h-7V3z" fill="#fff"/>
     <path d="M2 0C.892 0 0 .892 0 2v18c0 1.108.892 2 2 2h18c1.108 0 2-.892 2-2V2c0-1.108-.892-2-2-2zm0 1h18c.554 0 1 .446 1 1v18c0 .554-.446 1-1 1H2c-.554 0-1-.446-1-1V2c0-.554.446-1 1-1z" style="fill:currentColor;fill-opacity:0.6;stroke:none" class="ColorScheme-Text"/>
 </svg>
diff --git a/icons-dark/emblems/22/emblem-information.svg b/icons-dark/emblems/22/emblem-information.svg
--- a/icons-dark/emblems/22/emblem-information.svg
+++ b/icons-dark/emblems/22/emblem-information.svg
@@ -2,14 +2,14 @@
     <style
         type="text/css"
         id="current-color-scheme">
-        .ColorScheme-Highlight {
+        .olorScheme-ButtonFocus {
             color:#3daee9;
         }
         .ColorScheme-Text {
             color:#eff0f1;
         }
     </style>
-    <rect style="fill:currentColor;fill-opacity:1;stroke:none" class="ColorScheme-Highlight" height="22" rx="2" width="22"/>
+    <rect style="fill:currentColor;fill-opacity:1;stroke:none" class="olorScheme-ButtonFocus" height="22" rx="2" width="22"/>
     <path d="M10 3v2h2V3zm0 4v12h2V7z" fill="#fff"/>
     <path d="M2 0C.892 0 0 .892 0 2v18c0 1.108.892 2 2 2h18c1.108 0 2-.892 2-2V2c0-1.108-.892-2-2-2zm0 1h18c.554 0 1 .446 1 1v18c0 .554-.446 1-1 1H2c-.554 0-1-.446-1-1V2c0-.554.446-1 1-1z" style="fill:currentColor;fill-opacity:0.6;stroke:none" class="ColorScheme-Text"/>
 </svg>
diff --git a/icons-dark/emblems/22/emblem-remove.svg b/icons-dark/emblems/22/emblem-remove.svg
--- a/icons-dark/emblems/22/emblem-remove.svg
+++ b/icons-dark/emblems/22/emblem-remove.svg
@@ -2,14 +2,14 @@
     <style
         type="text/css"
         id="current-color-scheme">
-        .ColorScheme-Highlight {
+        .olorScheme-ButtonFocus {
             color:#3daee9;
         }
         .ColorScheme-Text {
             color:#eff0f1;
         }
     </style>
-    <rect style="fill:currentColor;fill-opacity:1;stroke:none" class="ColorScheme-Highlight" height="22" rx="2" width="22"/>
+    <rect style="fill:currentColor;fill-opacity:1;stroke:none" class="olorScheme-ButtonFocus" height="22" rx="2" width="22"/>
     <path d="M3 10v2h16v-2z" fill="#fff"/>
     <path d="M2 0C.892 0 0 .892 0 2v18c0 1.108.892 2 2 2h18c1.108 0 2-.892 2-2V2c0-1.108-.892-2-2-2zm0 1h18c.554 0 1 .446 1 1v18c0 .554-.446 1-1 1H2c-.554 0-1-.446-1-1V2c0-.554.446-1 1-1z" style="fill:currentColor;fill-opacity:0.6;stroke:none" class="ColorScheme-Text"/>
 </svg>
diff --git a/icons-dark/emblems/22/emblem-shared.svg b/icons-dark/emblems/22/emblem-shared.svg
--- a/icons-dark/emblems/22/emblem-shared.svg
+++ b/icons-dark/emblems/22/emblem-shared.svg
@@ -2,14 +2,14 @@
     <style
         type="text/css"
         id="current-color-scheme">
-        .ColorScheme-Highlight {
+        .olorScheme-ButtonFocus {
             color:#3daee9;
         }
         .ColorScheme-Text {
             color:#eff0f1;
         }
     </style>
-    <rect style="fill:currentColor;fill-opacity:1;stroke:none" class="ColorScheme-Highlight" height="22" rx="2" width="22"/>
+    <rect style="fill:currentColor;fill-opacity:1;stroke:none" class="olorScheme-ButtonFocus" height="22" rx="2" width="22"/>
     <path d="M2 0C.892 0 0 .892 0 2v18c0 1.108.892 2 2 2h18c1.108 0 2-.892 2-2V2c0-1.108-.892-2-2-2zm0 1h18c.554 0 1 .446 1 1v18c0 .554-.446 1-1 1H2c-.554 0-1-.446-1-1V2c0-.554.446-1 1-1z" style="fill:currentColor;fill-opacity:0.6;stroke:none" class="ColorScheme-Text"/>
     <path d="M12.5 6a.499.499 0 1 0 0 1 .499.499 0 1 0 0-1zm0 9a.499.499 0 1 0 0 1 .499.499 0 1 0 0-1zm-2-1a.499.499 0 1 0 0 1 .499.499 0 1 0 0-1zm-2-1a.499.499 0 1 0 0 1 .499.499 0 1 0 0-1zm0-5a.499.499 0 1 0 0 1 .499.499 0 1 0 0-1zm2-1a.499.499 0 1 0 0 1 .499.499 0 1 0 0-1zm5.5 8c-1.108 0-2 .892-2 2s.892 2 2 2 2-.892 2-2-.892-2-2-2zM5 9c-1.108 0-2 .892-2 2s.892 2 2 2 2-.892 2-2-.892-2-2-2zm11-6c-1.108 0-2 .892-2 2s.892 2 2 2 2-.892 2-2-.892-2-2-2z" fill="#fff"/>
 </svg>
diff --git a/icons-dark/emblems/22/rating.svg b/icons-dark/emblems/22/rating.svg
--- a/icons-dark/emblems/22/rating.svg
+++ b/icons-dark/emblems/22/rating.svg
@@ -2,12 +2,12 @@
     <style
         type="text/css"
         id="current-color-scheme">
-        .ColorScheme-Highlight {
+        .olorScheme-ButtonFocus {
             color:#3daee9;
         }
         .ColorScheme-Text {
             color:#eff0f1;
         }
     </style>
-    <path d="M11 .008l3.4 6.888L22 8l-5.5 5.361 1.298 7.57L11 17.357l-6.798 3.574 1.298-7.57L0 8l7.6-1.104z" style="fill:currentColor;fill-opacity:1;stroke:none" class="ColorScheme-Highlight"/>
+    <path d="M11 .008l3.4 6.888L22 8l-5.5 5.361 1.298 7.57L11 17.357l-6.798 3.574 1.298-7.57L0 8l7.6-1.104z" style="fill:currentColor;fill-opacity:1;stroke:none" class="olorScheme-ButtonFocus"/>
 </svg>
diff --git a/icons-dark/emblems/22/vcs-added.svg b/icons-dark/emblems/22/vcs-added.svg
--- a/icons-dark/emblems/22/vcs-added.svg
+++ b/icons-dark/emblems/22/vcs-added.svg
@@ -2,14 +2,14 @@
     <style
         type="text/css"
         id="current-color-scheme">
-        .ColorScheme-Highlight {
+        .olorScheme-ButtonFocus {
             color:#3daee9;
         }
         .ColorScheme-Text {
             color:#eff0f1;
         }
     </style>
-    <path d="M11 0A11 11 0 0 0 0 11a11 11 0 0 0 11 11 11 11 0 0 0 11-11A11 11 0 0 0 11 0z" style="fill:currentColor;fill-opacity:1;stroke:none" class="ColorScheme-Highlight"/>
+    <path d="M11 0A11 11 0 0 0 0 11a11 11 0 0 0 11 11 11 11 0 0 0 11-11A11 11 0 0 0 11 0z" style="fill:currentColor;fill-opacity:1;stroke:none" class="olorScheme-ButtonFocus"/>
     <path d="M10 3v7H3v2h7v7h2v-7h7v-2h-7V3z" fill="#fff"/>
     <path d="M11 0A11 11 0 0 0 0 11a11 11 0 0 0 11 11 11 11 0 0 0 11-11A11 11 0 0 0 11 0zm0 1a10 10 0 0 1 10 10 10 10 0 0 1-10 10A10 10 0 0 1 1 11 10 10 0 0 1 11 1z" style="fill:currentColor;fill-opacity:0.6;stroke:none" class="ColorScheme-Text"/>
 </svg>
diff --git a/icons-dark/emblems/22/vcs-locally-modified.svg b/icons-dark/emblems/22/vcs-locally-modified.svg
--- a/icons-dark/emblems/22/vcs-locally-modified.svg
+++ b/icons-dark/emblems/22/vcs-locally-modified.svg
@@ -2,14 +2,14 @@
     <style
         type="text/css"
         id="current-color-scheme">
-        .ColorScheme-Highlight {
+        .olorScheme-ButtonFocus {
             color:#3daee9;
         }
         .ColorScheme-Text {
             color:#eff0f1;
         }
     </style>
-    <path d="M11 0A11 11 0 0 0 0 11a11 11 0 0 0 11 11 11 11 0 0 0 11-11A11 11 0 0 0 11 0z" style="fill:currentColor;fill-opacity:1;stroke:none" class="ColorScheme-Highlight"/>
+    <path d="M11 0A11 11 0 0 0 0 11a11 11 0 0 0 11 11 11 11 0 0 0 11-11A11 11 0 0 0 11 0z" style="fill:currentColor;fill-opacity:1;stroke:none" class="olorScheme-ButtonFocus"/>
     <path d="M19 11l-4 3v-2H6a1 1 0 0 0-1 1v5.988a10 10 0 0 1-2-2.008V12a2 2 0 0 1 2-2h10V8zM3.34 18.879a11 11 0 0 1-.078-.074 11 11 0 0 0 .078.074z" fill="#fff"/>
     <path d="M11 0A11 11 0 0 0 0 11a11 11 0 0 0 11 11 11 11 0 0 0 11-11A11 11 0 0 0 11 0zm0 1a10 10 0 0 1 10 10 10 10 0 0 1-10 10A10 10 0 0 1 1 11 10 10 0 0 1 11 1z" style="fill:currentColor;fill-opacity:0.6;stroke:none" class="ColorScheme-Text"/>
 </svg>
diff --git a/icons-dark/emblems/8/emblem-added.svg b/icons-dark/emblems/8/emblem-added.svg
--- a/icons-dark/emblems/8/emblem-added.svg
+++ b/icons-dark/emblems/8/emblem-added.svg
@@ -2,10 +2,10 @@
     <style
         type="text/css"
         id="current-color-scheme">
-        .ColorScheme-Highlight {
+        .olorScheme-ButtonFocus {
             color:#3daee9;
         }
     </style>
-    <rect style="fill:currentColor;fill-opacity:1;stroke:none" class="ColorScheme-Highlight" height="8" rx="1" width="8"/>
+    <rect style="fill:currentColor;fill-opacity:1;stroke:none" class="olorScheme-ButtonFocus" height="8" rx="1" width="8"/>
     <path d="M3 1v2H1v2h2v2h2V5h2V3H5V1z" fill="#fff"/>
 </svg>
diff --git a/icons-dark/emblems/8/emblem-information.svg b/icons-dark/emblems/8/emblem-information.svg
--- a/icons-dark/emblems/8/emblem-information.svg
+++ b/icons-dark/emblems/8/emblem-information.svg
@@ -2,10 +2,10 @@
     <style
         type="text/css"
         id="current-color-scheme">
-        .ColorScheme-Highlight {
+        .olorScheme-ButtonFocus {
             color:#3daee9;
         }
     </style>
-    <rect style="fill:currentColor;fill-opacity:1;stroke:none" class="ColorScheme-Highlight" height="8" rx="1" width="8"/>
+    <rect style="fill:currentColor;fill-opacity:1;stroke:none" class="olorScheme-ButtonFocus" height="8" rx="1" width="8"/>
     <path d="M3 1h2v2H3zm0 3v4h2V4z" fill="#fff"/>
 </svg>
diff --git a/icons-dark/emblems/8/emblem-remove.svg b/icons-dark/emblems/8/emblem-remove.svg
--- a/icons-dark/emblems/8/emblem-remove.svg
+++ b/icons-dark/emblems/8/emblem-remove.svg
@@ -2,10 +2,10 @@
     <style
         type="text/css"
         id="current-color-scheme">
-        .ColorScheme-Highlight {
+        .olorScheme-ButtonFocus {
             color:#3daee9;
         }
     </style>
-    <path style="fill:currentColor;fill-opacity:1;stroke:none" class="ColorScheme-Highlight" d="M1 0C.446 0 0 .446 0 1v6c0 .554.446 1 1 1h6c.554 0 1-.446 1-1V1c0-.554-.446-1-1-1z"/>
+    <path style="fill:currentColor;fill-opacity:1;stroke:none" class="olorScheme-ButtonFocus" d="M1 0C.446 0 0 .446 0 1v6c0 .554.446 1 1 1h6c.554 0 1-.446 1-1V1c0-.554-.446-1-1-1z"/>
     <path d="M1 3v2h6V3z" fill="#fff"/>
 </svg>
diff --git a/icons-dark/emblems/8/emblem-shared.svg b/icons-dark/emblems/8/emblem-shared.svg
--- a/icons-dark/emblems/8/emblem-shared.svg
+++ b/icons-dark/emblems/8/emblem-shared.svg
@@ -2,10 +2,10 @@
     <style
         type="text/css"
         id="current-color-scheme">
-        .ColorScheme-Highlight {
+        .olorScheme-ButtonFocus {
             color:#3daee9;
         }
     </style>
-    <rect style="fill:currentColor;fill-opacity:1;stroke:none" class="ColorScheme-Highlight" height="8" rx="1" width="8"/>
+    <rect style="fill:currentColor;fill-opacity:1;stroke:none" class="olorScheme-ButtonFocus" height="8" rx="1" width="8"/>
     <path d="M6 1a1 1 0 1 0 0 2 1 1 0 0 0 0-2zM4 4.5a.5.5 0 1 0 0 1 .5.5 0 0 0 0-1zM2 3a1 1 0 1 0 0 2 1 1 0 0 0 0-2zM6 5a1 1 0 1 0 0 2 1 1 0 0 0 0-2zM4 2.5a.5.5 0 1 0 0 1 .5.5 0 0 0 0-1z" fill="#fff"/>
 </svg>
diff --git a/icons-dark/emblems/8/rating.svg b/icons-dark/emblems/8/rating.svg
--- a/icons-dark/emblems/8/rating.svg
+++ b/icons-dark/emblems/8/rating.svg
@@ -2,9 +2,9 @@
     <style
         type="text/css"
         id="current-color-scheme">
-        .ColorScheme-Highlight {
+        .olorScheme-ButtonFocus {
             color:#3daee9;
         }
     </style>
-    <path d="M4 .094l1.236 2.505L8 3 6 4.95l.472 2.753L4 6.403l-2.472 1.3L2 4.95 0 3l2.764-.401z" style="fill:currentColor;fill-opacity:1;stroke:none" class="ColorScheme-Highlight"/>
+    <path d="M4 .094l1.236 2.505L8 3 6 4.95l.472 2.753L4 6.403l-2.472 1.3L2 4.95 0 3l2.764-.401z" style="fill:currentColor;fill-opacity:1;stroke:none" class="olorScheme-ButtonFocus"/>
 </svg>
diff --git a/icons-dark/emblems/8/vcs-added.svg b/icons-dark/emblems/8/vcs-added.svg
--- a/icons-dark/emblems/8/vcs-added.svg
+++ b/icons-dark/emblems/8/vcs-added.svg
@@ -2,10 +2,10 @@
     <style
         type="text/css"
         id="current-color-scheme">
-        .ColorScheme-Highlight {
+        .olorScheme-ButtonFocus {
             color:#3daee9;
         }
     </style>
-    <path d="M4 0a4 4 0 0 0-4 4 4 4 0 0 0 4 4 4 4 0 0 0 4-4 4 4 0 0 0-4-4z" style="fill:currentColor;fill-opacity:1;stroke:none" class="ColorScheme-Highlight"/>
+    <path d="M4 0a4 4 0 0 0-4 4 4 4 0 0 0 4 4 4 4 0 0 0 4-4 4 4 0 0 0-4-4z" style="fill:currentColor;fill-opacity:1;stroke:none" class="olorScheme-ButtonFocus"/>
     <path d="M3 1v2H1v2h2v2h2V5h2V3H5V1z" fill="#fff"/>
 </svg>
diff --git a/icons-dark/emblems/8/vcs-locally-modified.svg b/icons-dark/emblems/8/vcs-locally-modified.svg
--- a/icons-dark/emblems/8/vcs-locally-modified.svg
+++ b/icons-dark/emblems/8/vcs-locally-modified.svg
@@ -51,13 +51,13 @@
   <style
      type="text/css"
      id="current-color-scheme">
-        .ColorScheme-Highlight {
+        .olorScheme-ButtonFocus {
             color:#3daee9;
         }
     </style>
   <circle
      style="fill:currentColor;fill-opacity:1;stroke:none"
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      cx="4"
      cy="4"
      r="4"
diff --git a/icons-dark/status/16/state-information.svg b/icons-dark/status/16/state-information.svg
--- a/icons-dark/status/16/state-information.svg
+++ b/icons-dark/status/16/state-information.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,7 +17,7 @@
   <path 
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="M 11 6 A 4 4 0 0 0 7 10 A 4 4 0 0 0 11 14 A 4 4 0 0 0 15 10 A 4 4 0 0 0 11 6 z "
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
         />
     <path
        style="opacity:1;fill:#ffffff"
diff --git a/icons-dark/status/16/state-offline.svg b/icons-dark/status/16/state-offline.svg
--- a/icons-dark/status/16/state-offline.svg
+++ b/icons-dark/status/16/state-offline.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons-dark/status/16/state-sync.svg b/icons-dark/status/16/state-sync.svg
--- a/icons-dark/status/16/state-sync.svg
+++ b/icons-dark/status/16/state-sync.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,7 +17,7 @@
   <path 
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="M 11 6 C 8.784 6 7 7.784 7 10 C 7 12.216 8.784 14 11 14 C 13.216 14 15 12.216 15 10 C 15 7.784 13.216 6 11 6 z "
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
         />
     <path
        style="opacity:1;fill:#ffffff"
diff --git a/icons-dark/status/22/state-information.svg b/icons-dark/status/22/state-information.svg
--- a/icons-dark/status/22/state-information.svg
+++ b/icons-dark/status/22/state-information.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -18,7 +18,7 @@
        class="ColorScheme-Text" />
     <path
        style="fill:currentColor;fill-opacity:1;stroke:none"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
        d="m 441.71429,540.29071 a 4.5,4.5 0 0 1 -4.5,4.5 4.5,4.5 0 0 1 -4.5,-4.5 4.5,4.5 0 0 1 4.5,-4.5 4.5,4.5 0 0 1 4.5,4.5 z"
        id="path4509" />
     <path
diff --git a/icons-dark/status/22/update-low.svg b/icons-dark/status/22/update-low.svg
--- a/icons-dark/status/22/update-low.svg
+++ b/icons-dark/status/22/update-low.svg
@@ -3,10 +3,10 @@
         <style type="text/css" id="current-color-scheme">.ColorScheme-Text {
         color:#eff0f1;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }</style>
     </defs>
     <path class="ColorScheme-Text" fill="currentColor" d="m10.943359 3.0019531c-2.3096783 0.0179358-4.5777809 1.0323219-6.1289059 2.921875-2.4818 3.023337-2.4103312 7.4081339 0.1679688 10.34961l0.7519531-0.658204c-2.2602-2.578617-2.3221844-6.4042931-0.1464844-9.0546871 2.175699-2.650394 5.9425094-3.3375469 8.9121094-1.6230469l-0.5 0.8671875 2.480469-0.2988281-0.980469-2.2988282-0.5 0.8652344c-1.270312-0.7334062-2.670833-1.0810739-4.056641-1.0703125zm6.072266 2.7265625-0.751953 0.6582032c1.498615 1.7097401 2.023814 3.9662772 1.578125 6.0664062a3.9904534 4.0021063 0 0 1 0.878906 0.625c0.193608-0.721967 0.289408-1.46347 0.277344-2.205078-0.029962-1.8417764-0.693272-3.6737934-1.982422-5.1445314zm-6.017578 0.2714844-4.0000001 4h2v5h3.1406251a3.9904534 4.0021063 0 0 1 0.859375-1.626953v-3.373047h2l-4-4zm-2.998047 10.197266-2.4824219 0.298828 0.9824219 2.298828 0.5-0.865234c1.8980665 1.095835 4.087429 1.331359 6.082031 0.794921a3.9904534 4.0021063 0 0 1-0.623047-0.882812c-1.644174 0.350774-3.4090691 0.115547-4.958984-0.779297l0.5-0.865234z"/>
-    <path class="ColorScheme-Highlight" fill="currentColor" d="m16 13a2.9999907 2.9999907 0 0 0-3 3 2.9999907 2.9999907 0 0 0 3 3 2.9999907 2.9999907 0 0 0 3-3 2.9999907 2.9999907 0 0 0-3-3z"/>
+    <path class="olorScheme-ButtonFocus" fill="currentColor" d="m16 13a2.9999907 2.9999907 0 0 0-3 3 2.9999907 2.9999907 0 0 0 3 3 2.9999907 2.9999907 0 0 0 3-3 2.9999907 2.9999907 0 0 0-3-3z"/>
 </svg>
diff --git a/icons/actions/12/transform-affect-gradient.svg b/icons/actions/12/transform-affect-gradient.svg
--- a/icons/actions/12/transform-affect-gradient.svg
+++ b/icons/actions/12/transform-affect-gradient.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -23,7 +23,7 @@
      style="fill:currentColor;fill-opacity:1;stroke:none"
      d="m424.8 542.79l.367.379 1.621 1.621h-2.076v1h2.076l-1.621 1.621-.381.379h1.417l2.5-2.5-2.5-2.5zm-2.088 2v1h2v-1z"
      transform="translate(-421.71-535.79)"
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      id="path10" />
   <path
      style="fill:currentColor;fill-opacity:1;stroke:none"
diff --git a/icons/actions/12/transform-affect-pattern.svg b/icons/actions/12/transform-affect-pattern.svg
--- a/icons/actions/12/transform-affect-pattern.svg
+++ b/icons/actions/12/transform-affect-pattern.svg
@@ -4,16 +4,16 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
   </defs>
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="m424.8 542.79l.367.379 1.621 1.621h-2.076v1h2.076l-1.621 1.621-.381.379h1.417l2.5-2.5-2.5-2.5zm-2.088 2v1h2v-1z" 
      transform="translate(-421.71-535.79)"
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
diff --git a/icons/actions/12/transform-affect-rounded-corners.svg b/icons/actions/12/transform-affect-rounded-corners.svg
--- a/icons/actions/12/transform-affect-rounded-corners.svg
+++ b/icons/actions/12/transform-affect-rounded-corners.svg
@@ -4,15 +4,15 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
   </defs>
  <path style="fill:currentColor;fill-opacity:1;stroke:none" 
        d="m424.8 542.79l.367.379 1.621 1.621h-2.076v1h2.076l-1.621 1.621-.381.379h1.417l2.5-2.5-2.5-2.5zm-2.088 2v1h2v-1z" 
        transform="translate(-421.71-535.79)"
-       class="ColorScheme-Highlight"
+       class="olorScheme-ButtonFocus"
        />
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
diff --git a/icons/actions/12/transform-affect-stroke.svg b/icons/actions/12/transform-affect-stroke.svg
--- a/icons/actions/12/transform-affect-stroke.svg
+++ b/icons/actions/12/transform-affect-stroke.svg
@@ -4,15 +4,15 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
   </defs>
  <path style="fill:currentColor;fill-opacity:1;stroke:none" 
        d="m424.8 542.79l.367.379 1.621 1.621h-2.076v1h2.076l-1.621 1.621-.381.379h1.417l2.5-2.5-2.5-2.5zm-2.088 2v1h2v-1z" 
        transform="translate(-421.71-535.79)" 
-       class="ColorScheme-Highlight" 
+       class="olorScheme-ButtonFocus" 
        />
  <path style="fill:currentColor;fill-opacity:1;stroke:none" 
        d="m1 1v2h8v6h2v-8zm0 4v1h5v1h1v-2z"
diff --git a/icons/actions/16/artifact.svg b/icons/actions/16/artifact.svg
--- a/icons/actions/16/artifact.svg
+++ b/icons/actions/16/artifact.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -15,6 +15,6 @@
      />
  <path style="fill:currentColor;fill-opacity:1;stroke:none" 
        d="M 2 6 L 2 7 L 4 7 L 4 6 L 2 6 z M 7 6 L 7 7 L 9 7 L 9 6 L 7 6 z M 12 6 L 12 7 L 14 7 L 14 6 L 12 6 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/16/category2parent.svg b/icons/actions/16/category2parent.svg
--- a/icons/actions/16/category2parent.svg
+++ b/icons/actions/16/category2parent.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path 
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="M 4,7 4,11 9,11 9,6 8,6 8,7 7,7 7,6 6,6 6,7 5,7 5,6 4,6 Z m 1,1 3,0 0,2 -3,0 z" 
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
         />
 </svg>
diff --git a/icons/actions/16/child2category.svg b/icons/actions/16/child2category.svg
--- a/icons/actions/16/child2category.svg
+++ b/icons/actions/16/child2category.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path 
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="M 10 9 L 10 10 L 10 14 L 15 14 L 15 9 L 14 9 L 14 10 L 13 10 L 13 9 L 12 9 L 12 10 L 11 10 L 11 9 L 10 9 z M 11 11 L 14 11 L 14 13 L 11 13 L 11 11 z "
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
         />
 </svg>
diff --git a/icons/actions/16/curve-connector.svg b/icons/actions/16/curve-connector.svg
--- a/icons/actions/16/curve-connector.svg
+++ b/icons/actions/16/curve-connector.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path 
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="M 12.5 3.0019531 A 1.5 1.5 0 0 0 11 4.5019531 A 1.5 1.5 0 0 0 12.5 6.0019531 A 1.5 1.5 0 0 0 14 4.5019531 A 1.5 1.5 0 0 0 12.5 3.0019531 z M 12.5 4.0019531 A 0.50000025 0.500001 0 0 1 13 4.5019531 A 0.50000025 0.500001 0 0 1 12.5 5.0019531 A 0.50000025 0.500001 0 0 1 12 4.5019531 A 0.50000025 0.500001 0 0 1 12.5 4.0019531 z M 3.5 11.001953 A 1.5 1.5 0 0 0 2 12.501953 A 1.5 1.5 0 0 0 3.5 14.001953 A 1.5 1.5 0 0 0 5 12.501953 A 1.5 1.5 0 0 0 3.5 11.001953 z M 3.5 12.001953 A 0.50000025 0.500001 0 0 1 4 12.501953 A 0.50000025 0.500001 0 0 1 3.5 13.001953 A 0.50000025 0.500001 0 0 1 3 12.501953 A 0.50000025 0.500001 0 0 1 3.5 12.001953 z "
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
         />
 </svg>
diff --git a/icons/actions/16/deep-history.svg b/icons/actions/16/deep-history.svg
--- a/icons/actions/16/deep-history.svg
+++ b/icons/actions/16/deep-history.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -15,6 +15,6 @@
      />
  <path style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="m10 10v1h2a1 1 0 0 1 1 1 1 1 0 0 1 -1 1v1a2 2 0 0 0 2 -2 2 2 0 0 0 -2 -2z"
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/16/dialog-tile-clones.svg b/icons/actions/16/dialog-tile-clones.svg
--- a/icons/actions/16/dialog-tile-clones.svg
+++ b/icons/actions/16/dialog-tile-clones.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path 
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="M 11.5,8 A 1.5,1.5 0 0 0 10,9.5 l 0,1.5 -1,0 0,3 5,0 0,-3 -1,0 0,-1.5 A 1.5,1.5 0 0 0 11.5,8 m 0,1 A 0.5,0.5 0 0 1 12,9.5 l 0,1.5 -1,0 0,-1.5 A 0.5,0.5 0 0 1 11.5,9"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
         />
 </svg>
diff --git a/icons/actions/16/document-compareright.svg b/icons/actions/16/document-compareright.svg
--- a/icons/actions/16/document-compareright.svg
+++ b/icons/actions/16/document-compareright.svg
@@ -1,13 +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-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
   </defs>
   <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 9 2 L 7 3.5 L 9 5 L 9 4 L 10 4 C 10.552 4 11 4.448 11 5 L 11 11.087891 C 10.401411 11.299528 10.000895 11.865099 10 12.5 C 10.000008 13.328424 10.671576 13.999992 11.5 14 C 12.328424 13.999992 12.999992 13.328424 13 12.5 C 12.999105 11.865099 12.598589 11.299528 12 11.087891 L 12 5 C 12 3.895 11.105 3 10 3 L 9 3 L 9 2 z M 11.5 12 C 11.776142 12 12 12.223858 12 12.5 C 12 12.776142 11.776142 13 11.5 13 C 11.223858 13 11 12.776142 11 12.5 C 11 12.223858 11.223858 12 11.5 12 z "
-     class="ColorScheme-Highlight"/>
+     class="olorScheme-ButtonFocus"/>
 </svg>
diff --git a/icons/actions/16/draw-connector.svg b/icons/actions/16/draw-connector.svg
--- a/icons/actions/16/draw-connector.svg
+++ b/icons/actions/16/draw-connector.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path 
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="M 11 2 L 11 5 L 14 5 L 14 2 L 11 2 z M 12 3 L 13 3 L 13 4 L 12 4 L 12 3 z M 2 11 L 2 14 L 5 14 L 5 11 L 2 11 z M 3 12 L 4 12 L 4 13 L 3 13 L 3 12 z "
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
         />
 </svg>
diff --git a/icons/actions/16/edit-select-original.svg b/icons/actions/16/edit-select-original.svg
--- a/icons/actions/16/edit-select-original.svg
+++ b/icons/actions/16/edit-select-original.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path 
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="m 2,2 0,11 3,0 0,-1 -2,0 0,-9 8,0 0,1 1,0 0,-2 z"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
         />
 </svg>
diff --git a/icons/actions/16/edit-table-cell-split.svg b/icons/actions/16/edit-table-cell-split.svg
--- a/icons/actions/16/edit-table-cell-split.svg
+++ b/icons/actions/16/edit-table-cell-split.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       .ColorScheme-NegativeText {
diff --git a/icons/actions/16/edit-table-insert-column-left.svg b/icons/actions/16/edit-table-insert-column-left.svg
--- a/icons/actions/16/edit-table-insert-column-left.svg
+++ b/icons/actions/16/edit-table-insert-column-left.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path 
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="M 7,2 6,2 6,3.281 4.719,2 3.281,2 6,4.719 l 0,2.563 -3,-3 0,-2.281 -1,0 0,7 1.719,0 L 3,8.282 3,5.719 6,8.719 6,9 7,9 7,3 Z"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
         />
 </svg>
diff --git a/icons/actions/16/edit-table-insert-column-right.svg b/icons/actions/16/edit-table-insert-column-right.svg
--- a/icons/actions/16/edit-table-insert-column-right.svg
+++ b/icons/actions/16/edit-table-insert-column-right.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path 
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="M 9,2 10,2 10,3.281 11.281,2 12.719,2 10,4.719 l 0,2.563 3,-3 0,-2.281 1,0 0,7 -1.719,0 L 13,8.282 13,5.719 10,8.719 10,9 9,9 9,3 Z"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
         />
 </svg>
diff --git a/icons/actions/16/edit-table-insert-row-above.svg b/icons/actions/16/edit-table-insert-row-above.svg
--- a/icons/actions/16/edit-table-insert-row-above.svg
+++ b/icons/actions/16/edit-table-insert-row-above.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path 
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="M 2,7 2,6 3.281,6 2,4.719 2,3.281 4.719,6 l 2.563,0 -3,-3 -2.281,0 0,-1 7,0 0,1.719 L 8.282,3 5.719,3 8.719,6 9,6 9,7 3,7 Z"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
         />
 </svg>
diff --git a/icons/actions/16/edit-table-insert-row-below.svg b/icons/actions/16/edit-table-insert-row-below.svg
--- a/icons/actions/16/edit-table-insert-row-below.svg
+++ b/icons/actions/16/edit-table-insert-row-below.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path 
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="M 2,9 2,10 3.281,10 2,11.281 2,12.719 4.719,10 l 2.563,0 -3,3 -2.281,0 0,1 7,0 0,-1.719 L 8.282,13 5.719,13 8.719,10 9,10 9,9 3,9 Z"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
         />
 </svg>
diff --git a/icons/actions/16/edit-table-insert-row-under.svg b/icons/actions/16/edit-table-insert-row-under.svg
--- a/icons/actions/16/edit-table-insert-row-under.svg
+++ b/icons/actions/16/edit-table-insert-row-under.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path 
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="M 2,5 2,6 3.281,6 2,7.281 2,8.719 4.719,6 l 2.563,0 -3,3 -2.281,0 0,1 7,0 0,-1.719 L 8.282,9 5.719,9 8.719,6 9,6 9,5 3,5 Z" 
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
         />
 </svg>
diff --git a/icons/actions/16/edit-text-frame-update.svg b/icons/actions/16/edit-text-frame-update.svg
--- a/icons/actions/16/edit-text-frame-update.svg
+++ b/icons/actions/16/edit-text-frame-update.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path 
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="M 2,2 4,5 6,2 Z"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
         />
 </svg>
diff --git a/icons/actions/16/escape-direction-all.svg b/icons/actions/16/escape-direction-all.svg
--- a/icons/actions/16/escape-direction-all.svg
+++ b/icons/actions/16/escape-direction-all.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       .ColorScheme-NegativeText {
@@ -25,6 +25,6 @@
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
      d="m 8,6.005 c -1.10475,0 -2.00025,0.8955 -2.00025,2.00025 0,1.10475 0.8955,2.00025 2.00025,2.00025 1.10475,0 2.00025,-0.8955 2.00025,-2.00025 C 10.00025,6.9005 9.10475,6.005 8,6.005 m 0,0.99975 c 0.552,0 0.99975,0.44775 0.99975,0.99975 C 8.99975,8.5565 8.552,9.00425 8,9.00425 7.448,9.00425 7.00025,8.5565 7.00025,8.0045 7.00025,7.4525 7.448,7.00475 8,7.00475"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
 </svg>
diff --git a/icons/actions/16/escape-direction-down.svg b/icons/actions/16/escape-direction-down.svg
--- a/icons/actions/16/escape-direction-down.svg
+++ b/icons/actions/16/escape-direction-down.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       .ColorScheme-NegativeText {
@@ -25,6 +25,6 @@
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
      d="m 8,6.005 c -1.10475,0 -2.00025,0.8955 -2.00025,2.00025 0,1.10475 0.8955,2.00025 2.00025,2.00025 1.10475,0 2.00025,-0.8955 2.00025,-2.00025 C 10.00025,6.9005 9.10475,6.005 8,6.005 m 0,0.99975 c 0.552,0 0.99975,0.44775 0.99975,0.99975 C 8.99975,8.5565 8.552,9.00425 8,9.00425 7.448,9.00425 7.00025,8.5565 7.00025,8.0045 7.00025,7.4525 7.448,7.00475 8,7.00475"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
 </svg>
diff --git a/icons/actions/16/escape-direction-horizontal.svg b/icons/actions/16/escape-direction-horizontal.svg
--- a/icons/actions/16/escape-direction-horizontal.svg
+++ b/icons/actions/16/escape-direction-horizontal.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       .ColorScheme-NegativeText {
@@ -25,6 +25,6 @@
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
      d="m 8,6.005 c -1.10475,0 -2.00025,0.8955 -2.00025,2.00025 0,1.10475 0.8955,2.00025 2.00025,2.00025 1.10475,0 2.00025,-0.8955 2.00025,-2.00025 C 10.00025,6.9005 9.10475,6.005 8,6.005 m 0,0.99975 c 0.552,0 0.99975,0.44775 0.99975,0.99975 C 8.99975,8.5565 8.552,9.00425 8,9.00425 7.448,9.00425 7.00025,8.5565 7.00025,8.0045 7.00025,7.4525 7.448,7.00475 8,7.00475"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
 </svg>
diff --git a/icons/actions/16/escape-direction-left.svg b/icons/actions/16/escape-direction-left.svg
--- a/icons/actions/16/escape-direction-left.svg
+++ b/icons/actions/16/escape-direction-left.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       .ColorScheme-NegativeText {
@@ -25,6 +25,6 @@
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
      d="m 8,6.005 c -1.10475,0 -2.00025,0.8955 -2.00025,2.00025 0,1.10475 0.8955,2.00025 2.00025,2.00025 1.10475,0 2.00025,-0.8955 2.00025,-2.00025 C 10.00025,6.9005 9.10475,6.005 8,6.005 m 0,0.99975 c 0.552,0 0.99975,0.44775 0.99975,0.99975 C 8.99975,8.5565 8.552,9.00425 8,9.00425 7.448,9.00425 7.00025,8.5565 7.00025,8.0045 7.00025,7.4525 7.448,7.00475 8,7.00475"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
 </svg>
diff --git a/icons/actions/16/escape-direction-right.svg b/icons/actions/16/escape-direction-right.svg
--- a/icons/actions/16/escape-direction-right.svg
+++ b/icons/actions/16/escape-direction-right.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       .ColorScheme-NegativeText {
@@ -25,6 +25,6 @@
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
      d="m 8,6.005 c -1.10475,0 -2.00025,0.8955 -2.00025,2.00025 0,1.10475 0.8955,2.00025 2.00025,2.00025 1.10475,0 2.00025,-0.8955 2.00025,-2.00025 C 10.00025,6.9005 9.10475,6.005 8,6.005 m 0,0.99975 c 0.552,0 0.99975,0.44775 0.99975,0.99975 C 8.99975,8.5565 8.552,9.00425 8,9.00425 7.448,9.00425 7.00025,8.5565 7.00025,8.0045 7.00025,7.4525 7.448,7.00475 8,7.00475"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
 </svg>
diff --git a/icons/actions/16/escape-direction-up.svg b/icons/actions/16/escape-direction-up.svg
--- a/icons/actions/16/escape-direction-up.svg
+++ b/icons/actions/16/escape-direction-up.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       .ColorScheme-NegativeText {
@@ -25,6 +25,6 @@
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
      d="m 8,6.005 c -1.10475,0 -2.00025,0.8955 -2.00025,2.00025 0,1.10475 0.8955,2.00025 2.00025,2.00025 1.10475,0 2.00025,-0.8955 2.00025,-2.00025 C 10.00025,6.9005 9.10475,6.005 8,6.005 m 0,0.99975 c 0.552,0 0.99975,0.44775 0.99975,0.99975 C 8.99975,8.5565 8.552,9.00425 8,9.00425 7.448,9.00425 7.00025,8.5565 7.00025,8.0045 7.00025,7.4525 7.448,7.00475 8,7.00475"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
 </svg>
diff --git a/icons/actions/16/escape-direction-vertical.svg b/icons/actions/16/escape-direction-vertical.svg
--- a/icons/actions/16/escape-direction-vertical.svg
+++ b/icons/actions/16/escape-direction-vertical.svg
@@ -7,7 +7,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       .ColorScheme-NegativeText {
@@ -27,6 +27,6 @@
   <path
      style="fill:currentColor;fill-opacity:1;stroke:none"
      d="m 8,6.005 c -1.10475,0 -2.00025,0.8955 -2.00025,2.00025 0,1.10475 0.8955,2.00025 2.00025,2.00025 1.10475,0 2.00025,-0.8955 2.00025,-2.00025 C 10.00025,6.9005 9.10475,6.005 8,6.005 m 0,0.99975 c 0.552,0 0.99975,0.44775 0.99975,0.99975 C 8.99975,8.5565 8.552,9.00425 8,9.00425 7.448,9.00425 7.00025,8.5565 7.00025,8.0045 7.00025,7.4525 7.448,7.00475 8,7.00475"
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      id="path10" />
 </svg>
diff --git a/icons/actions/16/filename-title-amarok.svg b/icons/actions/16/filename-title-amarok.svg
--- a/icons/actions/16/filename-title-amarok.svg
+++ b/icons/actions/16/filename-title-amarok.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,7 +17,7 @@
   <path 
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="m426.71 535.79h6v2h-6z"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
         />
  </g>
 </svg>
diff --git a/icons/actions/16/foreign_green.svg b/icons/actions/16/foreign_green.svg
--- a/icons/actions/16/foreign_green.svg
+++ b/icons/actions/16/foreign_green.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons/actions/16/foreign_red.svg b/icons/actions/16/foreign_red.svg
--- a/icons/actions/16/foreign_red.svg
+++ b/icons/actions/16/foreign_red.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       .ColorScheme-NegativeText {
diff --git a/icons/actions/16/format-break-node.svg b/icons/actions/16/format-break-node.svg
--- a/icons/actions/16/format-break-node.svg
+++ b/icons/actions/16/format-break-node.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path 
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="m 5.99975,7.0025 2.00025,3 2.00025,-3 z"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
         />
 </svg>
diff --git a/icons/actions/16/format-connect-node.svg b/icons/actions/16/format-connect-node.svg
--- a/icons/actions/16/format-connect-node.svg
+++ b/icons/actions/16/format-connect-node.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path 
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="m 5.99975,7.0025 2.00025,3 2.00025,-3 z"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
         />
 </svg>
diff --git a/icons/actions/16/format-disconnect-node.svg b/icons/actions/16/format-disconnect-node.svg
--- a/icons/actions/16/format-disconnect-node.svg
+++ b/icons/actions/16/format-disconnect-node.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path 
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="m 5.99975,7.0025 2.00025,3 2.00025,-3 z"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
         />
 </svg>
diff --git a/icons/actions/16/format-join-node.svg b/icons/actions/16/format-join-node.svg
--- a/icons/actions/16/format-join-node.svg
+++ b/icons/actions/16/format-join-node.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path 
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="m 5.99975,7.0025 2.00025,3 2.00025,-3 z"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
         />
 </svg>
diff --git a/icons/actions/16/format-precision-more.svg b/icons/actions/16/format-precision-more.svg
--- a/icons/actions/16/format-precision-more.svg
+++ b/icons/actions/16/format-precision-more.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path
      style="fill:currentColor;fill-opacity:1;stroke:none"
      d="m 11,9 0,2 -2,0 0,1 2,0 0,2 1,0 0,-2 2,0 0,-1 -2,0 0,-2 z"
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
       />
 </svg>
diff --git a/icons/actions/16/format-remove-node.svg b/icons/actions/16/format-remove-node.svg
--- a/icons/actions/16/format-remove-node.svg
+++ b/icons/actions/16/format-remove-node.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       .ColorScheme-NegativeText {
diff --git a/icons/actions/16/format-text-capitalize.svg b/icons/actions/16/format-text-capitalize.svg
--- a/icons/actions/16/format-text-capitalize.svg
+++ b/icons/actions/16/format-text-capitalize.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path 
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="M 2,5 7,5 4.5,2 Z"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
         />
 </svg>
diff --git a/icons/actions/16/format-text-lowercase.svg b/icons/actions/16/format-text-lowercase.svg
--- a/icons/actions/16/format-text-lowercase.svg
+++ b/icons/actions/16/format-text-lowercase.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path 
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="m 9.49975,1.9975 5.00025,0 -2.49975,3 z"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
         />
 </svg>
diff --git a/icons/actions/16/format-text-uppercase.svg b/icons/actions/16/format-text-uppercase.svg
--- a/icons/actions/16/format-text-uppercase.svg
+++ b/icons/actions/16/format-text-uppercase.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path 
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="m 8.71,5 5,0 -2.5,-3 z"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
         />
 </svg>
diff --git a/icons/actions/16/input-mouse-click-left.svg b/icons/actions/16/input-mouse-click-left.svg
--- a/icons/actions/16/input-mouse-click-left.svg
+++ b/icons/actions/16/input-mouse-click-left.svg
@@ -3,10 +3,10 @@
         .ColorScheme-Text {
             color:#232629;
         }
-        .ColorScheme-Highlight {
+        .olorScheme-ButtonFocus {
             color:#3daee9;
         }
     </style>
     <path d="M8 2a4 4 0 0 0-4 4v4a4 4 0 0 0 4 4h1a4 4 0 0 0 4-4V6a4 4 0 0 0-4-4zm0 1h1a3 3 0 0 1 3 3v4a3 3 0 0 1-3 3H8a3 3 0 0 1-3-3V6a3 3 0 0 1 3-3zm0 1v3h1V4z" fill="currentColor" class="ColorScheme-Text"/>
-    <path d="M8 3a3 3 0 0 0-3 3v2h3z" fill="currentColor" class="ColorScheme-Highlight"/>
+    <path d="M8 3a3 3 0 0 0-3 3v2h3z" fill="currentColor" class="olorScheme-ButtonFocus"/>
 </svg>
diff --git a/icons/actions/16/input-mouse-click-middle.svg b/icons/actions/16/input-mouse-click-middle.svg
--- a/icons/actions/16/input-mouse-click-middle.svg
+++ b/icons/actions/16/input-mouse-click-middle.svg
@@ -3,10 +3,10 @@
         .ColorScheme-Text {
             color:#232629;
         }
-        .ColorScheme-Highlight {
+        .olorScheme-ButtonFocus {
             color:#3daee9;
         }
     </style>
     <path d="M8 2a4 4 0 0 0-4 4v4a4 4 0 0 0 4 4h1a4 4 0 0 0 4-4V6a4 4 0 0 0-4-4zm0 1h1a3 3 0 0 1 3 3v4a3 3 0 0 1-3 3H8a3 3 0 0 1-3-3V6a3 3 0 0 1 3-3z" fill="currentColor" class="ColorScheme-Text"/>
-    <path d="M8 3a3 3 0 0 0-1 .176V8h3V3.174A3 3 0 0 0 9 3zm0 1h1v3H8z" fill="currentColor" class="ColorScheme-Highlight"/>
+    <path d="M8 3a3 3 0 0 0-1 .176V8h3V3.174A3 3 0 0 0 9 3zm0 1h1v3H8z" fill="currentColor" class="olorScheme-ButtonFocus"/>
 </svg>
diff --git a/icons/actions/16/input-mouse-click-right.svg b/icons/actions/16/input-mouse-click-right.svg
--- a/icons/actions/16/input-mouse-click-right.svg
+++ b/icons/actions/16/input-mouse-click-right.svg
@@ -3,10 +3,10 @@
         .ColorScheme-Text {
             color:#232629;
         }
-        .ColorScheme-Highlight {
+        .olorScheme-ButtonFocus {
             color:#3daee9;
         }
     </style>
     <path d="M8 2a4 4 0 0 0-4 4v4a4 4 0 0 0 4 4h1a4 4 0 0 0 4-4V6a4 4 0 0 0-4-4zm0 1h1a3 3 0 0 1 3 3v4a3 3 0 0 1-3 3H8a3 3 0 0 1-3-3V6a3 3 0 0 1 3-3zm0 1v3h1V4z" fill="currentColor" class="ColorScheme-Text"/>
-    <path d="M9 3a3 3 0 0 1 3 3v2H9z" fill="currentColor" class="ColorScheme-Highlight"/>
+    <path d="M9 3a3 3 0 0 1 3 3v2H9z" fill="currentColor" class="olorScheme-ButtonFocus"/>
 </svg>
diff --git a/icons/actions/16/insert-button.svg b/icons/actions/16/insert-button.svg
--- a/icons/actions/16/insert-button.svg
+++ b/icons/actions/16/insert-button.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons/actions/16/insert-endnote.svg b/icons/actions/16/insert-endnote.svg
--- a/icons/actions/16/insert-endnote.svg
+++ b/icons/actions/16/insert-endnote.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path 
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="M 13 8 L 13 9 L 14 9 L 14 8 L 13 8 z M 4 9 L 4 10 L 8 10 L 8 9 L 4 9 z M 13 10 L 13 14 L 14 14 L 14 10 L 13 10 z "
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
         />
 </svg>
diff --git a/icons/actions/16/insert-footnote.svg b/icons/actions/16/insert-footnote.svg
--- a/icons/actions/16/insert-footnote.svg
+++ b/icons/actions/16/insert-footnote.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path 
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="M 13 8 L 12 10 L 13 10 L 13 14 L 14 14 L 14 8 L 13 8 z M 4 11 L 4 12 L 8 12 L 8 11 L 4 11 z "
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
         />
 </svg>
diff --git a/icons/actions/16/insert-more-mark.svg b/icons/actions/16/insert-more-mark.svg
--- a/icons/actions/16/insert-more-mark.svg
+++ b/icons/actions/16/insert-more-mark.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path 
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="M 2,7 14,7 14,8 2,8 Z"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
         />
 </svg>
diff --git a/icons/actions/16/insert-page-break.svg b/icons/actions/16/insert-page-break.svg
--- a/icons/actions/16/insert-page-break.svg
+++ b/icons/actions/16/insert-page-break.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path 
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="M 2,6 2,7 4,7 4,6 2,6 Z M 7,6 7,7 9,7 9,6 7,6 Z m 5,0 0,1 2,0 0,-1 -2,0 z"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
         />
 </svg>
diff --git a/icons/actions/16/insert-table-of-contents.svg b/icons/actions/16/insert-table-of-contents.svg
--- a/icons/actions/16/insert-table-of-contents.svg
+++ b/icons/actions/16/insert-table-of-contents.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path 
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="M 11 3 L 11 4 L 12 4 L 12 6 L 11 6 L 11 7 L 14 7 L 14 6 L 13 6 L 13 4 L 14 4 L 14 3 L 11 3 z M 5 5 L 5 6 L 6 6 L 6 5 L 5 5 z M 7 5 L 7 6 L 8 6 L 8 5 L 7 5 z M 9 5 L 9 6 L 10 6 L 10 5 L 9 5 z M 9 9 L 9 10 L 10 10 L 10 12 L 9 12 L 9 13 L 14 13 L 14 12 L 13 12 L 13 10 L 14 10 L 14 9 L 11 9 L 9 9 z M 11 10 L 12 10 L 12 12 L 11 12 L 11 10 z M 3 11 L 3 12 L 4 12 L 4 11 L 3 11 z M 5 11 L 5 12 L 6 12 L 6 11 L 5 11 z M 7 11 L 7 12 L 8 12 L 8 11 L 7 11 z "
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
         />
 </svg>
diff --git a/icons/actions/16/insert-table.svg b/icons/actions/16/insert-table.svg
--- a/icons/actions/16/insert-table.svg
+++ b/icons/actions/16/insert-table.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons/actions/16/kr_mountman.svg b/icons/actions/16/kr_mountman.svg
--- a/icons/actions/16/kr_mountman.svg
+++ b/icons/actions/16/kr_mountman.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       .ColorScheme-PositiveText {
diff --git a/icons/actions/16/kr_syncbrowse_off.svg b/icons/actions/16/kr_syncbrowse_off.svg
--- a/icons/actions/16/kr_syncbrowse_off.svg
+++ b/icons/actions/16/kr_syncbrowse_off.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       .ColorScheme-PositiveText {
diff --git a/icons/actions/16/kr_syncbrowse_on.svg b/icons/actions/16/kr_syncbrowse_on.svg
--- a/icons/actions/16/kr_syncbrowse_on.svg
+++ b/icons/actions/16/kr_syncbrowse_on.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       .ColorScheme-NegativeText {
diff --git a/icons/actions/16/layer-bottom.svg b/icons/actions/16/layer-bottom.svg
--- a/icons/actions/16/layer-bottom.svg
+++ b/icons/actions/16/layer-bottom.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="m 11,14 3,-3 -6,0 -3,3 z"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
 </svg>
diff --git a/icons/actions/16/layer-duplicate.svg b/icons/actions/16/layer-duplicate.svg
--- a/icons/actions/16/layer-duplicate.svg
+++ b/icons/actions/16/layer-duplicate.svg
@@ -4,14 +4,14 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
   </defs>
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="M 5 5 L 2 8 L 11 8 L 14 5 L 5 5 z M 5 9 L 2 12 L 11 12 L 14 9 L 5 9 z "
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
 </svg>
diff --git a/icons/actions/16/layer-lower.svg b/icons/actions/16/layer-lower.svg
--- a/icons/actions/16/layer-lower.svg
+++ b/icons/actions/16/layer-lower.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="m 9,7 -3,3 5,0 3,-3 z"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
 </svg>
diff --git a/icons/actions/16/layer-next.svg b/icons/actions/16/layer-next.svg
--- a/icons/actions/16/layer-next.svg
+++ b/icons/actions/16/layer-next.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="M 11,6.8 8,10 5,6.8 5.75,6 8,8.4 10.25,6 Z"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
 </svg>
diff --git a/icons/actions/16/layer-previous.svg b/icons/actions/16/layer-previous.svg
--- a/icons/actions/16/layer-previous.svg
+++ b/icons/actions/16/layer-previous.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="M 11,9.2 8,6 5,9.2 5.75,10 8,7.6 10.25,10 Z"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
 </svg>
diff --git a/icons/actions/16/layer-raise.svg b/icons/actions/16/layer-raise.svg
--- a/icons/actions/16/layer-raise.svg
+++ b/icons/actions/16/layer-raise.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="m 5,7 -3,3 5,0 3,-3 z"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
 </svg>
diff --git a/icons/actions/16/layer-top.svg b/icons/actions/16/layer-top.svg
--- a/icons/actions/16/layer-top.svg
+++ b/icons/actions/16/layer-top.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="M 5,3 2,6 8,6 11,3 Z"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
 </svg>
diff --git a/icons/actions/16/lines-connector.svg b/icons/actions/16/lines-connector.svg
--- a/icons/actions/16/lines-connector.svg
+++ b/icons/actions/16/lines-connector.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="M 11 2 L 11 5 L 14 5 L 14 2 L 11 2 z M 12 3 L 13 3 L 13 4 L 12 4 L 12 3 z M 2 11 L 2 14 L 5 14 L 5 11 L 2 11 z M 3 12 L 4 12 L 4 13 L 3 13 L 3 12 z "
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
 </svg>
diff --git a/icons/actions/16/media-show-active-track-amarok.svg b/icons/actions/16/media-show-active-track-amarok.svg
--- a/icons/actions/16/media-show-active-track-amarok.svg
+++ b/icons/actions/16/media-show-active-track-amarok.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="M 14,12 14,7 11,9.5 Z"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
 </svg>
diff --git a/icons/actions/16/media-track-queue-amarok.svg b/icons/actions/16/media-track-queue-amarok.svg
--- a/icons/actions/16/media-track-queue-amarok.svg
+++ b/icons/actions/16/media-track-queue-amarok.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="M 14,11 9,11 11.5,8 Z"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
 </svg>
diff --git a/icons/actions/16/mode1.svg b/icons/actions/16/mode1.svg
--- a/icons/actions/16/mode1.svg
+++ b/icons/actions/16/mode1.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="m 12,11 2,1.5 -2,1.5 0,-1 -5,0 C 5.892,13 5,12.108 5,11 l 1,0 c 0,0.554 0.446,1 1,1 l 5,0 z"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
 </svg>
diff --git a/icons/actions/16/mode2.svg b/icons/actions/16/mode2.svg
--- a/icons/actions/16/mode2.svg
+++ b/icons/actions/16/mode2.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="M 7,7 5,8.5 7,10 7,9 12,9 c 0.554,0 1,0.446 1,1 l 1,0 C 14,8.892 13.108,8 12,8 L 7,8 Z"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
 </svg>
diff --git a/icons/actions/16/mode3.svg b/icons/actions/16/mode3.svg
--- a/icons/actions/16/mode3.svg
+++ b/icons/actions/16/mode3.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="m 12,7 0,1 -2,0 C 8.892,8 8,8.892 8,10 l 0,1 c 0,0.554 -0.446,1 -1,1 l -2,0 0,1 2,0 c 1.108,0 2,-0.892 2,-2 L 9,10 C 9,9.446 9.446,9 10,9 l 2,0 0,1 2,-1.5 z"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
 </svg>
diff --git a/icons/actions/16/mode4.svg b/icons/actions/16/mode4.svg
--- a/icons/actions/16/mode4.svg
+++ b/icons/actions/16/mode4.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="M 7,7 5,8.5 7,10 7,9 9,9 c 0.554,0 1,0.446 1,1 l 0,1 c 0,1.108 0.892,2 2,2 l 2,0 0,-1 -2,0 c -0.554,0 -1,-0.446 -1,-1 l 0,-1 C 11,8.892 10.108,8 9,8 L 7,8 Z"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
 </svg>
diff --git a/icons/actions/16/mode5.svg b/icons/actions/16/mode5.svg
--- a/icons/actions/16/mode5.svg
+++ b/icons/actions/16/mode5.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="M 6 7 L 4 8.5 L 6 10 L 6 9 L 8 9 C 8.554 9 9 9.446 9 10 L 9 11 C 9 12.108 9.892 13 11 13 L 13 13 L 13 12 L 11 12 C 10.446 12 10 11.554 10 11 L 10 10 C 10 8.892 9.108 8 8 8 L 6 8 L 6 7 z M 12 7 L 12 8 L 11 8 L 11 9 L 12 9 L 12 10 L 14 8.5 L 12 7 z M 5 12 L 5 13 L 8 13 L 8 12 L 5 12 z "
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
 </svg>
diff --git a/icons/actions/16/node-segment-curve.svg b/icons/actions/16/node-segment-curve.svg
--- a/icons/actions/16/node-segment-curve.svg
+++ b/icons/actions/16/node-segment-curve.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="m 11,3 a 8,8 0 0 0 -8,8 l 1,0 a 7,7 0 0 1 7,-7 z"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
 </svg>
diff --git a/icons/actions/16/node-segment-line.svg b/icons/actions/16/node-segment-line.svg
--- a/icons/actions/16/node-segment-line.svg
+++ b/icons/actions/16/node-segment-line.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 11,4.3175 4.31225,11.00525 5,11.00525 5,11.693 11.68775,5.00525 11,5.00525 Z"
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
  </svg>
diff --git a/icons/actions/16/node-transform.svg b/icons/actions/16/node-transform.svg
--- a/icons/actions/16/node-transform.svg
+++ b/icons/actions/16/node-transform.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="M 8 8 L 8 10 L 9 10 L 9 9 L 10 9 L 10 8 L 8 8 z M 12 8 L 12 9 L 13 9 L 13 10 L 14 10 L 14 8 L 12 8 z M 8 12 L 8 14 L 10 14 L 10 13 L 9 13 L 9 12 L 8 12 z M 13 12 L 13 13 L 12 13 L 12 14 L 14 14 L 14 12 L 13 12 z "
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
 </svg>
diff --git a/icons/actions/16/node-type-auto-smooth.svg b/icons/actions/16/node-type-auto-smooth.svg
--- a/icons/actions/16/node-type-auto-smooth.svg
+++ b/icons/actions/16/node-type-auto-smooth.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="m 8.00429,8.00074 a 2.499985,2.499985 0 0 0 -2.5,2.5 2.499985,2.499985 0 0 0 2.5,2.5 2.499985,2.499985 0 0 0 2.5,-2.5 2.499985,2.499985 0 0 0 -2.5,-2.5 m 0,1 a 1.5,1.5 0 0 1 1.5,1.5 1.5,1.5 0 0 1 -1.5,1.5 1.5,1.5 0 0 1 -1.5,-1.5 1.5,1.5 0 0 1 1.5,-1.5"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
 </svg>
diff --git a/icons/actions/16/node-type-cusp.svg b/icons/actions/16/node-type-cusp.svg
--- a/icons/actions/16/node-type-cusp.svg
+++ b/icons/actions/16/node-type-cusp.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="m 5.173145,10.827109 2.82844,2.82844 2.82844,-2.82844 -2.82844,-2.8284402 z m 1.41422,0 1.41422,-1.4142202 1.41422,1.4142202 -1.41422,1.41422 z"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
 </svg>
diff --git a/icons/actions/16/node-type-smooth.svg b/icons/actions/16/node-type-smooth.svg
--- a/icons/actions/16/node-type-smooth.svg
+++ b/icons/actions/16/node-type-smooth.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="m 6,9 0,4 4,0 0,-4 z m 1,1 2,0 0,2 -2,0 z"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
 </svg>
diff --git a/icons/actions/16/node-type-symmetric.svg b/icons/actions/16/node-type-symmetric.svg
--- a/icons/actions/16/node-type-symmetric.svg
+++ b/icons/actions/16/node-type-symmetric.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="m 8,8 -3,5 6,0 z m 0,2 1,2 -2,0 z"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
 </svg>
diff --git a/icons/actions/16/object-to-path.svg b/icons/actions/16/object-to-path.svg
--- a/icons/actions/16/object-to-path.svg
+++ b/icons/actions/16/object-to-path.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="M 11 2 L 11 6 L 15 6 L 15 2 L 11 2 z M 12 3 L 14 3 L 14 5 L 12 5 L 12 3 z M 2 10 L 2 14 L 6 14 L 6 10 L 2 10 z M 3 11 L 5 11 L 5 13 L 3 13 L 3 11 z "
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
 </svg>
diff --git a/icons/actions/16/paint-pattern.svg b/icons/actions/16/paint-pattern.svg
--- a/icons/actions/16/paint-pattern.svg
+++ b/icons/actions/16/paint-pattern.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons/actions/16/path-break-apart.svg b/icons/actions/16/path-break-apart.svg
--- a/icons/actions/16/path-break-apart.svg
+++ b/icons/actions/16/path-break-apart.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="M 9.5039062 2 A 4.5 4.5 0 0 0 5.0371094 6 L 2 6 L 2 14 L 10 14 L 10 10.970703 A 4.5 4.5 0 0 0 14.003906 6.5 A 4.5 4.5 0 0 0 9.5039062 2 z M 9.5039062 3 A 3.5 3.5 0 0 1 13.003906 6.5 A 3.5 3.5 0 0 1 10 9.9609375 L 10 6 L 6.0449219 6 A 3.5 3.5 0 0 1 9.5039062 3 z M 3 7 L 5.0351562 7 A 4.5 4.5 0 0 0 9 10.966797 L 9 13 L 3 13 L 3 7 z M 6.0429688 7 L 9 7 L 9 9.9589844 A 3.5 3.5 0 0 1 6.0429688 7 z "
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
 </svg>
diff --git a/icons/actions/16/path-combine.svg b/icons/actions/16/path-combine.svg
--- a/icons/actions/16/path-combine.svg
+++ b/icons/actions/16/path-combine.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="M 9.5039062 2 A 4.5 4.5 0 0 0 5.0371094 6 L 2 6 L 2 14 L 10 14 L 10 10.970703 A 4.5 4.5 0 0 0 14.003906 6.5 A 4.5 4.5 0 0 0 9.5039062 2 z M 9.5039062 3 A 3.5 3.5 0 0 1 13.003906 6.5 A 3.5 3.5 0 0 1 10 9.9609375 L 10 6 L 6.0449219 6 A 3.5 3.5 0 0 1 9.5039062 3 z M 3 7 L 5.0351562 7 A 4.5 4.5 0 0 0 9 10.966797 L 9 13 L 3 13 L 3 7 z M 6.0429688 7 L 9 7 L 9 9.9589844 A 3.5 3.5 0 0 1 6.0429688 7 z "
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
 </svg>
diff --git a/icons/actions/16/path-cut.svg b/icons/actions/16/path-cut.svg
--- a/icons/actions/16/path-cut.svg
+++ b/icons/actions/16/path-cut.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons/actions/16/path-effect-parameter-next.svg b/icons/actions/16/path-effect-parameter-next.svg
--- a/icons/actions/16/path-effect-parameter-next.svg
+++ b/icons/actions/16/path-effect-parameter-next.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="m 11,3 a 8,8 0 0 0 -8,8 l 1,0 a 7,7 0 0 1 7,-7 z"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
 </svg>
diff --git a/icons/actions/16/path-inset.svg b/icons/actions/16/path-inset.svg
--- a/icons/actions/16/path-inset.svg
+++ b/icons/actions/16/path-inset.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="m 14,8 a 6,6 0 0 0 -6,6 l 1,0 a 5,5 0 0 1 5,-5 z" 
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
 </svg>
diff --git a/icons/actions/16/path-intersection.svg b/icons/actions/16/path-intersection.svg
--- a/icons/actions/16/path-intersection.svg
+++ b/icons/actions/16/path-intersection.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="M 9,7 6.041,7.021 C 6.273,8.545 7.474,9.738 9,9.959 Z"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
 </svg>
diff --git a/icons/actions/16/path-offset-dynamic.svg b/icons/actions/16/path-offset-dynamic.svg
--- a/icons/actions/16/path-offset-dynamic.svg
+++ b/icons/actions/16/path-offset-dynamic.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="m 6,6 0,4 4,0 0,-4 z M 7,7 9,7 9,9 7,9 Z"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
 </svg>
diff --git a/icons/actions/16/path-offset-linked.svg b/icons/actions/16/path-offset-linked.svg
--- a/icons/actions/16/path-offset-linked.svg
+++ b/icons/actions/16/path-offset-linked.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="M 4,4 4,8 8,8 8,4 Z M 5,5 7,5 7,7 5,7 Z"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
 </svg>
diff --git a/icons/actions/16/path-outset.svg b/icons/actions/16/path-outset.svg
--- a/icons/actions/16/path-outset.svg
+++ b/icons/actions/16/path-outset.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="M 14,2 A 12.00001,12.00001 0 0 0 2,14 l 1,0 A 11,11 0 0 1 14,3 Z"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
 </svg>
diff --git a/icons/actions/16/path-reverse.svg b/icons/actions/16/path-reverse.svg
--- a/icons/actions/16/path-reverse.svg
+++ b/icons/actions/16/path-reverse.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="m 6,6 0,4 4,0 0,-4 z M 7,7 9,7 9,9 7,9 Z"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
 </svg>
diff --git a/icons/actions/16/rectangle-make-corners-sharp.svg b/icons/actions/16/rectangle-make-corners-sharp.svg
--- a/icons/actions/16/rectangle-make-corners-sharp.svg
+++ b/icons/actions/16/rectangle-make-corners-sharp.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -18,7 +18,7 @@
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="m423.71 533.79v1h11v11h1v-12z"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
   </g>
 </svg>
diff --git a/icons/actions/16/selection-move-to-layer-above.svg b/icons/actions/16/selection-move-to-layer-above.svg
--- a/icons/actions/16/selection-move-to-layer-above.svg
+++ b/icons/actions/16/selection-move-to-layer-above.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="M 11,11 11,6.96875 9.656,8.4065 8.99975,7.71875 11.312,5.219 11.4995,5 11.687,5.219 13.99925,7.71875 13.343,8.4065 11.999,6.96875 c 0,0.02325 0,2.90775 0,4.03125 z"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
 </svg>
diff --git a/icons/actions/16/selection-move-to-layer-below.svg b/icons/actions/16/selection-move-to-layer-below.svg
--- a/icons/actions/16/selection-move-to-layer-below.svg
+++ b/icons/actions/16/selection-move-to-layer-below.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="M 11,5 11,9.03 9.656,7.593 9,8.28 l 2.313,2.5 0.188,0.219 0.188,-0.219 2.313,-2.5 -0.656,-0.687 -1.344,1.437 c 0,-0.023 0,-2.908 0,-4.03 z" 
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
 </svg>
diff --git a/icons/actions/16/show-node-handles.svg b/icons/actions/16/show-node-handles.svg
--- a/icons/actions/16/show-node-handles.svg
+++ b/icons/actions/16/show-node-handles.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="M 3.5 2 A 1.5 1.500015 0 0 0 2 3.5 A 1.5 1.500015 0 0 0 3 4.9121094 L 3 7 L 4 7 L 4 4.9121094 A 1.5 1.500015 0 0 0 5 3.5 A 1.5 1.500015 0 0 0 3.5 2 z M 3.5 3 A 0.5 0.5 0 0 1 4 3.5 A 0.5 0.5 0 0 1 3.5 4 A 0.5 0.5 0 0 1 3 3.5 A 0.5 0.5 0 0 1 3.5 3 z M 3 8 L 3 9 L 4 9 L 4 8 L 3 8 z M 3 10 L 3 11 L 2 11 L 2 14 L 5 14 L 5 11 L 4 11 L 4 10 L 3 10 z M 3 12 L 4 12 L 4 13 L 3 13 L 3 12 z "
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
 </svg>
diff --git a/icons/actions/16/similarartists-amarok.svg b/icons/actions/16/similarartists-amarok.svg
--- a/icons/actions/16/similarartists-amarok.svg
+++ b/icons/actions/16/similarartists-amarok.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="M 11.5 2 A 2.5 2.5 0 0 0 9 4.5 A 2.5 2.5 0 0 0 11.5 7 A 2.5 2.5 0 0 0 14 4.5 A 2.5 2.5 0 0 0 11.5 2 z M 11.646484 8 A 3.499998 4 0 0 0 8.4921875 10.273438 A 4.5 5 0 0 1 9.6171875 12 L 15.150391 12 A 3.499998 4 0 0 0 11.646484 8 z M 11.646484 9 A 2.5 3 0 0 1 14 11 L 9.2929688 11 A 2.5 3 0 0 1 11.646484 9 z "
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
 </svg>
diff --git a/icons/actions/16/snap-bounding-box-center.svg b/icons/actions/16/snap-bounding-box-center.svg
--- a/icons/actions/16/snap-bounding-box-center.svg
+++ b/icons/actions/16/snap-bounding-box-center.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="M 8,6 A 2,2 0 0 0 6,8 2,2 0 0 0 8,10 2,2 0 0 0 10,8 2,2 0 0 0 8,6 M 8,7 A 1,1 0 0 1 9,8 1,1 0 0 1 8,9 1,1 0 0 1 7,8 1,1 0 0 1 8,7"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
 </svg>
diff --git a/icons/actions/16/snap-bounding-box-corners.svg b/icons/actions/16/snap-bounding-box-corners.svg
--- a/icons/actions/16/snap-bounding-box-corners.svg
+++ b/icons/actions/16/snap-bounding-box-corners.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -19,7 +19,7 @@
   <path 
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="m 431.71429,541.79074 0,4 4,0 0,-4 -4,0 z m 1,1 2,0 0,2 -2,0 0,-2 z"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
         />
   </g>
 </svg>
diff --git a/icons/actions/16/snap-bounding-box-edges.svg b/icons/actions/16/snap-bounding-box-edges.svg
--- a/icons/actions/16/snap-bounding-box-edges.svg
+++ b/icons/actions/16/snap-bounding-box-edges.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="M 8.0039062 7 A 2 2 0 0 0 6.0039062 9 A 2 2 0 0 0 8 11 A 2 2 0 0 0 6 13 A 2 2 0 0 0 8 15 A 2 2 0 0 0 10 13 A 2 2 0 0 0 8.0039062 11 A 2 2 0 0 0 10.003906 9 A 2 2 0 0 0 8.0039062 7 z M 8.0039062 8 A 1 1 0 0 1 9.0039062 9 A 1 1 0 0 1 8.0039062 10 A 1 1 0 0 1 7.0039062 9 A 1 1 0 0 1 8.0039062 8 z M 8 12 A 1 1 0 0 1 9 13 A 1 1 0 0 1 8 14 A 1 1 0 0 1 7 13 A 1 1 0 0 1 8 12 z "
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
 </svg>
diff --git a/icons/actions/16/snap-bounding-box-midpoints.svg b/icons/actions/16/snap-bounding-box-midpoints.svg
--- a/icons/actions/16/snap-bounding-box-midpoints.svg
+++ b/icons/actions/16/snap-bounding-box-midpoints.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -19,7 +19,7 @@
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="m431.71 537.79v4h4v-4zm1 1h2v2h-2z"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
   </g>
 </svg>
diff --git a/icons/actions/16/snap-grid-guide-intersections.svg b/icons/actions/16/snap-grid-guide-intersections.svg
--- a/icons/actions/16/snap-grid-guide-intersections.svg
+++ b/icons/actions/16/snap-grid-guide-intersections.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="m 5,8 0,4 5,0 0,-4 z m 1,1 3,0 0,2 -3,0 z"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
 </svg>
diff --git a/icons/actions/16/snap-nodes-center.svg b/icons/actions/16/snap-nodes-center.svg
--- a/icons/actions/16/snap-nodes-center.svg
+++ b/icons/actions/16/snap-nodes-center.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="M8 6A2 2 0 0 0 6 8 2 2 0 0 0 8 10 2 2 0 0 0 10 8 2 2 0 0 0 8 6M8 7A1 1 0 0 1 9 8 1 1 0 0 1 8 9 1 1 0 0 1 7 8 1 1 0 0 1 8 7"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
 </svg>
diff --git a/icons/actions/16/snap-nodes-cusp.svg b/icons/actions/16/snap-nodes-cusp.svg
--- a/icons/actions/16/snap-nodes-cusp.svg
+++ b/icons/actions/16/snap-nodes-cusp.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="M 2 2 L 2 5 L 5 5 L 5 2 L 2 2 z M 11 2 L 11 5 L 14 5 L 14 2 L 11 2 z M 3 3 L 4 3 L 4 4 L 3 4 L 3 3 z M 12 3 L 13 3 L 13 4 L 12 4 L 12 3 z M 2 11 L 2 14 L 5 14 L 5 11 L 2 11 z M 11 11 L 11 14 L 14 14 L 14 11 L 11 11 z M 3 12 L 4 12 L 4 13 L 3 13 L 3 12 z M 12 12 L 13 12 L 13 13 L 12 13 L 12 12 z "
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
 </svg>
diff --git a/icons/actions/16/snap-nodes-intersection.svg b/icons/actions/16/snap-nodes-intersection.svg
--- a/icons/actions/16/snap-nodes-intersection.svg
+++ b/icons/actions/16/snap-nodes-intersection.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="m6 6v4h4v-4zm1 1h2v2h-2z"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
 </svg>
diff --git a/icons/actions/16/snap-nodes-midpoint.svg b/icons/actions/16/snap-nodes-midpoint.svg
--- a/icons/actions/16/snap-nodes-midpoint.svg
+++ b/icons/actions/16/snap-nodes-midpoint.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="m 8,5 -3,6 6,0 z m 0,2.235 1.383,2.764 -2.766,0 z"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
 </svg>
diff --git a/icons/actions/16/snap-nodes-path.svg b/icons/actions/16/snap-nodes-path.svg
--- a/icons/actions/16/snap-nodes-path.svg
+++ b/icons/actions/16/snap-nodes-path.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="M 4.5039062 3 A 1.499998 1.499998 0 0 0 3.0039062 4.5 A 1.499998 1.499998 0 0 0 4.5039062 6 A 1.499998 1.499998 0 0 0 6.0039062 4.5 A 1.499998 1.499998 0 0 0 4.5039062 3 z M 4.5039062 4 A 0.5 0.5 0 0 1 5.0039062 4.5 A 0.5 0.5 0 0 1 4.5039062 5 A 0.5 0.5 0 0 1 4.0039062 4.5 A 0.5 0.5 0 0 1 4.5039062 4 z M 7.5039062 6 A 1.499998 1.499998 0 0 0 6.0039062 7.5 A 1.499998 1.499998 0 0 0 7.5039062 9 A 1.499998 1.499998 0 0 0 9.0039062 7.5 A 1.499998 1.499998 0 0 0 7.5039062 6 z M 7.5039062 7 A 0.5 0.5 0 0 1 8.0039062 7.5 A 0.5 0.5 0 0 1 7.5039062 8 A 0.5 0.5 0 0 1 7.0039062 7.5 A 0.5 0.5 0 0 1 7.5039062 7 z "
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
 </svg>
diff --git a/icons/actions/16/snap-nodes-rotation-center.svg b/icons/actions/16/snap-nodes-rotation-center.svg
--- a/icons/actions/16/snap-nodes-rotation-center.svg
+++ b/icons/actions/16/snap-nodes-rotation-center.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="m 10,8 a 2,2 0 0 0 -2,2 2,2 0 0 0 2,2 2,2 0 0 0 2,-2 2,2 0 0 0 -2,-2 m 0,1 a 1,1 0 0 1 1,1 1,1 0 0 1 -1,1 1,1 0 0 1 -1,-1 1,1 0 0 1 1,-1"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
 </svg>
diff --git a/icons/actions/16/snap-nodes-smooth.svg b/icons/actions/16/snap-nodes-smooth.svg
--- a/icons/actions/16/snap-nodes-smooth.svg
+++ b/icons/actions/16/snap-nodes-smooth.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="M 7 1 L 7 4 L 10 4 L 10 1 L 7 1 z M 8 2 L 9 2 L 9 3 L 8 3 L 8 2 z M 2 6 L 2 9 L 5 9 L 5 6 L 2 6 z M 12 6 L 12 9 L 15 9 L 15 6 L 12 6 z M 3 7 L 4 7 L 4 8 L 3 8 L 3 7 z M 13 7 L 14 7 L 14 8 L 13 8 L 13 7 z M 7 11 L 7 14 L 10 14 L 10 11 L 7 11 z M 8 12 L 9 12 L 9 13 L 8 13 L 8 12 z "
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
 </svg>
diff --git a/icons/actions/16/snap-text-baseline.svg b/icons/actions/16/snap-text-baseline.svg
--- a/icons/actions/16/snap-text-baseline.svg
+++ b/icons/actions/16/snap-text-baseline.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="m 2,10 0,4 4,0 0,-4 z m 1,1 2,0 0,2 -2,0 z"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
 </svg>
diff --git a/icons/actions/16/snap.svg b/icons/actions/16/snap.svg
--- a/icons/actions/16/snap.svg
+++ b/icons/actions/16/snap.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
      d="m 10,10 0,4 4,0 0,-4 z m 1,1 2,0 0,2 -2,0 z"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
 </svg>
diff --git a/icons/actions/16/standard-connector.svg b/icons/actions/16/standard-connector.svg
--- a/icons/actions/16/standard-connector.svg
+++ b/icons/actions/16/standard-connector.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
      d="M 3.5 2 A 1.499998 1.5 0 0 0 2 3.5 A 1.499998 1.5 0 0 0 3.5 5 A 1.499998 1.5 0 0 0 5 3.5 A 1.499998 1.5 0 0 0 3.5 2 z M 3.5 3 A 0.5 0.5 0 0 1 4 3.5 A 0.5 0.5 0 0 1 3.5 4 A 0.5 0.5 0 0 1 3 3.5 A 0.5 0.5 0 0 1 3.5 3 z M 12.503906 11 A 1.499998 1.5 0 0 0 11.003906 12.5 A 1.499998 1.5 0 0 0 12.503906 14 A 1.499998 1.5 0 0 0 14.003906 12.5 A 1.499998 1.5 0 0 0 12.503906 11 z M 12.503906 12 A 0.5 0.5 0 0 1 13.003906 12.5 A 0.5 0.5 0 0 1 12.503906 13 A 0.5 0.5 0 0 1 12.003906 12.5 A 0.5 0.5 0 0 1 12.503906 12 z "
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
 </svg>
diff --git a/icons/actions/16/stroke-to-path.svg b/icons/actions/16/stroke-to-path.svg
--- a/icons/actions/16/stroke-to-path.svg
+++ b/icons/actions/16/stroke-to-path.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -22,6 +22,6 @@
   <path
         style="fill:currentColor;fill-opacity:1;stroke:none"
      d="M 10 2 L 10 6 L 14 6 L 14 2 L 10 2 z M 11 3 L 13 3 L 13 5 L 11 5 L 11 3 z M 2 10 L 2 14 L 6 14 L 6 10 L 2 10 z M 3 11 L 5 11 L 5 13 L 3 13 L 3 11 z "
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
       />
 </svg>
diff --git a/icons/actions/16/text-put-on-path.svg b/icons/actions/16/text-put-on-path.svg
--- a/icons/actions/16/text-put-on-path.svg
+++ b/icons/actions/16/text-put-on-path.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -15,6 +15,6 @@
      />
  <path style="fill:currentColor;fill-opacity:1;stroke:none" 
        d="M 14 7 A 7 7 0 0 0 7 14 L 8 14 A 6 6 0 0 1 14 8 L 14 7 z "
-       class="ColorScheme-Highlight"
+       class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/16/text_line_spacing.svg b/icons/actions/16/text_line_spacing.svg
--- a/icons/actions/16/text_line_spacing.svg
+++ b/icons/actions/16/text_line_spacing.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -16,5 +16,5 @@
   <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="m 12.5,2 -1.5,2 1,0 0,8 -1,0 1.5,2 1.5,-2 -1,0 0,-8 1,0 z"
-     class="ColorScheme-Highlight"/>
+     class="olorScheme-ButtonFocus"/>
 </svg>
diff --git a/icons/actions/16/transform-affect-pattern.svg b/icons/actions/16/transform-affect-pattern.svg
--- a/icons/actions/16/transform-affect-pattern.svg
+++ b/icons/actions/16/transform-affect-pattern.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -16,5 +16,5 @@
   <path
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="m 5.17,14.33 -0.707,-0.707 1.621,-1.621 -4.076,0 0,-1 4.076,0 L 4.463,9.381 5.17,8.674 7.998,11.502 7.291,12.209 Z" 
-     class="ColorScheme-Highlight"/>
+     class="olorScheme-ButtonFocus"/>
 </svg>
diff --git a/icons/actions/16/transform-affect-rounded-corners.svg b/icons/actions/16/transform-affect-rounded-corners.svg
--- a/icons/actions/16/transform-affect-rounded-corners.svg
+++ b/icons/actions/16/transform-affect-rounded-corners.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -16,5 +16,5 @@
   <path
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="m 5.17,14.33 -0.707,-0.707 1.621,-1.621 -4.076,0 0,-1 4.076,0 L 4.463,9.381 5.17,8.674 7.998,11.502 7.291,12.209 Z" 
-     class="ColorScheme-Highlight"/>
+     class="olorScheme-ButtonFocus"/>
 </svg>
diff --git a/icons/actions/16/transform-affect-stroke.svg b/icons/actions/16/transform-affect-stroke.svg
--- a/icons/actions/16/transform-affect-stroke.svg
+++ b/icons/actions/16/transform-affect-stroke.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -16,5 +16,5 @@
   <path
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="m 5.17,14.33 -0.707,-0.707 1.621,-1.621 -4.076,0 0,-1 4.076,0 L 4.463,9.381 5.17,8.674 7.998,11.502 7.291,12.209 Z"
-     class="ColorScheme-Highlight"/>
+     class="olorScheme-ButtonFocus"/>
 </svg>
diff --git a/icons/actions/22/adjusthsl.svg b/icons/actions/22/adjusthsl.svg
--- a/icons/actions/22/adjusthsl.svg
+++ b/icons/actions/22/adjusthsl.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>    
diff --git a/icons/actions/22/atmosphere.svg b/icons/actions/22/atmosphere.svg
--- a/icons/actions/22/atmosphere.svg
+++ b/icons/actions/22/atmosphere.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -18,6 +18,6 @@
  <path 
     style="fill:currentColor;fill-opacity:1;stroke:none"
      d="M11 3A8 8 0 0 0 3 11 8 8 0 0 0 11 19 8 8 0 0 0 19 11 8 8 0 0 0 11 3M11 4A7 7 0 0 1 18 11 7 7 0 0 1 11 18 7 7 0 0 1 4 11 7 7 0 0 1 11 4"
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/22/category2parent.svg b/icons/actions/22/category2parent.svg
--- a/icons/actions/22/category2parent.svg
+++ b/icons/actions/22/category2parent.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 6 9 L 6 10 L 6 15 L 12 15 L 12 10 L 12 9 L 11 9 L 11 10 L 10 10 L 10 9 L 8 9 L 8 10 L 7 10 L 7 9 L 6 9 z M 7 11 L 11 11 L 11 14 L 7 14 L 7 11 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/22/check_constraint.svg b/icons/actions/22/check_constraint.svg
--- a/icons/actions/22/check_constraint.svg
+++ b/icons/actions/22/check_constraint.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -19,7 +19,7 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
 	 d="m 434.71429,528.79074 3,4 3,-4 z"
-	 class="ColorScheme-Highlight"
+	 class="olorScheme-ButtonFocus"
      />
  </g>
 </svg>
diff --git a/icons/actions/22/child2category.svg b/icons/actions/22/child2category.svg
--- a/icons/actions/22/child2category.svg
+++ b/icons/actions/22/child2category.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 13 13 L 13 14 L 13 19 L 19 19 L 19 14 L 19 13 L 18 13 L 18 14 L 17 14 L 17 13 L 15 13 L 15 14 L 14 14 L 14 13 L 13 13 z M 14 15 L 18 15 L 18 18 L 14 18 L 14 15 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/22/colorfx.svg b/icons/actions/22/colorfx.svg
--- a/icons/actions/22/colorfx.svg
+++ b/icons/actions/22/colorfx.svg
@@ -4,15 +4,15 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
   </defs>
      />
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 10.5 3 L 10.5 4.8125 L 11.5 4.8125 L 11.5 3 L 10.5 3 z M 5.6875 4.96875 L 4.96875 5.6875 L 6.25 7 L 6.96875 6.25 L 5.6875 4.96875 z M 16.3125 4.96875 L 15.03125 6.25 L 15.75 7 L 17.03125 5.6875 L 16.3125 4.96875 z M 11 6 C 8.23858 6 6 8.2386 6 11 C 6 13.7614 8.23858 16 11 16 C 13.76142 16 16 13.7614 16 11 C 16 8.2386 13.76142 6 11 6 z M 3 10.5 L 3 11.5 L 4.8125 11.5 L 4.8125 10.5 L 3 10.5 z M 17.1875 10.5 L 17.1875 11.5 L 19 11.5 L 19 10.5 L 17.1875 10.5 z M 6.25 15.03125 L 4.96875 16.3125 L 5.6875 17.03125 L 6.96875 15.75 L 6.25 15.03125 z M 15.75 15.03125 L 15.03125 15.75 L 16.3125 17.03125 L 17.03125 16.3125 L 15.75 15.03125 z M 10.5 17.1875 L 10.5 19 L 11.5 19 L 11.5 17.1875 L 10.5 17.1875 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/22/colorneg.svg b/icons/actions/22/colorneg.svg
--- a/icons/actions/22/colorneg.svg
+++ b/icons/actions/22/colorneg.svg
@@ -4,14 +4,14 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
   </defs>
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
 	 transform="translate(-1-1)" d="m4 4v16h16v-16h-16m15 1v14h-14l3.46875-3.46875c-.904822-.904822-1.46875-2.150538-1.46875-3.53125 0-2.761424 2.238576-5 5-5 1.380712 0 2.626428.563928 3.53125 1.46875l3.46875-3.46875m-3.46875 3.46875l-7.0625 7.0625c.904822.904822 2.150538 1.46875 3.53125 1.46875 2.761424 0 5-2.238576 5-5 0-1.380712-.563928-2.626428-1.46875-3.53125z" 
-	 class="ColorScheme-Highlight"
+	 class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/22/curve-connector.svg b/icons/actions/22/curve-connector.svg
--- a/icons/actions/22/curve-connector.svg
+++ b/icons/actions/22/curve-connector.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path
     style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 5.5 4 A 2.499996 2.499996 0 0 0 3 6.5 A 2.499996 2.499996 0 0 0 5.5 9 A 2.499996 2.499996 0 0 0 8 6.5 A 2.499996 2.499996 0 0 0 5.5 4 z M 5.5 5 A 1.5 1.5 0 0 1 7 6.5 A 1.5 1.5 0 0 1 5.5 8 A 1.5 1.5 0 0 1 4 6.5 A 1.5 1.5 0 0 1 5.5 5 z M 16.5 14 A 2.499996 2.499996 0 0 0 14 16.5 A 2.499996 2.499996 0 0 0 16.5 19 A 2.499996 2.499996 0 0 0 19 16.5 A 2.499996 2.499996 0 0 0 16.5 14 z M 16.5 15 A 1.5 1.5 0 0 1 18 16.5 A 1.5 1.5 0 0 1 16.5 18 A 1.5 1.5 0 0 1 15 16.5 A 1.5 1.5 0 0 1 16.5 15 z "
-	class="ColorScheme-Highlight"
+	class="olorScheme-ButtonFocus"
      id="path10" />
 </svg>
diff --git a/icons/actions/22/database-change-key.svg b/icons/actions/22/database-change-key.svg
--- a/icons/actions/22/database-change-key.svg
+++ b/icons/actions/22/database-change-key.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path
     style="fill:currentColor;fill-opacity:1;stroke:none" 
     d="M 16.5 2 A 3.499991 3.499991 0 0 0 13 5.5 A 3.499991 3.499991 0 0 0 13.699219 7.59375 L 14.416016 6.8769531 A 2.5 2.5 0 0 1 14 5.5 A 2.5 2.5 0 0 1 16.5 3 A 2.5 2.5 0 0 1 17.876953 3.4160156 L 18.59375 2.6992188 A 3.499991 3.499991 0 0 0 16.5 2 z M 19.300781 3.40625 L 18.583984 4.1230469 A 2.5 2.5 0 0 1 19 5.5 A 2.5 2.5 0 0 1 16.5 8 A 2.5 2.5 0 0 1 15.123047 7.5839844 L 14.40625 8.3007812 A 3.499991 3.499991 0 0 0 16.5 9 A 3.499991 3.499991 0 0 0 20 5.5 A 3.499991 3.499991 0 0 0 19.300781 3.40625 z "
-	class="ColorScheme-Highlight"
+	class="olorScheme-ButtonFocus"
      id="path10" />
 </svg>
diff --git a/icons/actions/22/debug-step-into-instruction.svg b/icons/actions/22/debug-step-into-instruction.svg
--- a/icons/actions/22/debug-step-into-instruction.svg
+++ b/icons/actions/22/debug-step-into-instruction.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons/actions/22/debug-step-into.svg b/icons/actions/22/debug-step-into.svg
--- a/icons/actions/22/debug-step-into.svg
+++ b/icons/actions/22/debug-step-into.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons/actions/22/debug-step-out.svg b/icons/actions/22/debug-step-out.svg
--- a/icons/actions/22/debug-step-out.svg
+++ b/icons/actions/22/debug-step-out.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons/actions/22/debug-step-over.svg b/icons/actions/22/debug-step-over.svg
--- a/icons/actions/22/debug-step-over.svg
+++ b/icons/actions/22/debug-step-over.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons/actions/22/deep-history.svg b/icons/actions/22/deep-history.svg
--- a/icons/actions/22/deep-history.svg
+++ b/icons/actions/22/deep-history.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path
     style="fill:currentColor;fill-opacity:1;stroke:none" 
     d="m13.65625 14v1h.845703 1.998047a1.5 1.5 0 0 1 1.5 1.5 1.5 1.5 0 0 1 -1.5 1.5v1a2.5 2.5 0 0 0 2.5 -2.5 2.5 2.5 0 0 0 -2.5 -2.5h-2.84375"
-	class="ColorScheme-Highlight"
+	class="olorScheme-ButtonFocus"
      id="path10" />
 </svg>
diff --git a/icons/actions/22/distribute-graph-directed.svg b/icons/actions/22/distribute-graph-directed.svg
--- a/icons/actions/22/distribute-graph-directed.svg
+++ b/icons/actions/22/distribute-graph-directed.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path
     style="fill:currentColor;fill-opacity:1;stroke:none" 
     d="M 4.5 3 A 1.4999959 1.5 0 0 0 3 4.5 A 1.4999959 1.5 0 0 0 4.5 6 A 1.4999959 1.5 0 0 0 6 4.5 A 1.4999959 1.5 0 0 0 4.5 3 z M 17.5 3 A 1.4999959 1.5 0 0 0 16 4.5 A 1.4999959 1.5 0 0 0 17.5 6 A 1.4999959 1.5 0 0 0 19 4.5 A 1.4999959 1.5 0 0 0 17.5 3 z M 11 10 A 1.4999959 1.5 0 0 0 9.5 11.5 A 1.4999959 1.5 0 0 0 11 13 A 1.4999959 1.5 0 0 0 12.5 11.5 A 1.4999959 1.5 0 0 0 11 10 z M 11 16 A 1.4999959 1.5 0 0 0 9.5 17.5 A 1.4999959 1.5 0 0 0 11 19 A 1.4999959 1.5 0 0 0 12.5 17.5 A 1.4999959 1.5 0 0 0 11 16 z "
-	class="ColorScheme-Highlight"
+	class="olorScheme-ButtonFocus"
      id="path10" />
 </svg>
diff --git a/icons/actions/22/distribute-graph.svg b/icons/actions/22/distribute-graph.svg
--- a/icons/actions/22/distribute-graph.svg
+++ b/icons/actions/22/distribute-graph.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path
     style="fill:currentColor;fill-opacity:1;stroke:none" 
     d="M 8.5 3 A 1.4999959 1.5 0 0 0 7 4.5 A 1.4999959 1.5 0 0 0 8.5 6 A 1.4999959 1.5 0 0 0 10 4.5 A 1.4999959 1.5 0 0 0 8.5 3 z M 19.5 3 A 1.4999959 1.5 0 0 0 18 4.5 A 1.4999959 1.5 0 0 0 19.5 6 A 1.4999959 1.5 0 0 0 21 4.5 A 1.4999959 1.5 0 0 0 19.5 3 z M 2.5 8 A 1.4999959 1.5 0 0 0 1 9.5 A 1.4999959 1.5 0 0 0 2.5 11 A 1.4999959 1.5 0 0 0 4 9.5 A 1.4999959 1.5 0 0 0 2.5 8 z M 14.5 10 A 1.4999959 1.5 0 0 0 13 11.5 A 1.4999959 1.5 0 0 0 14.5 13 A 1.4999959 1.5 0 0 0 16 11.5 A 1.4999959 1.5 0 0 0 14.5 10 z M 2.5 16 A 1.4999959 1.5 0 0 0 1 17.5 A 1.4999959 1.5 0 0 0 2.5 19 A 1.4999959 1.5 0 0 0 4 17.5 A 1.4999959 1.5 0 0 0 2.5 16 z M 9.5 16 A 1.4999959 1.5 0 0 0 8 17.5 A 1.4999959 1.5 0 0 0 9.5 19 A 1.4999959 1.5 0 0 0 11 17.5 A 1.4999959 1.5 0 0 0 9.5 16 z M 19.5 16 A 1.4999959 1.5 0 0 0 18 17.5 A 1.4999959 1.5 0 0 0 19.5 19 A 1.4999959 1.5 0 0 0 21 17.5 A 1.4999959 1.5 0 0 0 19.5 16 z "
-	class="ColorScheme-Highlight"
+	class="olorScheme-ButtonFocus"
      id="path10" />
 </svg>
diff --git a/icons/actions/22/document-send.svg b/icons/actions/22/document-send.svg
--- a/icons/actions/22/document-send.svg
+++ b/icons/actions/22/document-send.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons/actions/22/draw-connector.svg b/icons/actions/22/draw-connector.svg
--- a/icons/actions/22/draw-connector.svg
+++ b/icons/actions/22/draw-connector.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 15 3 L 15 7 L 19 7 L 19 3 L 15 3 z M 16 4 L 18 4 L 18 6 L 16 6 L 16 4 z M 3 15 L 3 19 L 7 19 L 7 15 L 3 15 z M 4 16 L 6 16 L 6 18 L 4 18 L 4 16 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/22/edit-table-insert-column-left.svg b/icons/actions/22/edit-table-insert-column-left.svg
--- a/icons/actions/22/edit-table-insert-column-left.svg
+++ b/icons/actions/22/edit-table-insert-column-left.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -16,6 +16,6 @@
     />  
   <path
      style="fill:currentColor;fill-opacity:1;stroke:none" 
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      d="M 3 3 L 3 4 L 3 12 L 3 13 L 9 13 L 9 12 L 9 9.2929688 L 9 4 L 9 3 L 3 3 z M 4 4 L 8 4 L 8 8.2929688 L 4 4.2929688 L 4 4 z M 4 5.7070312 L 8 9.7070312 L 8 12 L 7.7070312 12 L 4 8.2929688 L 4 5.7070312 z M 4 9.7070312 L 6.2929688 12 L 4 12 L 4 9.7070312 z " />
 </svg>
diff --git a/icons/actions/22/edit-table-insert-column-right.svg b/icons/actions/22/edit-table-insert-column-right.svg
--- a/icons/actions/22/edit-table-insert-column-right.svg
+++ b/icons/actions/22/edit-table-insert-column-right.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 13 3 L 13 4 L 13 9.2929688 L 13 12 L 13 13 L 19 13 L 19 12 L 19 4 L 19 3 L 13 3 z M 14 4 L 18 4 L 18 4.2929688 L 14 8.2929688 L 14 4 z M 18 5.7070312 L 18 8.2929688 L 14.292969 12 L 14 12 L 14 9.7070312 L 18 5.7070312 z M 18 9.7070312 L 18 12 L 15.707031 12 L 18 9.7070312 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/22/edit-table-insert-row-above.svg b/icons/actions/22/edit-table-insert-row-above.svg
--- a/icons/actions/22/edit-table-insert-row-above.svg
+++ b/icons/actions/22/edit-table-insert-row-above.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 3 3 L 3 9 L 4 9 L 9.2929688 9 L 12 9 L 13 9 L 13 3 L 12 3 L 4 3 L 3 3 z M 4 4 L 4.2929688 4 L 8.2929688 8 L 4 8 L 4 4 z M 5.7070312 4 L 8.2929688 4 L 12 7.7070312 L 12 8 L 9.7070312 8 L 5.7070312 4 z M 9.7070312 4 L 12 4 L 12 6.2929688 L 9.7070312 4 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/22/edit-table-insert-row-below.svg b/icons/actions/22/edit-table-insert-row-below.svg
--- a/icons/actions/22/edit-table-insert-row-below.svg
+++ b/icons/actions/22/edit-table-insert-row-below.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -16,6 +16,6 @@
     />  
   <path
      style="fill:currentColor;fill-opacity:1;stroke:none" 
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      d="M 4,13 9.29297,13 12,13 l 0,1 -2.29297,0 -4,4 2.58594,0 L 12,14.29297 12,15.70703 9.70703,18 12,18 l 0,1 -8,0 0,-1 0.29297,0 4,-4 L 4,14 4,13" />
 </svg>
diff --git a/icons/actions/22/edit-table-insert-row-under.svg b/icons/actions/22/edit-table-insert-row-under.svg
--- a/icons/actions/22/edit-table-insert-row-under.svg
+++ b/icons/actions/22/edit-table-insert-row-under.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -16,6 +16,6 @@
     />  
   <path
      style="fill:currentColor;fill-opacity:1;stroke:none" 
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      d="M 3,8 3,9 4,9 7.28125,9 4,12.28125 4,12.292969 3.292969,13 3,13 l 0,1 1,0 7,0 2,0 0,-1 -0.28125,0 L 13,12.71875 13,11.28125 11.28125,13 11,13 8.71875,13 11,10.71875 12.71875,9 13,9 13,8 11,8 8.292969,8 4,8 3,8 M 8.71875,9 11,9 11.28125,9 11,9.28125 7.28125,13 l -2.5625,0 4,-4" />
 </svg>
diff --git a/icons/actions/22/edit-text-frame-update.svg b/icons/actions/22/edit-text-frame-update.svg
--- a/icons/actions/22/edit-text-frame-update.svg
+++ b/icons/actions/22/edit-text-frame-update.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -16,6 +16,6 @@
     />  
   <path
      style="fill:currentColor;fill-opacity:1;stroke:none" 
-      class="ColorScheme-Highlight"
+      class="olorScheme-ButtonFocus"
      d="M 3,3 5,6 7,3 Z" />
 </svg>
diff --git a/icons/actions/22/escape-direction-all.svg b/icons/actions/22/escape-direction-all.svg
--- a/icons/actions/22/escape-direction-all.svg
+++ b/icons/actions/22/escape-direction-all.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -21,6 +21,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 11 8 C 9.34314 8 8 9.3431 8 11 C 8 12.6569 9.34314 14 11 14 C 12.65686 14 14 12.6569 14 11 C 14 9.3431 12.65686 8 11 8 z M 11 10 C 11.55228 10 12 10.4477 12 11 C 12 11.5523 11.55228 12 11 12 C 10.44772 12 10 11.5523 10 11 C 10 10.4477 10.44772 10 11 10 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/22/escape-direction-down.svg b/icons/actions/22/escape-direction-down.svg
--- a/icons/actions/22/escape-direction-down.svg
+++ b/icons/actions/22/escape-direction-down.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,11 +17,11 @@
  <path 
      style="fill:#da4453;fill-opacity:1;stroke:none" 
      d="M 10 13 L 10 18 L 12 18 L 12 13 L 10 13 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      /> 
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 11 8 C 9.34314 8 8 9.3431 8 11 C 8 12.6569 9.34314 14 11 14 C 12.65686 14 14 12.6569 14 11 C 14 9.3431 12.65686 8 11 8 z M 11 10 C 11.55228 10 12 10.4477 12 11 C 12 11.5523 11.55228 12 11 12 C 10.44772 12 10 11.5523 10 11 C 10 10.4477 10.44772 10 11 10 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/22/escape-direction-horizontal.svg b/icons/actions/22/escape-direction-horizontal.svg
--- a/icons/actions/22/escape-direction-horizontal.svg
+++ b/icons/actions/22/escape-direction-horizontal.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,11 +17,11 @@
  <path 
      style="fill:#da4453;fill-opacity:1;stroke:none" 
      d="M 4 10 L 4 12 L 9 12 L 9 10 L 4 10 z M 13 10 L 13 12 L 18 12 L 18 10 L 13 10 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      /> 
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 11 8 C 9.34314 8 8 9.3431 8 11 C 8 12.6569 9.34314 14 11 14 C 12.65686 14 14 12.6569 14 11 C 14 9.3431 12.65686 8 11 8 z M 11 10 C 11.55228 10 12 10.4477 12 11 C 12 11.5523 11.55228 12 11 12 C 10.44772 12 10 11.5523 10 11 C 10 10.4477 10.44772 10 11 10 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/22/escape-direction-left.svg b/icons/actions/22/escape-direction-left.svg
--- a/icons/actions/22/escape-direction-left.svg
+++ b/icons/actions/22/escape-direction-left.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,11 +17,11 @@
  <path 
      style="fill:#da4453;fill-opacity:1;stroke:none" 
      d="M 4 10 L 4 12 L 9 12 L 9 10 L 4 10 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      /> 
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 11 8 C 9.34314 8 8 9.3431 8 11 C 8 12.6569 9.34314 14 11 14 C 12.65686 14 14 12.6569 14 11 C 14 9.3431 12.65686 8 11 8 z M 11 10 C 11.55228 10 12 10.4477 12 11 C 12 11.5523 11.55228 12 11 12 C 10.44772 12 10 11.5523 10 11 C 10 10.4477 10.44772 10 11 10 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/22/escape-direction-right.svg b/icons/actions/22/escape-direction-right.svg
--- a/icons/actions/22/escape-direction-right.svg
+++ b/icons/actions/22/escape-direction-right.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,11 +17,11 @@
  <path 
      style="fill:#da4453;fill-opacity:1;stroke:none" 
      d="M 13 10 L 13 12 L 18 12 L 18 10 L 13 10 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      /> 
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 11 8 C 9.34314 8 8 9.3431 8 11 C 8 12.6569 9.34314 14 11 14 C 12.65686 14 14 12.6569 14 11 C 14 9.3431 12.65686 8 11 8 z M 11 10 C 11.55228 10 12 10.4477 12 11 C 12 11.5523 11.55228 12 11 12 C 10.44772 12 10 11.5523 10 11 C 10 10.4477 10.44772 10 11 10 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/22/escape-direction-up.svg b/icons/actions/22/escape-direction-up.svg
--- a/icons/actions/22/escape-direction-up.svg
+++ b/icons/actions/22/escape-direction-up.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,11 +17,11 @@
  <path 
      style="fill:#da4453;fill-opacity:1;stroke:none" 
      d="M 10 4 L 10 9 L 12 9 L 12 4 L 10 4 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      /> 
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 11 8 C 9.34314 8 8 9.3431 8 11 C 8 12.6569 9.34314 14 11 14 C 12.65686 14 14 12.6569 14 11 C 14 9.3431 12.65686 8 11 8 z M 11 10 C 11.55228 10 12 10.4477 12 11 C 12 11.5523 11.55228 12 11 12 C 10.44772 12 10 11.5523 10 11 C 10 10.4477 10.44772 10 11 10 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/22/escape-direction-vertical.svg b/icons/actions/22/escape-direction-vertical.svg
--- a/icons/actions/22/escape-direction-vertical.svg
+++ b/icons/actions/22/escape-direction-vertical.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,11 +17,11 @@
  <path 
      style="fill:#da4453;fill-opacity:1;stroke:none" 
      d="M 10 4 L 10 9 L 12 9 L 12 4 L 10 4 z M 10 13 L 10 18 L 12 18 L 12 13 L 10 13 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      /> 
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 11 8 C 9.34314 8 8 9.3431 8 11 C 8 12.6569 9.34314 14 11 14 C 12.65686 14 14 12.6569 14 11 C 14 9.3431 12.65686 8 11 8 z M 11 10 C 11.55228 10 12 10.4477 12 11 C 12 11.5523 11.55228 12 11 12 C 10.44772 12 10 11.5523 10 11 C 10 10.4477 10.44772 10 11 10 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/22/exchange-positions-clockwise.svg b/icons/actions/22/exchange-positions-clockwise.svg
--- a/icons/actions/22/exchange-positions-clockwise.svg
+++ b/icons/actions/22/exchange-positions-clockwise.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,5 +17,5 @@
   <path
     style="fill:currentColor;fill-opacity:1;stroke:none" 
     d="m 15.5,12 a 3.499991,3.499991 0 0 0 -3.5,3.5 3.499991,3.499991 0 0 0 0.699219,2.0938 L 13.416016,16.877 A 2.5,2.5 0 0 1 13,15.5 2.5,2.5 0 0 1 15.5,13 2.5,2.5 0 0 1 16.876953,13.416 L 17.59375,12.6992 A 3.499991,3.499991 0 0 0 15.5,12 m 2.800781,1.4063 -0.716797,0.7167 A 2.5,2.5 0 0 1 18,15.5 2.5,2.5 0 0 1 15.5,18 2.5,2.5 0 0 1 14.123047,17.584 L 13.40625,18.3008 A 3.499991,3.499991 0 0 0 15.5,19 3.499991,3.499991 0 0 0 19,15.5 3.499991,3.499991 0 0 0 18.300781,13.4063 Z" 
-	class="ColorScheme-Highlight"/>
+	class="olorScheme-ButtonFocus"/>
 </svg>
diff --git a/icons/actions/22/exchange-positions-zorder.svg b/icons/actions/22/exchange-positions-zorder.svg
--- a/icons/actions/22/exchange-positions-zorder.svg
+++ b/icons/actions/22/exchange-positions-zorder.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,5 +17,5 @@
   <path
     style="fill:currentColor;fill-opacity:1;stroke:none" 
     d="M 13 12 L 12.792969 12.207031 L 11 14 L 11 15.414062 L 12.5 13.914062 L 12.5 18 L 13.5 18 L 13.5 13.914062 L 15 15.414062 L 15 14 L 13.207031 12.207031 L 13 12 z M 16.5 13 L 16.5 17.085938 L 15 15.585938 L 15 17 L 16.792969 18.792969 L 17 19 L 17.207031 18.792969 L 19 17 L 19 15.585938 L 17.5 17.085938 L 17.5 13 L 16.5 13 z "
-	class="ColorScheme-Highlight"/>
+	class="olorScheme-ButtonFocus"/>
 </svg>
diff --git a/icons/actions/22/filename-initial-amarok.svg b/icons/actions/22/filename-initial-amarok.svg
--- a/icons/actions/22/filename-initial-amarok.svg
+++ b/icons/actions/22/filename-initial-amarok.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -18,7 +18,7 @@
  <path 
     style="fill:currentColor;fill-opacity:1;stroke:none" 
     d="m 331.67226,537.3622 -4.84123,14 1.16897,0 1.73532,-4.66667 6.03963,0 1.72854,4.66667 1.32754,0 -4.90693,-14 -2.25184,0 z m 1.08967,1.20085 2.58033,6.96582 -5.17198,0 2.59165,-6.96582 z"
-    class="ColorScheme-Highlight"
+    class="olorScheme-ButtonFocus"
     />  
  </g>
 </svg>
diff --git a/icons/actions/22/filename-title-amarok.svg b/icons/actions/22/filename-title-amarok.svg
--- a/icons/actions/22/filename-title-amarok.svg
+++ b/icons/actions/22/filename-title-amarok.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 7 6 L 7 8 L 15 8 L 15 6 L 7 6 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/22/format-break-node.svg b/icons/actions/22/format-break-node.svg
--- a/icons/actions/22/format-break-node.svg
+++ b/icons/actions/22/format-break-node.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 9 9.5 L 11 12.5 L 13 9.5 L 9 9.5 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/22/format-connect-node.svg b/icons/actions/22/format-connect-node.svg
--- a/icons/actions/22/format-connect-node.svg
+++ b/icons/actions/22/format-connect-node.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 9 9.5 L 11 12.5 L 13 9.5 L 9 9.5 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/22/format-convert-to-path.svg b/icons/actions/22/format-convert-to-path.svg
--- a/icons/actions/22/format-convert-to-path.svg
+++ b/icons/actions/22/format-convert-to-path.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 1 9 L 1 13 L 5 13 L 5 9 L 1 9 z M 9 9 L 9 13 L 13 13 L 13 9 L 9 9 z M 17 9 L 17 13 L 21 13 L 21 9 L 17 9 z M 2 10 L 4 10 L 4 12 L 2 12 L 2 10 z M 10 10 L 12 10 L 12 12 L 10 12 L 10 10 z M 18 10 L 20 10 L 20 12 L 18 12 L 18 10 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/22/format-disconnect-node.svg b/icons/actions/22/format-disconnect-node.svg
--- a/icons/actions/22/format-disconnect-node.svg
+++ b/icons/actions/22/format-disconnect-node.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 9 9.5 L 11 12.5 L 13 9.5 L 9 9.5 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/22/format-insert-node.svg b/icons/actions/22/format-insert-node.svg
--- a/icons/actions/22/format-insert-node.svg
+++ b/icons/actions/22/format-insert-node.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 16 14 L 16 16 L 14 16 L 14 17 L 16 17 L 16 19 L 17 19 L 17 17 L 19 17 L 19 16 L 17 16 L 17 14 L 16 14 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/22/format-join-node.svg b/icons/actions/22/format-join-node.svg
--- a/icons/actions/22/format-join-node.svg
+++ b/icons/actions/22/format-join-node.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 9 9.5 L 11 12.5 L 13 9.5 L 9 9.5 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/22/format-node-corner.svg b/icons/actions/22/format-node-corner.svg
--- a/icons/actions/22/format-node-corner.svg
+++ b/icons/actions/22/format-node-corner.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 4.5 3 A 1.5 1.5 0 0 0 3 4.5 A 1.5 1.5 0 0 0 4.5 6 A 1.5 1.5 0 0 0 6 4.5 A 1.5 1.5 0 0 0 4.5 3 z M 4.5 4 A 0.5 0.5 0 0 1 5 4.5 A 0.5 0.5 0 0 1 4.5 5 A 0.5 0.5 0 0 1 4 4.5 A 0.5 0.5 0 0 1 4.5 4 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/22/format-node-curve.svg b/icons/actions/22/format-node-curve.svg
--- a/icons/actions/22/format-node-curve.svg
+++ b/icons/actions/22/format-node-curve.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 6 7 L 6 10 L 9 10 L 9 7 L 6 7 z M 7 8 L 8 8 L 8 9 L 7 9 L 7 8 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/22/format-node-line.svg b/icons/actions/22/format-node-line.svg
--- a/icons/actions/22/format-node-line.svg
+++ b/icons/actions/22/format-node-line.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 9 10 L 9 13 L 12 13 L 12 10 L 9 10 z M 10 11 L 11 11 L 11 12 L 10 12 L 10 11 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/22/format-node-smooth.svg b/icons/actions/22/format-node-smooth.svg
--- a/icons/actions/22/format-node-smooth.svg
+++ b/icons/actions/22/format-node-smooth.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 7 8 L 7 12 L 11 12 L 11 8 L 7 8 z M 8 9 L 10 9 L 10 11 L 8 11 L 8 9 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/22/format-node-symmetric.svg b/icons/actions/22/format-node-symmetric.svg
--- a/icons/actions/22/format-node-symmetric.svg
+++ b/icons/actions/22/format-node-symmetric.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 9 8 L 9 10 L 6 10 L 6 11 L 9 11 L 9 12 L 13 12 L 13 11 L 16 11 L 16 10 L 13 10 L 13 8 L 9 8 z M 10 9 L 12 9 L 12 11 L 10 11 L 10 9 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/22/format-precision-more.svg b/icons/actions/22/format-precision-more.svg
--- a/icons/actions/22/format-precision-more.svg
+++ b/icons/actions/22/format-precision-more.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 15 15 L 15 17 L 13 17 L 13 18 L 15 18 L 15 20 L 16 20 L 16 18 L 18 18 L 18 17 L 16 17 L 16 15 L 15 15 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/22/format-segment-curve.svg b/icons/actions/22/format-segment-curve.svg
--- a/icons/actions/22/format-segment-curve.svg
+++ b/icons/actions/22/format-segment-curve.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
   <path
     style="fill:currentColor;fill-opacity:1;stroke:none" 
     d="M16 4A12 12 0 0 0 4 16H5A11 11 0 0 1 16 5V4"
-	class="ColorScheme-Highlight"
+	class="olorScheme-ButtonFocus"
 	/>
 </svg>
diff --git a/icons/actions/22/format-segment-line.svg b/icons/actions/22/format-segment-line.svg
--- a/icons/actions/22/format-segment-line.svg
+++ b/icons/actions/22/format-segment-line.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 16 5.3125 L 5.3125 16 L 6 16 L 6 16.6875 L 16.6875 6 L 16 6 L 16 5.3125 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/22/format-text-capitalize.svg b/icons/actions/22/format-text-capitalize.svg
--- a/icons/actions/22/format-text-capitalize.svg
+++ b/icons/actions/22/format-text-capitalize.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -19,7 +19,7 @@
  <path 
     style="fill:currentColor;fill-opacity:1;stroke:none" 
     d="m 424.71429,531.79074 3,-4 3,4 z"
-    class="ColorScheme-Highlight"
+    class="olorScheme-ButtonFocus"
     />  
  </g>
 </svg>
diff --git a/icons/actions/22/format-text-lowercase.svg b/icons/actions/22/format-text-lowercase.svg
--- a/icons/actions/22/format-text-lowercase.svg
+++ b/icons/actions/22/format-text-lowercase.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 13 3 L 16 7 L 19 3 L 13 3 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/22/format-text-uppercase.svg b/icons/actions/22/format-text-uppercase.svg
--- a/icons/actions/22/format-text-uppercase.svg
+++ b/icons/actions/22/format-text-uppercase.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -19,7 +19,7 @@
  <path 
     style="fill:currentColor;fill-opacity:1;stroke:none" 
     d="m 434.71429,531.79074 3,-4 3,4 z"
-    class="ColorScheme-Highlight"
+    class="olorScheme-ButtonFocus"
     />  
  </g>
 </svg>
diff --git a/icons/actions/22/input-mouse-click-left.svg b/icons/actions/22/input-mouse-click-left.svg
--- a/icons/actions/22/input-mouse-click-left.svg
+++ b/icons/actions/22/input-mouse-click-left.svg
@@ -3,10 +3,10 @@
         .ColorScheme-Text {
             color:#232629;
         }
-        .ColorScheme-Highlight {
+        .olorScheme-ButtonFocus {
             color:#3daee9;
         }
     </style>
     <path d="M10 3a5 5 0 0 0-5 5v6a5 5 0 0 0 5 5h2a5 5 0 0 0 5-5V8a5 5 0 0 0-5-5zm0 1h2a4 4 0 0 1 4 4v6a4 4 0 0 1-4 4h-2a4 4 0 0 1-4-4V8a4 4 0 0 1 4-4zm0 1v5h2V5z" fill="currentColor" class="ColorScheme-Text"/>
-    <path d="M10 4a4 4 0 0 0-4 4v3h4z" fill="currentColor" class="ColorScheme-Highlight"/>
+    <path d="M10 4a4 4 0 0 0-4 4v3h4z" fill="currentColor" class="olorScheme-ButtonFocus"/>
 </svg>
diff --git a/icons/actions/22/input-mouse-click-middle.svg b/icons/actions/22/input-mouse-click-middle.svg
--- a/icons/actions/22/input-mouse-click-middle.svg
+++ b/icons/actions/22/input-mouse-click-middle.svg
@@ -3,10 +3,10 @@
         .ColorScheme-Text {
             color:#232629;
         }
-        .ColorScheme-Highlight {
+        .olorScheme-ButtonFocus {
             color:#3daee9;
         }
     </style>
     <path d="M10 3a5 5 0 0 0-5 5v6a5 5 0 0 0 5 5h2a5 5 0 0 0 5-5V8a5 5 0 0 0-5-5zm0 1h2a4 4 0 0 1 4 4v6a4 4 0 0 1-4 4h-2a4 4 0 0 1-4-4V8a4 4 0 0 1 4-4z" fill="currentColor" class="ColorScheme-Text"/>
-    <path d="M10 4a4 4 0 0 0-1 .133V11h4V4.13A4 4 0 0 0 12 4zm0 1h2v5h-2z" fill="currentColor" class="ColorScheme-Highlight"/>
+    <path d="M10 4a4 4 0 0 0-1 .133V11h4V4.13A4 4 0 0 0 12 4zm0 1h2v5h-2z" fill="currentColor" class="olorScheme-ButtonFocus"/>
 </svg>
diff --git a/icons/actions/22/input-mouse-click-right.svg b/icons/actions/22/input-mouse-click-right.svg
--- a/icons/actions/22/input-mouse-click-right.svg
+++ b/icons/actions/22/input-mouse-click-right.svg
@@ -3,10 +3,10 @@
         .ColorScheme-Text {
             color:#232629;
         }
-        .ColorScheme-Highlight {
+        .olorScheme-ButtonFocus {
             color:#3daee9;
         }
     </style>
     <path d="M10 3a5 5 0 0 0-5 5v6a5 5 0 0 0 5 5h2a5 5 0 0 0 5-5V8a5 5 0 0 0-5-5zm0 1h2a4 4 0 0 1 4 4v6a4 4 0 0 1-4 4h-2a4 4 0 0 1-4-4V8a4 4 0 0 1 4-4zm0 1v5h2V5z" fill="currentColor" class="ColorScheme-Text"/>
-    <path d="M12 4v7h4V8a4 4 0 0 0-4-4z" fill="currentColor" class="ColorScheme-Highlight"/>
+    <path d="M12 4v7h4V8a4 4 0 0 0-4-4z" fill="currentColor" class="olorScheme-ButtonFocus"/>
 </svg>
diff --git a/icons/actions/22/insert-endnote.svg b/icons/actions/22/insert-endnote.svg
--- a/icons/actions/22/insert-endnote.svg
+++ b/icons/actions/22/insert-endnote.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 6 13 L 6 14 L 11 14 L 11 13 L 6 13 z M 17 13 L 17 14 L 18 14 L 18 13 L 17 13 z M 17 15 L 17 19 L 18 19 L 18 15 L 17 15 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/22/insert-footnote.svg b/icons/actions/22/insert-footnote.svg
--- a/icons/actions/22/insert-footnote.svg
+++ b/icons/actions/22/insert-footnote.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 16 13 L 15 15 L 16 15 L 16 19 L 17 19 L 17 13 L 16 13 z M 6 15 L 6 16 L 13 16 L 13 15 L 6 15 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/22/insert-more-mark.svg b/icons/actions/22/insert-more-mark.svg
--- a/icons/actions/22/insert-more-mark.svg
+++ b/icons/actions/22/insert-more-mark.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 3 10 L 3 11 L 19 11 L 19 10 L 3 10 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/22/insert-page-break.svg b/icons/actions/22/insert-page-break.svg
--- a/icons/actions/22/insert-page-break.svg
+++ b/icons/actions/22/insert-page-break.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 5 10 L 5 11 L 7 11 L 7 10 L 5 10 z M 10 10 L 10 11 L 12 11 L 12 10 L 10 10 z M 15 10 L 15 11 L 17 11 L 17 10 L 15 10 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/22/insert-table-of-contents.svg b/icons/actions/22/insert-table-of-contents.svg
--- a/icons/actions/22/insert-table-of-contents.svg
+++ b/icons/actions/22/insert-table-of-contents.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 16 3 L 16 4 L 17 4 L 17 6 L 16 6 L 16 7 L 17 7 L 18 7 L 19 7 L 19 6 L 18 6 L 18 4 L 19 4 L 19 3 L 18 3 L 17 3 L 16 3 z M 10 5 L 10 6 L 11 6 L 11 5 L 10 5 z M 12 5 L 12 6 L 13 6 L 13 5 L 12 5 z M 14 5 L 14 6 L 15 6 L 15 5 L 14 5 z M 14 9 L 14 10 L 15 10 L 15 12 L 14 12 L 14 13 L 19 13 L 19 12 L 18 12 L 18 10 L 19 10 L 19 9 L 14 9 z M 16 10 L 17 10 L 17 12 L 16 12 L 16 10 z M 8 11 L 8 12 L 9 12 L 9 11 L 8 11 z M 10 11 L 10 12 L 11 12 L 11 11 L 10 11 z M 12 11 L 12 12 L 13 12 L 13 11 L 12 11 z M 12 15 L 12 16 L 13 16 L 13 18 L 12 18 L 12 19 L 13 19 L 14 19 L 15 19 L 19 19 L 19 18 L 18 18 L 18 16 L 19 16 L 19 15 L 15 15 L 14 15 L 13 15 L 12 15 z M 14 16 L 15 16 L 15 18 L 14 18 L 14 16 z M 16 16 L 17 16 L 17 18 L 16 18 L 16 16 z M 6 17 L 6 18 L 7 18 L 7 17 L 6 17 z M 8 17 L 8 18 L 9 18 L 9 17 L 8 17 z M 10 17 L 10 18 L 11 18 L 11 17 L 10 17 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/22/insert-table.svg b/icons/actions/22/insert-table.svg
--- a/icons/actions/22/insert-table.svg
+++ b/icons/actions/22/insert-table.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 4 4 L 4 7 L 4 9 L 9 9 L 9 7 L 9 4 L 7 4 L 4 4 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/22/item.svg b/icons/actions/22/item.svg
--- a/icons/actions/22/item.svg
+++ b/icons/actions/22/item.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
     style="fill:currentColor;fill-opacity:1;stroke:none" 
     d="M 4.5,9 C 3.671573,8.9999999 3,9.671572 3,10.5 3,11.328428 3.671573,12.000001 4.5,12 5.328427,12 6,11.328428 6,10.5 6,9.671572 5.328427,8.999999 4.5,9 Z m 2.5,1 0,1 1,0 0,-1 z m 2,0 0,1 10,0 0,-1 z m 0,2 0,1 4,0 0,-1 z"
-    class="ColorScheme-Highlight"
+    class="olorScheme-ButtonFocus"
     />  
 </svg>
diff --git a/icons/actions/22/kdenlive-insert-edit.svg b/icons/actions/22/kdenlive-insert-edit.svg
--- a/icons/actions/22/kdenlive-insert-edit.svg
+++ b/icons/actions/22/kdenlive-insert-edit.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 8 9 L 8 14 L 14 14 L 14 9 L 8 9 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/22/kdenlive-normal-edit.svg b/icons/actions/22/kdenlive-normal-edit.svg
--- a/icons/actions/22/kdenlive-normal-edit.svg
+++ b/icons/actions/22/kdenlive-normal-edit.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 8 4 L 8 9 L 14 9 L 14 4 L 8 4 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/22/kdenlive-overwrite-edit.svg b/icons/actions/22/kdenlive-overwrite-edit.svg
--- a/icons/actions/22/kdenlive-overwrite-edit.svg
+++ b/icons/actions/22/kdenlive-overwrite-edit.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 8 8 L 8 13 L 14 13 L 14 8 L 8 8 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/22/know.svg b/icons/actions/22/know.svg
--- a/icons/actions/22/know.svg
+++ b/icons/actions/22/know.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 19.306641 13 L 14.814453 17.591797 L 13.691406 16.445312 L 13 17.152344 L 14.806641 19 L 14.8125 18.992188 L 14.820312 19 L 20 13.707031 L 19.308594 13 L 19.306641 13 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/22/kstars_supernovae.svg b/icons/actions/22/kstars_supernovae.svg
--- a/icons/actions/22/kstars_supernovae.svg
+++ b/icons/actions/22/kstars_supernovae.svg
@@ -55,7 +55,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons/actions/22/kt-queue-manager.svg b/icons/actions/22/kt-queue-manager.svg
--- a/icons/actions/22/kt-queue-manager.svg
+++ b/icons/actions/22/kt-queue-manager.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 4 3 L 4 4 L 5 4 L 5 6 L 4 6 L 4 7 L 7 7 L 7 6 L 6 6 L 6 4 L 7 4 L 7 3 L 4 3 z M 3 9 L 3 10 L 4 10 L 4 12 L 3 12 L 3 13 L 8 13 L 8 12 L 7 12 L 7 10 L 8 10 L 8 9 L 3 9 z M 5 10 L 6 10 L 6 12 L 5 12 L 5 10 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/22/labplot-1x-zoom.svg b/icons/actions/22/labplot-1x-zoom.svg
--- a/icons/actions/22/labplot-1x-zoom.svg
+++ b/icons/actions/22/labplot-1x-zoom.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="m 19,19 -1,0 0,-8 c -0.508487,0.438772 -1.58039,1.423509 -2.094174,1.845943 L 15.334976,12.19775 18,10 l 1,0 z"
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/22/labplot-2x-zoom.svg b/icons/actions/22/labplot-2x-zoom.svg
--- a/icons/actions/22/labplot-2x-zoom.svg
+++ b/icons/actions/22/labplot-2x-zoom.svg
@@ -4,15 +4,15 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
   </defs>
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="m 19.191702,18.828671 -5.87247,0 0,-0.910932 2.325911,-2.350202 q 1.050608,-1.062753 1.390689,-1.518219 0.340081,-0.455465 0.504048,-0.880567 0.170041,-0.425101 0.170041,-0.917004 0,-0.704453 -0.419029,-1.09919 -0.419028,-0.394737 -1.147773,-0.394737 -0.546559,0 -1.038462,0.182186 -0.48583,0.182187 -1.09919,0.661944 l -0.582996,-0.734818 q 1.244939,-1.0445346 2.720648,-1.0445346 1.238866,0 1.961539,0.6376516 0.728744,0.631579 0.728744,1.724697 0,0.582996 -0.21255,1.129554 -0.212551,0.540486 -0.637652,1.105264 -0.425101,0.558704 -1.427126,1.536437 l -1.852226,1.827935 0,0.04858 4.487854,0 0,0.995952 z"
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
diff --git a/icons/actions/22/labplot-3x-zoom.svg b/icons/actions/22/labplot-3x-zoom.svg
--- a/icons/actions/22/labplot-3x-zoom.svg
+++ b/icons/actions/22/labplot-3x-zoom.svg
@@ -4,15 +4,15 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
   </defs>
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="m 18.857694,12.027051 q 0,0.850202 -0.479757,1.396761 -0.473684,0.546559 -1.360324,0.728745 l 0,0.04858 q 1.062753,0.133603 1.58502,0.680162 0.52834,0.546559 0.52834,1.421053 0,1.26923 -0.880566,1.961538 -0.880567,0.686235 -2.526316,0.686235 -0.704454,0 -1.299596,-0.103239 -0.589068,-0.103239 -1.1417,-0.376518 l 0,-1.020243 q 0.564777,0.279352 1.208502,0.431174 0.643725,0.151822 1.244939,0.151822 2.246964,0 2.246964,-1.755061 0,-1.566802 -2.483806,-1.566802 l -0.862348,0 0,-0.929149 0.874494,0 q 1.044534,0 1.633603,-0.44332 0.589069,-0.449393 0.589069,-1.238867 0,-0.637651 -0.431174,-0.995951 -0.425101,-0.3583 -1.18421,-0.3583 -0.589069,0 -1.093118,0.163968 -0.497976,0.157895 -1.147773,0.582996 l -0.546559,-0.746964 q 0.546559,-0.431174 1.257085,-0.674089 0.716599,-0.2489876 1.518219,-0.2489876 1.299595,0 2.022267,0.5951416 0.728745,0.589069 0.728745,1.609312 z"
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
diff --git a/icons/actions/22/labplot-4x-zoom.svg b/icons/actions/22/labplot-4x-zoom.svg
--- a/icons/actions/22/labplot-4x-zoom.svg
+++ b/icons/actions/22/labplot-4x-zoom.svg
@@ -4,15 +4,15 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
   </defs>
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 20.287449,16.967346 19,16.967346 19,19 l -1.062754,0 0,-2.032654 -4.251012,0 0,-0.936734 L 17.864372,10 19,10 l 0,5.975509 1.287449,0 0,0.991837 z m -2.350203,-0.991837 0,-2.816326 q 0,-0.838775 0.0668,-1.983673 l -0.05466,0 q -0.0668,0.159183 -0.236842,0.477551 -0.163968,0.318367 -0.297571,0.502041 l -2.659919,3.820407 3.182186,0 z"
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
diff --git a/icons/actions/22/labplot-5x-zoom.svg b/icons/actions/22/labplot-5x-zoom.svg
--- a/icons/actions/22/labplot-5x-zoom.svg
+++ b/icons/actions/22/labplot-5x-zoom.svg
@@ -4,15 +4,15 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
   </defs>
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="m 16.143119,13.381302 c 0.927125,0 1.65587,0.232794 2.186235,0.698381 0.534413,0.465587 0.801619,1.103238 0.801619,1.912955 0,0.923077 -0.293522,1.647773 -0.880566,2.174089 -0.587045,0.522267 -1.40081,0.783401 -2.441296,0.783401 -0.991903,0 -1.759109,-0.159919 -2.30162,-0.479757 l 0,-1.032389 c 0.299595,0.178138 0.659919,0.319838 1.080972,0.425101 0.421053,0.105263 0.831984,0.157895 1.232794,0.157895 0.696356,0 1.234817,-0.165992 1.615384,-0.497976 0.380567,-0.331983 0.570851,-0.805667 0.570851,-1.421052 0,-1.198381 -0.740891,-1.797571 -2.222673,-1.797571 -0.477733,0 -0.983805,0.06073 -1.518218,0.182186 L 13.720042,14.140411 14,10 18.505467,9.9501278 18.505467,11 15,11 14.776722,13.520978 c 0.465587,-0.09312 0.921053,-0.139676 1.366397,-0.139676 z"
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
diff --git a/icons/actions/22/labplot-matrix-new.svg b/icons/actions/22/labplot-matrix-new.svg
--- a/icons/actions/22/labplot-matrix-new.svg
+++ b/icons/actions/22/labplot-matrix-new.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="m 5,5 0,5 5,0 0,-5 z m 7,0 0,5 5,0 0,-5 z M 6,6 9,6 9,9 6,9 Z m 7,0 3,0 0,3 -3,0 z m -8,6 0,5 5,0 0,-5 z m 7,0 0,3 1,0 0,-2 2,0 0,-1 z m -6,1 3,0 0,3 -3,0 z"
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/22/labplot-matrix.svg b/icons/actions/22/labplot-matrix.svg
--- a/icons/actions/22/labplot-matrix.svg
+++ b/icons/actions/22/labplot-matrix.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 5 5 L 5 10 L 10 10 L 10 5 L 5 5 z M 12 5 L 12 10 L 17 10 L 17 5 L 12 5 z M 6 6 L 9 6 L 9 9 L 6 9 L 6 6 z M 13 6 L 16 6 L 16 9 L 13 9 L 13 6 z M 5 12 L 5 17 L 10 17 L 10 12 L 5 12 z M 12 12 L 12 17 L 17 17 L 17 12 L 12 12 z M 6 13 L 9 13 L 9 16 L 6 16 L 6 13 z M 13 13 L 16 13 L 16 16 L 13 16 L 13 13 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/22/labplot-plot-axis-points.svg b/icons/actions/22/labplot-plot-axis-points.svg
--- a/icons/actions/22/labplot-plot-axis-points.svg
+++ b/icons/actions/22/labplot-plot-axis-points.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 3 2 L 3 5 L 6 5 L 6 2 L 3 2 z M 4 3 L 5 3 L 5 4 L 4 4 L 4 3 z M 3 16 L 3 19 L 6 19 L 6 16 L 3 16 z M 16 16 L 16 19 L 19 19 L 19 16 L 16 16 z M 4 17 L 5 17 L 5 18 L 4 18 L 4 17 z M 17 17 L 18 17 L 18 18 L 17 18 L 17 17 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/22/labplot-xy-fit-curve.svg b/icons/actions/22/labplot-xy-fit-curve.svg
--- a/icons/actions/22/labplot-xy-fit-curve.svg
+++ b/icons/actions/22/labplot-xy-fit-curve.svg
@@ -4,15 +4,15 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
   </defs>
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 18.662109 3.6308594 L 8 13.404297 L 8 14 L 8.8300781 14 L 19.337891 4.3691406 L 18.662109 3.6308594 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
diff --git a/icons/actions/22/labplot-xy-fourier-filter-curve.svg b/icons/actions/22/labplot-xy-fourier-filter-curve.svg
--- a/icons/actions/22/labplot-xy-fourier-filter-curve.svg
+++ b/icons/actions/22/labplot-xy-fourier-filter-curve.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 11,5 C 10.09558,5 9.3630583,5.6034836 8.7695312,6.3652344 8.1760043,7.1269864 7.685626,8.095759 7.28125,9.056641 6.472498,10.978403 6.0136719,12.882813 6.0136719,12.882812 l 0.9726562,0.234376 c 0,0 0.4474039,-1.845591 1.2167969,-3.673829 C 8.587822,8.529241 9.0544716,7.6230136 9.5566406,6.9785156 10.056781,6.3366186 10.556129,6.0065983 10.994141,6.0039062 c 0.4208,0.01378 0.782978,0.1849888 1.15625,0.5429688 0.375823,0.360428 0.739876,0.9081416 1.076171,1.587891 0.643616,1.300928 1.184369,3.072232 1.722657,4.865234 l 1.046875,0 c -0.0052,-0.0174 -0.01041,-0.03338 -0.01563,-0.05078 C 15.41832,11.074493 14.857287,9.175514 14.123047,7.6914062 13.755927,6.9493522 13.345582,6.307366 12.841797,5.8242188 12.338012,5.3410719 11.715369,5.0192827 11.013672,5 l -0.0059,0 z"
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/22/labplot-xy-fourier-transform-curve.svg b/icons/actions/22/labplot-xy-fourier-transform-curve.svg
--- a/icons/actions/22/labplot-xy-fourier-transform-curve.svg
+++ b/icons/actions/22/labplot-xy-fourier-transform-curve.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 7,3 C 6.0955801,3 5.3630583,3.6034832 4.7695312,4.3652344 4.1760042,5.1269856 3.6856261,6.0957593 3.28125,7.0566406 2.4724978,8.9784034 2.0136719,10.882812 2.0136719,10.882812 l 0.9726562,0.234376 c 0,0 0.4474039,-1.8455914 1.2167969,-3.6738286 0.3846965,-0.9141187 0.8513471,-1.820345 1.3535156,-2.4648438 0.5001406,-0.6418961 0.9994888,-0.9719176 1.4375,-0.9746094 0.4208002,0.013779 0.7829782,0.1849883 1.15625,0.5429688 0.3758235,0.3604276 0.7398764,0.9081422 1.0761719,1.5878906 0.6725911,1.3594969 1.2345245,3.2261636 1.7968755,5.1015624 0.56235,1.875399 1.123821,3.759112 1.859374,5.214844 0.367777,0.727866 0.778279,1.354826 1.28711,1.816406 0.50725,0.460146 1.13933,0.747934 1.83789,0.730469 0.876622,-0.0041 1.542608,-0.633925 2.03125,-1.402344 0.490232,-0.770918 0.856353,-1.740786 1.142579,-2.703125 0.572451,-1.924677 0.814453,-3.828125 0.814453,-3.828125 l -0.992188,-0.128906 c 0,0 -0.238349,1.846552 -0.78125,3.671875 -0.27145,0.912661 -0.623332,1.817793 -1.027344,2.453125 C 16.791301,17.695879 16.388448,18 16,18 l -0.0078,0 -0.0059,0 C 15.562694,18.01175 15.211514,17.860775 14.841797,17.525391 14.47208,17.190006 14.110323,16.662863 13.775391,16 13.105526,14.674274 12.542618,12.823945 11.980469,10.949219 11.41832,9.0744925 10.857287,7.175514 10.123047,5.6914062 9.7559266,4.9493524 9.3455816,4.3073656 8.8417969,3.8242188 8.3380121,3.3410719 7.7153687,3.0192827 7.0136719,3 L 7.0078125,3 7,3 Z"
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/22/labplot-xy-interpolation-curve.svg b/icons/actions/22/labplot-xy-interpolation-curve.svg
--- a/icons/actions/22/labplot-xy-interpolation-curve.svg
+++ b/icons/actions/22/labplot-xy-interpolation-curve.svg
@@ -4,15 +4,15 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
   </defs>
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 10.216797,5.8339844 7.03125,14.324219 7.96875,14.675781 10.785156,7.1679688 17.302734,9.9609375 17.697266,9.0410156 10.216797,5.8339844 Z"
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
diff --git a/icons/actions/22/labplot-xy-smoothing-curve.svg b/icons/actions/22/labplot-xy-smoothing-curve.svg
--- a/icons/actions/22/labplot-xy-smoothing-curve.svg
+++ b/icons/actions/22/labplot-xy-smoothing-curve.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 18.996094 4 C 17.318298 4.0147218 15.882867 4.9286614 14.630859 6.1972656 C 13.378852 7.4658699 12.274223 9.1100804 11.208984 10.732422 C 10.143746 12.354763 9.117216 13.956734 8.0800781 15.123047 C 7.0429402 16.28936 6.0347103 16.977377 5 16.978516 L 5 17.978516 C 6.4652897 17.976903 7.7081101 17.048575 8.828125 15.789062 C 9.9481399 14.529551 10.984438 12.89635 12.044922 11.28125 C 13.105406 9.6661502 14.188096 8.0693852 15.341797 6.9003906 C 16.495498 5.731396 17.684591 5.0115764 19.003906 5 L 18.996094 4 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/22/lensautofix.svg b/icons/actions/22/lensautofix.svg
--- a/icons/actions/22/lensautofix.svg
+++ b/icons/actions/22/lensautofix.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 11 4 A 7 7 0 0 0 4 11 A 7 7 0 0 0 11 18 A 7 7 0 0 0 18 11 A 7 7 0 0 0 11 4 z M 11 5 A 6 6 0 0 1 17 11 A 6 6 0 0 1 11 17 A 6 6 0 0 1 5 11 A 6 6 0 0 1 11 5 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/22/lines-connector.svg b/icons/actions/22/lines-connector.svg
--- a/icons/actions/22/lines-connector.svg
+++ b/icons/actions/22/lines-connector.svg
@@ -4,16 +4,16 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
   </defs>
      />
     <path
        style="fill:currentColor;fill-opacity:1;stroke:none" 
        d="M 16 3 L 16 6 L 19 6 L 19 3 L 16 3 z M 17 4 L 18 4 L 18 5 L 17 5 L 17 4 z M 3 16 L 3 19 L 6 19 L 6 16 L 3 16 z M 4 17 L 5 17 L 5 18 L 4 18 L 4 17 z " 
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
         />
     <path
        style="fill:currentColor;fill-opacity:1;stroke:none" 
diff --git a/icons/actions/22/media-show-active-track-amarok.svg b/icons/actions/22/media-show-active-track-amarok.svg
--- a/icons/actions/22/media-show-active-track-amarok.svg
+++ b/icons/actions/22/media-show-active-track-amarok.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 19 8 L 15 11 L 19 14 L 19 8 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/22/media-track-queue-amarok.svg b/icons/actions/22/media-track-queue-amarok.svg
--- a/icons/actions/22/media-track-queue-amarok.svg
+++ b/icons/actions/22/media-track-queue-amarok.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 16.5 9 L 14 12 L 19 12 L 16.5 9 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/22/mode1.svg b/icons/actions/22/mode1.svg
--- a/icons/actions/22/mode1.svg
+++ b/icons/actions/22/mode1.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 11 16 C 11 17.10801 11.89199 18 13 18 L 18 18 L 18 19 L 20 17.5 L 18 16 L 18 17 L 13 17 C 12.446 17 12 16.554 12 16 L 11 16 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/22/mode2.svg b/icons/actions/22/mode2.svg
--- a/icons/actions/22/mode2.svg
+++ b/icons/actions/22/mode2.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 13 12 L 11 13.5 L 13 15 L 13 14 L 18 14 C 18.554 14 19 14.446 19 15 L 20 15 C 20 13.89199 19.10801 13 18 13 L 13 13 L 13 12 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/22/mode3.svg b/icons/actions/22/mode3.svg
--- a/icons/actions/22/mode3.svg
+++ b/icons/actions/22/mode3.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 18.009766 12 L 18.009766 13 L 17.009766 13 C 15.629056 12.99999 14.509766 14.11928 14.509766 15.5 C 14.509766 16.32843 13.838196 17 13.009766 17 L 10.978516 17 L 10.978516 18 L 13.009766 18 C 14.390476 18.00001 15.509766 16.88072 15.509766 15.5 C 15.509766 14.67157 16.181336 14 17.009766 14 L 18.009766 14 L 18.009766 15 L 20.009766 13.5 L 18.009766 12 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/22/mode4.svg b/icons/actions/22/mode4.svg
--- a/icons/actions/22/mode4.svg
+++ b/icons/actions/22/mode4.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 13 12 L 11 13.5 L 13 15 L 13 14 L 14 14 C 14.82843 14 15.5 14.67157 15.5 15.5 C 15.5 16.88072 16.61929 18.00001 18 18 L 20.03125 18 L 20.03125 17 L 18 17 C 17.17157 17 16.5 16.32843 16.5 15.5 C 16.5 14.11928 15.38071 12.99999 14 13 L 13 13 L 13 12 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/22/mode5.svg b/icons/actions/22/mode5.svg
--- a/icons/actions/22/mode5.svg
+++ b/icons/actions/22/mode5.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 12.5 12 L 10.5 13.5 L 12.5 15 L 12.5 14 L 13.5 14 C 14.32843 14 15 14.67157 15 15.5 C 15 16.88072 16.11929 18.00001 17.5 18 L 19.53125 18 L 19.53125 17 L 17.5 17 C 16.67157 17 16 16.32843 16 15.5 C 16 14.11928 14.88071 12.99999 13.5 13 L 12.5 13 L 12.5 12 z M 18.53125 12 L 18.53125 13 L 17.53125 13 C 17.037155 12.999996 16.579232 13.149125 16.191406 13.396484 A 2 2 0 0 1 16.822266 14.179688 A 2 2 0 0 1 16.828125 14.181641 C 17.038704 14.068834 17.275641 14 17.53125 14 L 18.53125 14 L 18.53125 15 L 20.53125 13.5 L 18.53125 12 z M 14.189453 16.841797 C 13.989891 16.940029 13.76871 17 13.53125 17 L 11.5 17 L 11.5 18 L 13.53125 18 C 14.012649 18.000003 14.460445 17.863343 14.839844 17.626953 A 2 2 0 0 1 14.189453 16.841797 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/22/node-segment-curve.svg b/icons/actions/22/node-segment-curve.svg
--- a/icons/actions/22/node-segment-curve.svg
+++ b/icons/actions/22/node-segment-curve.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 16 4 A 12 12 0 0 0 4 16 L 5 16 A 11 11 0 0 1 16 5 L 16 4 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/22/node-segment-line.svg b/icons/actions/22/node-segment-line.svg
--- a/icons/actions/22/node-segment-line.svg
+++ b/icons/actions/22/node-segment-line.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 16 3 L 16 6 L 19 6 L 19 3 L 16 3 z M 17 4 L 18 4 L 18 5 L 17 5 L 17 4 z M 3 16 L 3 19 L 6 19 L 6 16 L 3 16 z M 4 17 L 5 17 L 5 18 L 4 18 L 4 17 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/22/node-transform.svg b/icons/actions/22/node-transform.svg
--- a/icons/actions/22/node-transform.svg
+++ b/icons/actions/22/node-transform.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 13 13 L 13 14 L 13 15 L 14 15 L 14 14 L 15 14 L 15 13 L 13 13 z M 17 13 L 17 14 L 18 14 L 18 15 L 19 15 L 19 13 L 18 13 L 17 13 z M 13 17 L 13 19 L 14 19 L 15 19 L 15 18 L 14 18 L 14 17 L 13 17 z M 18 17 L 18 18 L 17 18 L 17 19 L 19 19 L 19 18 L 19 17 L 18 17 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/22/node-type-auto-smooth.svg b/icons/actions/22/node-type-auto-smooth.svg
--- a/icons/actions/22/node-type-auto-smooth.svg
+++ b/icons/actions/22/node-type-auto-smooth.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 11 14 A 2.5 2.5 0 0 0 8.5 16.5 A 2.5 2.5 0 0 0 11 19 A 2.5 2.5 0 0 0 13.5 16.5 A 2.5 2.5 0 0 0 11 14 z M 11 15 A 1.5 1.5 0 0 1 12.5 16.5 A 1.5 1.5 0 0 1 11 18 A 1.5 1.5 0 0 1 9.5 16.5 A 1.5 1.5 0 0 1 11 15 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/22/node-type-cusp.svg b/icons/actions/22/node-type-cusp.svg
--- a/icons/actions/22/node-type-cusp.svg
+++ b/icons/actions/22/node-type-cusp.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 11 14.34375 L 8.171875 17.171875 L 11 20 L 13.828125 17.171875 L 11 14.34375 z M 11 15.757812 L 12.414062 17.171875 L 11 18.585938 L 9.5859375 17.171875 L 11 15.757812 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/22/node-type-smooth.svg b/icons/actions/22/node-type-smooth.svg
--- a/icons/actions/22/node-type-smooth.svg
+++ b/icons/actions/22/node-type-smooth.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 8.5 14 L 8.5 19 L 13.5 19 L 13.5 14 L 8.5 14 z M 9.5 15 L 12.5 15 L 12.5 18 L 9.5 18 L 9.5 15 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/22/node-type-symmetric.svg b/icons/actions/22/node-type-symmetric.svg
--- a/icons/actions/22/node-type-symmetric.svg
+++ b/icons/actions/22/node-type-symmetric.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 11 13 L 8 18 L 14 18 L 11 13 z M 11 15 L 12 17 L 10 17 L 11 15 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/22/object-group.svg b/icons/actions/22/object-group.svg
--- a/icons/actions/22/object-group.svg
+++ b/icons/actions/22/object-group.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons/actions/22/object-order-back.svg b/icons/actions/22/object-order-back.svg
--- a/icons/actions/22/object-order-back.svg
+++ b/icons/actions/22/object-order-back.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons/actions/22/object-order-front.svg b/icons/actions/22/object-order-front.svg
--- a/icons/actions/22/object-order-front.svg
+++ b/icons/actions/22/object-order-front.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons/actions/22/object-order-lower.svg b/icons/actions/22/object-order-lower.svg
--- a/icons/actions/22/object-order-lower.svg
+++ b/icons/actions/22/object-order-lower.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons/actions/22/object-order-raise.svg b/icons/actions/22/object-order-raise.svg
--- a/icons/actions/22/object-order-raise.svg
+++ b/icons/actions/22/object-order-raise.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons/actions/22/object-rotate-left.svg b/icons/actions/22/object-rotate-left.svg
--- a/icons/actions/22/object-rotate-left.svg
+++ b/icons/actions/22/object-rotate-left.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons/actions/22/object-rows.svg b/icons/actions/22/object-rows.svg
--- a/icons/actions/22/object-rows.svg
+++ b/icons/actions/22/object-rows.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons/actions/22/object-to-path.svg b/icons/actions/22/object-to-path.svg
--- a/icons/actions/22/object-to-path.svg
+++ b/icons/actions/22/object-to-path.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 15 3 L 15 7 L 19 7 L 19 3 L 15 3 z M 16 4 L 18 4 L 18 6 L 16 6 L 16 4 z M 3 15 L 3 19 L 7 19 L 7 15 L 3 15 z M 4 16 L 6 16 L 6 18 L 4 18 L 4 16 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/22/object-ungroup.svg b/icons/actions/22/object-ungroup.svg
--- a/icons/actions/22/object-ungroup.svg
+++ b/icons/actions/22/object-ungroup.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons/actions/22/office-chart-bar-percentage.svg b/icons/actions/22/office-chart-bar-percentage.svg
--- a/icons/actions/22/office-chart-bar-percentage.svg
+++ b/icons/actions/22/office-chart-bar-percentage.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons/actions/22/office-chart-line-percentage.svg b/icons/actions/22/office-chart-line-percentage.svg
--- a/icons/actions/22/office-chart-line-percentage.svg
+++ b/icons/actions/22/office-chart-line-percentage.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons/actions/22/office-chart-line-stacked.svg b/icons/actions/22/office-chart-line-stacked.svg
--- a/icons/actions/22/office-chart-line-stacked.svg
+++ b/icons/actions/22/office-chart-line-stacked.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons/actions/22/office-chart-line.svg b/icons/actions/22/office-chart-line.svg
--- a/icons/actions/22/office-chart-line.svg
+++ b/icons/actions/22/office-chart-line.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons/actions/22/office-chart-polar-stacked.svg b/icons/actions/22/office-chart-polar-stacked.svg
--- a/icons/actions/22/office-chart-polar-stacked.svg
+++ b/icons/actions/22/office-chart-polar-stacked.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons/actions/22/office-chart-ring.svg b/icons/actions/22/office-chart-ring.svg
--- a/icons/actions/22/office-chart-ring.svg
+++ b/icons/actions/22/office-chart-ring.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons/actions/22/office-chart-scatter.svg b/icons/actions/22/office-chart-scatter.svg
--- a/icons/actions/22/office-chart-scatter.svg
+++ b/icons/actions/22/office-chart-scatter.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons/actions/22/overexposure.svg b/icons/actions/22/overexposure.svg
--- a/icons/actions/22/overexposure.svg
+++ b/icons/actions/22/overexposure.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons/actions/22/password-copy.svg b/icons/actions/22/password-copy.svg
--- a/icons/actions/22/password-copy.svg
+++ b/icons/actions/22/password-copy.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons/actions/22/path-clip-edit.svg b/icons/actions/22/path-clip-edit.svg
--- a/icons/actions/22/path-clip-edit.svg
+++ b/icons/actions/22/path-clip-edit.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons/actions/22/path-effect-parameter-next.svg b/icons/actions/22/path-effect-parameter-next.svg
--- a/icons/actions/22/path-effect-parameter-next.svg
+++ b/icons/actions/22/path-effect-parameter-next.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 16 4 A 12 12 0 0 0 4 16 L 5 16 A 11 11 0 0 1 16 5 L 16 4 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/22/path-mask-edit.svg b/icons/actions/22/path-mask-edit.svg
--- a/icons/actions/22/path-mask-edit.svg
+++ b/icons/actions/22/path-mask-edit.svg
@@ -7,7 +7,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons/actions/22/path-mode-polyline-paraxial.svg b/icons/actions/22/path-mode-polyline-paraxial.svg
--- a/icons/actions/22/path-mode-polyline-paraxial.svg
+++ b/icons/actions/22/path-mode-polyline-paraxial.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons/actions/22/path-mode-polyline.svg b/icons/actions/22/path-mode-polyline.svg
--- a/icons/actions/22/path-mode-polyline.svg
+++ b/icons/actions/22/path-mode-polyline.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons/actions/22/path-reverse.svg b/icons/actions/22/path-reverse.svg
--- a/icons/actions/22/path-reverse.svg
+++ b/icons/actions/22/path-reverse.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 9 9 L 9 13 L 13 13 L 13 9 L 9 9 z M 10 10 L 12 10 L 12 12 L 10 12 L 10 10 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/22/player-time.svg b/icons/actions/22/player-time.svg
--- a/icons/actions/22/player-time.svg
+++ b/icons/actions/22/player-time.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons/actions/22/send_signal.svg b/icons/actions/22/send_signal.svg
--- a/icons/actions/22/send_signal.svg
+++ b/icons/actions/22/send_signal.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons/actions/22/sharpenimage.svg b/icons/actions/22/sharpenimage.svg
--- a/icons/actions/22/sharpenimage.svg
+++ b/icons/actions/22/sharpenimage.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons/actions/22/show-node-handles.svg b/icons/actions/22/show-node-handles.svg
--- a/icons/actions/22/show-node-handles.svg
+++ b/icons/actions/22/show-node-handles.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 4.9804688 3 A 2 2 0 0 0 3 5.0136719 A 2 2 0 0 0 4.5 6.9355469 L 4.5 9 L 5.5 9 L 5.5 6.9335938 A 2 2 0 0 0 7 5 L 7 4.9746094 A 2 2 0 0 0 4.9804688 3 z M 4.9902344 4 A 1 1 0 0 1 6 4.9863281 L 6 5 A 1 1 0 0 1 5.0039062 6 A 1 1 0 0 1 4 5.0058594 A 1 1 0 0 1 4.9902344 4 z M 4.5 10 L 4.5 11 L 5.5 11 L 5.5 10 L 4.5 10 z M 3 15 L 3 19 L 7 19 L 7 15 L 3 15 z M 4 16 L 6 16 L 6 18 L 4 18 L 4 16 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/22/show-path-outline.svg b/icons/actions/22/show-path-outline.svg
--- a/icons/actions/22/show-path-outline.svg
+++ b/icons/actions/22/show-path-outline.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons/actions/22/similarartists-amarok.svg b/icons/actions/22/similarartists-amarok.svg
--- a/icons/actions/22/similarartists-amarok.svg
+++ b/icons/actions/22/similarartists-amarok.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 14 3 C 12.338 3 11 4.338 11 6 C 11 7.662 12.338 9 14 9 C 15.662 9 17 7.662 17 6 C 17 4.338 15.662 3 14 3 z M 14 10 C 13.353654 10 12.744006 10.134157 12.181641 10.361328 L 12.636719 11.275391 C 13.064535 11.114885 13.514485 11 14 11 C 16.21602 11 18 12.78398 18 15 L 14.5 15 L 15 16 L 19 16 L 19 15 C 19 12.22998 16.77002 10 14 10 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/22/skg-chart-bubble.svg b/icons/actions/22/skg-chart-bubble.svg
--- a/icons/actions/22/skg-chart-bubble.svg
+++ b/icons/actions/22/skg-chart-bubble.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons/actions/22/skrooge_type.svg b/icons/actions/22/skrooge_type.svg
--- a/icons/actions/22/skrooge_type.svg
+++ b/icons/actions/22/skrooge_type.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons/actions/22/snap-bounding-box-center.svg b/icons/actions/22/snap-bounding-box-center.svg
--- a/icons/actions/22/snap-bounding-box-center.svg
+++ b/icons/actions/22/snap-bounding-box-center.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 11 9 A 2 2 0 0 0 9 11 A 2 2 0 0 0 11 13 A 2 2 0 0 0 13 11 A 2 2 0 0 0 11 9 z M 11 10 A 1 1 0 0 1 12 11 A 1 1 0 0 1 11 12 A 1 1 0 0 1 10 11 A 1 1 0 0 1 11 10 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/22/snap-bounding-box-corners.svg b/icons/actions/22/snap-bounding-box-corners.svg
--- a/icons/actions/22/snap-bounding-box-corners.svg
+++ b/icons/actions/22/snap-bounding-box-corners.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 15 15 L 15 19 L 19 19 L 19 15 L 15 15 z M 16 16 L 18 16 L 18 18 L 16 18 L 16 16 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/22/snap-bounding-box-edges.svg b/icons/actions/22/snap-bounding-box-edges.svg
--- a/icons/actions/22/snap-bounding-box-edges.svg
+++ b/icons/actions/22/snap-bounding-box-edges.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 11 12 A 2 2 0 0 0 9 14 A 2 2 0 0 0 11 16 A 2 2 0 0 0 13 14 A 2 2 0 0 0 11 12 z M 11 16 A 2 2 0 0 0 9 18 A 2 2 0 0 0 11 20 A 2 2 0 0 0 13 18 A 2 2 0 0 0 11 16 z M 11 13 A 1 1 0 0 1 12 14 A 1 1 0 0 1 11 15 A 1 1 0 0 1 10 14 A 1 1 0 0 1 11 13 z M 11 17 A 1 1 0 0 1 12 18 A 1 1 0 0 1 11 19 A 1 1 0 0 1 10 18 A 1 1 0 0 1 11 17 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/22/snap-bounding-box-midpoints.svg b/icons/actions/22/snap-bounding-box-midpoints.svg
--- a/icons/actions/22/snap-bounding-box-midpoints.svg
+++ b/icons/actions/22/snap-bounding-box-midpoints.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 15 9 L 15 13 L 19 13 L 19 9 L 15 9 z M 16 10 L 18 10 L 18 12 L 16 12 L 16 10 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/22/snap-grid-guide-intersections.svg b/icons/actions/22/snap-grid-guide-intersections.svg
--- a/icons/actions/22/snap-grid-guide-intersections.svg
+++ b/icons/actions/22/snap-grid-guide-intersections.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 9 11 L 9 15 L 13 15 L 13 11 L 9 11 z M 10 12 L 12 12 L 12 14 L 10 14 L 10 12 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/22/snap-nodes-center.svg b/icons/actions/22/snap-nodes-center.svg
--- a/icons/actions/22/snap-nodes-center.svg
+++ b/icons/actions/22/snap-nodes-center.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 11 9 A 2 2 0 0 0 9 11 A 2 2 0 0 0 11 13 A 2 2 0 0 0 13 11 A 2 2 0 0 0 11 9 z M 11 10 A 1 1 0 0 1 12 11 A 1 1 0 0 1 11 12 A 1 1 0 0 1 10 11 A 1 1 0 0 1 11 10 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/22/snap-nodes-intersection.svg b/icons/actions/22/snap-nodes-intersection.svg
--- a/icons/actions/22/snap-nodes-intersection.svg
+++ b/icons/actions/22/snap-nodes-intersection.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 9 9 L 9 13 L 13 13 L 13 9 L 9 9 z M 10 10 L 12 10 L 12 12 L 10 12 L 10 10 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/22/snap-nodes-rotation-center.svg b/icons/actions/22/snap-nodes-rotation-center.svg
--- a/icons/actions/22/snap-nodes-rotation-center.svg
+++ b/icons/actions/22/snap-nodes-rotation-center.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 14 10 A 4 4 0 0 0 10 14 A 4 4 0 0 0 14 18 A 4 4 0 0 0 18 14 A 4 4 0 0 0 14 10 z M 14 11 A 3 3 0 0 1 17 14 A 3 3 0 0 1 14 17 A 3 3 0 0 1 11 14 A 3 3 0 0 1 14 11 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/22/snap-text-baseline.svg b/icons/actions/22/snap-text-baseline.svg
--- a/icons/actions/22/snap-text-baseline.svg
+++ b/icons/actions/22/snap-text-baseline.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 3 15 L 3 19 L 7 19 L 7 15 L 3 15 z M 4 16 L 6 16 L 6 18 L 4 18 L 4 16 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/22/snap.svg b/icons/actions/22/snap.svg
--- a/icons/actions/22/snap.svg
+++ b/icons/actions/22/snap.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 14 15 L 14 19 L 19 19 L 19 15 L 14 15 z M 15 16 L 18 16 L 18 18 L 15 18 L 15 16 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/22/standard-connector.svg b/icons/actions/22/standard-connector.svg
--- a/icons/actions/22/standard-connector.svg
+++ b/icons/actions/22/standard-connector.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 4.5 3 A 1.4999979 1.5 0 0 0 3 4.5 A 1.4999979 1.5 0 0 0 4.5 6 A 1.4999979 1.5 0 0 0 6 4.5 A 1.4999979 1.5 0 0 0 4.5 3 z M 4.5 4 A 0.5 0.5 0 0 1 5 4.5 A 0.5 0.5 0 0 1 4.5 5 A 0.5 0.5 0 0 1 4 4.5 A 0.5 0.5 0 0 1 4.5 4 z M 17.5 16 A 1.4999979 1.5 0 0 0 16 17.5 A 1.4999979 1.5 0 0 0 17.5 19 A 1.4999979 1.5 0 0 0 19 17.5 A 1.4999979 1.5 0 0 0 17.5 16 z M 17.5 17 A 0.5 0.5 0 0 1 18 17.5 A 0.5 0.5 0 0 1 17.5 18 A 0.5 0.5 0 0 1 17 17.5 A 0.5 0.5 0 0 1 17.5 17 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/22/step_object_ChargedParticle.svg b/icons/actions/22/step_object_ChargedParticle.svg
--- a/icons/actions/22/step_object_ChargedParticle.svg
+++ b/icons/actions/22/step_object_ChargedParticle.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons/actions/22/step_object_CoulombForce.svg b/icons/actions/22/step_object_CoulombForce.svg
--- a/icons/actions/22/step_object_CoulombForce.svg
+++ b/icons/actions/22/step_object_CoulombForce.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 15.5 12 A 3.4999979 3.5 0 0 0 12 15.5 A 3.4999979 3.5 0 0 0 15.5 19 A 3.4999979 3.5 0 0 0 17.972656 17.972656 L 17.267578 17.267578 A 2.5 2.5 0 0 1 15.5 18 A 2.5 2.5 0 0 1 13 15.5 A 2.5 2.5 0 0 1 15.5 13 A 2.5 2.5 0 0 1 17.267578 13.732422 L 17.972656 13.027344 A 3.4999979 3.5 0 0 0 15.5 12 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/22/step_object_GravitationForce.svg b/icons/actions/22/step_object_GravitationForce.svg
--- a/icons/actions/22/step_object_GravitationForce.svg
+++ b/icons/actions/22/step_object_GravitationForce.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 15.5 12 C 13.567 12 12 13.567 12 15.5 C 12 17.433 13.567 19 15.5 19 C 17.23865 18.998 18.75163 17.72081 19 16 L 19 15 L 16 15 L 16 16 L 17.945312 16 C 17.708032 17.16244 16.68641 17.99802 15.5 18 C 14.11929 18 13 16.88071 13 15.5 C 13 14.11929 14.11929 13 15.5 13 C 16.163 13.0001 16.798808 13.263562 17.267578 13.732422 L 17.972656 13.027344 C 17.317176 12.370704 16.42781 12.00118 15.5 12 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/22/step_object_LinearMotor.svg b/icons/actions/22/step_object_LinearMotor.svg
--- a/icons/actions/22/step_object_LinearMotor.svg
+++ b/icons/actions/22/step_object_LinearMotor.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons/actions/22/step_object_WeightForce.svg b/icons/actions/22/step_object_WeightForce.svg
--- a/icons/actions/22/step_object_WeightForce.svg
+++ b/icons/actions/22/step_object_WeightForce.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 11 13 L 11.052734 13.158203 L 13 19 L 14.054688 19 L 15.527344 14.582031 L 17 19 L 18.054688 19 L 20.001953 13.158203 L 20.054688 13 L 19 13 L 17.527344 17.417969 L 16.054688 13 L 15 13 L 13.527344 17.417969 L 12.054688 13 L 11 13 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/22/story-editor.svg b/icons/actions/22/story-editor.svg
--- a/icons/actions/22/story-editor.svg
+++ b/icons/actions/22/story-editor.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons/actions/22/stroke-to-path.svg b/icons/actions/22/stroke-to-path.svg
--- a/icons/actions/22/stroke-to-path.svg
+++ b/icons/actions/22/stroke-to-path.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -22,6 +22,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 15 3 L 15 7 L 19 7 L 19 3 L 15 3 z M 16 4 L 18 4 L 18 6 L 16 6 L 16 4 z M 3 15 L 3 19 L 7 19 L 7 15 L 3 15 z M 4 16 L 6 16 L 6 18 L 4 18 L 4 16 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/22/svn-commit.svg b/icons/actions/22/svn-commit.svg
--- a/icons/actions/22/svn-commit.svg
+++ b/icons/actions/22/svn-commit.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons/actions/22/svn-update.svg b/icons/actions/22/svn-update.svg
--- a/icons/actions/22/svn-update.svg
+++ b/icons/actions/22/svn-update.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons/actions/22/table.svg b/icons/actions/22/table.svg
--- a/icons/actions/22/table.svg
+++ b/icons/actions/22/table.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 4 4 L 4 7 L 4 9 L 9 9 L 9 7 L 9 4 L 7 4 L 4 4 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/22/tag-new.svg b/icons/actions/22/tag-new.svg
--- a/icons/actions/22/tag-new.svg
+++ b/icons/actions/22/tag-new.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons/actions/22/tag-recents.svg b/icons/actions/22/tag-recents.svg
--- a/icons/actions/22/tag-recents.svg
+++ b/icons/actions/22/tag-recents.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons/actions/22/tag.svg b/icons/actions/22/tag.svg
--- a/icons/actions/22/tag.svg
+++ b/icons/actions/22/tag.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons/actions/22/taxes-finances.svg b/icons/actions/22/taxes-finances.svg
--- a/icons/actions/22/taxes-finances.svg
+++ b/icons/actions/22/taxes-finances.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons/actions/22/text-flow-into-frame.svg b/icons/actions/22/text-flow-into-frame.svg
--- a/icons/actions/22/text-flow-into-frame.svg
+++ b/icons/actions/22/text-flow-into-frame.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 11 12 L 11 13 L 15 13 L 15.5 13 C 16.885 13 18 14.115 18 15.5 C 18 16.3187 17.60449 17.035134 17 17.490234 L 17 16 L 16 16 L 16 17.949219 L 16 18 L 16 18.951172 L 16 19 L 17 19 L 19 19 L 19 18 L 17.923828 18 C 18.581798 17.3681 19 16.4903 19 15.5 C 19 13.561 17.439 12 15.5 12 L 11 12 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/22/text-unflow.svg b/icons/actions/22/text-unflow.svg
--- a/icons/actions/22/text-unflow.svg
+++ b/icons/actions/22/text-unflow.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons/actions/22/text-wrap.svg b/icons/actions/22/text-wrap.svg
--- a/icons/actions/22/text-wrap.svg
+++ b/icons/actions/22/text-wrap.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 11 12 L 11 13 L 15 13 L 15.5 13 C 16.885 13 18 14.115 18 15.5 C 18 16.3187 17.604493 17.035134 17 17.490234 L 17 16 L 16 16 L 16 17.949219 L 16 18 L 16 18.951172 L 16 19 L 17 19 L 19 19 L 19 18 L 17.923828 18 C 18.581798 17.3681 19 16.4903 19 15.5 C 19 13.561 17.439 12 15.5 12 L 11 12 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/22/text_horz_kern.svg b/icons/actions/22/text_horz_kern.svg
--- a/icons/actions/22/text_horz_kern.svg
+++ b/icons/actions/22/text_horz_kern.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
 	 d="M 9 3 L 5 6 L 9 9 L 9 3 z M 13 3 L 13 9 L 17 6 L 13 3 z "
-       class="ColorScheme-Highlight"
+       class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/22/text_letter_spacing.svg b/icons/actions/22/text_letter_spacing.svg
--- a/icons/actions/22/text_letter_spacing.svg
+++ b/icons/actions/22/text_letter_spacing.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons/actions/22/text_line_spacing.svg b/icons/actions/22/text_line_spacing.svg
--- a/icons/actions/22/text_line_spacing.svg
+++ b/icons/actions/22/text_line_spacing.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 16 3 L 13 7 L 15 7 L 15 8 L 15 13 L 15 15 L 13 15 L 16 19 L 19 15 L 17 15 L 17 12 L 17 11 L 17 8 L 17 7 L 19 7 L 16 3 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/22/text_rotation.svg b/icons/actions/22/text_rotation.svg
--- a/icons/actions/22/text_rotation.svg
+++ b/icons/actions/22/text_rotation.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
 	d="M 10 3 L 10 19 L 11 19 L 11 16.580078 L 20.359375 18.685547 L 20.591797 17.658203 L 11 15.5 L 11 3 L 10 3 z "
-       class="ColorScheme-Highlight"
+       class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/22/text_subscript.svg b/icons/actions/22/text_subscript.svg
--- a/icons/actions/22/text_subscript.svg
+++ b/icons/actions/22/text_subscript.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons/actions/22/text_superscript.svg b/icons/actions/22/text_superscript.svg
--- a/icons/actions/22/text_superscript.svg
+++ b/icons/actions/22/text_superscript.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons/actions/22/text_vert_kern.svg b/icons/actions/22/text_vert_kern.svg
--- a/icons/actions/22/text_vert_kern.svg
+++ b/icons/actions/22/text_vert_kern.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
 	d="M 10 3 L 10 19 L 11 19 L 11 15 L 20 15 L 20 14 L 11 14 L 11 3 L 10 3 z "
-       class="ColorScheme-Highlight"
+       class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/22/text_word_spacing.svg b/icons/actions/22/text_word_spacing.svg
--- a/icons/actions/22/text_word_spacing.svg
+++ b/icons/actions/22/text_word_spacing.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 10 3 L 6 6 L 10 9 L 10 3 z M 13 3 L 13 9 L 17 6 L 13 3 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/22/timeline-insert.svg b/icons/actions/22/timeline-insert.svg
--- a/icons/actions/22/timeline-insert.svg
+++ b/icons/actions/22/timeline-insert.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,7 +17,7 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 7,5 10,8 13,5 7,5 Z"
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
@@ -27,6 +27,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="m 7,9 6,0 0,5 -6,0 z"
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/22/timeline-overwrite.svg b/icons/actions/22/timeline-overwrite.svg
--- a/icons/actions/22/timeline-overwrite.svg
+++ b/icons/actions/22/timeline-overwrite.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,11 +17,11 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M8 8h6v5H8z"
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="m 8,4 3.000001,3 3,-3 L 8,4 Z"
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/22/tool_color_eraser.svg b/icons/actions/22/tool_color_eraser.svg
--- a/icons/actions/22/tool_color_eraser.svg
+++ b/icons/actions/22/tool_color_eraser.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons/actions/22/tool_curve.svg b/icons/actions/22/tool_curve.svg
--- a/icons/actions/22/tool_curve.svg
+++ b/icons/actions/22/tool_curve.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons/actions/22/tool_elliptical_selection.svg b/icons/actions/22/tool_elliptical_selection.svg
--- a/icons/actions/22/tool_elliptical_selection.svg
+++ b/icons/actions/22/tool_elliptical_selection.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons/actions/22/unmarkasblank.svg b/icons/actions/22/unmarkasblank.svg
--- a/icons/actions/22/unmarkasblank.svg
+++ b/icons/actions/22/unmarkasblank.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons/actions/22/user-group-delete.svg b/icons/actions/22/user-group-delete.svg
--- a/icons/actions/22/user-group-delete.svg
+++ b/icons/actions/22/user-group-delete.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons/actions/22/view-calendar-wedding-anniversary.svg b/icons/actions/22/view-calendar-wedding-anniversary.svg
--- a/icons/actions/22/view-calendar-wedding-anniversary.svg
+++ b/icons/actions/22/view-calendar-wedding-anniversary.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons/actions/22/view-categories-expenditures.svg b/icons/actions/22/view-categories-expenditures.svg
--- a/icons/actions/22/view-categories-expenditures.svg
+++ b/icons/actions/22/view-categories-expenditures.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons/actions/22/view-close.svg b/icons/actions/22/view-close.svg
--- a/icons/actions/22/view-close.svg
+++ b/icons/actions/22/view-close.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons/actions/22/view-left-close.svg b/icons/actions/22/view-left-close.svg
--- a/icons/actions/22/view-left-close.svg
+++ b/icons/actions/22/view-left-close.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons/actions/22/view-media-lyrics.svg b/icons/actions/22/view-media-lyrics.svg
--- a/icons/actions/22/view-media-lyrics.svg
+++ b/icons/actions/22/view-media-lyrics.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons/actions/22/view-pim-tasks-pending.svg b/icons/actions/22/view-pim-tasks-pending.svg
--- a/icons/actions/22/view-pim-tasks-pending.svg
+++ b/icons/actions/22/view-pim-tasks-pending.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons/actions/22/view-right-close.svg b/icons/actions/22/view-right-close.svg
--- a/icons/actions/22/view-right-close.svg
+++ b/icons/actions/22/view-right-close.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons/actions/22/view-time-schedule-baselined-add.svg b/icons/actions/22/view-time-schedule-baselined-add.svg
--- a/icons/actions/22/view-time-schedule-baselined-add.svg
+++ b/icons/actions/22/view-time-schedule-baselined-add.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,7 +17,7 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="m 433.71432,532.79071 0.99995,0 c 10e-6,0 2e-5,10e-6 2e-5,3e-5 l 0,10.99994 c 0,2e-5 -1e-5,3e-5 -2e-5,3e-5 l -0.99995,0 c -10e-6,0 -3e-5,-10e-6 -3e-5,-3e-5 l 0,-10.99994 c 0,-2e-5 2e-5,-3e-5 3e-5,-3e-5 z"
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      transform="translate(-421.71429,-525.79074)"
      />
 </svg>
diff --git a/icons/actions/22/view-time-schedule-baselined-remove.svg b/icons/actions/22/view-time-schedule-baselined-remove.svg
--- a/icons/actions/22/view-time-schedule-baselined-remove.svg
+++ b/icons/actions/22/view-time-schedule-baselined-remove.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons/actions/22/view-time-schedule-baselined.svg b/icons/actions/22/view-time-schedule-baselined.svg
--- a/icons/actions/22/view-time-schedule-baselined.svg
+++ b/icons/actions/22/view-time-schedule-baselined.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,7 +17,7 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="m 433.71432,532.79071 0.99995,0 c 10e-6,0 2e-5,10e-6 2e-5,3e-5 l 0,10.99994 c 0,2e-5 -1e-5,3e-5 -2e-5,3e-5 l -0.99995,0 c -10e-6,0 -3e-5,-10e-6 -3e-5,-3e-5 l 0,-10.99994 c 0,-2e-5 2e-5,-3e-5 3e-5,-3e-5 z"
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      transform="translate(-421.71429,-525.79074)"
      />
 </svg>
diff --git a/icons/actions/22/view-time-schedule-calculus.svg b/icons/actions/22/view-time-schedule-calculus.svg
--- a/icons/actions/22/view-time-schedule-calculus.svg
+++ b/icons/actions/22/view-time-schedule-calculus.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons/actions/22/view-time-schedule-edit.svg b/icons/actions/22/view-time-schedule-edit.svg
--- a/icons/actions/22/view-time-schedule-edit.svg
+++ b/icons/actions/22/view-time-schedule-edit.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons/actions/24/align-horizontal-node.svg b/icons/actions/24/align-horizontal-node.svg
--- a/icons/actions/24/align-horizontal-node.svg
+++ b/icons/actions/24/align-horizontal-node.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 9 4 L 9 8 L 12 6 L 9 4 z M 16 10 L 13 12 L 16 14 L 16 10 z M 9 16 L 9 20 L 12 18 L 9 16 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/24/align-vertical-node.svg b/icons/actions/24/align-vertical-node.svg
--- a/icons/actions/24/align-vertical-node.svg
+++ b/icons/actions/24/align-vertical-node.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 10 8 L 12 11 L 14 8 L 10 8 z M 6 12 L 4 15 L 8 15 L 6 12 z M 18 12 L 16 15 L 20 15 L 18 12 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/24/database-change-key.svg b/icons/actions/24/database-change-key.svg
--- a/icons/actions/24/database-change-key.svg
+++ b/icons/actions/24/database-change-key.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 17.5 3 A 3.499991 3.499991 0 0 0 14 6.5 A 3.499991 3.499991 0 0 0 14.699219 8.59375 L 15.416016 7.8769531 A 2.5 2.5 0 0 1 15 6.5 A 2.5 2.5 0 0 1 17.5 4 A 2.5 2.5 0 0 1 18.876953 4.4160156 L 19.59375 3.6992188 A 3.499991 3.499991 0 0 0 17.5 3 z M 20.300781 4.40625 L 19.583984 5.1230469 A 2.5 2.5 0 0 1 20 6.5 A 2.5 2.5 0 0 1 17.5 9 A 2.5 2.5 0 0 1 16.123047 8.5839844 L 15.40625 9.3007812 A 3.499991 3.499991 0 0 0 17.5 10 A 3.499991 3.499991 0 0 0 21 6.5 A 3.499991 3.499991 0 0 0 20.300781 4.40625 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/24/distribute-graph-directed.svg b/icons/actions/24/distribute-graph-directed.svg
--- a/icons/actions/24/distribute-graph-directed.svg
+++ b/icons/actions/24/distribute-graph-directed.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 5.5 4 A 1.4999959 1.5 0 0 0 4 5.5 A 1.4999959 1.5 0 0 0 5.5 7 A 1.4999959 1.5 0 0 0 7 5.5 A 1.4999959 1.5 0 0 0 5.5 4 z M 18.5 4 A 1.4999959 1.5 0 0 0 17 5.5 A 1.4999959 1.5 0 0 0 18.5 7 A 1.4999959 1.5 0 0 0 20 5.5 A 1.4999959 1.5 0 0 0 18.5 4 z M 12 11 A 1.4999959 1.5 0 0 0 10.5 12.5 A 1.4999959 1.5 0 0 0 12 14 A 1.4999959 1.5 0 0 0 13.5 12.5 A 1.4999959 1.5 0 0 0 12 11 z M 12 17 A 1.4999959 1.5 0 0 0 10.5 18.5 A 1.4999959 1.5 0 0 0 12 20 A 1.4999959 1.5 0 0 0 13.5 18.5 A 1.4999959 1.5 0 0 0 12 17 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/24/distribute-graph.svg b/icons/actions/24/distribute-graph.svg
--- a/icons/actions/24/distribute-graph.svg
+++ b/icons/actions/24/distribute-graph.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 9.5 4 A 1.4999959 1.5 0 0 0 8 5.5 A 1.4999959 1.5 0 0 0 9.5 7 A 1.4999959 1.5 0 0 0 11 5.5 A 1.4999959 1.5 0 0 0 9.5 4 z M 20.5 4 A 1.4999959 1.5 0 0 0 19 5.5 A 1.4999959 1.5 0 0 0 20.5 7 A 1.4999959 1.5 0 0 0 22 5.5 A 1.4999959 1.5 0 0 0 20.5 4 z M 3.5 9 A 1.4999959 1.5 0 0 0 2 10.5 A 1.4999959 1.5 0 0 0 3.5 12 A 1.4999959 1.5 0 0 0 5 10.5 A 1.4999959 1.5 0 0 0 3.5 9 z M 15.5 11 A 1.4999959 1.5 0 0 0 14 12.5 A 1.4999959 1.5 0 0 0 15.5 14 A 1.4999959 1.5 0 0 0 17 12.5 A 1.4999959 1.5 0 0 0 15.5 11 z M 3.5 17 A 1.4999959 1.5 0 0 0 2 18.5 A 1.4999959 1.5 0 0 0 3.5 20 A 1.4999959 1.5 0 0 0 5 18.5 A 1.4999959 1.5 0 0 0 3.5 17 z M 10.5 17 A 1.4999959 1.5 0 0 0 9 18.5 A 1.4999959 1.5 0 0 0 10.5 20 A 1.4999959 1.5 0 0 0 12 18.5 A 1.4999959 1.5 0 0 0 10.5 17 z M 20.5 17 A 1.4999959 1.5 0 0 0 19 18.5 A 1.4999959 1.5 0 0 0 20.5 20 A 1.4999959 1.5 0 0 0 22 18.5 A 1.4999959 1.5 0 0 0 20.5 17 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/24/distribute-horizontal-node.svg b/icons/actions/24/distribute-horizontal-node.svg
--- a/icons/actions/24/distribute-horizontal-node.svg
+++ b/icons/actions/24/distribute-horizontal-node.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 6 4 L 6 8 L 7 8 L 7 7 L 9 7 L 9 8 L 10 8 L 10 4 L 9 4 L 9 5 L 7 5 L 7 4 L 6 4 z M 14 4 L 14 8 L 15 8 L 15 7 L 17 7 L 17 8 L 18 8 L 18 4 L 17 4 L 17 5 L 15 5 L 15 4 L 14 4 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/24/distribute-vertical-node.svg b/icons/actions/24/distribute-vertical-node.svg
--- a/icons/actions/24/distribute-vertical-node.svg
+++ b/icons/actions/24/distribute-vertical-node.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 10 6 L 10 7 L 11 7 L 11 9 L 10 9 L 10 10 L 14 10 L 14 9 L 13 9 L 13 7 L 14 7 L 14 6 L 10 6 z M 10 14 L 10 15 L 11 15 L 11 17 L 10 17 L 10 18 L 14 18 L 14 17 L 13 17 L 13 15 L 14 15 L 14 14 L 10 14 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/24/draw-connector.svg b/icons/actions/24/draw-connector.svg
--- a/icons/actions/24/draw-connector.svg
+++ b/icons/actions/24/draw-connector.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 16 4 L 16 8 L 20 8 L 20 4 L 16 4 z M 17 5 L 19 5 L 19 7 L 17 7 L 17 5 z M 4 16 L 4 20 L 8 20 L 8 16 L 4 16 z M 5 17 L 7 17 L 7 19 L 5 19 L 5 17 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/24/edit-table-insert-column-left.svg b/icons/actions/24/edit-table-insert-column-left.svg
--- a/icons/actions/24/edit-table-insert-column-left.svg
+++ b/icons/actions/24/edit-table-insert-column-left.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 4 4 L 4 5 L 4 13 L 4 14 L 10 14 L 10 13 L 10 10.292969 L 10 5 L 10 4 L 4 4 z M 5 5 L 9 5 L 9 9.2929688 L 5 5.2929688 L 5 5 z M 5 6.7070312 L 9 10.707031 L 9 13 L 8.7070312 13 L 5 9.2929688 L 5 6.7070312 z M 5 10.707031 L 7.2929688 13 L 5 13 L 5 10.707031 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/24/edit-table-insert-column-right.svg b/icons/actions/24/edit-table-insert-column-right.svg
--- a/icons/actions/24/edit-table-insert-column-right.svg
+++ b/icons/actions/24/edit-table-insert-column-right.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 14 4 L 14 5 L 14 10.292969 L 14 13 L 14 14 L 20 14 L 20 13 L 20 5 L 20 4 L 14 4 z M 15 5 L 19 5 L 19 5.2929688 L 15 9.2929688 L 15 5 z M 19 6.7070312 L 19 9.2929688 L 15.292969 13 L 15 13 L 15 10.707031 L 19 6.7070312 z M 19 10.707031 L 19 13 L 16.707031 13 L 19 10.707031 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/24/edit-table-insert-row-above.svg b/icons/actions/24/edit-table-insert-row-above.svg
--- a/icons/actions/24/edit-table-insert-row-above.svg
+++ b/icons/actions/24/edit-table-insert-row-above.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 4 4 L 4 10 L 5 10 L 10.292969 10 L 13 10 L 14 10 L 14 4 L 13 4 L 5 4 L 4 4 z M 5 5 L 5.2929688 5 L 9.2929688 9 L 5 9 L 5 5 z M 6.7070312 5 L 9.2929688 5 L 13 8.7070312 L 13 9 L 10.707031 9 L 6.7070312 5 z M 10.707031 5 L 13 5 L 13 7.2929688 L 10.707031 5 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/24/edit-table-insert-row-below.svg b/icons/actions/24/edit-table-insert-row-below.svg
--- a/icons/actions/24/edit-table-insert-row-below.svg
+++ b/icons/actions/24/edit-table-insert-row-below.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 5 14 L 5 15 L 9.2929688 15 L 5.2929688 19 L 5 19 L 5 20 L 13 20 L 13 19 L 10.707031 19 L 13 16.707031 L 13 15.292969 L 9.2929688 19 L 6.7070312 19 L 10.707031 15 L 13 15 L 13 14 L 10.292969 14 L 5 14 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/24/edit-table-insert-row-under.svg b/icons/actions/24/edit-table-insert-row-under.svg
--- a/icons/actions/24/edit-table-insert-row-under.svg
+++ b/icons/actions/24/edit-table-insert-row-under.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 4 9 L 4 10 L 5 10 L 8.28125 10 L 5 13.28125 L 5 13.292969 L 4.2929688 14 L 4 14 L 4 15 L 5 15 L 12 15 L 14 15 L 14 14 L 13.71875 14 L 14 13.71875 L 14 12.28125 L 12.28125 14 L 12 14 L 9.71875 14 L 12 11.71875 L 13.71875 10 L 14 10 L 14 9 L 12 9 L 9.2929688 9 L 5 9 L 4 9 z M 9.71875 10 L 12 10 L 12.28125 10 L 12 10.28125 L 8.28125 14 L 5.71875 14 L 9.71875 10 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/24/edit-text-frame-update.svg b/icons/actions/24/edit-text-frame-update.svg
--- a/icons/actions/24/edit-text-frame-update.svg
+++ b/icons/actions/24/edit-text-frame-update.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 5 4 L 7 7 L 9 4 L 5 4 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/24/exchange-positions-clockwise.svg b/icons/actions/24/exchange-positions-clockwise.svg
--- a/icons/actions/24/exchange-positions-clockwise.svg
+++ b/icons/actions/24/exchange-positions-clockwise.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 16.5 13 A 3.499991 3.499991 0 0 0 13 16.5 A 3.499991 3.499991 0 0 0 13.699219 18.59375 L 14.416016 17.876953 A 2.5 2.5 0 0 1 14 16.5 A 2.5 2.5 0 0 1 16.5 14 A 2.5 2.5 0 0 1 17.876953 14.416016 L 18.59375 13.699219 A 3.499991 3.499991 0 0 0 16.5 13 z M 19.300781 14.40625 L 18.583984 15.123047 A 2.5 2.5 0 0 1 19 16.5 A 2.5 2.5 0 0 1 16.5 19 A 2.5 2.5 0 0 1 15.123047 18.583984 L 14.40625 19.300781 A 3.499991 3.499991 0 0 0 16.5 20 A 3.499991 3.499991 0 0 0 20 16.5 A 3.499991 3.499991 0 0 0 19.300781 14.40625 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/24/exchange-positions-zorder.svg b/icons/actions/24/exchange-positions-zorder.svg
--- a/icons/actions/24/exchange-positions-zorder.svg
+++ b/icons/actions/24/exchange-positions-zorder.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 14 13 L 13.792969 13.207031 L 12 15 L 12 16.414062 L 13.5 14.914062 L 13.5 19 L 14.5 19 L 14.5 14.914062 L 16 16.414062 L 16 15 L 14.207031 13.207031 L 14 13 z M 17.5 14 L 17.5 18.085938 L 16 16.585938 L 16 18 L 17.792969 19.792969 L 18 20 L 18.207031 19.792969 L 20 18 L 20 16.585938 L 18.5 18.085938 L 18.5 14 L 17.5 14 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/24/format-break-node.svg b/icons/actions/24/format-break-node.svg
--- a/icons/actions/24/format-break-node.svg
+++ b/icons/actions/24/format-break-node.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 10 10.5 L 12 13.5 L 14 10.5 L 10 10.5 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/24/format-connect-node.svg b/icons/actions/24/format-connect-node.svg
--- a/icons/actions/24/format-connect-node.svg
+++ b/icons/actions/24/format-connect-node.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 10 10.5 L 12 13.5 L 14 10.5 L 10 10.5 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/24/format-convert-to-path.svg b/icons/actions/24/format-convert-to-path.svg
--- a/icons/actions/24/format-convert-to-path.svg
+++ b/icons/actions/24/format-convert-to-path.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 2 10 L 2 14 L 6 14 L 6 10 L 2 10 z M 10 10 L 10 14 L 14 14 L 14 10 L 10 10 z M 18 10 L 18 14 L 22 14 L 22 10 L 18 10 z M 3 11 L 5 11 L 5 13 L 3 13 L 3 11 z M 11 11 L 13 11 L 13 13 L 11 13 L 11 11 z M 19 11 L 21 11 L 21 13 L 19 13 L 19 11 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/24/format-disconnect-node.svg b/icons/actions/24/format-disconnect-node.svg
--- a/icons/actions/24/format-disconnect-node.svg
+++ b/icons/actions/24/format-disconnect-node.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 10 10.5 L 12 13.5 L 14 10.5 L 10 10.5 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/24/format-insert-node.svg b/icons/actions/24/format-insert-node.svg
--- a/icons/actions/24/format-insert-node.svg
+++ b/icons/actions/24/format-insert-node.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 17 15 L 17 17 L 15 17 L 15 18 L 17 18 L 17 20 L 18 20 L 18 18 L 20 18 L 20 17 L 18 17 L 18 15 L 17 15 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/24/format-join-node.svg b/icons/actions/24/format-join-node.svg
--- a/icons/actions/24/format-join-node.svg
+++ b/icons/actions/24/format-join-node.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 10 10.5 L 12 13.5 L 14 10.5 L 10 10.5 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/24/format-node-corner.svg b/icons/actions/24/format-node-corner.svg
--- a/icons/actions/24/format-node-corner.svg
+++ b/icons/actions/24/format-node-corner.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 5.5 4 A 1.5 1.5 0 0 0 4 5.5 A 1.5 1.5 0 0 0 5.5 7 A 1.5 1.5 0 0 0 7 5.5 A 1.5 1.5 0 0 0 5.5 4 z M 5.5 5 A 0.5 0.5 0 0 1 6 5.5 A 0.5 0.5 0 0 1 5.5 6 A 0.5 0.5 0 0 1 5 5.5 A 0.5 0.5 0 0 1 5.5 5 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/24/format-node-line.svg b/icons/actions/24/format-node-line.svg
--- a/icons/actions/24/format-node-line.svg
+++ b/icons/actions/24/format-node-line.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 10 11 L 10 14 L 13 14 L 13 11 L 10 11 z M 11 12 L 12 12 L 12 13 L 11 13 L 11 12 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/24/format-node-smooth.svg b/icons/actions/24/format-node-smooth.svg
--- a/icons/actions/24/format-node-smooth.svg
+++ b/icons/actions/24/format-node-smooth.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 8 9 L 8 13 L 12 13 L 12 9 L 8 9 z M 9 10 L 11 10 L 11 12 L 9 12 L 9 10 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/24/format-node-symmetric.svg b/icons/actions/24/format-node-symmetric.svg
--- a/icons/actions/24/format-node-symmetric.svg
+++ b/icons/actions/24/format-node-symmetric.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 10 9 L 10 11 L 7 11 L 7 12 L 10 12 L 10 13 L 14 13 L 14 12 L 17 12 L 17 11 L 14 11 L 14 9 L 10 9 z M 11 10 L 13 10 L 13 12 L 11 12 L 11 10 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/24/format-precision-more.svg b/icons/actions/24/format-precision-more.svg
--- a/icons/actions/24/format-precision-more.svg
+++ b/icons/actions/24/format-precision-more.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 16 16 L 16 18 L 14 18 L 14 19 L 16 19 L 16 21 L 17 21 L 17 19 L 19 19 L 19 18 L 17 18 L 17 16 L 16 16 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/24/format-segment-curve.svg b/icons/actions/24/format-segment-curve.svg
--- a/icons/actions/24/format-segment-curve.svg
+++ b/icons/actions/24/format-segment-curve.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 17 5 A 12 12 0 0 0 5 17 L 6 17 A 11 11 0 0 1 17 6 L 17 5 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/24/format-segment-line.svg b/icons/actions/24/format-segment-line.svg
--- a/icons/actions/24/format-segment-line.svg
+++ b/icons/actions/24/format-segment-line.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 17 6.3125 L 6.3125 17 L 7 17 L 7 17.6875 L 17.6875 7 L 17 7 L 17 6.3125 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/24/format-text-capitalize.svg b/icons/actions/24/format-text-capitalize.svg
--- a/icons/actions/24/format-text-capitalize.svg
+++ b/icons/actions/24/format-text-capitalize.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 7 3 L 4 7 L 10 7 L 7 3 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/24/format-text-lowercase.svg b/icons/actions/24/format-text-lowercase.svg
--- a/icons/actions/24/format-text-lowercase.svg
+++ b/icons/actions/24/format-text-lowercase.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 14 4 L 17 8 L 20 4 L 14 4 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/24/format-text-uppercase.svg b/icons/actions/24/format-text-uppercase.svg
--- a/icons/actions/24/format-text-uppercase.svg
+++ b/icons/actions/24/format-text-uppercase.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 17 3 L 14 7 L 20 7 L 17 3 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/24/insert-page-break.svg b/icons/actions/24/insert-page-break.svg
--- a/icons/actions/24/insert-page-break.svg
+++ b/icons/actions/24/insert-page-break.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 6 11 L 6 12 L 8 12 L 8 11 L 6 11 z M 11 11 L 11 12 L 13 12 L 13 11 L 11 11 z M 16 11 L 16 12 L 18 12 L 18 11 L 16 11 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/24/insert-table-of-contents.svg b/icons/actions/24/insert-table-of-contents.svg
--- a/icons/actions/24/insert-table-of-contents.svg
+++ b/icons/actions/24/insert-table-of-contents.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 17 4 L 17 5 L 18 5 L 18 7 L 17 7 L 17 8 L 18 8 L 19 8 L 20 8 L 20 7 L 19 7 L 19 5 L 20 5 L 20 4 L 19 4 L 18 4 L 17 4 z M 11 6 L 11 7 L 12 7 L 12 6 L 11 6 z M 13 6 L 13 7 L 14 7 L 14 6 L 13 6 z M 15 6 L 15 7 L 16 7 L 16 6 L 15 6 z M 15 10 L 15 11 L 16 11 L 16 13 L 15 13 L 15 14 L 20 14 L 20 13 L 19 13 L 19 11 L 20 11 L 20 10 L 15 10 z M 17 11 L 18 11 L 18 13 L 17 13 L 17 11 z M 9 12 L 9 13 L 10 13 L 10 12 L 9 12 z M 11 12 L 11 13 L 12 13 L 12 12 L 11 12 z M 13 12 L 13 13 L 14 13 L 14 12 L 13 12 z M 13 16 L 13 17 L 14 17 L 14 19 L 13 19 L 13 20 L 14 20 L 15 20 L 16 20 L 20 20 L 20 19 L 19 19 L 19 17 L 20 17 L 20 16 L 16 16 L 15 16 L 14 16 L 13 16 z M 15 17 L 16 17 L 16 19 L 15 19 L 15 17 z M 17 17 L 18 17 L 18 19 L 17 19 L 17 17 z M 7 18 L 7 19 L 8 19 L 8 18 L 7 18 z M 9 18 L 9 19 L 10 19 L 10 18 L 9 18 z M 11 18 L 11 19 L 12 19 L 12 18 L 11 18 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/24/insert-table.svg b/icons/actions/24/insert-table.svg
--- a/icons/actions/24/insert-table.svg
+++ b/icons/actions/24/insert-table.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 5 5 L 5 8 L 5 10 L 10 10 L 10 8 L 10 5 L 8 5 L 5 5 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/24/media-show-active-track-amarok.svg b/icons/actions/24/media-show-active-track-amarok.svg
--- a/icons/actions/24/media-show-active-track-amarok.svg
+++ b/icons/actions/24/media-show-active-track-amarok.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 20 9 L 16 12 L 20 15 L 20 9 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/24/media-track-queue-amarok.svg b/icons/actions/24/media-track-queue-amarok.svg
--- a/icons/actions/24/media-track-queue-amarok.svg
+++ b/icons/actions/24/media-track-queue-amarok.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 17.5 10 L 15 13 L 20 13 L 17.5 10 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/24/node-segment-curve.svg b/icons/actions/24/node-segment-curve.svg
--- a/icons/actions/24/node-segment-curve.svg
+++ b/icons/actions/24/node-segment-curve.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 17 5 A 12 12 0 0 0 5 17 L 6 17 A 11 11 0 0 1 17 6 L 17 5 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/24/node-segment-line.svg b/icons/actions/24/node-segment-line.svg
--- a/icons/actions/24/node-segment-line.svg
+++ b/icons/actions/24/node-segment-line.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 17 4 L 17 7 L 20 7 L 20 4 L 17 4 z M 18 5 L 19 5 L 19 6 L 18 6 L 18 5 z M 4 17 L 4 20 L 7 20 L 7 17 L 4 17 z M 5 18 L 6 18 L 6 19 L 5 19 L 5 18 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/24/node-transform.svg b/icons/actions/24/node-transform.svg
--- a/icons/actions/24/node-transform.svg
+++ b/icons/actions/24/node-transform.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 14 14 L 14 15 L 14 16 L 15 16 L 15 15 L 16 15 L 16 14 L 14 14 z M 18 14 L 18 15 L 19 15 L 19 16 L 20 16 L 20 14 L 19 14 L 18 14 z M 14 18 L 14 20 L 15 20 L 16 20 L 16 19 L 15 19 L 15 18 L 14 18 z M 19 18 L 19 19 L 18 19 L 18 20 L 20 20 L 20 19 L 20 18 L 19 18 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/24/node-type-auto-smooth.svg b/icons/actions/24/node-type-auto-smooth.svg
--- a/icons/actions/24/node-type-auto-smooth.svg
+++ b/icons/actions/24/node-type-auto-smooth.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 12 15 A 2.5 2.5 0 0 0 9.5 17.5 A 2.5 2.5 0 0 0 12 20 A 2.5 2.5 0 0 0 14.5 17.5 A 2.5 2.5 0 0 0 12 15 z M 12 16 A 1.5 1.5 0 0 1 13.5 17.5 A 1.5 1.5 0 0 1 12 19 A 1.5 1.5 0 0 1 10.5 17.5 A 1.5 1.5 0 0 1 12 16 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/24/node-type-cusp.svg b/icons/actions/24/node-type-cusp.svg
--- a/icons/actions/24/node-type-cusp.svg
+++ b/icons/actions/24/node-type-cusp.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 12 15.34375 L 9.171875 18.171875 L 12 21 L 14.828125 18.171875 L 12 15.34375 z M 12 16.757812 L 13.414062 18.171875 L 12 19.585938 L 10.585938 18.171875 L 12 16.757812 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/24/node-type-smooth.svg b/icons/actions/24/node-type-smooth.svg
--- a/icons/actions/24/node-type-smooth.svg
+++ b/icons/actions/24/node-type-smooth.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 9.5 15 L 9.5 20 L 14.5 20 L 14.5 15 L 9.5 15 z M 10.5 16 L 13.5 16 L 13.5 19 L 10.5 19 L 10.5 16 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/24/node-type-symmetric.svg b/icons/actions/24/node-type-symmetric.svg
--- a/icons/actions/24/node-type-symmetric.svg
+++ b/icons/actions/24/node-type-symmetric.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 12 14 L 9 19 L 15 19 L 12 14 z M 12 16 L 13 18 L 11 18 L 12 16 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/24/object-to-path.svg b/icons/actions/24/object-to-path.svg
--- a/icons/actions/24/object-to-path.svg
+++ b/icons/actions/24/object-to-path.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 16 4 L 16 8 L 20 8 L 20 4 L 16 4 z M 17 5 L 19 5 L 19 7 L 17 7 L 17 5 z M 4 16 L 4 20 L 8 20 L 8 16 L 4 16 z M 5 17 L 7 17 L 7 19 L 5 19 L 5 17 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/24/path-effect-parameter-next.svg b/icons/actions/24/path-effect-parameter-next.svg
--- a/icons/actions/24/path-effect-parameter-next.svg
+++ b/icons/actions/24/path-effect-parameter-next.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 17 5 A 12 12 0 0 0 5 17 L 6 17 A 11 11 0 0 1 17 6 L 17 5 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/24/path-reverse.svg b/icons/actions/24/path-reverse.svg
--- a/icons/actions/24/path-reverse.svg
+++ b/icons/actions/24/path-reverse.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 10 10 L 10 14 L 14 14 L 14 10 L 10 10 z M 11 11 L 13 11 L 13 13 L 11 13 L 11 11 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/24/show-node-handles.svg b/icons/actions/24/show-node-handles.svg
--- a/icons/actions/24/show-node-handles.svg
+++ b/icons/actions/24/show-node-handles.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 5.9804688 4 A 2 2 0 0 0 4 6.0136719 A 2 2 0 0 0 5.5 7.9355469 L 5.5 10 L 6.5 10 L 6.5 7.9335938 A 2 2 0 0 0 8 6 L 8 5.9746094 A 2 2 0 0 0 5.9804688 4 z M 5.9902344 5 A 1 1 0 0 1 7 5.9863281 L 7 6 A 1 1 0 0 1 6.0039062 7 A 1 1 0 0 1 5 6.0058594 A 1 1 0 0 1 5.9902344 5 z M 5.5 11 L 5.5 12 L 6.5 12 L 6.5 11 L 5.5 11 z M 4 16 L 4 20 L 8 20 L 8 16 L 4 16 z M 5 17 L 7 17 L 7 19 L 5 19 L 5 17 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/24/snap-bounding-box-center.svg b/icons/actions/24/snap-bounding-box-center.svg
--- a/icons/actions/24/snap-bounding-box-center.svg
+++ b/icons/actions/24/snap-bounding-box-center.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 12 10 A 2 2 0 0 0 10 12 A 2 2 0 0 0 12 14 A 2 2 0 0 0 14 12 A 2 2 0 0 0 12 10 z M 12 11 A 1 1 0 0 1 13 12 A 1 1 0 0 1 12 13 A 1 1 0 0 1 11 12 A 1 1 0 0 1 12 11 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/24/snap-bounding-box-corners.svg b/icons/actions/24/snap-bounding-box-corners.svg
--- a/icons/actions/24/snap-bounding-box-corners.svg
+++ b/icons/actions/24/snap-bounding-box-corners.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 16 16 L 16 20 L 20 20 L 20 16 L 16 16 z M 17 17 L 19 17 L 19 19 L 17 19 L 17 17 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/24/snap-bounding-box-edges.svg b/icons/actions/24/snap-bounding-box-edges.svg
--- a/icons/actions/24/snap-bounding-box-edges.svg
+++ b/icons/actions/24/snap-bounding-box-edges.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 12 13 A 2 2 0 0 0 10 15 A 2 2 0 0 0 12 17 A 2 2 0 0 0 14 15 A 2 2 0 0 0 12 13 z M 12 17 A 2 2 0 0 0 10 19 A 2 2 0 0 0 12 21 A 2 2 0 0 0 14 19 A 2 2 0 0 0 12 17 z M 12 14 A 1 1 0 0 1 13 15 A 1 1 0 0 1 12 16 A 1 1 0 0 1 11 15 A 1 1 0 0 1 12 14 z M 12 18 A 1 1 0 0 1 13 19 A 1 1 0 0 1 12 20 A 1 1 0 0 1 11 19 A 1 1 0 0 1 12 18 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/24/snap-bounding-box-midpoints.svg b/icons/actions/24/snap-bounding-box-midpoints.svg
--- a/icons/actions/24/snap-bounding-box-midpoints.svg
+++ b/icons/actions/24/snap-bounding-box-midpoints.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 16 10 L 16 14 L 20 14 L 20 10 L 16 10 z M 17 11 L 19 11 L 19 13 L 17 13 L 17 11 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/24/snap-grid-guide-intersections.svg b/icons/actions/24/snap-grid-guide-intersections.svg
--- a/icons/actions/24/snap-grid-guide-intersections.svg
+++ b/icons/actions/24/snap-grid-guide-intersections.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 10 12 L 10 16 L 14 16 L 14 12 L 10 12 z M 11 13 L 13 13 L 13 15 L 11 15 L 11 13 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/24/snap-nodes-center.svg b/icons/actions/24/snap-nodes-center.svg
--- a/icons/actions/24/snap-nodes-center.svg
+++ b/icons/actions/24/snap-nodes-center.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 12 10 A 2 2 0 0 0 10 12 A 2 2 0 0 0 12 14 A 2 2 0 0 0 14 12 A 2 2 0 0 0 12 10 z M 12 11 A 1 1 0 0 1 13 12 A 1 1 0 0 1 12 13 A 1 1 0 0 1 11 12 A 1 1 0 0 1 12 11 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/24/snap-nodes-cusp.svg b/icons/actions/24/snap-nodes-cusp.svg
--- a/icons/actions/24/snap-nodes-cusp.svg
+++ b/icons/actions/24/snap-nodes-cusp.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 3 3 L 3 7 L 7 7 L 7 3 L 3 3 z M 17 3 L 17 7 L 21 7 L 21 3 L 17 3 z M 4 4 L 6 4 L 6 6 L 4 6 L 4 4 z M 18 4 L 20 4 L 20 6 L 18 6 L 18 4 z M 3 17 L 3 21 L 7 21 L 7 17 L 3 17 z M 17 17 L 17 21 L 21 21 L 21 17 L 17 17 z M 4 18 L 6 18 L 6 20 L 4 20 L 4 18 z M 18 18 L 20 18 L 20 20 L 18 20 L 18 18 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/24/snap-nodes-intersection.svg b/icons/actions/24/snap-nodes-intersection.svg
--- a/icons/actions/24/snap-nodes-intersection.svg
+++ b/icons/actions/24/snap-nodes-intersection.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 10 10 L 10 14 L 14 14 L 14 10 L 10 10 z M 11 11 L 13 11 L 13 13 L 11 13 L 11 11 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/24/snap-nodes-midpoint.svg b/icons/actions/24/snap-nodes-midpoint.svg
--- a/icons/actions/24/snap-nodes-midpoint.svg
+++ b/icons/actions/24/snap-nodes-midpoint.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 12 9 L 9 15 L 15 15 L 12 9 z M 12 11.236328 L 13.382812 14 L 10.617188 14 L 12 11.236328 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/24/snap-nodes-path.svg b/icons/actions/24/snap-nodes-path.svg
--- a/icons/actions/24/snap-nodes-path.svg
+++ b/icons/actions/24/snap-nodes-path.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 8 6 A 2 2 0 0 0 6 8 A 2 2 0 0 0 8 10 A 2 2 0 0 0 10 8 A 2 2 0 0 0 8 6 z M 8 7 A 1 1 0 0 1 9 8 A 1 1 0 0 1 8 9 A 1 1 0 0 1 7 8 A 1 1 0 0 1 8 7 z M 12 9 A 2 2 0 0 0 10 11 A 2 2 0 0 0 12 13 A 2 2 0 0 0 14 11 A 2 2 0 0 0 12 9 z M 12 10 A 1 1 0 0 1 13 11 A 1 1 0 0 1 12 12 A 1 1 0 0 1 11 11 A 1 1 0 0 1 12 10 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/24/snap-nodes-rotation-center.svg b/icons/actions/24/snap-nodes-rotation-center.svg
--- a/icons/actions/24/snap-nodes-rotation-center.svg
+++ b/icons/actions/24/snap-nodes-rotation-center.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 15 11 A 4 4 0 0 0 11 15 A 4 4 0 0 0 15 19 A 4 4 0 0 0 19 15 A 4 4 0 0 0 15 11 z M 15 12 A 3 3 0 0 1 18 15 A 3 3 0 0 1 15 18 A 3 3 0 0 1 12 15 A 3 3 0 0 1 15 12 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/24/snap-nodes-smooth.svg b/icons/actions/24/snap-nodes-smooth.svg
--- a/icons/actions/24/snap-nodes-smooth.svg
+++ b/icons/actions/24/snap-nodes-smooth.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 10 3 L 10 7 L 14 7 L 14 3 L 10 3 z M 11 4 L 13 4 L 13 6 L 11 6 L 11 4 z M 3 10 L 3 14 L 7 14 L 7 10 L 3 10 z M 17 10 L 17 14 L 21 14 L 21 10 L 17 10 z M 4 11 L 6 11 L 6 13 L 4 13 L 4 11 z M 18 11 L 20 11 L 20 13 L 18 13 L 18 11 z M 10 17 L 10 21 L 14 21 L 14 17 L 10 17 z M 11 18 L 13 18 L 13 20 L 11 20 L 11 18 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/24/snap-text-baseline.svg b/icons/actions/24/snap-text-baseline.svg
--- a/icons/actions/24/snap-text-baseline.svg
+++ b/icons/actions/24/snap-text-baseline.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 4 16 L 4 20 L 8 20 L 8 16 L 4 16 z M 5 17 L 7 17 L 7 19 L 5 19 L 5 17 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/24/snap.svg b/icons/actions/24/snap.svg
--- a/icons/actions/24/snap.svg
+++ b/icons/actions/24/snap.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 15 16 L 15 20 L 20 20 L 20 16 L 15 16 z M 16 17 L 19 17 L 19 19 L 16 19 L 16 17 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/24/stroke-to-path.svg b/icons/actions/24/stroke-to-path.svg
--- a/icons/actions/24/stroke-to-path.svg
+++ b/icons/actions/24/stroke-to-path.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -22,6 +22,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 16 4 L 16 8 L 20 8 L 20 4 L 16 4 z M 17 5 L 19 5 L 19 7 L 17 7 L 17 5 z M 4 16 L 4 20 L 8 20 L 8 16 L 4 16 z M 5 17 L 7 17 L 7 19 L 5 19 L 5 17 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/24/table.svg b/icons/actions/24/table.svg
--- a/icons/actions/24/table.svg
+++ b/icons/actions/24/table.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 5 5 L 5 8 L 5 10 L 10 10 L 10 8 L 10 5 L 8 5 L 5 5 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/24/text-flow-into-frame.svg b/icons/actions/24/text-flow-into-frame.svg
--- a/icons/actions/24/text-flow-into-frame.svg
+++ b/icons/actions/24/text-flow-into-frame.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 12 13 L 12 14 L 16 14 L 16.5 14 C 17.885 14 19 15.115 19 16.5 C 19 17.3187 18.60449 18.035134 18 18.490234 L 18 17 L 17 17 L 17 18.949219 L 17 19 L 17 19.951172 L 17 20 L 18 20 L 20 20 L 20 19 L 18.923828 19 C 19.581798 18.3681 20 17.4903 20 16.5 C 20 14.561 18.439 13 16.5 13 L 12 13 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/24/text-wrap.svg b/icons/actions/24/text-wrap.svg
--- a/icons/actions/24/text-wrap.svg
+++ b/icons/actions/24/text-wrap.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 12 13 L 12 14 L 16 14 L 16.5 14 C 17.885 14 19 15.115 19 16.5 C 19 17.3187 18.604493 18.035134 18 18.490234 L 18 17 L 17 17 L 17 18.949219 L 17 19 L 17 19.951172 L 17 20 L 18 20 L 20 20 L 20 19 L 18.923828 19 C 19.581798 18.3681 20 17.4903 20 16.5 C 20 14.561 18.439 13 16.5 13 L 12 13 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/24/text_horz_kern.svg b/icons/actions/24/text_horz_kern.svg
--- a/icons/actions/24/text_horz_kern.svg
+++ b/icons/actions/24/text_horz_kern.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 10 4 L 6 7 L 10 10 L 10 4 z M 14 4 L 14 10 L 18 7 L 14 4 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/24/text_line_spacing.svg b/icons/actions/24/text_line_spacing.svg
--- a/icons/actions/24/text_line_spacing.svg
+++ b/icons/actions/24/text_line_spacing.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 17 4 L 14 8 L 16 8 L 16 9 L 16 14 L 16 16 L 14 16 L 17 20 L 20 16 L 18 16 L 18 13 L 18 12 L 18 9 L 18 8 L 20 8 L 17 4 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/24/text_rotation.svg b/icons/actions/24/text_rotation.svg
--- a/icons/actions/24/text_rotation.svg
+++ b/icons/actions/24/text_rotation.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 11 4 L 11 20 L 12 20 L 12 17.580078 L 21.359375 19.685547 L 21.591797 18.658203 L 12 16.5 L 12 4 L 11 4 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/24/text_vert_kern.svg b/icons/actions/24/text_vert_kern.svg
--- a/icons/actions/24/text_vert_kern.svg
+++ b/icons/actions/24/text_vert_kern.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 11 4 L 11 20 L 12 20 L 12 16 L 21 16 L 21 15 L 12 15 L 12 4 L 11 4 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/24/text_word_spacing.svg b/icons/actions/24/text_word_spacing.svg
--- a/icons/actions/24/text_word_spacing.svg
+++ b/icons/actions/24/text_word_spacing.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,6 +17,6 @@
  <path 
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 11 4 L 7 7 L 11 10 L 11 4 z M 14 4 L 14 10 L 18 7 L 14 4 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/24/view-time-schedule-baselined-add.svg b/icons/actions/24/view-time-schedule-baselined-add.svg
--- a/icons/actions/24/view-time-schedule-baselined-add.svg
+++ b/icons/actions/24/view-time-schedule-baselined-add.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -15,6 +15,6 @@
      />
  <path style="fill:currentColor;fill-opacity:1;stroke:none" 
        d="M 13 8 L 13 19 L 14 19 L 14 8 L 13 8 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/24/view-time-schedule-baselined.svg b/icons/actions/24/view-time-schedule-baselined.svg
--- a/icons/actions/24/view-time-schedule-baselined.svg
+++ b/icons/actions/24/view-time-schedule-baselined.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -15,6 +15,6 @@
      />
  <path style="fill:currentColor;fill-opacity:1;stroke:none" 
        d="M 13 8 L 13 19 L 14 19 L 14 8 L 13 8 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/32/colors-luma.svg b/icons/actions/32/colors-luma.svg
--- a/icons/actions/32/colors-luma.svg
+++ b/icons/actions/32/colors-luma.svg
@@ -7,7 +7,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons/actions/32/configure.svg b/icons/actions/32/configure.svg
--- a/icons/actions/32/configure.svg
+++ b/icons/actions/32/configure.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons/actions/32/document-print-direct.svg b/icons/actions/32/document-print-direct.svg
--- a/icons/actions/32/document-print-direct.svg
+++ b/icons/actions/32/document-print-direct.svg
@@ -7,7 +7,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -22,6 +22,6 @@
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      id="path10"
      d="M 24,28 29,23.5 24,19 Z" 
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/actions/32/document-print.svg b/icons/actions/32/document-print.svg
--- a/icons/actions/32/document-print.svg
+++ b/icons/actions/32/document-print.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons/actions/32/document-revert.svg b/icons/actions/32/document-revert.svg
--- a/icons/actions/32/document-revert.svg
+++ b/icons/actions/32/document-revert.svg
@@ -7,7 +7,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons/actions/symbolic/media-view-subtitles-symbolic.svg b/icons/actions/symbolic/media-view-subtitles-symbolic.svg
--- a/icons/actions/symbolic/media-view-subtitles-symbolic.svg
+++ b/icons/actions/symbolic/media-view-subtitles-symbolic.svg
@@ -51,7 +51,7 @@
       .ColorScheme-Text {
         color:#bebebe;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -68,7 +68,7 @@
     <path
        style="color:#3daee9;fill:currentColor;fill-opacity:1;stroke:none"
        d="m 426.71,535.79 6,0 0,2 -6,0 z"
-       class="ColorScheme-Highlight"
+       class="olorScheme-ButtonFocus"
        id="path10"
        inkscape:connector-curvature="0" />
   </g>
diff --git a/icons/applets/128/user-ada-lovelace.svg b/icons/applets/128/user-ada-lovelace.svg
--- a/icons/applets/128/user-ada-lovelace.svg
+++ b/icons/applets/128/user-ada-lovelace.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#4d4d4d;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -23,7 +23,7 @@
      transform="translate(0,-924.36216)">
     <path
        style="fill:currentColor;fill-opacity:1;stroke:none" 
-       class="ColorScheme-Highlight"
+       class="olorScheme-ButtonFocus"
        d="M 0 0 L 0 128 L 128 128 L 128 0 L 0 0 z "
        transform="translate(0,924.36216)"
        id="rect5879" />
@@ -44,7 +44,7 @@
        style="opacity:0.1;fill:url(#linearGradient6626);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
     <path
        style="fill:currentColor;fill-opacity:1;stroke:none" 
-       class="ColorScheme-Highlight"
+       class="olorScheme-ButtonFocus"
        d="M 78.640625 7.6796875 L 61.439453 12.800781 C 64.783535 26.177103 84.629499 55.909717 96.462891 51.654297 C 95.713507 53.91554 96.029691 56.274464 96.517578 56.972656 C 95.062694 58.174186 92.674344 66.248965 93.755859 67.796875 C 92.300947 68.998025 91.553227 74.496872 92.634766 76.044922 C 91.179888 77.246422 90.342285 83.305616 91.423828 84.853516 C 89.968872 86.054916 88.027746 89.91685 92.015625 90.34375 C 98.523547 91.04195 101.28846 88.427434 101.47461 87.052734 C 102.92957 85.851034 107.66747 79.497019 106.58594 77.949219 C 108.04087 76.747819 112.77881 70.387754 111.69727 68.839844 C 113.15225 67.638314 116.63257 61.108364 115.54297 59.558594 C 116.99791 58.357064 116.09878 48.321142 105.62109 47.013672 C 103.85655 46.793581 102.40244 46.891515 101.20117 47.205078 C 111.16534 29.496031 78.640625 7.6796875 78.640625 7.6796875 z M 46.080078 10.240234 C 36.986099 10.532664 27.714469 9.4391906 20.925781 27.712891 L 26.214844 47.433594 C 25.155826 47.246586 23.926303 47.212967 22.486328 47.392578 C 12.008635 48.700128 11.109504 58.734027 12.564453 59.935547 C 11.474833 61.485327 14.953263 68.01722 16.408203 69.21875 C 15.326681 70.76653 20.066545 77.126625 21.521484 78.328125 C 20.439961 79.875925 25.177885 86.230041 26.632812 87.431641 C 26.818984 88.806441 29.581923 91.420856 36.089844 90.722656 C 40.077723 90.295756 38.136614 86.433922 36.681641 85.232422 C 37.763184 83.684522 36.925564 77.625228 35.470703 76.423828 C 36.552242 74.875748 35.806489 69.377061 34.351562 68.175781 C 35.433076 66.627871 33.044733 58.553083 31.589844 57.351562 C 32.236395 56.426315 32.580933 52.589676 30.53125 49.925781 C 30.066399 46.928728 28.696322 36.404901 32 32 C 35.840003 26.88 61.440861 24.320781 58.880859 12.800781 L 46.080078 10.240234 z M 47.037109 51.207031 C 45.341856 51.287982 43.654898 52.072176 43.279297 53.642578 C 42.778528 55.736388 43.91402 56.715623 45.990234 57.220703 C 48.066439 57.725723 51.079277 57.566436 51.580078 55.472656 C 52.080879 53.378796 50.761768 51.862482 48.685547 51.357422 C 48.166491 51.231154 47.602194 51.180048 47.037109 51.207031 z M 80.962891 51.207031 C 80.397806 51.180048 79.831556 51.231154 79.3125 51.357422 C 77.236279 51.862482 75.917168 53.378796 76.417969 55.472656 C 76.91877 57.566436 79.931607 57.725723 82.007812 57.220703 C 84.084027 56.715623 85.221472 55.736388 84.720703 53.642578 C 84.345102 52.072176 82.658144 51.287982 80.962891 51.207031 z "
        transform="translate(0,924.36216)"
        id="path6520" />
@@ -59,7 +59,7 @@
        />
     <path
        style="fill:currentColor;fill-opacity:1;stroke:none" 
-       class="ColorScheme-Highlight"
+       class="olorScheme-ButtonFocus"
        d="M 59.621094,86.943359 C 58.456249,86.994962 57.2,87.442797 56,88.591797 c -1.600001,1.532 -4.800781,0.640625 -4.800781,0.640625 1.600001,3.0639 6.400777,8.046875 12.800781,8.046875 6.400003,0 11.20078,-4.982975 12.800781,-8.046875 0,0 -3.20078,0.891375 -4.800781,-0.640625 -3.200001,-3.064 -6.799999,-1.1489 -8,0 -0.750001,-0.718063 -2.437499,-1.734443 -4.378906,-1.648438 z m -5.861328,3.296875 c 6.960101,1.055993 13.379804,0.666984 20.480468,0 0,0 -3.840231,3.839844 -10.240234,3.839844 -6.400004,0 -10.240234,-3.839844 -10.240234,-3.839844 z"
        transform="translate(0,924.36216)"
        />
diff --git a/icons/applets/128/user-alice-in-wonderland.svg b/icons/applets/128/user-alice-in-wonderland.svg
--- a/icons/applets/128/user-alice-in-wonderland.svg
+++ b/icons/applets/128/user-alice-in-wonderland.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#4d4d4d;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -48,16 +48,16 @@
        style="fill:currentColor;fill-opacity:1;stroke:none"
        d="M 0 0 L 0 128 L 128 128 L 128 0 L 0 0 z "
        transform="translate(0,924.36216)"
-       class="ColorScheme-Highlight"
+       class="olorScheme-ButtonFocus"
        id="rect5879" />
   </g>
   <path
      style="opacity:0.2;fill:url(#linearGradient4475);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
      d="m 98.56,11.775988 29.44,29.439944 0,86.783978 -51.2,0 z"
      />
   <path
      style="fill:currentColor;fill-opacity:1;stroke:none" 
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      d="M 64,-3.6072446e-5 C 19.2,-3.6072446e-5 16.64,31.999959 19.2,63.999916 21.80239,96.529702 12.8,121.59991 6.4,127.99991 l 115.2,0 c -6.4,-6.4 -15.40239,-31.470208 -12.8,-63.999994 C 111.36,31.999959 108.8,-3.6072446e-5 64,-3.6072446e-5 Z"
      />
   <path
@@ -70,12 +70,12 @@
      />
   <path
      style="fill:currentColor;fill-opacity:1;stroke:none" 
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      d="m 46.9525,53.527455 c -1.70873,0.09635 -3.40891,1.031025 -3.7875,2.9 -0.50475,2.491916 0.64228,3.656386 2.735,4.257499 2.09271,0.601075 5.12772,0.40934 5.6325,-2.082499 0.50478,-2.491981 -0.82477,-4.293912 -2.9175,-4.895 -0.52318,-0.150268 -1.09292,-0.212115 -1.6625,-0.18 z m 34.095,0 c -0.56958,-0.03212 -1.13932,0.02973 -1.6625,0.18 -2.09273,0.601088 -3.42228,2.403019 -2.9175,4.895 0.50478,2.491839 3.53979,2.683574 5.6325,2.082499 2.09272,-0.601113 3.23975,-1.765583 2.735,-4.257499 -0.37859,-1.868975 -2.07877,-2.803653 -3.7875,-2.9 z M 50.615,87.192451 c -0.0883,-0.02024 -0.20895,-0.01929 -0.3675,0.01 -0.18319,0.03383 -0.41714,0.105869 -0.715,0.224999 -2.38285,0.953216 -0.57425,1.947081 -0.2275,2.525001 1.02209,1.703476 1.07128,0.273577 1.02,-0.685001 1.27393,1.894322 4.83622,5.433142 13.675,5.452515 9.59053,0.02078 12.94495,-4.158529 13.9275,-5.872499 -0.0687,0.687967 -0.2585,3.189992 0.9925,1.105 0.34675,-0.57792 2.15785,-1.571784 -0.225,-2.525 -2.38285,-0.953088 -0.7425,1.145001 -0.7425,1.145001 0,0 2e-5,0.0099 0,0.01 C 77.71991,88.560767 67.16509,87.574983 64,87.574983 c -3.10066,0 -13.0803,0.925688 -13.7175,0.984999 0.0232,-0.02985 0.95087,-1.22583 0.3325,-1.367499 z M 64,88.66495 c 1.45454,0 6.4,0.315 6.4,0.315 -0.36364,0.475136 -1.83435,1.9128 -6.4,1.9 -4.56565,-0.0068 -6.03636,-1.424864 -6.4,-1.9 0,0 4.94546,-0.315 6.4,-0.315 z"
      />
   <path
      style="fill:currentColor;fill-opacity:1;stroke:none" 
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      d="m 72.825,4.3024632 c -2.62104,2.2150252 -4.92839,4.4746561 -6.905,6.7124988 -0.001,-0.0085 -0.001,-0.01652 -0.003,-0.025 l -30.617,2.29 -15.395,18.904997 8.625,12.712498 c 0,0 20.06291,-5.633824 30.845,-16.942497 1.26103,3.003397 4.66746,5.152183 10.77,5.914999 18.10193,2.262746 16.14642,14.084706 20.7875,17.622497 4.64108,3.537779 13.56297,6.617089 13.7225,-9.094999 C 104.92222,16.078511 72.825,4.3024632 72.825,4.3024632 Z"
      />
   <path
diff --git a/icons/applets/128/user-grace-hopper.svg b/icons/applets/128/user-grace-hopper.svg
--- a/icons/applets/128/user-grace-hopper.svg
+++ b/icons/applets/128/user-grace-hopper.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#4d4d4d;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -44,15 +44,15 @@
     <path
        style="fill:currentColor;fill-opacity:1;stroke:none"
        d="M 0 0 L 0 128 L 128 128 L 128 0 L 0 0 z "
-       class="ColorScheme-Highlight"
+       class="olorScheme-ButtonFocus"
        id="rect5879" />
   <path
      style="opacity:0.2;fill:url(#linearGradient4475-2);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
      d="M 98.560547 20.480469 L 76.800781 128 L 128 128 L 128 49.919922 L 98.560547 20.480469 z "
      id="path15" />
   <path
      style="fill:currentColor;fill-opacity:1;stroke:none"
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      d="m 64,6.3999544 c -32,0 -51.2,25.5999996 -44.8,57.5999996 6.275716,31.378582 14.08,25.6 7.68,32 -6.4,6.399996 0,12.799996 6.4,19.199996 6.4,6.4 17.92,6.4 17.92,6.4 l 12.8,0 12.8,0 c 0,0 11.52,0 17.92,-6.4 6.4,-6.4 12.8,-12.8 6.4,-19.199996 -6.4,-6.4 1.40428,-0.621418 7.68,-32 6.4,-32 -12.8,-57.5999996 -44.8,-57.5999996 z"
      id="path17" />
   <path
@@ -69,12 +69,12 @@
      id="path23" />
   <path
      style="fill:currentColor;fill-opacity:1;stroke:none"
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      d="m 47.035,52.487454 c -1.695252,0.08096 -3.379399,0.864604 -3.755,2.435 -0.500769,2.093811 0.633787,3.072425 2.710001,3.5775 2.076202,0.505024 5.089199,0.346286 5.589999,-1.747499 0.500801,-2.093863 -0.81628,-3.609938 -2.8925,-4.115 -0.519055,-0.12626 -1.087416,-0.176985 -1.6525,-0.150001 z m 33.93,0 c -0.565084,-0.02698 -1.133445,0.02373 -1.6525,0.150001 -2.07622,0.505062 -3.393301,2.021137 -2.8925,4.115 0.5008,2.093785 3.513797,2.252523 5.589999,1.747499 2.076213,-0.505075 3.21077,-1.483689 2.710001,-3.5775 -0.375601,-1.570396 -2.059748,-2.354046 -3.755,-2.435 z m -23.49,34.22 C 56.9,86.754699 56.4,86.929479 56,87.312455 c -1.600032,1.532032 -6.08,1.28 -6.08,1.28 0.8,1.531904 2.72,2.743571 5.24,3.572499 2.52,0.829056 5.64,2.555 8.84,2.555 3.2,0 6.32,-1.725944 8.84,-2.555 2.52,-0.828928 4.44,-2.040467 5.24,-3.572499 0,0 -4.479968,0.252032 -6.08,-1.28 -1.6,-1.531904 -4.8,0.2625 -8,0.2625 -2.4,0 -4.8,-1.009233 -6.525,-0.867501 z"
      id="path25" />
   <path
      style="fill:currentColor;fill-opacity:1;stroke:none"
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      d="M 102.19067,33.534828 C 88.8,7.5199544 62.668428,23.030534 62.668428,23.030534 c 0,0 -9.140452,-19.2551556 -26.116181,-1.229607 -12.909601,13.707955 -7.152781,14.019072 -7.152781,14.019072 L 33.278487,16.842015 54.959323,7.1217336 85.640513,11.013382 98.56,20.47998 l 7.3199,11.243392 z"
      id="path27" />
 </svg>
diff --git a/icons/applets/128/user-leonardo-da-vinci.svg b/icons/applets/128/user-leonardo-da-vinci.svg
--- a/icons/applets/128/user-leonardo-da-vinci.svg
+++ b/icons/applets/128/user-leonardo-da-vinci.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#4d4d4d;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -45,7 +45,7 @@
      inkscape:connector-curvature="0"
      id="rect5879"
      d="M 0,0 0,128 128,128 128,0 0,0 Z"
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      style="color:#3daee9;fill:currentColor;fill-opacity:1;stroke:none" />
   <path
      sodipodi:nodetypes="ccccc"
diff --git a/icons/applets/128/user-mahatma-gandhi.svg b/icons/applets/128/user-mahatma-gandhi.svg
--- a/icons/applets/128/user-mahatma-gandhi.svg
+++ b/icons/applets/128/user-mahatma-gandhi.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#4d4d4d;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -43,7 +43,7 @@
   </defs>
   <path
      style="fill:currentColor;fill-opacity:1;stroke:none" 
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      d="M 0 0 L 0 128 L 128 128 L 128 0 L 0 0 z "
      />
   <path
@@ -56,7 +56,7 @@
      />
   <path
      style="fill:currentColor;fill-opacity:1;stroke:none" 
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      d="m 47.0375,49.927454 c -1.695245,0.08095 -3.381901,0.864604 -3.7575,2.435 -0.500767,2.093799 0.636296,3.072425 2.7125,3.5775 2.076196,0.504999 5.086701,0.346274 5.5875,-1.747499 0.500797,-2.09385 -0.816288,-3.609951 -2.8925,-4.115 -0.519053,-0.12626 -1.084918,-0.176985 -1.65,-0.150001 z m 33.925,0 c -0.565082,-0.02698 -1.130947,0.02373 -1.65,0.150001 -2.076212,0.505049 -3.393297,2.02115 -2.8925,4.115 0.500799,2.093773 3.511304,2.252498 5.5875,1.747499 2.076204,-0.505075 3.213267,-1.483701 2.7125,-3.5775 -0.375599,-1.570396 -2.062255,-2.354049 -3.7575,-2.435 z M 64,71.679954 l -8.96,1.12 c -2.56,0 -6.4,2.56 -7.68,3.84 -1.28,1.28 -2.56,5.12 -1.28,6.4 1.28,1.28 3.84,1.28 8.96,0 5.12,-1.28 3.84,0 8.96,0 5.12,0 3.84,-1.28 8.96,0 5.12,1.28 7.68,1.28 8.96,0 1.28,-1.28 0,-5.12 -1.28,-6.4 -1.28,-1.28 -5.12,-3.84 -7.68,-3.84 l -8.96,-1.12 z m -10.275,12.157501 0,0.0026 a 0.640064,0.640064 0 0 0 -0.12,1.262499 c 0,0 5.168334,1.297501 10.395,1.297501 5.226666,0 10.395,-1.297501 10.395,-1.297501 a 0.64029412,0.64029412 0 0 0 -0.31,-1.242499 c 0,0 -5.071666,1.26 -10.085,1.26 -5.013334,0 -10.085,-1.26 -10.085,-1.26 a 0.640064,0.640064 0 0 0 -0.19,-0.0225 z"
      />
   <path
diff --git a/icons/applets/128/user-man.svg b/icons/applets/128/user-man.svg
--- a/icons/applets/128/user-man.svg
+++ b/icons/applets/128/user-man.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#4d4d4d;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -44,7 +44,7 @@
   <path
      style="fill:currentColor;fill-opacity:1;stroke:none"
      d="M 0 0 L 0 128 L 128 128 L 128 0 L 0 0 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      id="rect5879" />
   <path
      style="opacity:0.2;fill:url(#linearGradient4475-2);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
diff --git a/icons/applets/128/user-mowgli.svg b/icons/applets/128/user-mowgli.svg
--- a/icons/applets/128/user-mowgli.svg
+++ b/icons/applets/128/user-mowgli.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#4d4d4d;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -43,24 +43,24 @@
   </defs>
   <path
      style="fill:currentColor;fill-opacity:1;stroke:none" 
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      d="M 0 0 L 0 128 L 128 128 L 128 0 L 0 0 z "/>
   <path
      style="opacity:0.2;fill:url(#linearGradient4475);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
      d="M 98.56,2.8159982 128,32.255938 l 0,95.743962 -51.2,0 z"
      />
   <path
      style="fill:currentColor;fill-opacity:1;stroke:none" 
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      d="M 64,-2.6544892e-5 C 19.2,-2.6544892e-5 16.64,32.000002 19.2,63.999953 c 2.602387,32.529782 32,57.599987 25.6,63.999977 l 38.4,0 c -1.960777,-1.96077 -0.54191,-5.6892 2.4175,-10.83249 0.963388,1.67293 2.890117,4.7562 4.9425,6.35249 2.88,2.24 7.36,2.24 7.36,2.24 0,0 -0.928376,-8.49462 -0.86,-21.31749 3.00999,3.78079 11.42,-0.1225 11.42,-0.1225 0,0 -5.10777,-8.411901 -5.355,-17.847493 0.38735,-0.183813 0.82701,-0.410789 1.355,-0.7125 4.48,-2.56 7.84,-1.12 7.84,-1.12 0,0 -2.66472,-7.049268 -3.5725,-19.077494 3.64843,5.807192 6.7725,10.757497 6.7725,10.757497 0,0 6.24,-8.160036 5.76,-19.519994 -0.3129,-7.40535 -6.93943,-16.373308 -13.335,-25.309993 C 104.26203,13.384643 92.965887,-2.6544892e-5 64,-2.6544892e-5 Z"
      />
   <path
      style="color:#eff0f1;fill:currentColor;fill-opacity:1;stroke:none"
      d="m 66.385,12.752469 c -0.78059,8.4e-4 -1.575829,0.01575 -2.385,0.0475 -25.893472,1.015885 -37.12,14.079996 -35.84,26.879992 1.153336,11.53336 -4.668067,12.123375 -1.28,32.23999 3.840004,22.799993 6.4,25.359992 12.8,31.759989 2.286034,2.28603 5.338065,4.01173 8.565,5.2975 -1.405851,4.91509 -3.737521,11.92754 -7.285,19.02249 l 46.08,0 c -3.547479,-7.09495 -5.879149,-14.1074 -7.285,-19.02249 3.226935,-1.28577 6.278966,-3.01147 8.565,-5.2975 6.4,-6.399997 8.959996,-8.959996 12.8,-31.759989 3.38807,-20.116627 -2.433336,-20.70663 -1.28,-32.23999 C 101.08,27.279965 90.583308,12.726434 66.385,12.752469 Z M 19.0475,52.202457 c -0.351563,0.02812 -0.7275,0.1175 -1.1275,0.2775 -6.4,2.559999 1.628667,13.80774 2.56,15.359995 3.84,6.399998 3.84,-2.559999 3.84,-2.559999 0,0 9.37e-4,-13.499375 -5.2725,-13.077496 z m 89.905,0 c -5.27344,-0.421879 -5.2725,13.077496 -5.2725,13.077496 0,0 0,8.959997 3.84,2.559999 0.93133,-1.552255 8.96,-12.799996 2.56,-15.359995 -0.4,-0.16 -0.77594,-0.249375 -1.1275,-0.2775 z"
      />
   <path
      style="fill:currentColor;fill-opacity:1;stroke:none" 
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      d="m 45.4775,54.169956 c -1.443101,0.08137 -2.880266,0.869068 -3.2,2.4475 -0.426285,2.10455 0.542601,3.089838 2.31,3.597499 1.767392,0.507648 5.23869,1.252037 5.665,-0.8525 0.426313,-2.104576 -1.605095,-4.534851 -3.3725,-5.042499 -0.441851,-0.126911 -0.921466,-0.177121 -1.4025,-0.15 z m 37.045,0 c -0.481034,-0.02712 -0.960649,0.02309 -1.4025,0.15 -1.767405,0.507648 -3.798813,2.937923 -3.3725,5.042499 0.42631,2.104537 3.897608,1.360148 5.665,0.8525 1.767399,-0.507661 2.736285,-1.492962 2.31,-3.597499 -0.319734,-1.578442 -1.756899,-2.366131 -3.2,-2.4475 z m -34.465,30.462491 c -0.08841,-0.02127 -0.209709,-0.01961 -0.37,0.01 -0.183189,0.03383 -0.417144,0.105869 -0.715,0.225 -2.382851,0.953216 -0.574255,1.94708 -0.2275,2.525 1.041993,1.736651 1.076201,0.214298 1.02,-0.742501 1.577043,2.245876 7.145012,8.050089 16.235,8.070014 9.690287,0.02099 15.379265,-6.610856 16.489999,-8.457498 -0.06596,0.644855 -0.277257,3.242092 0.990001,1.130001 0.346755,-0.57792 2.157852,-1.571785 -0.225,-2.525001 -2.382852,-0.953087 -0.7425,1.145001 -0.7425,1.145001 0,0 -0.0023,0.03314 -0.0026,0.035 -0.241373,0.02767 -13.339235,1.527501 -16.51,1.527501 -3.119079,0 -15.632209,-1.428383 -16.28,-1.5025 -6.38e-4,-0.0054 -0.005,-0.05999 -0.005,-0.05999 0,0 0.961376,-1.231105 0.3425,-1.38 z"
      />
   <path
@@ -77,17 +77,17 @@
      />
   <path
      style="fill:currentColor;fill-opacity:1;stroke:none" 
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      d="m 75.495,6.6424713 c -2.242355,0.013215 -5.397267,4.1316897 -6.2125,5.2474987 l -12.375,-0.3075 c 0,0 -13.009658,0.791976 -16.177501,5.769999 -0.08755,0.137583 -0.164971,0.292647 -0.237499,0.454998 -0.293721,-1.739752 -0.689889,-3.607815 -1.235,-5.659997 l -5.11,6.347498 -7.71,1.46 c 0,0 1.470588,5.655205 1.81,15.384994 0.339411,9.729789 -4.18554,12.671438 -4.977499,22.627493 -0.791959,9.956042 2.884999,18.214994 2.884999,18.214994 0,0 1.02725,-1.145367 1.3,-3.054999 0.813342,2.404863 0.8925,4.932499 0.8925,4.932499 0,0 1.616497,-5.218227 0.6925,-8.552498 1.368552,2.678143 2.345,4.225 2.345,4.225 0,0 2.745639,-3.31982 2.6325,-10.447498 -0.08188,-5.158619 -2.99009,-18.492599 -2.327501,-31.214989 0.932881,2.24118 1.658077,4.984557 1.572501,8.022497 -0.226273,8.03274 4.185,9.049997 4.185,9.049997 0,0 -1.810242,-4.185597 0.4525,-10.294997 1.065632,-2.877204 2.273202,-5.765806 2.86,-9.517497 1.321583,7.205055 3.7025,14.722496 3.7025,14.722496 0,0 21.886751,-7.955339 25.5975,-27.257491 1.502469,8.324243 -0.1425,12.889995 -0.1425,12.889995 0,0 5.477729,-2.436006 7.2575,-11.679996 3.010736,11.465587 15.1825,17.562494 15.1825,17.562494 0,0 -1.018282,-8.938734 0.452499,-14.934995 C 94.121463,15.285733 80.756768,12.677926 77.7125,12.14747 77.709409,8.0599435 76.773933,6.6349346 75.495,6.6424713 Z M 92.96,8.3199709 c 0,0 5.12,22.3999931 12.48,23.1999931 7.36,0.799999 7.52,-15.039996 7.52,-15.039996 0,0 -7.04,2.4 -20,-8.1599971 z"
      />
   <path
      style="fill:currentColor;fill-opacity:1;stroke:none" 
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      d="m 86.08,111.99994 -10.56,6.4 8.6025,9.59999 3.307501,0 C 88.12741,124.93902 88.619256,119.41456 86.08,111.99994 Z"
      />
   <path
      style="fill:currentColor;fill-opacity:1;stroke:none" 
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      d="m 83.6,7.759971 c 6.52,0.2 15,-4.8799984 15,-4.8799984 0,0 4,9.2399974 0.8,11.2399964 C 96.2,16.119968 87.88,11.47997 87.88,11.47997 Z"
      />
   <path
diff --git a/icons/applets/128/user-none.svg b/icons/applets/128/user-none.svg
--- a/icons/applets/128/user-none.svg
+++ b/icons/applets/128/user-none.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#4d4d4d;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -34,7 +34,7 @@
     <path
        style="fill:currentColor;fill-opacity:1;stroke:none"
        d="M 0 0 L 0 128 L 128 128 L 128 0 L 0 0 z "
-       class="ColorScheme-Highlight"
+       class="olorScheme-ButtonFocus"
        id="rect5879" />
     <path
        style="opacity:0.2;fill:url(#linearGradient6632);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
diff --git a/icons/applets/64/osd-duplicate.svg b/icons/applets/64/osd-duplicate.svg
--- a/icons/applets/64/osd-duplicate.svg
+++ b/icons/applets/64/osd-duplicate.svg
@@ -7,7 +7,7 @@
       .ColorScheme-Text {
         color:#4d4d4d;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -20,6 +20,6 @@
   <path
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 30 18 L 30 24 L 32 24 L 32 22 L 50 22 L 50 31 L 40 31 L 40 33 L 52 33 L 52 18 L 30 18 z M 12 31 L 12 46 L 34 46 L 34 31 L 12 31 z M 14 35 L 32 35 L 32 44 L 14 44 L 14 35 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/applets/64/osd-rotate-ccw.svg b/icons/applets/64/osd-rotate-ccw.svg
--- a/icons/applets/64/osd-rotate-ccw.svg
+++ b/icons/applets/64/osd-rotate-ccw.svg
@@ -7,7 +7,7 @@
       .ColorScheme-Text {
         color:#4d4d4d;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -20,6 +20,6 @@
   <path
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 32.691406 19 A 13.311049 13.330146 0 0 0 19.949219 28.566406 L 18 27.736328 L 19.691406 31.929688 L 23.880859 30.236328 L 21.916016 29.400391 A 11.181282 11.197323 0 0 1 32.691406 21.132812 A 11.181282 11.197323 0 0 1 43.873047 32.330078 A 11.181282 11.197323 0 0 1 38.564453 41.839844 L 39.945312 43.5 A 13.311049 13.330146 0 0 0 46 32.330078 A 13.311049 13.330146 0 0 0 32.691406 19 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/applets/64/osd-rotate-cw.svg b/icons/applets/64/osd-rotate-cw.svg
--- a/icons/applets/64/osd-rotate-cw.svg
+++ b/icons/applets/64/osd-rotate-cw.svg
@@ -7,7 +7,7 @@
       .ColorScheme-Text {
         color:#4d4d4d;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -20,6 +20,6 @@
   <path
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 31.308594 19 A 13.311049 13.330146 0 0 0 18 32.330078 A 13.311049 13.330146 0 0 0 24.054688 43.5 L 25.435547 41.839844 A 11.181282 11.197323 0 0 1 20.126953 32.330078 A 11.181282 11.197323 0 0 1 31.308594 21.132812 A 11.181282 11.197323 0 0 1 42.083984 29.400391 L 40.119141 30.236328 L 44.308594 31.929688 L 46 27.736328 L 44.050781 28.566406 A 13.311049 13.330146 0 0 0 31.308594 19 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/applets/64/osd-rotate-flip.svg b/icons/applets/64/osd-rotate-flip.svg
--- a/icons/applets/64/osd-rotate-flip.svg
+++ b/icons/applets/64/osd-rotate-flip.svg
@@ -7,7 +7,7 @@
       .ColorScheme-Text {
         color:#4d4d4d;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -20,6 +20,6 @@
   <path
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 32 20.798828 L 28.638672 24.160156 L 30.878906 24.160156 L 30.878906 39.839844 L 28.638672 39.839844 L 32 43.199219 L 35.359375 39.839844 L 33.119141 39.839844 L 33.119141 24.160156 L 35.359375 24.160156 L 32 20.798828 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/applets/64/osd-rotate-normal.svg b/icons/applets/64/osd-rotate-normal.svg
--- a/icons/applets/64/osd-rotate-normal.svg
+++ b/icons/applets/64/osd-rotate-normal.svg
@@ -7,7 +7,7 @@
       .ColorScheme-Text {
         color:#4d4d4d;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -20,6 +20,6 @@
   <path
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 14 19 L 14 36.144531 L 37 36 L 37 19 L 14 19 z M 16 23 L 35 23 L 35 34 L 16 34 L 16 23 z M 49 25.855469 L 38 26 L 38 30 L 47 30 L 47 41 L 28 41 L 28 37 L 26 37 L 26 43 L 49 43 L 49 25.855469 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/applets/64/osd-sbs-left.svg b/icons/applets/64/osd-sbs-left.svg
--- a/icons/applets/64/osd-sbs-left.svg
+++ b/icons/applets/64/osd-sbs-left.svg
@@ -7,7 +7,7 @@
       .ColorScheme-Text {
         color:#4d4d4d;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -20,6 +20,6 @@
   <path
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 18 27 L 18 38 L 27 38 L 27 37 L 20 37 L 20 30 L 27 30 L 27 27 L 18 27 z M 31 27 L 31 30 L 40 30 L 40 37 L 31 37 L 31 38 L 42 38 L 42 27 L 31 27 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/applets/64/osd-sbs-sright.svg b/icons/applets/64/osd-sbs-sright.svg
--- a/icons/applets/64/osd-sbs-sright.svg
+++ b/icons/applets/64/osd-sbs-sright.svg
@@ -7,7 +7,7 @@
       .ColorScheme-Text {
         color:#4d4d4d;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -20,6 +20,6 @@
   <path
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 22.064453 25.935547 L 22 38 L 33 38 L 33 37 L 24 37 L 24 29 L 33 29 L 33 26 L 22.064453 25.935547 z M 37 26 L 37 29 L 44 29 L 44 37 L 37 37 L 37 38 L 46 38 L 46 26 L 37 26 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
 </svg>
diff --git a/icons/applets/64/osd-shutd-laptop.svg b/icons/applets/64/osd-shutd-laptop.svg
--- a/icons/applets/64/osd-shutd-laptop.svg
+++ b/icons/applets/64/osd-shutd-laptop.svg
@@ -7,7 +7,7 @@
       .ColorScheme-Text {
         color:#4d4d4d;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       .ColorScheme-NegativeText {
@@ -23,7 +23,7 @@
   <path
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 30 18 L 30 24 L 32 24 L 32 22 L 49 22 L 49 31 L 41 31 L 41 33 L 51 33 L 51 18 L 30 18 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
   <path
      style="fill:currentColor;fill-opacity:1;stroke:none" 
diff --git a/icons/applets/64/osd-shutd-screen.svg b/icons/applets/64/osd-shutd-screen.svg
--- a/icons/applets/64/osd-shutd-screen.svg
+++ b/icons/applets/64/osd-shutd-screen.svg
@@ -7,7 +7,7 @@
       .ColorScheme-Text {
         color:#4d4d4d;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       .ColorScheme-NegativeText {
@@ -23,7 +23,7 @@
   <path
      style="fill:currentColor;fill-opacity:1;stroke:none" 
      d="M 12 30 L 12 45 L 34 45 L 34 30 L 12 30 z M 14 34 L 32 34 L 32 43 L 14 43 L 14 34 z "
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      />
   <path
      style="fill:currentColor;fill-opacity:1;stroke:none" 
diff --git a/icons/emblems/16/emblem-added.svg b/icons/emblems/16/emblem-added.svg
--- a/icons/emblems/16/emblem-added.svg
+++ b/icons/emblems/16/emblem-added.svg
@@ -2,14 +2,14 @@
     <style
         type="text/css"
         id="current-color-scheme">
-        .ColorScheme-Highlight {
+        .olorScheme-ButtonFocus {
             color:#3daee9;
         }
         .ColorScheme-Text {
             color:#232629;
         }
     </style>
-    <rect style="fill:currentColor;fill-opacity:1;stroke:none" class="ColorScheme-Highlight" height="16" rx="2" width="16"/>
+    <rect style="fill:currentColor;fill-opacity:1;stroke:none" class="olorScheme-ButtonFocus" height="16" rx="2" width="16"/>
     <path style="fill:currentColor;fill-opacity:0.6;stroke:none" class="ColorScheme-Text" d="M2 0C.892 0 0 .892 0 2v12c0 1.108.892 2 2 2h12c1.108 0 2-.892 2-2V2c0-1.108-.892-2-2-2zm0 1h12c.554 0 1 .446 1 1v12c0 .554-.446 1-1 1H2c-.554 0-1-.446-1-1V2c0-.554.446-1 1-1z"/>
     <path d="M7 2v5H2v2h5v5h2V9h5V7H9V2z" fill="#fff"/>
 </svg>
diff --git a/icons/emblems/16/emblem-information.svg b/icons/emblems/16/emblem-information.svg
--- a/icons/emblems/16/emblem-information.svg
+++ b/icons/emblems/16/emblem-information.svg
@@ -2,14 +2,14 @@
     <style
         type="text/css"
         id="current-color-scheme">
-        .ColorScheme-Highlight {
+        .olorScheme-ButtonFocus {
             color:#3daee9;
         }
         .ColorScheme-Text {
             color:#232629;
         }
     </style>
-    <rect style="fill:currentColor;fill-opacity:1;stroke:none" class="ColorScheme-Highlight" height="16" rx="2" width="16"/>
+    <rect style="fill:currentColor;fill-opacity:1;stroke:none" class="olorScheme-ButtonFocus" height="16" rx="2" width="16"/>
     <path style="fill:currentColor;fill-opacity:0.6;stroke:none" class="ColorScheme-Text" d="M2 0C.892 0 0 .892 0 2v12c0 1.108.892 2 2 2h12c1.108 0 2-.892 2-2V2c0-1.108-.892-2-2-2zm0 1h12c.554 0 1 .446 1 1v12c0 .554-.446 1-1 1H2c-.554 0-1-.446-1-1V2c0-.554.446-1 1-1z"/>
     <path d="M7 2v2h2V2zm0 3v9h2V5z" fill="#fff"/>
 </svg>
diff --git a/icons/emblems/16/emblem-remove.svg b/icons/emblems/16/emblem-remove.svg
--- a/icons/emblems/16/emblem-remove.svg
+++ b/icons/emblems/16/emblem-remove.svg
@@ -2,14 +2,14 @@
     <style
         type="text/css"
         id="current-color-scheme">
-        .ColorScheme-Highlight {
+        .olorScheme-ButtonFocus {
             color:#3daee9;
         }
         .ColorScheme-Text {
             color:#232629;
         }
     </style>
-    <rect style="fill:currentColor;fill-opacity:1;stroke:none" class="ColorScheme-Highlight" height="16" rx="2" width="16"/>
+    <rect style="fill:currentColor;fill-opacity:1;stroke:none" class="olorScheme-ButtonFocus" height="16" rx="2" width="16"/>
     <path style="fill:currentColor;fill-opacity:0.6;stroke:none" class="ColorScheme-Text" d="M2 0C.892 0 0 .892 0 2v12c0 1.108.892 2 2 2h12c1.108 0 2-.892 2-2V2c0-1.108-.892-2-2-2zm0 1h12c.554 0 1 .446 1 1v12c0 .554-.446 1-1 1H2c-.554 0-1-.446-1-1V2c0-.554.446-1 1-1z"/>
     <path d="M2 7v2h12V7z" fill="#fff"/>
 </svg>
diff --git a/icons/emblems/16/emblem-shared.svg b/icons/emblems/16/emblem-shared.svg
--- a/icons/emblems/16/emblem-shared.svg
+++ b/icons/emblems/16/emblem-shared.svg
@@ -2,14 +2,14 @@
     <style
         type="text/css"
         id="current-color-scheme">
-        .ColorScheme-Highlight {
+        .olorScheme-ButtonFocus {
             color:#3daee9;
         }
         .ColorScheme-Text {
             color:#232629;
         }
     </style>
-    <rect style="fill:currentColor;fill-opacity:1;stroke:none" class="ColorScheme-Highlight" height="16" rx="2" width="16"/>
+    <rect style="fill:currentColor;fill-opacity:1;stroke:none" class="olorScheme-ButtonFocus" height="16" rx="2" width="16"/>
     <path style="fill:currentColor;fill-opacity:0.6;stroke:none" class="ColorScheme-Text" d="M2 0C.892 0 0 .892 0 2v12c0 1.108.892 2 2 2h12c1.108 0 2-.892 2-2V2c0-1.108-.892-2-2-2zm0 1h12c.554 0 1 .446 1 1v12c0 .554-.446 1-1 1H2c-.554 0-1-.446-1-1V2c0-.554.446-1 1-1z"/>
     <path d="M11.5 2a1.5 1.5 0 1 0 0 3 1.5 1.5 0 0 0 0-3zm-3 3a.5.5 0 1 0 0 1 .5.5 0 0 0 0-1zm-2 1a.5.5 0 1 0 0 1 .5.5 0 0 0 0-1zm-3 1a1.5 1.5 0 1 0 0 3 1.5 1.5 0 0 0 0-3zm3 3a.5.5 0 1 0 0 1 .5.5 0 0 0 0-1zm2 1a.5.5 0 1 0 0 1 .5.5 0 0 0 0-1zm3 0a1.5 1.5 0 1 0 0 3 1.5 1.5 0 0 0 0-3z" fill="#fff"/>
 </svg>
diff --git a/icons/emblems/16/package-install-auto.svg b/icons/emblems/16/package-install-auto.svg
--- a/icons/emblems/16/package-install-auto.svg
+++ b/icons/emblems/16/package-install-auto.svg
@@ -2,14 +2,14 @@
     <style
         type="text/css"
         id="current-color-scheme">
-        .ColorScheme-Highlight {
+        .olorScheme-ButtonFocus {
             color:#3daee9;
         }
         .ColorScheme-Text {
             color:#232629;
         }
     </style>
-    <rect style="fill:currentColor;fill-opacity:1;stroke:none" class="ColorScheme-Highlight" height="16" rx="2" width="16"/>
+    <rect style="fill:currentColor;fill-opacity:1;stroke:none" class="olorScheme-ButtonFocus" height="16" rx="2" width="16"/>
     <path d="m2 0c-1.108 0-2 .892-2 2v12c0 1.108.892 2 2 2h12c1.108 0 2-.892 2-2v-12c0-1.108-.892-2-2-2zm0 1h12c.554 0 1 .446 1 1v12c0 .554-.446 1-1 1h-12c-.554 0-1-.446-1-1v-12c0-.554.446-1 1-1z" style="fill:currentColor;fill-opacity:0.6;stroke:none" class="ColorScheme-Text"/>
     <g fill="#fff">
         <path d="m7 2v4h-4v2h4v4h2v-4h4v-2h-4v-4z"/>
diff --git a/icons/emblems/16/package-reinstall.svg b/icons/emblems/16/package-reinstall.svg
--- a/icons/emblems/16/package-reinstall.svg
+++ b/icons/emblems/16/package-reinstall.svg
@@ -2,14 +2,14 @@
     <style
         type="text/css"
         id="current-color-scheme">
-        .ColorScheme-Highlight {
+        .olorScheme-ButtonFocus {
             color:#3daee9;
         }
         .ColorScheme-Text {
             color:#232629;
         }
     </style>
-    <rect style="fill:currentColor;fill-opacity:1;stroke:none" class="ColorScheme-Highlight" height="16" rx="2" width="16"/>
+    <rect style="fill:currentColor;fill-opacity:1;stroke:none" class="olorScheme-ButtonFocus" height="16" rx="2" width="16"/>
     <path d="M2 0C.892 0 0 .892 0 2v12c0 1.108.892 2 2 2h12c1.108 0 2-.892 2-2V2c0-1.108-.892-2-2-2zm0 1h12c.554 0 1 .446 1 1v12c0 .554-.446 1-1 1H2c-.554 0-1-.446-1-1V2c0-.554.446-1 1-1z" style="fill:currentColor;fill-opacity:0.6;stroke:none" class="ColorScheme-Text"/>
     <path d="M8 1v2a5 5 0 0 0-5 5 5 5 0 0 0 5 5 5 5 0 0 0 5-5h-2a3 3 0 0 1-3 3 3 3 0 0 1-3-3 3 3 0 0 1 3-3v2l4-3z" fill="#fff"/>
 </svg>
diff --git a/icons/emblems/16/package-upgrade-auto.svg b/icons/emblems/16/package-upgrade-auto.svg
--- a/icons/emblems/16/package-upgrade-auto.svg
+++ b/icons/emblems/16/package-upgrade-auto.svg
@@ -2,14 +2,14 @@
     <style
         type="text/css"
         id="current-color-scheme">
-        .ColorScheme-Highlight {
+        .olorScheme-ButtonFocus {
             color:#3daee9;
         }
         .ColorScheme-Text {
             color:#232629;
         }
     </style>
-    <rect style="fill:currentColor;fill-opacity:1;stroke:none" class="ColorScheme-Highlight" height="16" rx="2" width="16"/>
+    <rect style="fill:currentColor;fill-opacity:1;stroke:none" class="olorScheme-ButtonFocus" height="16" rx="2" width="16"/>
     <path d="M2 0C.892 0 0 .892 0 2v12c0 1.108.892 2 2 2h12c1.108 0 2-.892 2-2V2c0-1.108-.892-2-2-2zm0 1h12c.554 0 1 .446 1 1v12c0 .554-.446 1-1 1H2c-.554 0-1-.446-1-1V2c0-.554.446-1 1-1z" style="fill:currentColor;fill-opacity:0.6;stroke:none" class="ColorScheme-Text"/>
     
     <g fill="#fff">
diff --git a/icons/emblems/16/package-upgrade.svg b/icons/emblems/16/package-upgrade.svg
--- a/icons/emblems/16/package-upgrade.svg
+++ b/icons/emblems/16/package-upgrade.svg
@@ -2,14 +2,14 @@
     <style
         type="text/css"
         id="current-color-scheme">
-        .ColorScheme-Highlight {
+        .olorScheme-ButtonFocus {
             color:#3daee9;
         }
         .ColorScheme-Text {
             color:#232629;
         }
     </style>
-    <rect style="fill:currentColor;fill-opacity:1;stroke:none" class="ColorScheme-Highlight" height="16" rx="2" width="16"/>
+    <rect style="fill:currentColor;fill-opacity:1;stroke:none" class="olorScheme-ButtonFocus" height="16" rx="2" width="16"/>
     <path d="M2 0C.892 0 0 .892 0 2v12c0 1.108.892 2 2 2h12c1.108 0 2-.892 2-2V2c0-1.108-.892-2-2-2zm0 1h12c.554 0 1 .446 1 1v12c0 .554-.446 1-1 1H2c-.554 0-1-.446-1-1V2c0-.554.446-1 1-1z" style="fill:currentColor;fill-opacity:0.6;stroke:none" class="ColorScheme-Text"/>
     <path d="M8 4l-6 6 1.414 1.414L8 6.828l4.586 4.586L14 10z" fill="#fff"/>
 </svg>
diff --git a/icons/emblems/16/rating.svg b/icons/emblems/16/rating.svg
--- a/icons/emblems/16/rating.svg
+++ b/icons/emblems/16/rating.svg
@@ -2,12 +2,12 @@
     <style
         type="text/css"
         id="current-color-scheme">
-        .ColorScheme-Highlight {
+        .olorScheme-ButtonFocus {
             color:#3daee9;
         }
         .ColorScheme-Text {
             color:#232629;
         }
     </style>
-    <path style="fill:currentColor;fill-opacity:1;stroke:none" class="ColorScheme-Highlight" d="M8 .188l2.472 5.009L16 6l-4 3.899.944 5.506L8 12.805l-4.944 2.6L4 9.899 0 6l5.528-.803z"/>
+    <path style="fill:currentColor;fill-opacity:1;stroke:none" class="olorScheme-ButtonFocus" d="M8 .188l2.472 5.009L16 6l-4 3.899.944 5.506L8 12.805l-4.944 2.6L4 9.899 0 6l5.528-.803z"/>
 </svg>
diff --git a/icons/emblems/16/vcs-added.svg b/icons/emblems/16/vcs-added.svg
--- a/icons/emblems/16/vcs-added.svg
+++ b/icons/emblems/16/vcs-added.svg
@@ -2,14 +2,14 @@
     <style
         type="text/css"
         id="current-color-scheme">
-        .ColorScheme-Highlight {
+        .olorScheme-ButtonFocus {
             color:#3daee9;
         }
         .ColorScheme-Text {
             color:#232629;
         }
     </style>
-    <path style="fill:currentColor;fill-opacity:1;stroke:none" class="ColorScheme-Highlight" d="M8 0a8 8 0 0 0-8 8 8 8 0 0 0 8 8 8 8 0 0 0 8-8 8 8 0 0 0-8-8z"/>
+    <path style="fill:currentColor;fill-opacity:1;stroke:none" class="olorScheme-ButtonFocus" d="M8 0a8 8 0 0 0-8 8 8 8 0 0 0 8 8 8 8 0 0 0 8-8 8 8 0 0 0-8-8z"/>
     <path style="fill:currentColor;fill-opacity:0.6;stroke:none" class="ColorScheme-Text" d="M8 0a8 8 0 0 0-8 8 8 8 0 0 0 8 8 8 8 0 0 0 8-8 8 8 0 0 0-8-8zm0 1a7 7 0 0 1 7 7 7 7 0 0 1-7 7 7 7 0 0 1-7-7 7 7 0 0 1 7-7z"/>
     <path d="M7 2v5H2v2h5v5h2V9h5V7H9V2z" fill="#fff"/>
 </svg>
diff --git a/icons/emblems/16/vcs-locally-modified.svg b/icons/emblems/16/vcs-locally-modified.svg
--- a/icons/emblems/16/vcs-locally-modified.svg
+++ b/icons/emblems/16/vcs-locally-modified.svg
@@ -2,14 +2,14 @@
     <style
         type="text/css"
         id="current-color-scheme">
-        .ColorScheme-Highlight {
+        .olorScheme-ButtonFocus {
             color:#3daee9;
         }
         .ColorScheme-Text {
             color:#232629;
         }
     </style>
-    <circle style="fill:currentColor;fill-opacity:1;stroke:none" class="ColorScheme-Highlight" cx="8" cy="8" r="8"/>
+    <circle style="fill:currentColor;fill-opacity:1;stroke:none" class="olorScheme-ButtonFocus" cx="8" cy="8" r="8"/>
     <path style="fill:currentColor;fill-opacity:0.6;stroke:none" class="ColorScheme-Text" d="M8 0a8 8 0 0 0-8 8 8 8 0 0 0 8 8 8 8 0 0 0 8-8 8 8 0 0 0-8-8zm0 1a7 7 0 0 1 7 7 7 7 0 0 1-7 7 7 7 0 0 1-7-7 7 7 0 0 1 7-7z"/>
     <path d="M10 5v2H4a2 2 0 0 0-2 2v2.59a7 7 0 0 0 2 2.152V10a1 1 0 0 1 1-1h5v2l4-3z" fill="#fff"/>
 </svg>
diff --git a/icons/emblems/22/emblem-added.svg b/icons/emblems/22/emblem-added.svg
--- a/icons/emblems/22/emblem-added.svg
+++ b/icons/emblems/22/emblem-added.svg
@@ -2,14 +2,14 @@
     <style
         type="text/css"
         id="current-color-scheme">
-        .ColorScheme-Highlight {
+        .olorScheme-ButtonFocus {
             color:#3daee9;
         }
         .ColorScheme-Text {
             color:#232629;
         }
     </style>
-    <rect style="fill:currentColor;fill-opacity:1;stroke:none" class="ColorScheme-Highlight" height="22" rx="2" width="22"/>
+    <rect style="fill:currentColor;fill-opacity:1;stroke:none" class="olorScheme-ButtonFocus" height="22" rx="2" width="22"/>
     <path d="M10 3v7H3v2h7v7h2v-7h7v-2h-7V3z" fill="#fff"/>
     <path d="M2 0C.892 0 0 .892 0 2v18c0 1.108.892 2 2 2h18c1.108 0 2-.892 2-2V2c0-1.108-.892-2-2-2zm0 1h18c.554 0 1 .446 1 1v18c0 .554-.446 1-1 1H2c-.554 0-1-.446-1-1V2c0-.554.446-1 1-1z" style="fill:currentColor;fill-opacity:0.6;stroke:none" class="ColorScheme-Text"/>
 </svg>
diff --git a/icons/emblems/22/emblem-information.svg b/icons/emblems/22/emblem-information.svg
--- a/icons/emblems/22/emblem-information.svg
+++ b/icons/emblems/22/emblem-information.svg
@@ -2,14 +2,14 @@
     <style
         type="text/css"
         id="current-color-scheme">
-        .ColorScheme-Highlight {
+        .olorScheme-ButtonFocus {
             color:#3daee9;
         }
         .ColorScheme-Text {
             color:#232629;
         }
     </style>
-    <rect style="fill:currentColor;fill-opacity:1;stroke:none" class="ColorScheme-Highlight" height="22" rx="2" width="22"/>
+    <rect style="fill:currentColor;fill-opacity:1;stroke:none" class="olorScheme-ButtonFocus" height="22" rx="2" width="22"/>
     <path d="M10 3v2h2V3zm0 4v12h2V7z" fill="#fff"/>
     <path d="M2 0C.892 0 0 .892 0 2v18c0 1.108.892 2 2 2h18c1.108 0 2-.892 2-2V2c0-1.108-.892-2-2-2zm0 1h18c.554 0 1 .446 1 1v18c0 .554-.446 1-1 1H2c-.554 0-1-.446-1-1V2c0-.554.446-1 1-1z" style="fill:currentColor;fill-opacity:0.6;stroke:none" class="ColorScheme-Text"/>
 </svg>
diff --git a/icons/emblems/22/emblem-remove.svg b/icons/emblems/22/emblem-remove.svg
--- a/icons/emblems/22/emblem-remove.svg
+++ b/icons/emblems/22/emblem-remove.svg
@@ -2,14 +2,14 @@
     <style
         type="text/css"
         id="current-color-scheme">
-        .ColorScheme-Highlight {
+        .olorScheme-ButtonFocus {
             color:#3daee9;
         }
         .ColorScheme-Text {
             color:#232629;
         }
     </style>
-    <rect style="fill:currentColor;fill-opacity:1;stroke:none" class="ColorScheme-Highlight" height="22" rx="2" width="22"/>
+    <rect style="fill:currentColor;fill-opacity:1;stroke:none" class="olorScheme-ButtonFocus" height="22" rx="2" width="22"/>
     <path d="M3 10v2h16v-2z" fill="#fff"/>
     <path d="M2 0C.892 0 0 .892 0 2v18c0 1.108.892 2 2 2h18c1.108 0 2-.892 2-2V2c0-1.108-.892-2-2-2zm0 1h18c.554 0 1 .446 1 1v18c0 .554-.446 1-1 1H2c-.554 0-1-.446-1-1V2c0-.554.446-1 1-1z" style="fill:currentColor;fill-opacity:0.6;stroke:none" class="ColorScheme-Text"/>
 </svg>
diff --git a/icons/emblems/22/emblem-shared.svg b/icons/emblems/22/emblem-shared.svg
--- a/icons/emblems/22/emblem-shared.svg
+++ b/icons/emblems/22/emblem-shared.svg
@@ -2,14 +2,14 @@
     <style
         type="text/css"
         id="current-color-scheme">
-        .ColorScheme-Highlight {
+        .olorScheme-ButtonFocus {
             color:#3daee9;
         }
         .ColorScheme-Text {
             color:#232629;
         }
     </style>
-    <rect style="fill:currentColor;fill-opacity:1;stroke:none" class="ColorScheme-Highlight" height="22" rx="2" width="22"/>
+    <rect style="fill:currentColor;fill-opacity:1;stroke:none" class="olorScheme-ButtonFocus" height="22" rx="2" width="22"/>
     <path d="M2 0C.892 0 0 .892 0 2v18c0 1.108.892 2 2 2h18c1.108 0 2-.892 2-2V2c0-1.108-.892-2-2-2zm0 1h18c.554 0 1 .446 1 1v18c0 .554-.446 1-1 1H2c-.554 0-1-.446-1-1V2c0-.554.446-1 1-1z" style="fill:currentColor;fill-opacity:0.6;stroke:none" class="ColorScheme-Text"/>
     <path d="M12.5 6a.499.499 0 1 0 0 1 .499.499 0 1 0 0-1zm0 9a.499.499 0 1 0 0 1 .499.499 0 1 0 0-1zm-2-1a.499.499 0 1 0 0 1 .499.499 0 1 0 0-1zm-2-1a.499.499 0 1 0 0 1 .499.499 0 1 0 0-1zm0-5a.499.499 0 1 0 0 1 .499.499 0 1 0 0-1zm2-1a.499.499 0 1 0 0 1 .499.499 0 1 0 0-1zm5.5 8c-1.108 0-2 .892-2 2s.892 2 2 2 2-.892 2-2-.892-2-2-2zM5 9c-1.108 0-2 .892-2 2s.892 2 2 2 2-.892 2-2-.892-2-2-2zm11-6c-1.108 0-2 .892-2 2s.892 2 2 2 2-.892 2-2-.892-2-2-2z" fill="#fff"/>
 </svg>
diff --git a/icons/emblems/22/rating.svg b/icons/emblems/22/rating.svg
--- a/icons/emblems/22/rating.svg
+++ b/icons/emblems/22/rating.svg
@@ -2,12 +2,12 @@
     <style
         type="text/css"
         id="current-color-scheme">
-        .ColorScheme-Highlight {
+        .olorScheme-ButtonFocus {
             color:#3daee9;
         }
         .ColorScheme-Text {
             color:#232629;
         }
     </style>
-    <path d="M11 .008l3.4 6.888L22 8l-5.5 5.361 1.298 7.57L11 17.357l-6.798 3.574 1.298-7.57L0 8l7.6-1.104z" style="fill:currentColor;fill-opacity:1;stroke:none" class="ColorScheme-Highlight"/>
+    <path d="M11 .008l3.4 6.888L22 8l-5.5 5.361 1.298 7.57L11 17.357l-6.798 3.574 1.298-7.57L0 8l7.6-1.104z" style="fill:currentColor;fill-opacity:1;stroke:none" class="olorScheme-ButtonFocus"/>
 </svg>
diff --git a/icons/emblems/22/vcs-added.svg b/icons/emblems/22/vcs-added.svg
--- a/icons/emblems/22/vcs-added.svg
+++ b/icons/emblems/22/vcs-added.svg
@@ -2,14 +2,14 @@
     <style
         type="text/css"
         id="current-color-scheme">
-        .ColorScheme-Highlight {
+        .olorScheme-ButtonFocus {
             color:#3daee9;
         }
         .ColorScheme-Text {
             color:#232629;
         }
     </style>
-    <path d="M11 0A11 11 0 0 0 0 11a11 11 0 0 0 11 11 11 11 0 0 0 11-11A11 11 0 0 0 11 0z" style="fill:currentColor;fill-opacity:1;stroke:none" class="ColorScheme-Highlight"/>
+    <path d="M11 0A11 11 0 0 0 0 11a11 11 0 0 0 11 11 11 11 0 0 0 11-11A11 11 0 0 0 11 0z" style="fill:currentColor;fill-opacity:1;stroke:none" class="olorScheme-ButtonFocus"/>
     <path d="M10 3v7H3v2h7v7h2v-7h7v-2h-7V3z" fill="#fff"/>
     <path d="M11 0A11 11 0 0 0 0 11a11 11 0 0 0 11 11 11 11 0 0 0 11-11A11 11 0 0 0 11 0zm0 1a10 10 0 0 1 10 10 10 10 0 0 1-10 10A10 10 0 0 1 1 11 10 10 0 0 1 11 1z" style="fill:currentColor;fill-opacity:0.6;stroke:none" class="ColorScheme-Text"/>
 </svg>
diff --git a/icons/emblems/22/vcs-locally-modified.svg b/icons/emblems/22/vcs-locally-modified.svg
--- a/icons/emblems/22/vcs-locally-modified.svg
+++ b/icons/emblems/22/vcs-locally-modified.svg
@@ -2,14 +2,14 @@
     <style
         type="text/css"
         id="current-color-scheme">
-        .ColorScheme-Highlight {
+        .olorScheme-ButtonFocus {
             color:#3daee9;
         }
         .ColorScheme-Text {
             color:#232629;
         }
     </style>
-    <path d="M11 0A11 11 0 0 0 0 11a11 11 0 0 0 11 11 11 11 0 0 0 11-11A11 11 0 0 0 11 0z" style="fill:currentColor;fill-opacity:1;stroke:none" class="ColorScheme-Highlight"/>
+    <path d="M11 0A11 11 0 0 0 0 11a11 11 0 0 0 11 11 11 11 0 0 0 11-11A11 11 0 0 0 11 0z" style="fill:currentColor;fill-opacity:1;stroke:none" class="olorScheme-ButtonFocus"/>
     <path d="M19 11l-4 3v-2H6a1 1 0 0 0-1 1v5.988a10 10 0 0 1-2-2.008V12a2 2 0 0 1 2-2h10V8zM3.34 18.879a11 11 0 0 1-.078-.074 11 11 0 0 0 .078.074z" fill="#fff"/>
     <path d="M11 0A11 11 0 0 0 0 11a11 11 0 0 0 11 11 11 11 0 0 0 11-11A11 11 0 0 0 11 0zm0 1a10 10 0 0 1 10 10 10 10 0 0 1-10 10A10 10 0 0 1 1 11 10 10 0 0 1 11 1z" style="fill:currentColor;fill-opacity:0.6;stroke:none" class="ColorScheme-Text"/>
 </svg>
diff --git a/icons/emblems/8/emblem-added.svg b/icons/emblems/8/emblem-added.svg
--- a/icons/emblems/8/emblem-added.svg
+++ b/icons/emblems/8/emblem-added.svg
@@ -2,10 +2,10 @@
     <style
         type="text/css"
         id="current-color-scheme">
-        .ColorScheme-Highlight {
+        .olorScheme-ButtonFocus {
             color:#3daee9;
         }
     </style>
-    <rect style="fill:currentColor;fill-opacity:1;stroke:none" class="ColorScheme-Highlight" height="8" rx="1" width="8"/>
+    <rect style="fill:currentColor;fill-opacity:1;stroke:none" class="olorScheme-ButtonFocus" height="8" rx="1" width="8"/>
     <path d="M3 1v2H1v2h2v2h2V5h2V3H5V1z" fill="#fff"/>
 </svg>
diff --git a/icons/emblems/8/emblem-information.svg b/icons/emblems/8/emblem-information.svg
--- a/icons/emblems/8/emblem-information.svg
+++ b/icons/emblems/8/emblem-information.svg
@@ -2,10 +2,10 @@
     <style
         type="text/css"
         id="current-color-scheme">
-        .ColorScheme-Highlight {
+        .olorScheme-ButtonFocus {
             color:#3daee9;
         }
     </style>
-    <rect style="fill:currentColor;fill-opacity:1;stroke:none" class="ColorScheme-Highlight" height="8" rx="1" width="8"/>
+    <rect style="fill:currentColor;fill-opacity:1;stroke:none" class="olorScheme-ButtonFocus" height="8" rx="1" width="8"/>
     <path d="M3 1h2v2H3zm0 3v4h2V4z" fill="#fff"/>
 </svg>
diff --git a/icons/emblems/8/emblem-remove.svg b/icons/emblems/8/emblem-remove.svg
--- a/icons/emblems/8/emblem-remove.svg
+++ b/icons/emblems/8/emblem-remove.svg
@@ -2,10 +2,10 @@
     <style
         type="text/css"
         id="current-color-scheme">
-        .ColorScheme-Highlight {
+        .olorScheme-ButtonFocus {
             color:#3daee9;
         }
     </style>
-    <path style="fill:currentColor;fill-opacity:1;stroke:none" class="ColorScheme-Highlight" d="M1 0C.446 0 0 .446 0 1v6c0 .554.446 1 1 1h6c.554 0 1-.446 1-1V1c0-.554-.446-1-1-1z"/>
+    <path style="fill:currentColor;fill-opacity:1;stroke:none" class="olorScheme-ButtonFocus" d="M1 0C.446 0 0 .446 0 1v6c0 .554.446 1 1 1h6c.554 0 1-.446 1-1V1c0-.554-.446-1-1-1z"/>
     <path d="M1 3v2h6V3z" fill="#fff"/>
 </svg>
diff --git a/icons/emblems/8/emblem-shared.svg b/icons/emblems/8/emblem-shared.svg
--- a/icons/emblems/8/emblem-shared.svg
+++ b/icons/emblems/8/emblem-shared.svg
@@ -2,10 +2,10 @@
     <style
         type="text/css"
         id="current-color-scheme">
-        .ColorScheme-Highlight {
+        .olorScheme-ButtonFocus {
             color:#3daee9;
         }
     </style>
-    <rect style="fill:currentColor;fill-opacity:1;stroke:none" class="ColorScheme-Highlight" height="8" rx="1" width="8"/>
+    <rect style="fill:currentColor;fill-opacity:1;stroke:none" class="olorScheme-ButtonFocus" height="8" rx="1" width="8"/>
     <path d="M6 1a1 1 0 1 0 0 2 1 1 0 0 0 0-2zM4 4.5a.5.5 0 1 0 0 1 .5.5 0 0 0 0-1zM2 3a1 1 0 1 0 0 2 1 1 0 0 0 0-2zM6 5a1 1 0 1 0 0 2 1 1 0 0 0 0-2zM4 2.5a.5.5 0 1 0 0 1 .5.5 0 0 0 0-1z" fill="#fff"/>
 </svg>
diff --git a/icons/emblems/8/rating.svg b/icons/emblems/8/rating.svg
--- a/icons/emblems/8/rating.svg
+++ b/icons/emblems/8/rating.svg
@@ -2,9 +2,9 @@
     <style
         type="text/css"
         id="current-color-scheme">
-        .ColorScheme-Highlight {
+        .olorScheme-ButtonFocus {
             color:#3daee9;
         }
     </style>
-    <path d="M4 .094l1.236 2.505L8 3 6 4.95l.472 2.753L4 6.403l-2.472 1.3L2 4.95 0 3l2.764-.401z" style="fill:currentColor;fill-opacity:1;stroke:none" class="ColorScheme-Highlight"/>
+    <path d="M4 .094l1.236 2.505L8 3 6 4.95l.472 2.753L4 6.403l-2.472 1.3L2 4.95 0 3l2.764-.401z" style="fill:currentColor;fill-opacity:1;stroke:none" class="olorScheme-ButtonFocus"/>
 </svg>
diff --git a/icons/emblems/8/vcs-added.svg b/icons/emblems/8/vcs-added.svg
--- a/icons/emblems/8/vcs-added.svg
+++ b/icons/emblems/8/vcs-added.svg
@@ -2,10 +2,10 @@
     <style
         type="text/css"
         id="current-color-scheme">
-        .ColorScheme-Highlight {
+        .olorScheme-ButtonFocus {
             color:#3daee9;
         }
     </style>
-    <path d="M4 0a4 4 0 0 0-4 4 4 4 0 0 0 4 4 4 4 0 0 0 4-4 4 4 0 0 0-4-4z" style="fill:currentColor;fill-opacity:1;stroke:none" class="ColorScheme-Highlight"/>
+    <path d="M4 0a4 4 0 0 0-4 4 4 4 0 0 0 4 4 4 4 0 0 0 4-4 4 4 0 0 0-4-4z" style="fill:currentColor;fill-opacity:1;stroke:none" class="olorScheme-ButtonFocus"/>
     <path d="M3 1v2H1v2h2v2h2V5h2V3H5V1z" fill="#fff"/>
 </svg>
diff --git a/icons/emblems/8/vcs-locally-modified.svg b/icons/emblems/8/vcs-locally-modified.svg
--- a/icons/emblems/8/vcs-locally-modified.svg
+++ b/icons/emblems/8/vcs-locally-modified.svg
@@ -51,13 +51,13 @@
   <style
      type="text/css"
      id="current-color-scheme">
-        .ColorScheme-Highlight {
+        .olorScheme-ButtonFocus {
             color:#3daee9;
         }
     </style>
   <circle
      style="fill:currentColor;fill-opacity:1;stroke:none"
-     class="ColorScheme-Highlight"
+     class="olorScheme-ButtonFocus"
      cx="4"
      cy="4"
      r="4"
diff --git a/icons/status/16/state-information.svg b/icons/status/16/state-information.svg
--- a/icons/status/16/state-information.svg
+++ b/icons/status/16/state-information.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,7 +17,7 @@
   <path 
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="M 11 6 A 4 4 0 0 0 7 10 A 4 4 0 0 0 11 14 A 4 4 0 0 0 15 10 A 4 4 0 0 0 11 6 z "
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
         />
     <path
        style="opacity:1;fill:#ffffff"
diff --git a/icons/status/16/state-offline.svg b/icons/status/16/state-offline.svg
--- a/icons/status/16/state-offline.svg
+++ b/icons/status/16/state-offline.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
diff --git a/icons/status/16/state-sync.svg b/icons/status/16/state-sync.svg
--- a/icons/status/16/state-sync.svg
+++ b/icons/status/16/state-sync.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -17,7 +17,7 @@
   <path 
         style="fill:currentColor;fill-opacity:1;stroke:none"
         d="M 11 6 C 8.784 6 7 7.784 7 10 C 7 12.216 8.784 14 11 14 C 13.216 14 15 12.216 15 10 C 15 7.784 13.216 6 11 6 z "
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
         />
     <path
        style="opacity:1;fill:#ffffff"
diff --git a/icons/status/22/state-information.svg b/icons/status/22/state-information.svg
--- a/icons/status/22/state-information.svg
+++ b/icons/status/22/state-information.svg
@@ -4,7 +4,7 @@
       .ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }
       </style>
@@ -18,7 +18,7 @@
        class="ColorScheme-Text" />
     <path
        style="fill:currentColor;fill-opacity:1;stroke:none"
-        class="ColorScheme-Highlight"
+        class="olorScheme-ButtonFocus"
        d="m 441.71429,540.29071 a 4.5,4.5 0 0 1 -4.5,4.5 4.5,4.5 0 0 1 -4.5,-4.5 4.5,4.5 0 0 1 4.5,-4.5 4.5,4.5 0 0 1 4.5,4.5 z"
        id="path4509" />
     <path
diff --git a/icons/status/22/update-low.svg b/icons/status/22/update-low.svg
--- a/icons/status/22/update-low.svg
+++ b/icons/status/22/update-low.svg
@@ -3,10 +3,10 @@
         <style type="text/css" id="current-color-scheme">.ColorScheme-Text {
         color:#232629;
       }
-      .ColorScheme-Highlight {
+      .olorScheme-ButtonFocus {
         color:#3daee9;
       }</style>
     </defs>
     <path class="ColorScheme-Text" fill="currentColor" d="m10.943359 3.0019531c-2.3096783 0.0179358-4.5777809 1.0323219-6.1289059 2.921875-2.4818 3.023337-2.4103312 7.4081339 0.1679688 10.34961l0.7519531-0.658204c-2.2602-2.578617-2.3221844-6.4042931-0.1464844-9.0546871 2.175699-2.650394 5.9425094-3.3375469 8.9121094-1.6230469l-0.5 0.8671875 2.480469-0.2988281-0.980469-2.2988282-0.5 0.8652344c-1.270312-0.7334062-2.670833-1.0810739-4.056641-1.0703125zm6.072266 2.7265625-0.751953 0.6582032c1.498615 1.7097401 2.023814 3.9662772 1.578125 6.0664062a3.9904534 4.0021063 0 0 1 0.878906 0.625c0.193608-0.721967 0.289408-1.46347 0.277344-2.205078-0.029962-1.8417764-0.693272-3.6737934-1.982422-5.1445314zm-6.017578 0.2714844-4.0000001 4h2v5h3.1406251a3.9904534 4.0021063 0 0 1 0.859375-1.626953v-3.373047h2l-4-4zm-2.998047 10.197266-2.4824219 0.298828 0.9824219 2.298828 0.5-0.865234c1.8980665 1.095835 4.087429 1.331359 6.082031 0.794921a3.9904534 4.0021063 0 0 1-0.623047-0.882812c-1.644174 0.350774-3.4090691 0.115547-4.958984-0.779297l0.5-0.865234z"/>
-    <path class="ColorScheme-Highlight" fill="currentColor" d="m16 13a2.9999907 2.9999907 0 0 0-3 3 2.9999907 2.9999907 0 0 0 3 3 2.9999907 2.9999907 0 0 0 3-3 2.9999907 2.9999907 0 0 0-3-3z"/>
+    <path class="olorScheme-ButtonFocus" fill="currentColor" d="m16 13a2.9999907 2.9999907 0 0 0-3 3 2.9999907 2.9999907 0 0 0 3 3 2.9999907 2.9999907 0 0 0 3-3 2.9999907 2.9999907 0 0 0-3-3z"/>
 </svg>