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/README.md b/README.md
index fcac500c9..a68ea9a3c 100644
--- a/README.md
+++ b/README.md
@@ -6,18 +6,18 @@
 
 Spectral is a glossy cross-platform client for Matrix, the decentralized communication protocol for instant messaging.
 
-![Screenshot](https://gitlab.com/b0/spectral/raw/master/screenshots/1.png)
-![Screenshot](https://gitlab.com/b0/spectral/raw/master/screenshots/2.png)
-![Screenshot](https://gitlab.com/b0/spectral/raw/master/screenshots/3.png)
-![Screenshot](https://gitlab.com/b0/spectral/raw/master/screenshots/4.png)
+![Screenshot](https://gitlab.com/spectral-im/spectral/raw/master/screenshots/1.png)
+![Screenshot](https://gitlab.com/spectral-im/spectral/raw/master/screenshots/2.png)
+![Screenshot](https://gitlab.com/spectral-im/spectral/raw/master/screenshots/3.png)
+![Screenshot](https://gitlab.com/spectral-im/spectral/raw/master/screenshots/4.png)
 
 ## Documentation
 
 Documentation for Spectral is located
-[here](https://spectral.encom.eu.org/docs/).
+[here](https://spectral.im/docs/).
 
 Build instructions for Spectral are located on [this
-page](https://spectral.encom.eu.org/docs/tutorial/compile.html).
+page](https://spectral.im/docs/tutorial/compile.html).
 
 ## Contact
 
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
diff --git a/linux/org.eu.encom.spectral.appdata.xml b/linux/org.eu.encom.spectral.appdata.xml
index e39470a1c..5ffbf0710 100644
--- a/linux/org.eu.encom.spectral.appdata.xml
+++ b/linux/org.eu.encom.spectral.appdata.xml
@@ -14,9 +14,9 @@
     </p>
   </description>
 
-  <url type="homepage">https://gitlab.com/b0/spectral/</url>
-  <url type="bugtracker">https://gitlab.com/b0/spectral/issues/</url>
-  <url type="help">https://spectral.encom.eu.org/docs/</url>
+  <url type="homepage">https://gitlab.com/spectral-im/spectral/</url>
+  <url type="bugtracker">https://gitlab.com/spectral-im/spectral/issues/</url>
+  <url type="help">https://spectral.im/docs/</url>
 
   <categories>
     <category>Matrix</category>
@@ -30,19 +30,19 @@
   <screenshots>
     <screenshot type="default">
       <caption>Overview</caption>
-      <image>https://gitlab.com/b0/spectral/raw/master/screenshots/1.png</image>
+      <image>https://gitlab.com/spectral-im/spectral/raw/master/screenshots/1.png</image>
     </screenshot>
     <screenshot>
       <caption>Room Timeline</caption>
-      <image>https://gitlab.com/b0/spectral/raw/master/screenshots/2.png</image>
+      <image>https://gitlab.com/spectral-im/spectral/raw/master/screenshots/2.png</image>
     </screenshot>
     <screenshot>
       <caption>Room Config</caption>
-      <image>https://gitlab.com/b0/spectral/raw/master/screenshots/3.png</image>
+      <image>https://gitlab.com/spectral-im/spectral/raw/master/screenshots/3.png</image>
     </screenshot>
     <screenshot>
       <caption>Settings</caption>
-      <image>https://gitlab.com/b0/spectral/raw/master/screenshots/4.png</image>
+      <image>https://gitlab.com/spectral-im/spectral/raw/master/screenshots/4.png</image>
     </screenshot>
   </screenshots>