diff --git a/Applications/Spreadsheet/main.cpp b/Applications/Spreadsheet/main.cpp
index 6e0f6e9ef9..e38a7d40dd 100644
--- a/Applications/Spreadsheet/main.cpp
+++ b/Applications/Spreadsheet/main.cpp
@@ -86,6 +86,7 @@ int main(int argc, char* argv[])
     auto window = GUI::Window::construct();
     window->set_title("Spreadsheet");
     window->resize(640, 480);
+    window->set_icon(Gfx::Bitmap::load_from_file("/res/icons/16x16/app-spreadsheet.png"));
 
     auto& spreadsheet_widget = window->set_main_widget<Spreadsheet::SpreadsheetWidget>(NonnullRefPtrVector<Spreadsheet::Sheet> {}, filename == nullptr);
 
@@ -113,8 +114,8 @@ int main(int argc, char* argv[])
 
     file_menu.add_action(GUI::CommonActions::make_save_action([&](auto&) {
         if (spreadsheet_widget.current_filename().is_empty()) {
-            String name = "sheet";
-            Optional<String> save_path = GUI::FilePicker::get_save_filepath(window, name, "json");
+            String name = "workbook";
+            Optional<String> save_path = GUI::FilePicker::get_save_filepath(window, name, "sheets");
             if (!save_path.has_value())
                 return;
 
@@ -126,8 +127,8 @@ int main(int argc, char* argv[])
 
     file_menu.add_action(GUI::CommonActions::make_save_as_action([&](auto&) {
         auto current_filename = spreadsheet_widget.current_filename();
-        String name = "sheet";
-        Optional<String> save_path = GUI::FilePicker::get_save_filepath(window, name, "json");
+        String name = "workbook";
+        Optional<String> save_path = GUI::FilePicker::get_save_filepath(window, name, "sheets");
         if (!save_path.has_value())
             return;
 
diff --git a/Base/res/apps/Spreadsheet.af b/Base/res/apps/Spreadsheet.af
new file mode 100644
index 0000000000..5a9551a100
--- /dev/null
+++ b/Base/res/apps/Spreadsheet.af
@@ -0,0 +1,11 @@
+[App]
+Name=Spreadsheet
+Executable=/bin/Spreadsheet
+Category=Utilities
+
+[Icons]
+16x16=/res/icons/16x16/app-spreadsheet.png
+32x32=/res/icons/32x32/app-spreadsheet.png
+
+[Launcher]
+FileTypes=sheets
diff --git a/Base/res/icons/16x16/app-spreadsheet.png b/Base/res/icons/16x16/app-spreadsheet.png
new file mode 100644
index 0000000000..01ec1da34f
Binary files /dev/null and b/Base/res/icons/16x16/app-spreadsheet.png differ
diff --git a/Base/res/icons/16x16/filetype-spreadsheet.png b/Base/res/icons/16x16/filetype-spreadsheet.png
new file mode 100644
index 0000000000..a0a2fafefd
Binary files /dev/null and b/Base/res/icons/16x16/filetype-spreadsheet.png differ
diff --git a/Base/res/icons/32x32/app-spreadsheet.png b/Base/res/icons/32x32/app-spreadsheet.png
new file mode 100644
index 0000000000..9e47d069cd
Binary files /dev/null and b/Base/res/icons/32x32/app-spreadsheet.png differ
diff --git a/Base/res/icons/32x32/filetype-spreadsheet.png b/Base/res/icons/32x32/filetype-spreadsheet.png
new file mode 100644
index 0000000000..824c992736
Binary files /dev/null and b/Base/res/icons/32x32/filetype-spreadsheet.png differ
diff --git a/Libraries/LibGUI/FileIconProvider.cpp b/Libraries/LibGUI/FileIconProvider.cpp
index 2fd3e514dd..c152b83077 100644
--- a/Libraries/LibGUI/FileIconProvider.cpp
+++ b/Libraries/LibGUI/FileIconProvider.cpp
@@ -48,7 +48,8 @@ namespace GUI {
     F(python, ".py")           \
     F(sound, ".wav")           \
     F(ini, ".ini")             \
-    F(text, ".txt")
+    F(text, ".txt")            \
+    F(spreadsheet, ".sheets")
 
 #define __ENUMERATE_FILETYPE(filetype_name, ...) \
     static Icon s_filetype_##filetype_name##_icon;