diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 22f4dc2e9..e5cb60609 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -24,7 +24,7 @@ build-appimage:
     - cd ..
     - cmake . -Bbuild -LA -DUSE_INTREE_LIBQMC=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=install/usr -DOlm_DIR="olm/install/lib/cmake/Olm" -DQt5Keychain_DIR="qtkeychain/install/lib/x86_64-linux-gnu/cmake/Qt5Keychain" -DCMARK_LIBRARY="$PWD/cmark/install/lib/libcmark_static.a" -DCMARK_INCLUDE_DIR="$PWD/cmark/install/include"
     - cmake --build build --target install --parallel $(nproc)
-    - cp install/usr/share/icons/hicolor/256x256/apps/spectral.png install/org.eu.encom.spectral.png
+    - cp install/usr/share/icons/hicolor/256x256/apps/org.eu.encom.spectral.png install/org.eu.encom.spectral.png
     - linuxdeployqt install/usr/share/applications/org.eu.encom.spectral.desktop -appimage -qmldir=qml -qmldir=imports
     - mv *.AppImage spectral.AppImage
   artifacts:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index df4dc0e84..06bf3a90c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -242,8 +242,8 @@ if(LINUX)
     install(FILES linux/${IDENTIFIER}.appdata.xml
             DESTINATION  ${CMAKE_INSTALL_DATADIR}/metainfo
             )
-    file(GLOB spectral_icons icons/hicolor/*-apps-spectral.png)
+    file(GLOB spectral_icons icons/hicolor/*-apps-org.eu.encom.spectral.png)
     ecm_install_icons(ICONS ${spectral_icons}
-                      DESTINATION ${CMAKE_INSTALL_DATADIR}/icons
-                      )
+            DESTINATION ${CMAKE_INSTALL_DATADIR}/icons
+    )
 endif(LINUX)
diff --git a/flatpak/org.eu.encom.spectral.yaml b/flatpak/org.eu.encom.spectral.yaml
index 781ce4e8e..84e1db772 100644
--- a/flatpak/org.eu.encom.spectral.yaml
+++ b/flatpak/org.eu.encom.spectral.yaml
@@ -1,5 +1,4 @@
 id: org.eu.encom.spectral
-rename-icon: spectral
 runtime: org.kde.Platform
 runtime-version: "5.12"
 sdk: org.kde.Sdk
diff --git a/icons/hicolor/128-apps-spectral.png b/icons/hicolor/128-apps-org.eu.encom.spectral.png
similarity index 100%
rename from icons/hicolor/128-apps-spectral.png
rename to icons/hicolor/128-apps-org.eu.encom.spectral.png
diff --git a/icons/hicolor/256-apps-spectral.png b/icons/hicolor/256-apps-org.eu.encom.spectral.png
similarity index 100%
rename from icons/hicolor/256-apps-spectral.png
rename to icons/hicolor/256-apps-org.eu.encom.spectral.png
diff --git a/icons/hicolor/32-apps-spectral.png b/icons/hicolor/32-apps-org.eu.encom.spectral.png
similarity index 100%
rename from icons/hicolor/32-apps-spectral.png
rename to icons/hicolor/32-apps-org.eu.encom.spectral.png
diff --git a/icons/hicolor/512-apps-spectral.png b/icons/hicolor/512-apps-org.eu.encom.spectral.png
similarity index 100%
rename from icons/hicolor/512-apps-spectral.png
rename to icons/hicolor/512-apps-org.eu.encom.spectral.png