diff --git a/Applications/Calculator/main.cpp b/Applications/Calculator/main.cpp
index f0701b1ead7..85dd112d86c 100644
--- a/Applications/Calculator/main.cpp
+++ b/Applications/Calculator/main.cpp
@@ -15,5 +15,6 @@ int main(int argc, char** argv)
     window->set_main_widget(calc_widget);
 
     window->show();
+    window->set_icon(GraphicsBitmap::load_from_file("/res/icons/16x16/app-calculator.png"));
     return app.exec();
 }
diff --git a/Base/res/apps/Calculator.af b/Base/res/apps/Calculator.af
index 3e346eb20b3..f0adb793725 100644
--- a/Base/res/apps/Calculator.af
+++ b/Base/res/apps/Calculator.af
@@ -4,5 +4,5 @@ Executable=/bin/Calculator
 Category=Utilities
 
 [Icons]
-16x16=
+16x16=/res/icons/16x16/app-calculator.png
 32x32=
diff --git a/Base/res/icons/16x16/app-calculator.png b/Base/res/icons/16x16/app-calculator.png
new file mode 100644
index 00000000000..4dd4b7c3f94
Binary files /dev/null and b/Base/res/icons/16x16/app-calculator.png differ