diff --git a/CMakeLists.txt b/CMakeLists.txt
index 639b2dba7..a9918c0a3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -847,10 +847,10 @@ if(WIN32)
 	endif()
 	# set the install/unistall icon used for the installer itself
 	# There is a bug in NSI that does not handle full unix paths properly.
-	set(CPACK_NSIS_MUI_ICON "${CMAKE_CURRENT_SOURCE_DIR}/client\\\\vcmi.ico")
-	set(CPACK_NSIS_MUI_UNIICON "${CMAKE_CURRENT_SOURCE_DIR}/client\\\\vcmi.ico")
+	set(CPACK_NSIS_MUI_ICON "${CMAKE_CURRENT_SOURCE_DIR}/clientapp/icons\\\\vcmi.ico")
+	set(CPACK_NSIS_MUI_UNIICON "${CMAKE_CURRENT_SOURCE_DIR}/clientapp/icons\\\\vcmi.ico")
 	# set the package header icon for MUI
-	set(CPACK_PACKAGE_ICON "${CMAKE_SOURCE_DIR}/client\\\\vcmi.ico")
+	set(CPACK_PACKAGE_ICON "${CMAKE_SOURCE_DIR}/clientapp/icons\\\\vcmi.ico")
 
 	set(CPACK_NSIS_MENU_LINKS "http://vcmi.eu/" "VCMI Web Site")
 
diff --git a/clientapp/CMakeLists.txt b/clientapp/CMakeLists.txt
index 56d21c1c8..edb0cb873 100644
--- a/clientapp/CMakeLists.txt
+++ b/clientapp/CMakeLists.txt
@@ -119,7 +119,6 @@ endif()
 
 #install icons and desktop file on Linux
 if(NOT WIN32 AND NOT APPLE AND NOT ANDROID)
-	#FIXME: move to client makefile?
 	foreach(iconSize 16 22 32 48 64 128 256 512 1024 2048)
 		install(FILES "icons/vcmiclient.${iconSize}x${iconSize}.png"
 			DESTINATION "share/icons/hicolor/${iconSize}x${iconSize}/apps"
diff --git a/clientapp/VCMI_client.rc b/clientapp/VCMI_client.rc
index f901de682..44812e214 100644
--- a/clientapp/VCMI_client.rc
+++ b/clientapp/VCMI_client.rc
@@ -1 +1 @@
-IDI_ICON1   ICON  "vcmi.ico"
\ No newline at end of file
+IDI_ICON1   ICON  "icons/vcmi.ico"
\ No newline at end of file
diff --git a/client/icons/generate_icns.py b/clientapp/icons/generate_icns.py
old mode 100755
new mode 100644
similarity index 100%
rename from client/icons/generate_icns.py
rename to clientapp/icons/generate_icns.py
diff --git a/client/vcmi.ico b/clientapp/icons/vcmi.ico
similarity index 100%
rename from client/vcmi.ico
rename to clientapp/icons/vcmi.ico
diff --git a/client/icons/vcmiclient.1024x1024.png b/clientapp/icons/vcmiclient.1024x1024.png
similarity index 100%
rename from client/icons/vcmiclient.1024x1024.png
rename to clientapp/icons/vcmiclient.1024x1024.png
diff --git a/client/icons/vcmiclient.128x128.png b/clientapp/icons/vcmiclient.128x128.png
similarity index 100%
rename from client/icons/vcmiclient.128x128.png
rename to clientapp/icons/vcmiclient.128x128.png
diff --git a/client/icons/vcmiclient.16x16.png b/clientapp/icons/vcmiclient.16x16.png
similarity index 100%
rename from client/icons/vcmiclient.16x16.png
rename to clientapp/icons/vcmiclient.16x16.png
diff --git a/client/icons/vcmiclient.2048x2048.png b/clientapp/icons/vcmiclient.2048x2048.png
similarity index 100%
rename from client/icons/vcmiclient.2048x2048.png
rename to clientapp/icons/vcmiclient.2048x2048.png
diff --git a/client/icons/vcmiclient.22x22.png b/clientapp/icons/vcmiclient.22x22.png
similarity index 100%
rename from client/icons/vcmiclient.22x22.png
rename to clientapp/icons/vcmiclient.22x22.png
diff --git a/client/icons/vcmiclient.256x256.png b/clientapp/icons/vcmiclient.256x256.png
similarity index 100%
rename from client/icons/vcmiclient.256x256.png
rename to clientapp/icons/vcmiclient.256x256.png
diff --git a/client/icons/vcmiclient.32x32.png b/clientapp/icons/vcmiclient.32x32.png
similarity index 100%
rename from client/icons/vcmiclient.32x32.png
rename to clientapp/icons/vcmiclient.32x32.png
diff --git a/client/icons/vcmiclient.48x48.png b/clientapp/icons/vcmiclient.48x48.png
similarity index 100%
rename from client/icons/vcmiclient.48x48.png
rename to clientapp/icons/vcmiclient.48x48.png
diff --git a/client/icons/vcmiclient.512x512.png b/clientapp/icons/vcmiclient.512x512.png
similarity index 100%
rename from client/icons/vcmiclient.512x512.png
rename to clientapp/icons/vcmiclient.512x512.png
diff --git a/client/icons/vcmiclient.64x64.png b/clientapp/icons/vcmiclient.64x64.png
similarity index 100%
rename from client/icons/vcmiclient.64x64.png
rename to clientapp/icons/vcmiclient.64x64.png
diff --git a/client/icons/vcmiclient.desktop b/clientapp/icons/vcmiclient.desktop
similarity index 100%
rename from client/icons/vcmiclient.desktop
rename to clientapp/icons/vcmiclient.desktop
diff --git a/client/icons/vcmiclient.svg b/clientapp/icons/vcmiclient.svg
similarity index 100%
rename from client/icons/vcmiclient.svg
rename to clientapp/icons/vcmiclient.svg
diff --git a/docs/modders/Translations.md b/docs/modders/Translations.md
index bc3aa42e9..7eeaa7ed9 100644
--- a/docs/modders/Translations.md
+++ b/docs/modders/Translations.md
@@ -82,6 +82,7 @@ VCMI Launcher and Map Editor use translation system provided by Qt framework so
 
 - Install Qt Linguist. You can find find standalone version here: https://download.qt.io/linguist_releases/
 - Open `<VCMI Sources>/launcher/translation/` directory, copy `english.ts` file and rename it to your language
+- Open `<VCMI Sources>/launcher/CMakeLists.txt` file with a text editor. In there you need to find list of existing translation files and add new file to the list.
 - Launch Qt Linguist, select Open and navigate to your copied file
 - Select any untranslated string, enter translation in field below, and click "Done and Next" (Ctrl+Return) to navigate to next untranslated string
 - Once translation has been finished, save resulting file.
diff --git a/launcher/CMakeLists.txt b/launcher/CMakeLists.txt
index 0eb22e284..1432b1b90 100644
--- a/launcher/CMakeLists.txt
+++ b/launcher/CMakeLists.txt
@@ -83,6 +83,7 @@ set(launcher_TS
 	"${translationsDir}/portuguese.ts"
 	"${translationsDir}/russian.ts"
 	"${translationsDir}/spanish.ts"
+	"${translationsDir}/swedish.ts"
 	"${translationsDir}/ukrainian.ts"
 	"${translationsDir}/vietnamese.ts"
 )