diff --git a/CMakeLists.txt b/CMakeLists.txt
index c394199f9..071f70c15 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -788,9 +788,15 @@ if(STK_ASSETS_DIR AND CHECK_ASSETS)
   install(DIRECTORY ${STK_ASSETS_DIR} DESTINATION ${STK_INSTALL_DATA_DIR}/data PATTERN ".svn" EXCLUDE PATTERN ".git" EXCLUDE)
 endif()
 install(FILES ${STK_DATA_DIR}/supertuxkart.desktop DESTINATION share/applications)
+install(FILES data/supertuxkart_16.png DESTINATION share/icons/hicolor/16x16/apps RENAME supertuxkart.png)
+install(FILES data/supertuxkart_32.png DESTINATION share/icons/hicolor/32x32/apps RENAME supertuxkart.png)
 install(FILES data/supertuxkart_48.png DESTINATION share/icons/hicolor/48x48/apps RENAME supertuxkart.png)
+install(FILES data/supertuxkart_64.png DESTINATION share/icons/hicolor/64x64/apps RENAME supertuxkart.png)
 install(FILES data/supertuxkart_128.png DESTINATION share/icons/hicolor/128x128/apps RENAME supertuxkart.png)
-install(FILES data/supertuxkart_48.png DESTINATION share/pixmaps RENAME supertuxkart.png)
+install(FILES data/supertuxkart_256.png DESTINATION share/icons/hicolor/256x256/apps RENAME supertuxkart.png)
+install(FILES data/supertuxkart_512.png DESTINATION share/icons/hicolor/512x512/apps RENAME supertuxkart.png)
+install(FILES data/supertuxkart_1024.png DESTINATION share/icons/hicolor/1024x1024/apps RENAME supertuxkart.png)
+install(FILES data/supertuxkart_512.png DESTINATION share/pixmaps RENAME supertuxkart.png)
 install(FILES data/supertuxkart.appdata.xml DESTINATION share/metainfo)
 
 if(MINGW)
diff --git a/android/generate_assets.sh b/android/generate_assets.sh
index 3a10e3d26..a45a3a4f4 100755
--- a/android/generate_assets.sh
+++ b/android/generate_assets.sh
@@ -45,7 +45,15 @@ export ASSETS_DIRS="library models music sfx textures"
 
 export CONVERT_TO_JPG_BLACKLIST="data/models/traffic_light.png"
 
-export BLACKLIST_FILES="data/music/cocoa_river_fast.ogg2"
+export BLACKLIST_FILES="data/supertuxkart.icns \
+                        data/supertuxkart_1024.png \
+                        data/supertuxkart_128.png \
+                        data/supertuxkart_16.png \
+                        data/supertuxkart_256.png \
+                        data/supertuxkart_32.png \
+                        data/supertuxkart_48.png \
+                        data/supertuxkart_512.png \
+                        data/supertuxkart_64.png"
 
 ################################################################################
 
diff --git a/android/icon-dbg.png b/android/icon-dbg.png
index f7e4e0ab3..3e4d18adf 100644
Binary files a/android/icon-dbg.png and b/android/icon-dbg.png differ
diff --git a/android/icon.png b/android/icon.png
index c03f50caa..a04507742 100644
Binary files a/android/icon.png and b/android/icon.png differ
diff --git a/android/icon_adaptive_fg-dbg.png b/android/icon_adaptive_fg-dbg.png
index 566285fa1..24e4b27dc 100644
Binary files a/android/icon_adaptive_fg-dbg.png and b/android/icon_adaptive_fg-dbg.png differ
diff --git a/android/icon_adaptive_fg.png b/android/icon_adaptive_fg.png
index f4e7365c6..45adca701 100644
Binary files a/android/icon_adaptive_fg.png and b/android/icon_adaptive_fg.png differ
diff --git a/data/gui/icons/karts.png b/data/gui/icons/karts.png
index 90420bce4..d9fa55a7d 100644
Binary files a/data/gui/icons/karts.png and b/data/gui/icons/karts.png differ
diff --git a/data/supertuxkart.icns b/data/supertuxkart.icns
index 806e9da08..d33c8a656 100644
Binary files a/data/supertuxkart.icns and b/data/supertuxkart.icns differ
diff --git a/data/supertuxkart_1024.png b/data/supertuxkart_1024.png
new file mode 100644
index 000000000..d9a8508d8
Binary files /dev/null and b/data/supertuxkart_1024.png differ
diff --git a/data/supertuxkart_128.png b/data/supertuxkart_128.png
index b93f156ab..bc06ebaae 100644
Binary files a/data/supertuxkart_128.png and b/data/supertuxkart_128.png differ
diff --git a/data/supertuxkart_16.png b/data/supertuxkart_16.png
new file mode 100644
index 000000000..05bc45cd1
Binary files /dev/null and b/data/supertuxkart_16.png differ
diff --git a/data/supertuxkart_256.png b/data/supertuxkart_256.png
new file mode 100644
index 000000000..a04507742
Binary files /dev/null and b/data/supertuxkart_256.png differ
diff --git a/data/supertuxkart_32.png b/data/supertuxkart_32.png
new file mode 100644
index 000000000..5ff266724
Binary files /dev/null and b/data/supertuxkart_32.png differ
diff --git a/data/supertuxkart_48.png b/data/supertuxkart_48.png
index a41cf2147..cac0ba489 100644
Binary files a/data/supertuxkart_48.png and b/data/supertuxkart_48.png differ
diff --git a/data/supertuxkart_512.png b/data/supertuxkart_512.png
new file mode 100644
index 000000000..0659046e5
Binary files /dev/null and b/data/supertuxkart_512.png differ
diff --git a/data/supertuxkart_64.png b/data/supertuxkart_64.png
new file mode 100644
index 000000000..6beb8e609
Binary files /dev/null and b/data/supertuxkart_64.png differ
diff --git a/tools/windows_installer/icon.ico b/tools/windows_installer/icon.ico
index 4755bca50..9041cfaf0 100644
Binary files a/tools/windows_installer/icon.ico and b/tools/windows_installer/icon.ico differ
diff --git a/tools/windows_installer/install.ico b/tools/windows_installer/install.ico
index 8d597f13d..9a2b07845 100644
Binary files a/tools/windows_installer/install.ico and b/tools/windows_installer/install.ico differ