diff --git a/Base/res/icons/16x16/app-calculator.png b/Base/res/icons/16x16/app-calculator.png
index 4dd4b7c3f9..703d4b1464 100644
Binary files a/Base/res/icons/16x16/app-calculator.png and b/Base/res/icons/16x16/app-calculator.png differ
diff --git a/Base/res/icons/16x16/app-hex-editor.png b/Base/res/icons/16x16/app-hex-editor.png
new file mode 100644
index 0000000000..1c09907517
Binary files /dev/null and b/Base/res/icons/16x16/app-hex-editor.png differ
diff --git a/Base/res/icons/16x16/app-hexeditor.png b/Base/res/icons/16x16/app-hexeditor.png
deleted file mode 100644
index 7fcae159f4..0000000000
Binary files a/Base/res/icons/16x16/app-hexeditor.png and /dev/null differ
diff --git a/Base/res/icons/16x16/filetype-hackstudio.png b/Base/res/icons/16x16/filetype-hackstudio.png
deleted file mode 100644
index 34295787ea..0000000000
Binary files a/Base/res/icons/16x16/filetype-hackstudio.png and /dev/null differ
diff --git a/Base/res/icons/16x16/filetype-html.png b/Base/res/icons/16x16/filetype-html.png
index b6a0cc0493..a3518bafb7 100644
Binary files a/Base/res/icons/16x16/filetype-html.png and b/Base/res/icons/16x16/filetype-html.png differ
diff --git a/Base/res/icons/16x16/filetype-library.png b/Base/res/icons/16x16/filetype-library.png
index 5a5cc7c635..705f228254 100644
Binary files a/Base/res/icons/16x16/filetype-library.png and b/Base/res/icons/16x16/filetype-library.png differ
diff --git a/Base/res/icons/16x16/filetype-markdown.png b/Base/res/icons/16x16/filetype-markdown.png
index 33a7ade678..e24f420fb1 100644
Binary files a/Base/res/icons/16x16/filetype-markdown.png and b/Base/res/icons/16x16/filetype-markdown.png differ
diff --git a/Base/res/icons/16x16/filetype-object.png b/Base/res/icons/16x16/filetype-object.png
index a392b1cdc8..b27dc1d611 100644
Binary files a/Base/res/icons/16x16/filetype-object.png and b/Base/res/icons/16x16/filetype-object.png differ
diff --git a/Base/res/icons/32x32/app-calculator.png b/Base/res/icons/32x32/app-calculator.png
index 7e9204db30..6a5efb452e 100644
Binary files a/Base/res/icons/32x32/app-calculator.png and b/Base/res/icons/32x32/app-calculator.png differ
diff --git a/Base/res/icons/32x32/app-hex-editor.png b/Base/res/icons/32x32/app-hex-editor.png
new file mode 100644
index 0000000000..9a7465eccb
Binary files /dev/null and b/Base/res/icons/32x32/app-hex-editor.png differ
diff --git a/Base/res/icons/32x32/app-hexeditor.png b/Base/res/icons/32x32/app-hexeditor.png
deleted file mode 100644
index cea2360c99..0000000000
Binary files a/Base/res/icons/32x32/app-hexeditor.png and /dev/null differ
diff --git a/Base/res/icons/32x32/app-text-editor.png b/Base/res/icons/32x32/app-text-editor.png
index 93e6db3330..df83648254 100644
Binary files a/Base/res/icons/32x32/app-text-editor.png and b/Base/res/icons/32x32/app-text-editor.png differ
diff --git a/Base/res/icons/32x32/filetype-hackstudio.png b/Base/res/icons/32x32/filetype-hackstudio.png
deleted file mode 100644
index c0f914930e..0000000000
Binary files a/Base/res/icons/32x32/filetype-hackstudio.png and /dev/null differ
diff --git a/Base/res/icons/32x32/filetype-library.png b/Base/res/icons/32x32/filetype-library.png
index 914ac5329b..4785d3050e 100644
Binary files a/Base/res/icons/32x32/filetype-library.png and b/Base/res/icons/32x32/filetype-library.png differ
diff --git a/Base/res/icons/32x32/filetype-markdown.png b/Base/res/icons/32x32/filetype-markdown.png
index 585b3023e4..31a0491a2f 100644
Binary files a/Base/res/icons/32x32/filetype-markdown.png and b/Base/res/icons/32x32/filetype-markdown.png differ
diff --git a/Base/res/icons/32x32/filetype-object.png b/Base/res/icons/32x32/filetype-object.png
index 469db2b62f..f7949399fc 100644
Binary files a/Base/res/icons/32x32/filetype-object.png and b/Base/res/icons/32x32/filetype-object.png differ
diff --git a/Userland/Applications/HexEditor/CMakeLists.txt b/Userland/Applications/HexEditor/CMakeLists.txt
index 496bb25a38..fd8ed78cfd 100644
--- a/Userland/Applications/HexEditor/CMakeLists.txt
+++ b/Userland/Applications/HexEditor/CMakeLists.txt
@@ -5,5 +5,5 @@ set(SOURCES
     main.cpp
 )
 
-serenity_app(HexEditor ICON app-hexeditor)
+serenity_app(HexEditor ICON app-hex-editor)
 target_link_libraries(HexEditor LibGUI)
diff --git a/Userland/Applications/HexEditor/HexEditorWidget.cpp b/Userland/Applications/HexEditor/HexEditorWidget.cpp
index 40d0f2aa97..f525134297 100644
--- a/Userland/Applications/HexEditor/HexEditorWidget.cpp
+++ b/Userland/Applications/HexEditor/HexEditorWidget.cpp
@@ -227,7 +227,7 @@ HexEditorWidget::HexEditorWidget()
     }));
 
     auto& help_menu = menubar->add_menu("Help");
-    help_menu.add_action(GUI::CommonActions::make_about_action("Hex Editor", GUI::Icon::default_icon("app-hexeditor"), window()));
+    help_menu.add_action(GUI::CommonActions::make_about_action("Hex Editor", GUI::Icon::default_icon("app-hex-editor"), window()));
 
     GUI::Application::the()->set_menubar(move(menubar));
 
diff --git a/Userland/Applications/HexEditor/main.cpp b/Userland/Applications/HexEditor/main.cpp
index dc5efa49ad..e8389645ef 100644
--- a/Userland/Applications/HexEditor/main.cpp
+++ b/Userland/Applications/HexEditor/main.cpp
@@ -43,7 +43,7 @@ int main(int argc, char** argv)
         return 1;
     }
 
-    auto app_icon = GUI::Icon::default_icon("app-hexeditor");
+    auto app_icon = GUI::Icon::default_icon("app-hex-editor");
 
     auto window = GUI::Window::construct();
     window->set_title("Hex Editor");