diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9e68cd425096a..179ab3e2b1086 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -564,8 +564,8 @@ if(ENABLE_DESKTOP_ENTRY AND ENABLE_GAME)
 	# exec_program(sed ARGS "-i" "'s/^\(Name.*=.*\)$/\1TEST/g'" ${CMAKE_CURRENT_BINARY_DIR}/${BINARY_PREFIX}wesnoth${BINARY_SUFFIX}.desktop )
 	# install the generated .desktop file
 	# install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${BINARY_PREFIX}wesnoth${BINARY_SUFFIX}.desktop DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications )
-	install(FILES icons/wesnoth.desktop DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications )
-	install(FILES icons/wesnoth-icon.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/64x64/apps )
+	install(FILES packaging/wesnoth.desktop DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications )
+	install(DIRECTORY packaging/icons/hicolor DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons )
 endif(ENABLE_DESKTOP_ENTRY AND ENABLE_GAME)
 
 
diff --git a/SConstruct b/SConstruct
index 2429b54939d89..8dca93c0948d0 100755
--- a/SConstruct
+++ b/SConstruct
@@ -687,11 +687,8 @@ if env["nls"]:
     env.InstallData("datadir", "wesnoth", "l10n-track")
 InstallManpages(env, "wesnoth")
 if have_client_prereqs and have_X and env["desktop_entry"]:
-     if sys.platform == "darwin":
-         env.InstallData("icondir", "wesnoth", "icons/wesnoth-icon-Mac.png")
-     else:
-         env.InstallData("icondir", "wesnoth", "icons/wesnoth-icon.png")
-     env.InstallData("desktopdir", "wesnoth", "icons/wesnoth.desktop")
+     env.InstallData("icondir", "wesnoth", "packaging/icons")
+     env.InstallData("desktopdir", "wesnoth", "packaging/wesnoth.desktop")
 
 # Python tools
 env.InstallData("bindir", "pytools", [os.path.join("data", "tools", tool) for tool in pythontools])
diff --git a/changelog b/changelog
index 7a34bade787fe..90bf6c52fca81 100644
--- a/changelog
+++ b/changelog
@@ -16,6 +16,8 @@ Version 1.13.10+dev:
      CMake minimum requirements, which is now at 2.8.5. Most distributions
      already use a CMake version above 3.0, so this would only affect users
      of vintage CMake versions.
+   * higher resolutions of the application icon have been added and are now
+     stored in the hicolor icon theme's directory
  * Language and i18n:
    * Updated translations: Chinese (Simplified), Italian, Spanish
  * Lua API:
diff --git a/icons/wesnoth-icon.png b/icons/wesnoth-icon.png
deleted file mode 100644
index 12b8ff66485c1..0000000000000
Binary files a/icons/wesnoth-icon.png and /dev/null differ
diff --git a/packaging/icons/hicolor/128x128/apps/wesnoth-icon.png b/packaging/icons/hicolor/128x128/apps/wesnoth-icon.png
new file mode 100644
index 0000000000000..239708dbfa33a
Binary files /dev/null and b/packaging/icons/hicolor/128x128/apps/wesnoth-icon.png differ
diff --git a/packaging/icons/hicolor/16x16/apps/wesnoth-icon.png b/packaging/icons/hicolor/16x16/apps/wesnoth-icon.png
new file mode 100644
index 0000000000000..c55432fbae0b8
Binary files /dev/null and b/packaging/icons/hicolor/16x16/apps/wesnoth-icon.png differ
diff --git a/packaging/icons/hicolor/256x256/apps/wesnoth-icon.png b/packaging/icons/hicolor/256x256/apps/wesnoth-icon.png
new file mode 100644
index 0000000000000..f9c5bdc2976a8
Binary files /dev/null and b/packaging/icons/hicolor/256x256/apps/wesnoth-icon.png differ
diff --git a/packaging/icons/hicolor/32x32/apps/wesnoth-icon.png b/packaging/icons/hicolor/32x32/apps/wesnoth-icon.png
new file mode 100644
index 0000000000000..c52df4e6f0e5b
Binary files /dev/null and b/packaging/icons/hicolor/32x32/apps/wesnoth-icon.png differ
diff --git a/packaging/icons/hicolor/512x512/apps/wesnoth-icon.png b/packaging/icons/hicolor/512x512/apps/wesnoth-icon.png
new file mode 100644
index 0000000000000..2a4c16d7f6367
Binary files /dev/null and b/packaging/icons/hicolor/512x512/apps/wesnoth-icon.png differ
diff --git a/packaging/icons/hicolor/64x64/apps/wesnoth-icon.png b/packaging/icons/hicolor/64x64/apps/wesnoth-icon.png
new file mode 100644
index 0000000000000..21920f5d0f4ca
Binary files /dev/null and b/packaging/icons/hicolor/64x64/apps/wesnoth-icon.png differ
diff --git a/icons/wesnoth.desktop b/packaging/wesnoth.desktop
old mode 100755
new mode 100644
similarity index 100%
rename from icons/wesnoth.desktop
rename to packaging/wesnoth.desktop