diff --git a/programs/notepad/dialog.c b/programs/notepad/dialog.c
index ad1e9a4e6c6..0a62c5e5097 100644
--- a/programs/notepad/dialog.c
+++ b/programs/notepad/dialog.c
@@ -791,9 +791,10 @@ VOID DIALOG_HelpAboutWine(VOID)
 {
     static const WCHAR notepadW[] = { 'N','o','t','e','p','a','d','\n',0 };
     WCHAR szNotepad[MAX_STRING_LEN];
+    HICON icon = LoadIcon(Globals.hInstance, MAKEINTRESOURCE(IDI_NOTEPAD));
 
     LoadString(Globals.hInstance, STRING_NOTEPAD, szNotepad, SIZEOF(szNotepad));
-    ShellAbout(Globals.hMainWnd, szNotepad, notepadW, 0);
+    ShellAbout(Globals.hMainWnd, szNotepad, notepadW, icon);
 }
 
 
diff --git a/programs/notepad/main.c b/programs/notepad/main.c
index c7b961f43e6..18500df06f9 100644
--- a/programs/notepad/main.c
+++ b/programs/notepad/main.c
@@ -647,7 +647,7 @@ int PASCAL WinMain(HINSTANCE hInstance, HINSTANCE prev, LPSTR cmdline, int show)
     class.cbSize        = sizeof(class);
     class.lpfnWndProc   = NOTEPAD_WndProc;
     class.hInstance     = Globals.hInstance;
-    class.hIcon         = LoadIcon(0, IDI_APPLICATION);
+    class.hIcon         = LoadIcon(Globals.hInstance, MAKEINTRESOURCE(IDI_NOTEPAD));
     class.hCursor       = LoadCursor(0, IDC_ARROW);
     class.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1);
     class.lpszMenuName  = MAKEINTRESOURCE(MAIN_MENU);
diff --git a/programs/notepad/notepad.ico b/programs/notepad/notepad.ico
new file mode 100644
index 00000000000..002bbbac111
Binary files /dev/null and b/programs/notepad/notepad.ico differ
diff --git a/programs/notepad/notepad_res.h b/programs/notepad/notepad_res.h
index 16f5c14bed7..d95239afbd0 100644
--- a/programs/notepad/notepad_res.h
+++ b/programs/notepad/notepad_res.h
@@ -23,6 +23,8 @@
 #define DIALOG_PAGESETUP        0x202
 #define ID_ACCEL                0x203
 
+#define IDI_NOTEPAD             0x300
+
 /* Commands */
 #define CMD_NEW                 0x100
 #define CMD_OPEN                0x101
diff --git a/programs/notepad/rsrc.rc b/programs/notepad/rsrc.rc
index 51ce7a9a609..119ede1abed 100644
--- a/programs/notepad/rsrc.rc
+++ b/programs/notepad/rsrc.rc
@@ -44,6 +44,9 @@ ID_ACCEL ACCELERATORS
     VK_INSERT, CMD_PASTE, VIRTKEY, SHIFT
 }
 
+/* @makedep: notepad.ico */
+IDI_NOTEPAD ICON "notepad.ico"
+
 #include "Bg.rc"
 #include "Cs.rc"
 #include "Da.rc"