diff --git a/Base/res/apps/Screensaver.af b/Base/res/apps/Screensaver.af
index 3765c6fbc9..fce0da7c7b 100644
--- a/Base/res/apps/Screensaver.af
+++ b/Base/res/apps/Screensaver.af
@@ -2,3 +2,6 @@
 Name=Screensaver
 Executable=/bin/Screensaver
 Category=Demos
+
+[Icons]
+16x16=/res/icons/16x16/app-screensaver.png
diff --git a/Base/res/icons/16x16/app-screensaver.png b/Base/res/icons/16x16/app-screensaver.png
new file mode 100644
index 0000000000..ad546f20cc
Binary files /dev/null and b/Base/res/icons/16x16/app-screensaver.png differ
diff --git a/Demos/Screensaver/Screensaver.cpp b/Demos/Screensaver/Screensaver.cpp
index be6c6ca89a..e477772b55 100644
--- a/Demos/Screensaver/Screensaver.cpp
+++ b/Demos/Screensaver/Screensaver.cpp
@@ -146,7 +146,7 @@ int main(int argc, char** argv)
     screensaver_window.update();
 
     window->show();
-    window->set_icon(Gfx::Bitmap::load_from_file("/res/icons/16x16/app-demo.png"));
+    window->set_icon(Gfx::Bitmap::load_from_file("/res/icons/16x16/app-screensaver.png"));
 
     return app.exec();
 }