diff --git a/.github/workflows/ccpp_ubuntu.yml b/.github/workflows/ccpp_ubuntu.yml
index cd5aa6684..f1d2858b0 100644
--- a/.github/workflows/ccpp_ubuntu.yml
+++ b/.github/workflows/ccpp_ubuntu.yml
@@ -72,8 +72,8 @@ jobs:
     - name: build appimage
       working-directory: ./build/package
       run: |
-        chmod +x ../../src/platform/unix/build_appimage.sh
-        ../../src/platform/unix/build_appimage.sh Slic3r_ubu64.AppImage
+        chmod +x ../build_appimage.sh
+        ../build_appimage.sh Slic3r_ubu64.AppImage
     - name: Upload appimage
       uses: actions/upload-artifact@v1.0.0
       with:
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 59d30dce2..b3d3fe7e2 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -95,6 +95,9 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/platform/msw/Slic3r.rc.in ${CMAKE_CUR
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/platform/msw/gcodeviewer.rc.in ${CMAKE_CURRENT_BINARY_DIR}/gcodeviewer.rc @ONLY)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/platform/msw/PrusaSlicer.manifest.in ${CMAKE_CURRENT_BINARY_DIR}/Slic3r.manifest @ONLY)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/platform/osx/Info.plist.in ${CMAKE_CURRENT_BINARY_DIR}/Info.plist @ONLY)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/platform/unix/build_appimage.sh.in ${CMAKE_CURRENT_BINARY_DIR}/build_appimage.sh @ONLY)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/platform/unix/Gcodeviewer.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/Gcodeviewer.desktop @ONLY)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/platform/unix/Slic3r.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/Slic3r.desktop @ONLY)
 if (WIN32)
     add_library(Slic3r SHARED PrusaSlicer.cpp PrusaSlicer.hpp)
 else ()
diff --git a/src/platform/unix/Gcodeviewer.desktop b/src/platform/unix/Gcodeviewer.desktop.in
similarity index 61%
rename from src/platform/unix/Gcodeviewer.desktop
rename to src/platform/unix/Gcodeviewer.desktop.in
index 49891c9d3..1de2805fa 100644
--- a/src/platform/unix/Gcodeviewer.desktop
+++ b/src/platform/unix/Gcodeviewer.desktop.in
@@ -1,8 +1,8 @@
 [Desktop Entry]
-Name=Super GCode viewer
+Name=@GCODEVIEWER_APP_NAME@
 Comment=G-code viewer of Slic3r
-Exec=superslicer --gcodeviewer %F
-Icon=Slic3r-gcodeviewer
+Exec=@SLIC3R_APP_CMD@ --gcodeviewer %F
+Icon=@SLIC3R_APP_KEY@-gcodeviewer
 Terminal=false
 Type=Application
 MimeType=text/x.gcode;
diff --git a/src/platform/unix/Slic3r.desktop b/src/platform/unix/Slic3r.desktop.in
similarity index 78%
rename from src/platform/unix/Slic3r.desktop
rename to src/platform/unix/Slic3r.desktop.in
index 644f318ec..f61a779bb 100644
--- a/src/platform/unix/Slic3r.desktop
+++ b/src/platform/unix/Slic3r.desktop.in
@@ -1,13 +1,13 @@
 [Desktop Entry]
-Name=Slic3r
+Name=@SLIC3R_APP_KEY@
 GenericName=3D Printing Software
 Comment=G-code generator for 3D printers
-Icon=Slic3r
-Exec=Slic3r %F
+Icon=@SLIC3R_APP_KEY@
+Exec=@SLIC3R_APP_CMD@ %F
 Terminal=false
 Type=Application
 MimeType=model/stl;application/vnd.ms-3mfdocument;application/prs.wavefront-obj;application/x-amf;
 Categories=Graphics;3DGraphics;Engineering;
 Keywords=3D;Printing;Slicer;slice;3D;printer;convert;gcode;stl;obj;amf;SLA
 StartupNotify=false
-StartupWMClass=Slic3r
+StartupWMClass=@SLIC3R_APP_KEY@
diff --git a/src/platform/unix/build_appimage.sh b/src/platform/unix/build_appimage.sh.in
similarity index 74%
rename from src/platform/unix/build_appimage.sh
rename to src/platform/unix/build_appimage.sh.in
index 404907ea4..90583e760 100644
--- a/src/platform/unix/build_appimage.sh
+++ b/src/platform/unix/build_appimage.sh.in
@@ -7,16 +7,16 @@ APP_IMAGE=$1
 wget ${APPIMAGETOOLURL} -O ../appimagetool.AppImage
 chmod +x ../appimagetool.AppImage
 
-sed -i -e 's#/usr#././#g' bin/Slic3r
-mv Slic3r AppRun
+sed -i -e 's#/usr#././#g' bin/@SLIC3R_APP_CMD@
+mv @SLIC3R_APP_CMD@ AppRun
 chmod +x AppRun
 
-cp resources/icons/Slic3r_192px.png Slic3r.png
+cp resources/icons/@SLIC3R_APP_KEY@_192px.png @SLIC3R_APP_KEY@.png
 cat <<EOF > Slic3r.desktop
 [Desktop Entry]
-Name=Slic3r
+Name=@SLIC3R_APP_NAME@
 Exec=AppRun %F
-Icon=Slic3r
+Icon=@SLIC3R_APP_KEY@
 Type=Application
 Categories=Utility;
 MimeType=model/stl;application/vnd.ms-3mfdocument;application/prs.wavefront-obj;application/x-amf;
diff --git a/version.inc b/version.inc
index daae9694b..916d72e36 100644
--- a/version.inc
+++ b/version.inc
@@ -6,7 +6,7 @@ set(SLIC3R_APP_NAME "Slic3r")
 # Key fo the slicer, must only contains ascii chars and no spaces
 set(SLIC3R_APP_KEY "Slic3r")
 # exe name of the slicer, should be lowercase and valid in all os
-set(SLIC3R_APP_CMD "slic3r")
+set(SLIC3R_APP_CMD "Slic3r")
 # versions
 set(SLIC3R_VERSION "2.0")
 set(SLIC3R_VERSION_FULL "2.0.00.0")