diff --git a/Userland/Applications/KeyboardSettings/Keyboard.gml b/Userland/Applications/KeyboardSettings/Keyboard.gml
index 2b17df82c0..5852366740 100644
--- a/Userland/Applications/KeyboardSettings/Keyboard.gml
+++ b/Userland/Applications/KeyboardSettings/Keyboard.gml
@@ -10,46 +10,66 @@
         title: "Mapping"
         fixed_height: 200
 
-        layout: @GUI::VerticalBoxLayout {
+        layout: @GUI::HorizontalBoxLayout {
             margins: [16, 8, 8]
-            spacing: 2
+            spacing: 16
         }
 
         @GUI::Widget {
-            layout: @GUI::HorizontalBoxLayout {
-                spacing: 16
+            fixed_width: 32
+            layout: @GUI::VerticalBoxLayout {
             }
 
             @GUI::Label {
-                text: "Character mapping file:"
-                fixed_width: 130
-                text_alignment: "CenterLeft"
+                fixed_width: 32
+                fixed_height: 32
+                name: "character_map_image_label"
             }
 
-            @GUI::ComboBox {
-                name: "character_map_file_combo"
-            }
+            @GUI::Widget
         }
 
         @GUI::Widget {
-            layout: @GUI::HorizontalBoxLayout {
-                spacing: 16
+            layout: @GUI::VerticalBoxLayout {
+                spacing: 2
             }
 
-            @GUI::Label {
-                text: "Test your current keymap below"
-                text_alignment: "CenterLeft"
-            }
-            @GUI::Button {
-                text: "Clear"
-                name: "button_clear_test_typing_area"
-                fixed_width: 48
-            }
-        }
+            @GUI::Widget {
+                layout: @GUI::HorizontalBoxLayout {
+                    spacing: 16
+                }
 
-        @GUI::TextEditor {
-            fixed_height: 100
-            name: "test_typing_area"
+                @GUI::Label {
+                    text: "Character mapping file:"
+                    fixed_width: 130
+                    text_alignment: "CenterLeft"
+                }
+
+                @GUI::ComboBox {
+                    name: "character_map_file_combo"
+                }
+            }
+
+            @GUI::Widget {
+                layout: @GUI::HorizontalBoxLayout {
+                    spacing: 16
+                }
+
+                @GUI::Label {
+                    text: "Test your current keymap below"
+                    text_alignment: "CenterLeft"
+                }
+                @GUI::Button {
+                    text: "Clear"
+                    name: "button_clear_test_typing_area"
+                    fixed_width: 48
+                }
+            }
+
+            @GUI::TextEditor {
+                fixed_height: 100
+                name: "test_typing_area"
+            }
         }
     }
 
@@ -59,6 +79,13 @@
 
         layout: @GUI::HorizontalBoxLayout {
             margins: [16, 8, 8]
+            spacing: 16
+        }
+
+        @GUI::Label {
+            fixed_width: 32
+            fixed_height: 32
+            name: "num_lock_image_label"
         }
 
         @GUI::CheckBox {
diff --git a/Userland/Applications/KeyboardSettings/KeyboardSettingsWidget.cpp b/Userland/Applications/KeyboardSettings/KeyboardSettingsWidget.cpp
index 2fb7e54b90..e2626ae64f 100644
--- a/Userland/Applications/KeyboardSettings/KeyboardSettingsWidget.cpp
+++ b/Userland/Applications/KeyboardSettings/KeyboardSettingsWidget.cpp
@@ -14,6 +14,7 @@
 #include <LibCore/File.h>
 #include <LibGUI/Application.h>
 #include <LibGUI/ItemListModel.h>
+#include <LibGUI/Label.h>
 #include <LibGUI/MessageBox.h>
 #include <LibKeyboard/CharacterMap.h>
 #include <spawn.h>
@@ -51,6 +52,9 @@ KeyboardSettingsWidget::KeyboardSettingsWidget()
     }
     VERIFY(initial_keymap_index < m_character_map_files.size());
 
+    auto& character_map_image_label = *find_descendant_of_type_named<GUI::Label>("character_map_image_label");
+    character_map_image_label.set_icon(Gfx::Bitmap::try_load_from_file("/res/icons/32x32/app-keyboard-mapper.png").release_value_but_fixme_should_propagate_errors());
+
     m_character_map_file_combo = find_descendant_of_type_named<GUI::ComboBox>("character_map_file_combo");
     m_character_map_file_combo->set_only_allow_values_from_model(true);
     m_character_map_file_combo->set_model(*GUI::ItemListModel<String>::create(m_character_map_files));
@@ -69,6 +73,8 @@ KeyboardSettingsWidget::KeyboardSettingsWidget()
         m_test_typing_area->set_focus(true);
     };
 
+    auto& num_lock_image_label = *find_descendant_of_type_named<GUI::Label>("num_lock_image_label");
+    num_lock_image_label.set_icon(Gfx::Bitmap::try_load_from_file("/res/icons/32x32/app-calculator.png").release_value_but_fixme_should_propagate_errors());
     m_num_lock_checkbox = find_descendant_of_type_named<GUI::CheckBox>("num_lock_checkbox");
     m_num_lock_checkbox->set_checked(Config::read_bool("KeyboardSettings", "StartupEnable", "NumLock", true));
 }