diff --git a/assets/icons/input/controller/switch_button_home.png b/assets/icons/input/controller/switch_button_home.png
index 3087f31..734dd75 100644
Binary files a/assets/icons/input/controller/switch_button_home.png and b/assets/icons/input/controller/switch_button_home.png differ
diff --git a/assets/icons/input/controller/switch_buttons_down.png b/assets/icons/input/controller/switch_buttons_down.png
index f1318f8..5952a06 100644
Binary files a/assets/icons/input/controller/switch_buttons_down.png and b/assets/icons/input/controller/switch_buttons_down.png differ
diff --git a/assets/icons/input/controller/switch_buttons_up.png b/assets/icons/input/controller/switch_buttons_up.png
index 6619be3..f2122fc 100644
Binary files a/assets/icons/input/controller/switch_buttons_up.png and b/assets/icons/input/controller/switch_buttons_up.png differ
diff --git a/assets/icons/input/controller/switch_dpad_down.png b/assets/icons/input/controller/switch_dpad_down.png
index 42c463e..cd7e256 100644
Binary files a/assets/icons/input/controller/switch_dpad_down.png and b/assets/icons/input/controller/switch_dpad_down.png differ
diff --git a/assets/icons/input/controller/switch_dpad_left.png b/assets/icons/input/controller/switch_dpad_left.png
index 64e0a84..51697f2 100644
Binary files a/assets/icons/input/controller/switch_dpad_left.png and b/assets/icons/input/controller/switch_dpad_left.png differ
diff --git a/assets/icons/input/controller/switch_dpad_right.png b/assets/icons/input/controller/switch_dpad_right.png
index f99eb8e..8de9682 100644
Binary files a/assets/icons/input/controller/switch_dpad_right.png and b/assets/icons/input/controller/switch_dpad_right.png differ
diff --git a/assets/icons/input/controller/switch_dpad_up.png b/assets/icons/input/controller/switch_dpad_up.png
index 580fd38..e86b086 100644
Binary files a/assets/icons/input/controller/switch_dpad_up.png and b/assets/icons/input/controller/switch_dpad_up.png differ
diff --git a/assets/icons/input/controller/switch_stick_l.png b/assets/icons/input/controller/switch_stick_l.png
index e04bbf3..8b72064 100644
Binary files a/assets/icons/input/controller/switch_stick_l.png and b/assets/icons/input/controller/switch_stick_l.png differ
diff --git a/assets/icons/input/keyboard/keyboard_0.png b/assets/icons/input/keyboard/keyboard_0.png
index a3b2246..53072ad 100644
Binary files a/assets/icons/input/keyboard/keyboard_0.png and b/assets/icons/input/keyboard/keyboard_0.png differ
diff --git a/assets/icons/input/keyboard/keyboard_1.png b/assets/icons/input/keyboard/keyboard_1.png
index 6e07ea7..ef88341 100644
Binary files a/assets/icons/input/keyboard/keyboard_1.png and b/assets/icons/input/keyboard/keyboard_1.png differ
diff --git a/assets/icons/input/keyboard/keyboard_2.png b/assets/icons/input/keyboard/keyboard_2.png
index b82cfe1..6d464c1 100644
Binary files a/assets/icons/input/keyboard/keyboard_2.png and b/assets/icons/input/keyboard/keyboard_2.png differ
diff --git a/assets/icons/input/keyboard/keyboard_3.png b/assets/icons/input/keyboard/keyboard_3.png
index 4bc7295..b2fb82f 100644
Binary files a/assets/icons/input/keyboard/keyboard_3.png and b/assets/icons/input/keyboard/keyboard_3.png differ
diff --git a/assets/icons/input/keyboard/keyboard_4.png b/assets/icons/input/keyboard/keyboard_4.png
index 98388ef..e100195 100644
Binary files a/assets/icons/input/keyboard/keyboard_4.png and b/assets/icons/input/keyboard/keyboard_4.png differ
diff --git a/assets/icons/input/keyboard/keyboard_5.png b/assets/icons/input/keyboard/keyboard_5.png
index 77edaf8..b7483d4 100644
Binary files a/assets/icons/input/keyboard/keyboard_5.png and b/assets/icons/input/keyboard/keyboard_5.png differ
diff --git a/assets/icons/input/keyboard/keyboard_6.png b/assets/icons/input/keyboard/keyboard_6.png
index 2e328a6..f9c7de6 100644
Binary files a/assets/icons/input/keyboard/keyboard_6.png and b/assets/icons/input/keyboard/keyboard_6.png differ
diff --git a/assets/icons/input/keyboard/keyboard_7.png b/assets/icons/input/keyboard/keyboard_7.png
index 8cf28af..6ce6b17 100644
Binary files a/assets/icons/input/keyboard/keyboard_7.png and b/assets/icons/input/keyboard/keyboard_7.png differ
diff --git a/assets/icons/input/keyboard/keyboard_8.png b/assets/icons/input/keyboard/keyboard_8.png
index eb418fe..43f98eb 100644
Binary files a/assets/icons/input/keyboard/keyboard_8.png and b/assets/icons/input/keyboard/keyboard_8.png differ
diff --git a/assets/icons/input/keyboard/keyboard_9.png b/assets/icons/input/keyboard/keyboard_9.png
index a20ac2e..1321245 100644
Binary files a/assets/icons/input/keyboard/keyboard_9.png and b/assets/icons/input/keyboard/keyboard_9.png differ
diff --git a/assets/icons/input/keyboard/keyboard_a.png b/assets/icons/input/keyboard/keyboard_a.png
index d845fa4..aa4badd 100644
Binary files a/assets/icons/input/keyboard/keyboard_a.png and b/assets/icons/input/keyboard/keyboard_a.png differ
diff --git a/assets/icons/input/keyboard/keyboard_arrow_down.png b/assets/icons/input/keyboard/keyboard_arrow_down.png
index 08f49a6..932c64f 100644
Binary files a/assets/icons/input/keyboard/keyboard_arrow_down.png and b/assets/icons/input/keyboard/keyboard_arrow_down.png differ
diff --git a/assets/icons/input/keyboard/keyboard_arrow_left.png b/assets/icons/input/keyboard/keyboard_arrow_left.png
index 88bdf43..3f59971 100644
Binary files a/assets/icons/input/keyboard/keyboard_arrow_left.png and b/assets/icons/input/keyboard/keyboard_arrow_left.png differ
diff --git a/assets/icons/input/keyboard/keyboard_arrow_right.png b/assets/icons/input/keyboard/keyboard_arrow_right.png
index 144c3ab..c52909d 100644
Binary files a/assets/icons/input/keyboard/keyboard_arrow_right.png and b/assets/icons/input/keyboard/keyboard_arrow_right.png differ
diff --git a/assets/icons/input/keyboard/keyboard_arrow_up.png b/assets/icons/input/keyboard/keyboard_arrow_up.png
index 944adfe..98f16e4 100644
Binary files a/assets/icons/input/keyboard/keyboard_arrow_up.png and b/assets/icons/input/keyboard/keyboard_arrow_up.png differ
diff --git a/assets/icons/input/keyboard/keyboard_d.png b/assets/icons/input/keyboard/keyboard_d.png
index 2436d62..7e5bb38 100644
Binary files a/assets/icons/input/keyboard/keyboard_d.png and b/assets/icons/input/keyboard/keyboard_d.png differ
diff --git a/assets/icons/input/keyboard/keyboard_escape.png b/assets/icons/input/keyboard/keyboard_escape.png
index 968d5bf..7a55e3e 100644
Binary files a/assets/icons/input/keyboard/keyboard_escape.png and b/assets/icons/input/keyboard/keyboard_escape.png differ
diff --git a/assets/icons/input/keyboard/keyboard_s.png b/assets/icons/input/keyboard/keyboard_s.png
index 2c16d71..b7483d4 100644
Binary files a/assets/icons/input/keyboard/keyboard_s.png and b/assets/icons/input/keyboard/keyboard_s.png differ
diff --git a/assets/icons/input/keyboard/keyboard_w.png b/assets/icons/input/keyboard/keyboard_w.png
index c79a453..d953f36 100644
Binary files a/assets/icons/input/keyboard/keyboard_w.png and b/assets/icons/input/keyboard/keyboard_w.png differ
diff --git a/src/ui/menu/mappings.rs b/src/ui/menu/mappings.rs
index 3d3ef64..bd8f816 100644
--- a/src/ui/menu/mappings.rs
+++ b/src/ui/menu/mappings.rs
@@ -15,9 +15,10 @@ use crate::{
     input::Action,
     ui::{
         menu::{navigation::FocusableHoverFill, MenuButton, MenuState},
-        widgets::{UiButtonWidget, UiImageWidget, UiOptionRowWidget, UiTextWidget},
-        UiRootContainer,
+        widgets::{UiButtonWidget, UiOptionRowWidget, UiTextWidget},
+        UiRootContainer, UI_GAP,
     },
+    SCALE,
 };
 
 // ·······
@@ -109,7 +110,12 @@ fn row_mapping(map: &dyn Reflect, row: &mut UiBuilder<Entity>, asset_server: &As
     for prompt in prompts {
         // Dynamic loading to avoid having all icons in memory
         row.option_button(|button| {
-            button.image(asset_server.load(&prompt));
+            button.spawn(ImageBundle {
+                image: UiImage::new(asset_server.load(&prompt)).with_color(Color::srgb(0.812, 0.776, 0.722)),
+                ..default()
+            }).style()
+            .height(Val::Px(16. * SCALE))
+            .width(Val::Px(16. * SCALE));
         })
         .insert(BorderRadius::all(Val::Px(16.)))
         .insert(BorderColor::from(Srgba::NONE))