diff --git a/res/ui/building_tutorials/storage.png b/res/ui/building_tutorials/storage.png
index 4bdfda9b..b5d21433 100644
Binary files a/res/ui/building_tutorials/storage.png and b/res/ui/building_tutorials/storage.png differ
diff --git a/src/js/game/hud/parts/buildings_toolbar.js b/src/js/game/hud/parts/buildings_toolbar.js
index 166ba624..b40429dc 100644
--- a/src/js/game/hud/parts/buildings_toolbar.js
+++ b/src/js/game/hud/parts/buildings_toolbar.js
@@ -32,10 +32,10 @@ export class HUDBuildingsToolbar extends HUDBaseToolbar {
             ],
             secondaryBuildings: [
                 MetaStorageBuilding,
+                MetaReaderBuilding,
                 MetaLeverBuilding,
                 MetaFilterBuilding,
                 MetaDisplayBuilding,
-                MetaReaderBuilding,
             ],
             visibilityCondition: () =>
                 !this.root.camera.getIsMapOverlayActive() && this.root.currentLayer === "regular",
diff --git a/src/js/game/key_action_mapper.js b/src/js/game/key_action_mapper.js
index ad8cf124..6f53fb83 100644
--- a/src/js/game/key_action_mapper.js
+++ b/src/js/game/key_action_mapper.js
@@ -26,7 +26,7 @@ export const KEYMAPPINGS = {
         exportScreenshot: { keyCode: 114 }, // F3PS
         toggleFPSInfo: { keyCode: 115 }, // F4
 
-        switchLayers: { keyCode: key("Y") },
+        switchLayers: { keyCode: key("E") },
     },
 
     navigation: {
@@ -44,6 +44,7 @@ export const KEYMAPPINGS = {
     },
 
     buildings: {
+        // Primary Toolbar
         belt: { keyCode: key("1") },
         balancer: { keyCode: key("2") },
         underground_belt: { keyCode: key("3") },
@@ -54,13 +55,15 @@ export const KEYMAPPINGS = {
         mixer: { keyCode: key("8") },
         painter: { keyCode: key("9") },
         trash: { keyCode: key("0") },
-        storage: { keyCode: key("I") },
 
-        lever: { keyCode: key("L") },
-        filter: { keyCode: key("B") },
-        display: { keyCode: key("N") },
-        reader: { keyCode: key("J") },
+        // Secondary toolbar
+        storage: { keyCode: key("Y") },
+        reader: { keyCode: key("U") },
+        lever: { keyCode: key("I") },
+        filter: { keyCode: key("O") },
+        display: { keyCode: key("P") },
 
+        // Wires toolbar
         wire: { keyCode: key("1") },
         wire_tunnel: { keyCode: key("2") },
         constant_signal: { keyCode: key("3") },
diff --git a/translations/base-en.yaml b/translations/base-en.yaml
index 4472c347..0f26f226 100644
--- a/translations/base-en.yaml
+++ b/translations/base-en.yaml
@@ -331,7 +331,7 @@ ingame:
         infoTexts:
             speed: Speed
             range: Range
-            storage: Storage
+            storage: Capacity
             oneItemPerSecond: 1 item / second
             itemsPerSecond: <x> items / s
             itemsPerSecondDouble: (x2)
@@ -601,7 +601,7 @@ buildings:
 
     transistor:
         default:
-            name: &transistor Gate
+            name: &transistor Transistor
             description: &transistor_desc Forwards the bottom input if the side input is truthy (a shape, color or "1").
 
         mirrored:
@@ -1039,7 +1039,7 @@ keybindings:
         storage: *storage
         wire: *wire
         constant_signal: *constant_signal
-        logic_gate: *logic_gate
+        logic_gate: Logic Gate
         lever: *lever
         filter: *filter
         wire_tunnel: *wire_tunnel