diff --git a/Applications/SystemMonitor/ProcessModel.cpp b/Applications/SystemMonitor/ProcessModel.cpp
index 4360a9b0772..d1c7901f0d5 100644
--- a/Applications/SystemMonitor/ProcessModel.cpp
+++ b/Applications/SystemMonitor/ProcessModel.cpp
@@ -47,10 +47,10 @@ ProcessModel::ProcessModel()
 {
     ASSERT(!s_the);
     s_the = this;
-    m_generic_process_icon = Gfx::Bitmap::load_from_file("/res/icons/gear16.png");
-    m_high_priority_icon = Gfx::Bitmap::load_from_file("/res/icons/highpriority16.png");
-    m_low_priority_icon = Gfx::Bitmap::load_from_file("/res/icons/lowpriority16.png");
-    m_normal_priority_icon = Gfx::Bitmap::load_from_file("/res/icons/normalpriority16.png");
+    m_generic_process_icon = Gfx::Bitmap::load_from_file("/res/icons/16x16/gear.png");
+    m_high_priority_icon = Gfx::Bitmap::load_from_file("/res/icons/16x16/highpriority.png");
+    m_low_priority_icon = Gfx::Bitmap::load_from_file("/res/icons/16x16/lowpriority.png");
+    m_normal_priority_icon = Gfx::Bitmap::load_from_file("/res/icons/16x16/normalpriority.png");
 
     auto file = Core::File::construct("/proc/cpuinfo");
     if (file->open(Core::IODevice::ReadOnly)) {
diff --git a/Applications/SystemMonitor/main.cpp b/Applications/SystemMonitor/main.cpp
index a9c6771d095..8428fa88761 100644
--- a/Applications/SystemMonitor/main.cpp
+++ b/Applications/SystemMonitor/main.cpp
@@ -199,19 +199,19 @@ int main(int argc, char** argv)
         return pid_index.data().to_i32();
     };
 
-    auto kill_action = GUI::Action::create("Kill process", { Mod_Ctrl, Key_K }, Gfx::Bitmap::load_from_file("/res/icons/kill16.png"), [&](const GUI::Action&) {
+    auto kill_action = GUI::Action::create("Kill process", { Mod_Ctrl, Key_K }, Gfx::Bitmap::load_from_file("/res/icons/16x16/kill.png"), [&](const GUI::Action&) {
         pid_t pid = selected_id(ProcessModel::Column::PID);
         if (pid != -1)
             kill(pid, SIGKILL);
     });
 
-    auto stop_action = GUI::Action::create("Stop process", { Mod_Ctrl, Key_S }, Gfx::Bitmap::load_from_file("/res/icons/stop16.png"), [&](const GUI::Action&) {
+    auto stop_action = GUI::Action::create("Stop process", { Mod_Ctrl, Key_S }, Gfx::Bitmap::load_from_file("/res/icons/16x16/stop-hand.png"), [&](const GUI::Action&) {
         pid_t pid = selected_id(ProcessModel::Column::PID);
         if (pid != -1)
             kill(pid, SIGSTOP);
     });
 
-    auto continue_action = GUI::Action::create("Continue process", { Mod_Ctrl, Key_C }, Gfx::Bitmap::load_from_file("/res/icons/continue16.png"), [&](const GUI::Action&) {
+    auto continue_action = GUI::Action::create("Continue process", { Mod_Ctrl, Key_C }, Gfx::Bitmap::load_from_file("/res/icons/16x16/continue.png"), [&](const GUI::Action&) {
         pid_t pid = selected_id(ProcessModel::Column::PID);
         if (pid != -1)
             kill(pid, SIGCONT);
diff --git a/Applications/Terminal/main.cpp b/Applications/Terminal/main.cpp
index 73e3da7e1ac..abd4be317ef 100644
--- a/Applications/Terminal/main.cpp
+++ b/Applications/Terminal/main.cpp
@@ -280,7 +280,7 @@ int main(int argc, char** argv)
                 perror("disown");
         }
     }));
-    app_menu.add_action(GUI::Action::create("Settings...", Gfx::Bitmap::load_from_file("/res/icons/gear16.png"),
+    app_menu.add_action(GUI::Action::create("Settings...", Gfx::Bitmap::load_from_file("/res/icons/16x16/gear.png"),
         [&](const GUI::Action&) {
             if (!settings_window) {
                 settings_window = create_settings_window(terminal);
diff --git a/Base/res/icons/16x16/audio-volume-high.png b/Base/res/icons/16x16/audio-volume-high.png
new file mode 100644
index 00000000000..2ef602a4bb8
Binary files /dev/null and b/Base/res/icons/16x16/audio-volume-high.png differ
diff --git a/Base/res/icons/16x16/audio-volume-low.png b/Base/res/icons/16x16/audio-volume-low.png
new file mode 100644
index 00000000000..b93e4a66175
Binary files /dev/null and b/Base/res/icons/16x16/audio-volume-low.png differ
diff --git a/Base/res/icons/16x16/audio-volume-medium.png b/Base/res/icons/16x16/audio-volume-medium.png
new file mode 100644
index 00000000000..53fadc34ff4
Binary files /dev/null and b/Base/res/icons/16x16/audio-volume-medium.png differ
diff --git a/Base/res/icons/16x16/audio-volume-muted.png b/Base/res/icons/16x16/audio-volume-muted.png
new file mode 100644
index 00000000000..bd0d79bc078
Binary files /dev/null and b/Base/res/icons/16x16/audio-volume-muted.png differ
diff --git a/Base/res/icons/16x16/audio-volume-zero.png b/Base/res/icons/16x16/audio-volume-zero.png
new file mode 100644
index 00000000000..7b73c82e997
Binary files /dev/null and b/Base/res/icons/16x16/audio-volume-zero.png differ
diff --git a/Base/res/icons/breakpoint.png b/Base/res/icons/16x16/breakpoint.png
similarity index 100%
rename from Base/res/icons/breakpoint.png
rename to Base/res/icons/16x16/breakpoint.png
diff --git a/Base/res/icons/clipboard.png b/Base/res/icons/16x16/clipboard.png
similarity index 100%
rename from Base/res/icons/clipboard.png
rename to Base/res/icons/16x16/clipboard.png
diff --git a/Base/res/icons/continue16.png b/Base/res/icons/16x16/continue.png
similarity index 100%
rename from Base/res/icons/continue16.png
rename to Base/res/icons/16x16/continue.png
diff --git a/Base/res/icons/gear16.png b/Base/res/icons/16x16/gear.png
similarity index 100%
rename from Base/res/icons/gear16.png
rename to Base/res/icons/16x16/gear.png
diff --git a/Base/res/icons/highpriority16.png b/Base/res/icons/16x16/highpriority.png
similarity index 100%
rename from Base/res/icons/highpriority16.png
rename to Base/res/icons/16x16/highpriority.png
diff --git a/Base/res/icons/kill16.png b/Base/res/icons/16x16/kill.png
similarity index 100%
rename from Base/res/icons/kill16.png
rename to Base/res/icons/16x16/kill.png
diff --git a/Base/res/icons/lowpriority16.png b/Base/res/icons/16x16/lowpriority.png
similarity index 100%
rename from Base/res/icons/lowpriority16.png
rename to Base/res/icons/16x16/lowpriority.png
diff --git a/Base/res/icons/normalpriority16.png b/Base/res/icons/16x16/normalpriority.png
similarity index 100%
rename from Base/res/icons/normalpriority16.png
rename to Base/res/icons/16x16/normalpriority.png
diff --git a/Base/res/icons/paste16.png b/Base/res/icons/16x16/paste.png
similarity index 100%
rename from Base/res/icons/paste16.png
rename to Base/res/icons/16x16/paste.png
diff --git a/Base/res/icons/stop16.png b/Base/res/icons/16x16/stop-hand.png
similarity index 100%
rename from Base/res/icons/stop16.png
rename to Base/res/icons/16x16/stop-hand.png
diff --git a/Base/res/icons/SystemMenu.ini b/Base/res/icons/SystemMenu.ini
index 4c2d7a2be2a..a0454ec0d84 100644
--- a/Base/res/icons/SystemMenu.ini
+++ b/Base/res/icons/SystemMenu.ini
@@ -4,6 +4,6 @@ Demos=/res/icons/16x16/app-demo.png
 #Games=
 #Graphics=
 #Internet=
-Settings=/res/icons/gear16.png
+Settings=/res/icons/16x16/gear.png
 Sound=/res/icons/16x16/filetype-music.png
 #Utilities=
diff --git a/Base/res/icons/audio-volume-high.png b/Base/res/icons/audio-volume-high.png
deleted file mode 100644
index 75879178092..00000000000
Binary files a/Base/res/icons/audio-volume-high.png and /dev/null differ
diff --git a/Base/res/icons/audio-volume-low.png b/Base/res/icons/audio-volume-low.png
deleted file mode 100644
index 839e2cb3a85..00000000000
Binary files a/Base/res/icons/audio-volume-low.png and /dev/null differ
diff --git a/Base/res/icons/audio-volume-medium.png b/Base/res/icons/audio-volume-medium.png
deleted file mode 100644
index d1906915787..00000000000
Binary files a/Base/res/icons/audio-volume-medium.png and /dev/null differ
diff --git a/Base/res/icons/audio-volume-muted.png b/Base/res/icons/audio-volume-muted.png
deleted file mode 100644
index ced31e0e5cc..00000000000
Binary files a/Base/res/icons/audio-volume-muted.png and /dev/null differ
diff --git a/Base/res/icons/audio-volume-zero.png b/Base/res/icons/audio-volume-zero.png
deleted file mode 100644
index a14917d9833..00000000000
Binary files a/Base/res/icons/audio-volume-zero.png and /dev/null differ
diff --git a/Base/res/welcome.txt b/Base/res/welcome.txt
index 8e4a900055b..ea8605ea7b1 100644
--- a/Base/res/welcome.txt
+++ b/Base/res/welcome.txt
@@ -55,7 +55,7 @@ This is all possibly by using HackStudio, Visual Builder, Terminal, and the
 (optional) GNU tools.
 
 * Multimedia
-$ /res/icons/audio-volume-medium.png
+$ /res/icons/16x16/audio-volume-medium.png
 > Draw while playing your favorite songs!
 Serenity includes the Piano, which allows you to create your own tunes by
 simply pressing keys on the keyboard. You can pick the wavetype, octave, and
diff --git a/Demos/WidgetGallery/main.cpp b/Demos/WidgetGallery/main.cpp
index 71a1fc6630c..26d8605cac8 100644
--- a/Demos/WidgetGallery/main.cpp
+++ b/Demos/WidgetGallery/main.cpp
@@ -195,9 +195,9 @@ int main(int argc, char** argv)
     button_vert2_container.set_layout<GUI::VerticalBoxLayout>();
 
     auto& button1 = button_vert1_container.add<GUI::Button>("Button 1");
-    button1.set_icon(Gfx::Bitmap::load_from_file("/res/icons/kill16.png"));
+    button1.set_icon(Gfx::Bitmap::load_from_file("/res/icons/16x16/kill.png"));
     auto& button2 = button_vert1_container.add<GUI::Button>("Button 2");
-    button2.set_icon(Gfx::Bitmap::load_from_file("/res/icons/kill16.png"));
+    button2.set_icon(Gfx::Bitmap::load_from_file("/res/icons/16x16/kill.png"));
     button2.set_enabled(false);
     auto& button3 = button_vert2_container.add<GUI::Button>("\xF0\x9F\x98\x88 Button 3");
     (void)button3;
diff --git a/DevTools/HackStudio/Editor.cpp b/DevTools/HackStudio/Editor.cpp
index 1374bd35e31..322ba6220c7 100644
--- a/DevTools/HackStudio/Editor.cpp
+++ b/DevTools/HackStudio/Editor.cpp
@@ -392,7 +392,7 @@ void Editor::clear_execution_position()
 
 const Gfx::Bitmap& Editor::breakpoint_icon_bitmap()
 {
-    static auto bitmap = Gfx::Bitmap::load_from_file("/res/icons/breakpoint.png");
+    static auto bitmap = Gfx::Bitmap::load_from_file("/res/icons/16x16/breakpoint.png");
     return *bitmap;
 }
 
diff --git a/Libraries/LibGUI/Action.cpp b/Libraries/LibGUI/Action.cpp
index 34ea0c40370..fc98dce3451 100644
--- a/Libraries/LibGUI/Action.cpp
+++ b/Libraries/LibGUI/Action.cpp
@@ -87,7 +87,7 @@ NonnullRefPtr<Action> make_copy_action(Function<void(Action&)> callback, Core::O
 
 NonnullRefPtr<Action> make_paste_action(Function<void(Action&)> callback, Core::Object* parent)
 {
-    return Action::create("Paste", { Mod_Ctrl, Key_V }, Gfx::Bitmap::load_from_file("/res/icons/paste16.png"), move(callback), parent);
+    return Action::create("Paste", { Mod_Ctrl, Key_V }, Gfx::Bitmap::load_from_file("/res/icons/16x16/paste.png"), move(callback), parent);
 }
 
 NonnullRefPtr<Action> make_fullscreen_action(Function<void(Action&)> callback, Core::Object* parent)
diff --git a/Libraries/LibVT/TerminalWidget.cpp b/Libraries/LibVT/TerminalWidget.cpp
index f9365075c95..71aaa0b57f7 100644
--- a/Libraries/LibVT/TerminalWidget.cpp
+++ b/Libraries/LibVT/TerminalWidget.cpp
@@ -129,7 +129,7 @@ TerminalWidget::TerminalWidget(int ptm_fd, bool automatic_size_policy, RefPtr<Co
         copy();
     });
 
-    m_paste_action = GUI::Action::create("Paste", { Mod_Ctrl | Mod_Shift, Key_V }, Gfx::Bitmap::load_from_file("/res/icons/paste16.png"), [this](auto&) {
+    m_paste_action = GUI::Action::create("Paste", { Mod_Ctrl | Mod_Shift, Key_V }, Gfx::Bitmap::load_from_file("/res/icons/16x16/paste.png"), [this](auto&) {
         paste();
     });
 
diff --git a/MenuApplets/Audio/main.cpp b/MenuApplets/Audio/main.cpp
index 42e9c92f9f1..5696a7c546f 100644
--- a/MenuApplets/Audio/main.cpp
+++ b/MenuApplets/Audio/main.cpp
@@ -58,11 +58,11 @@ public:
                 update();
         };
 
-        m_volume_level_bitmaps.append({ 66, Gfx::Bitmap::load_from_file("/res/icons/audio-volume-high.png") });
-        m_volume_level_bitmaps.append({ 33, Gfx::Bitmap::load_from_file("/res/icons/audio-volume-medium.png") });
-        m_volume_level_bitmaps.append({ 1, Gfx::Bitmap::load_from_file("/res/icons/audio-volume-low.png") });
-        m_volume_level_bitmaps.append({ 0, Gfx::Bitmap::load_from_file("/res/icons/audio-volume-zero.png") });
-        m_volume_level_bitmaps.append({ 0, Gfx::Bitmap::load_from_file("/res/icons/audio-volume-muted.png") });
+        m_volume_level_bitmaps.append({ 66, Gfx::Bitmap::load_from_file("/res/icons/16x16/audio-volume-high.png") });
+        m_volume_level_bitmaps.append({ 33, Gfx::Bitmap::load_from_file("/res/icons/16x16/audio-volume-medium.png") });
+        m_volume_level_bitmaps.append({ 1, Gfx::Bitmap::load_from_file("/res/icons/16x16/audio-volume-low.png") });
+        m_volume_level_bitmaps.append({ 0, Gfx::Bitmap::load_from_file("/res/icons/16x16/audio-volume-zero.png") });
+        m_volume_level_bitmaps.append({ 0, Gfx::Bitmap::load_from_file("/res/icons/16x16/audio-volume-muted.png") });
 
         m_slider_window = add<GUI::Window>(window());
         m_slider_window->set_frameless(true);
diff --git a/MenuApplets/ClipboardHistory/main.cpp b/MenuApplets/ClipboardHistory/main.cpp
index ff53f13df85..17400eb97c4 100644
--- a/MenuApplets/ClipboardHistory/main.cpp
+++ b/MenuApplets/ClipboardHistory/main.cpp
@@ -77,7 +77,7 @@ int main(int argc, char* argv[])
     applet_window->set_title("ClipboardHistory");
     applet_window->set_window_type(GUI::WindowType::MenuApplet);
     auto& icon = applet_window->set_main_widget<GUI::ImageWidget>();
-    icon.load_from_file("/res/icons/clipboard.png");
+    icon.load_from_file("/res/icons/16x16/clipboard.png");
     icon.set_fill_with_background_color(true);
     icon.on_click = [& main_window = *main_window] {
         main_window.show();