diff --git a/misc/CCicon.ico b/misc/CCicon.ico
new file mode 100644
index 000000000..c4d2991c5
Binary files /dev/null and b/misc/CCicon.ico differ
diff --git a/misc/CCicon.rc b/misc/CCicon.rc
new file mode 100644
index 000000000..0dbe9f8ba
--- /dev/null
+++ b/misc/CCicon.rc
@@ -0,0 +1 @@
+1 ICON "CCicon.ico"
diff --git a/misc/CCicon_32.res b/misc/CCicon_32.res
new file mode 100644
index 000000000..7a25402fa
Binary files /dev/null and b/misc/CCicon_32.res differ
diff --git a/misc/CCicon_64.res b/misc/CCicon_64.res
new file mode 100644
index 000000000..fb3cf5fea
Binary files /dev/null and b/misc/CCicon_64.res differ
diff --git a/src/Window.c b/src/Window.c
index eb0bd0fc9..66a3b3bd0 100644
--- a/src/Window.c
+++ b/src/Window.c
@@ -360,7 +360,11 @@ void Window_Create(int x, int y, int width, int height, struct GraphicsMode* mod
 	wc.hInstance = win_instance;
 	wc.lpfnWndProc   = Window_Procedure;
 	wc.lpszClassName = CC_WIN_CLASSNAME;
-	/* TODO: Set window icons here */
+
+	wc.hIcon   = (HICON)LoadImage(win_instance, MAKEINTRESOURCE(1), IMAGE_ICON,
+			GetSystemMetrics(SM_CXICON), GetSystemMetrics(SM_CYICON), 0);
+	wc.hIconSm = (HICON)LoadImage(win_instance,MAKEINTRESOURCE(1), IMAGE_ICON,
+			GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), 0);
 	wc.hCursor = LoadCursor(NULL, IDC_ARROW);
 
 	ATOM atom = RegisterClassEx(&wc);