diff --git a/icon.ico b/icon.ico
deleted file mode 100644
index 67e777ef..00000000
Binary files a/icon.ico and /dev/null differ
diff --git a/icon.png b/icon.png
deleted file mode 100644
index f36cc1da..00000000
Binary files a/icon.png and /dev/null differ
diff --git a/install.sh b/install.sh
index ae4828b3..56644532 100755
--- a/install.sh
+++ b/install.sh
@@ -49,7 +49,7 @@ Version=${ac_version}
 Type=Application
 Encoding=UTF-8
 Exec=${ac_dir}/${ac_exec}
-Icon=${ac_dir}/icon.png
+Icon=${ac_dir}/docs/images/favicon.png
 StartupNotify=false
 Categories=Game;ActionGame;
 Name=AssaultCube
@@ -66,7 +66,7 @@ Version=${ac_version}
 Type=Application
 Encoding=UTF-8
 Exec=${ac_dir}/${ac_exec}
-Icon=${ac_dir}/icon.png
+Icon=${ac_dir}/docs/images/favicon.png
 StartupNotify=false
 Categories=Game;ActionGame;
 Name=AssaultCube
diff --git a/source/vcpp/buildEnv/ac.nsi b/source/vcpp/buildEnv/ac.nsi
index 97496d82..45d8184a 100644
--- a/source/vcpp/buildEnv/ac.nsi
+++ b/source/vcpp/buildEnv/ac.nsi
@@ -517,7 +517,7 @@ Section "AssaultCube ${AC_FULLVERSION}" AC
     ; Create uninstaller
     WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${AC_FULLNAMESAVE}" "DisplayName" "${AC_FULLNAME}"
     WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${AC_FULLNAMESAVE}" "UninstallString" '"$INSTDIR\uninstall.exe"'
-    WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${AC_FULLNAMESAVE}" "DisplayIcon" '"$INSTDIR\icon.ico"'
+    WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${AC_FULLNAMESAVE}" "DisplayIcon" '"$INSTDIR\docs\images\favicon.ico"'
 
     WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${AC_FULLNAMESAVE}" "HelpLink" "$INSTDIR\README.html"
     WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${AC_FULLNAMESAVE}" "URLInfoAbout" "http://assault.cubers.net"
@@ -542,8 +542,8 @@ Section "AssaultCube ${AC_FULLVERSION}" AC
         SetShellVarContext all
 
         CreateDirectory "$SMPROGRAMS\$StartMenuFolder"
-        CreateShortCut "$SMPROGRAMS\$StartMenuFolder\${AC_SHORTNAME}.lnk" "$INSTDIR\AssaultCube.bat" "" "$INSTDIR\icon.ico" 0 SW_SHOWMINIMIZED
-        CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Uninstall.lnk" "$INSTDIR\uninstall.exe" "" "$INSTDIR\icon.ico" 0
+        CreateShortCut "$SMPROGRAMS\$StartMenuFolder\${AC_SHORTNAME}.lnk" "$INSTDIR\AssaultCube.bat" "" "$INSTDIR\docs\images\favicon.ico" 0 SW_SHOWMINIMIZED
+        CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Uninstall.lnk" "$INSTDIR\uninstall.exe" "" "$INSTDIR\docs\images\favicon.ico" 0
         CreateShortCut "$SMPROGRAMS\$StartMenuFolder\README.lnk" "$INSTDIR\README.html" "" "" 0
 
     !insertmacro MUI_STARTMENU_WRITE_END
@@ -571,7 +571,7 @@ Section "Desktop Shortcuts" DESKSHORTCUTS
 
     SetShellVarContext all
 
-    CreateShortCut "$DESKTOP\${AC_SHORTNAME}.lnk" "$INSTDIR\AssaultCube.bat" "" "$INSTDIR\icon.ico" 0 SW_SHOWMINIMIZED
+    CreateShortCut "$DESKTOP\${AC_SHORTNAME}.lnk" "$INSTDIR\AssaultCube.bat" "" "$INSTDIR\docs\images\favicon.ico" 0 SW_SHOWMINIMIZED
 
 SectionEnd