diff --git a/resources/themes/cura-dark/icons/tab_status_unknown.svg b/resources/themes/cura-dark/icons/tab_status_unknown.svg
index 249ae55554..94dc47c018 100644
--- a/resources/themes/cura-dark/icons/tab_status_unknown.svg
+++ b/resources/themes/cura-dark/icons/tab_status_unknown.svg
@@ -5,7 +5,7 @@
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="00-printer-status-overview" transform="translate(-407.000000, -62.000000)" fill="#D8D8D8" opacity="0.231600996">
+        <g id="00-printer-status-overview" transform="translate(-407.000000, -62.000000)" fill="#D8D8D8" opacity="0">
             <rect id="Rectangle-12" x="379" y="0" width="261" height="163"></rect>
         </g>
         <g id="Unknown" fill="#ffffff">
diff --git a/resources/themes/cura-dark/theme.json b/resources/themes/cura-dark/theme.json
index 906a5c280e..5c77f5144d 100644
--- a/resources/themes/cura-dark/theme.json
+++ b/resources/themes/cura-dark/theme.json
@@ -141,6 +141,8 @@
 
         "tool_panel_background": [39, 44, 48, 255],
 
+        "tool_button_border": [255, 255, 255, 38],
+
         "status_offline": [0, 0, 0, 255],
         "status_ready": [0, 205, 0, 255],
         "status_busy": [12, 169, 227, 255],
diff --git a/resources/themes/cura-light/icons/tab_status_unknown.svg b/resources/themes/cura-light/icons/tab_status_unknown.svg
index f195ae238a..a6aea3be84 100644
--- a/resources/themes/cura-light/icons/tab_status_unknown.svg
+++ b/resources/themes/cura-light/icons/tab_status_unknown.svg
@@ -5,7 +5,7 @@
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="00-printer-status-overview" transform="translate(-407.000000, -62.000000)" fill="#D8D8D8" opacity="0.231600996">
+        <g id="00-printer-status-overview" transform="translate(-407.000000, -62.000000)" fill="#D8D8D8" opacity="0">
             <rect id="Rectangle-12" x="379" y="0" width="261" height="163"></rect>
         </g>
         <g id="Unknown" fill="#000000">
diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json
index 1271dfbe71..fb6e43d0be 100644
--- a/resources/themes/cura-light/theme.json
+++ b/resources/themes/cura-light/theme.json
@@ -221,7 +221,7 @@
         "tooltip": [68, 192, 255, 255],
         "tooltip_text": [255, 255, 255, 255],
 
-        "tool_button_border": [39, 44, 48, 255],
+        "tool_button_border": [255, 255, 255, 0],
 
         "message_background": [255, 255, 255, 255],
         "message_shadow": [0, 0, 0, 120],
@@ -338,6 +338,8 @@
         "button_tooltip": [1.0, 1.3],
         "button_tooltip_arrow": [0.25, 0.25],
 
+        "tool_button_border": [1.0, 0],
+
         "progressbar": [26.0, 0.4],
         "progressbar_radius": [0, 0],
         "progressbar_control": [8.0, 0.4],