diff --git a/res/ui/building_icons/belt.png b/res/ui/building_icons/belt.png
index 28c2967a..566e971d 100644
Binary files a/res/ui/building_icons/belt.png and b/res/ui/building_icons/belt.png differ
diff --git a/res/ui/building_icons/constant_signal.png b/res/ui/building_icons/constant_signal.png
index 6d7d9110..c913837a 100644
Binary files a/res/ui/building_icons/constant_signal.png and b/res/ui/building_icons/constant_signal.png differ
diff --git a/res/ui/building_icons/cutter.png b/res/ui/building_icons/cutter.png
index 45dfe89a..84eafc30 100644
Binary files a/res/ui/building_icons/cutter.png and b/res/ui/building_icons/cutter.png differ
diff --git a/res/ui/building_icons/display.png b/res/ui/building_icons/display.png
index e24cef7b..322d84e2 100644
Binary files a/res/ui/building_icons/display.png and b/res/ui/building_icons/display.png differ
diff --git a/res/ui/building_icons/filter.png b/res/ui/building_icons/filter.png
index a0cba584..16215918 100644
Binary files a/res/ui/building_icons/filter.png and b/res/ui/building_icons/filter.png differ
diff --git a/res/ui/building_icons/lever.png b/res/ui/building_icons/lever.png
index 63ef3581..e4514b98 100644
Binary files a/res/ui/building_icons/lever.png and b/res/ui/building_icons/lever.png differ
diff --git a/res/ui/building_icons/logic_gate.png b/res/ui/building_icons/logic_gate.png
index b6956ce6..d71ddbc5 100644
Binary files a/res/ui/building_icons/logic_gate.png and b/res/ui/building_icons/logic_gate.png differ
diff --git a/res/ui/building_icons/miner.png b/res/ui/building_icons/miner.png
index d02d3d15..9103750b 100644
Binary files a/res/ui/building_icons/miner.png and b/res/ui/building_icons/miner.png differ
diff --git a/res/ui/building_icons/mixer.png b/res/ui/building_icons/mixer.png
index 8b4a30e2..9c0fd11c 100644
Binary files a/res/ui/building_icons/mixer.png and b/res/ui/building_icons/mixer.png differ
diff --git a/res/ui/building_icons/painter.png b/res/ui/building_icons/painter.png
index 274166aa..e0b63af5 100644
Binary files a/res/ui/building_icons/painter.png and b/res/ui/building_icons/painter.png differ
diff --git a/res/ui/building_icons/reader.png b/res/ui/building_icons/reader.png
index 7a2e8d97..8381c9b8 100644
Binary files a/res/ui/building_icons/reader.png and b/res/ui/building_icons/reader.png differ
diff --git a/res/ui/building_icons/rotater.png b/res/ui/building_icons/rotater.png
index 3d4776bc..00a4c75d 100644
Binary files a/res/ui/building_icons/rotater.png and b/res/ui/building_icons/rotater.png differ
diff --git a/res/ui/building_icons/splitter.png b/res/ui/building_icons/splitter.png
index 424f7f63..4347d2ba 100644
Binary files a/res/ui/building_icons/splitter.png and b/res/ui/building_icons/splitter.png differ
diff --git a/res/ui/building_icons/stacker.png b/res/ui/building_icons/stacker.png
index 495c470e..ccafd591 100644
Binary files a/res/ui/building_icons/stacker.png and b/res/ui/building_icons/stacker.png differ
diff --git a/res/ui/building_icons/trash.png b/res/ui/building_icons/trash.png
index fe8553d5..0f4238f4 100644
Binary files a/res/ui/building_icons/trash.png and b/res/ui/building_icons/trash.png differ
diff --git a/res/ui/building_icons/underground_belt.png b/res/ui/building_icons/underground_belt.png
index 6e24d4ce..a8f121c1 100644
Binary files a/res/ui/building_icons/underground_belt.png and b/res/ui/building_icons/underground_belt.png differ
diff --git a/res/ui/building_icons/virtual_processor.png b/res/ui/building_icons/virtual_processor.png
index a8759e16..310f130e 100644
Binary files a/res/ui/building_icons/virtual_processor.png and b/res/ui/building_icons/virtual_processor.png differ
diff --git a/res/ui/building_icons/wire.png b/res/ui/building_icons/wire.png
index 38e0ba92..bc2a128d 100644
Binary files a/res/ui/building_icons/wire.png and b/res/ui/building_icons/wire.png differ
diff --git a/res/ui/building_icons/wire_tunnel.png b/res/ui/building_icons/wire_tunnel.png
index b44197fe..97bfc3db 100644
Binary files a/res/ui/building_icons/wire_tunnel.png and b/res/ui/building_icons/wire_tunnel.png differ
diff --git a/src/css/ingame_hud/buildings_toolbar.scss b/src/css/ingame_hud/buildings_toolbar.scss
index 4700a7d6..81f16906 100644
--- a/src/css/ingame_hud/buildings_toolbar.scss
+++ b/src/css/ingame_hud/buildings_toolbar.scss
@@ -1,6 +1,6 @@
 .ingame_buildingsToolbar {
-    position: fixed;
-    @include S(bottom, 0px);
+    position: absolute;
+    @include S(bottom, 5px);
     left: 50%;
     transform: translateX(-50%);
 
@@ -8,23 +8,25 @@
     display: flex;
     flex-direction: column;
     background: transparent;
-    border-bottom-width: 0;
     transition: transform 120ms ease-in-out;
     will-change: transform;
 
-    backdrop-filter: blur(D(5px));
+    backdrop-filter: blur(D(3px));
+    background-color: rgba(0, 40, 80, 0.05);
+    @include S(border-radius, $globalBorderRadius);
 
     @include DarkThemeOverride {
-        background-color: darken($darkModeGameBackground, 15);
+        background-color: rgba(darken($darkModeGameBackground, 15), 0.4);
+
+        &#ingame_HUD_wires_toolbar {
+            background-color: rgba(darken($darkModeGameBackground, 5), 0.1);
+        }
     }
 
     &:not(.visible) {
         transform: translateX(-50%) translateY(#{D(100px)});
     }
 
-    @include S(border-top-left-radius, $globalBorderRadius);
-    @include S(border-top-right-radius, $globalBorderRadius);
-
     .buildings {
         display: grid;
         grid-auto-flow: column;
@@ -41,7 +43,7 @@
             @include S(width, 35px);
             @include S(height, 40px);
 
-            background: center center / 65% no-repeat;
+            background: center center / 70% no-repeat;
 
             &:not(.unlocked) {
                 @include S(width, 20px);
@@ -67,25 +69,10 @@
                 pointer-events: all;
                 transition: all 50ms ease-in-out;
                 transition-property: background-color, transform;
+
                 cursor: pointer;
-                will-change: transform;
-
-                &::before {
-                    content: "";
-                    position: absolute;
-                    top: 0;
-                    right: 0;
-                    bottom: 0;
-                    left: 0;
-                    background-color: $accentColorDark;
-                    opacity: 0;
-                    will-change: opacity;
-                }
-
                 &:hover {
-                    &::before {
-                        opacity: 0.1;
-                    }
+                    background-color: rgba(30, 40, 90, 0.1);
                 }
 
                 &.pressed {
@@ -94,13 +81,7 @@
 
                 &.selected {
                     // transform: scale(1.05);
-
-                    &::before {
-                        background-color: rgba($colorBlueBright, 0.2);
-                        opacity: 1;
-                        border-top: D(3px) solid $colorBlueBright;
-                        @include S(top, -3px);
-                    }
+                    background-color: rgba(lighten($colorBlueBright, 9), 0.4);
 
                     .keybinding {
                         color: #111;
diff --git a/src/js/game/belt_path.js b/src/js/game/belt_path.js
index a5c3e59c..e628a85c 100644
--- a/src/js/game/belt_path.js
+++ b/src/js/game/belt_path.js
@@ -1190,6 +1190,11 @@ export class BeltPath extends BasicSerializableObject {
             return false;
         }
 
+        if (this.root.currentLayer !== "regular") {
+            // Not in regular layer
+            return true;
+        }
+
         const mousePos = this.root.app.mousePosition;
         if (!mousePos) {
             // Mouse not registered
diff --git a/src/js/game/systems/belt.js b/src/js/game/systems/belt.js
index 931545ce..3951077a 100644
--- a/src/js/game/systems/belt.js
+++ b/src/js/game/systems/belt.js
@@ -501,7 +501,7 @@ export class BeltSystem extends GameSystemWithFilter {
             // POTATO Mode: Only show items when belt is hovered
             let hoveredBeltPath = null;
             const mousePos = this.root.app.mousePosition;
-            if (mousePos) {
+            if (mousePos && this.root.currentLayer === "regular") {
                 const tile = this.root.camera.screenToWorld(mousePos).toTileSpace();
                 const contents = this.root.map.getLayerContentXY(tile.x, tile.y, "regular");
                 if (contents && contents.components.Belt) {