diff --git a/CMakeLists.txt b/CMakeLists.txt
index b216804..83b3dd6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -97,11 +97,11 @@ if(UNIX AND NOT APPLE)
         install(SCRIPT install.cmake)
     else()
         if(DEFINED ENV{FLATPAK_DEST})
-            install(FILES org.nou.tenmon.desktop DESTINATION "$ENV{FLATPAK_DEST}/share/applications")
-            install(FILES org.nou.tenmon.png DESTINATION "$ENV{FLATPAK_DEST}/share/icons/hicolor/32x32/apps")
+            install(FILES space.nouspiro.tenmon.desktop DESTINATION "$ENV{FLATPAK_DEST}/share/applications")
+            install(FILES space.nouspiro.tenmon.png DESTINATION "$ENV{FLATPAK_DEST}/share/icons/hicolor/64x64/apps")
         else()
-            install(FILES org.nou.tenmon.desktop DESTINATION "/usr/share/applications")
-            install(FILES org.nou.tenmon.png DESTINATION "/usr/share/icons/hicolor/32x32/apps")
+            install(FILES space.nouspiro.tenmon.desktop DESTINATION "/usr/share/applications")
+            install(FILES space.nouspiro.tenmon.png DESTINATION "/usr/share/icons/hicolor/64x64/apps")
         endif()
     endif()
 endif(UNIX AND NOT APPLE)
diff --git a/about/tenmon b/about/tenmon
index c3e1d7f..84e6f91 100644
--- a/about/tenmon
+++ b/about/tenmon
@@ -1,5 +1,5 @@
 <table><tr>
-<td style="padding-right:10px"><img src=":/org.nou.tenmon.png"></td>
+<td style="padding-right:10px"><img src=":/space.nouspiro.tenmon.png"></td>
 <td><h3>Tenmon</h3>
 Tenmon is FITS/XISF image viewer and converter. It also index FITS keywords.<br>
 v@GITVERSION@ Copyright © 2022 Dušan Poizl<br><br>
diff --git a/install.cmake b/install.cmake
index ad9d4b5..36ed2ff 100644
--- a/install.cmake
+++ b/install.cmake
@@ -1,4 +1,4 @@
 find_program(XDG-DESKTOP-MENU_EXECUTABLE xdg-desktop-menu)
 find_program(XDG-ICON-RESOURCE_EXECUTABLE xdg-icon-resource)
-execute_process(COMMAND ${XDG-DESKTOP-MENU_EXECUTABLE} install --novendor org.nou.tenmon.desktop WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR})
-execute_process(COMMAND ${XDG-ICON-RESOURCE_EXECUTABLE} install --novendor --size 32 org.nou.tenmon.png org.nou.tenmon WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR})
+execute_process(COMMAND ${XDG-DESKTOP-MENU_EXECUTABLE} install --novendor space.nouspiro.tenmon.desktop WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR})
+execute_process(COMMAND ${XDG-ICON-RESOURCE_EXECUTABLE} install --novendor --size 64 space.nouspiro.tenmon.png space.nouspiro.tenmon WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR})
diff --git a/main.cpp b/main.cpp
index 1b784e5..7aadfca 100644
--- a/main.cpp
+++ b/main.cpp
@@ -23,7 +23,7 @@ int main(int argc, char *argv[])
     QApplication a(argc, argv);
     a.setOrganizationName("nou");
     a.setApplicationName("Tenmon");
-    a.setWindowIcon(QIcon(":/org.nou.tenmon.png"));
+    a.setWindowIcon(QIcon(":/space.nouspiro.tenmon.png"));
 
     QTranslator translator;
     QTranslator translator2;
diff --git a/resources.qrc b/resources.qrc
index 07fb408..288ea51 100644
--- a/resources.qrc
+++ b/resources.qrc
@@ -3,7 +3,7 @@
         <file>invert.png</file>
         <file>nuke.png</file>
         <file>bayer.png</file>
-        <file>org.nou.tenmon.png</file>
+        <file>space.nouspiro.tenmon.png</file>
         <file>nuke_a.png</file>
         <file>about/tenmon</file>
         <file>about/pcl</file>
diff --git a/org.nou.tenmon.desktop b/space.nouspiro.tenmon.desktop
similarity index 87%
rename from org.nou.tenmon.desktop
rename to space.nouspiro.tenmon.desktop
index d398f7f..0ff8e0a 100644
--- a/org.nou.tenmon.desktop
+++ b/space.nouspiro.tenmon.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 Exec=tenmon %U
-Icon=org.nou.tenmon
+Icon=space.nouspiro.tenmon
 Comment=FITS Image viewer
 Name=Tenmon
 Categories=Graphics;2DGraphics;RasterGraphics;Viewer;
diff --git a/org.nou.tenmon.png b/space.nouspiro.tenmon.png
similarity index 100%
rename from org.nou.tenmon.png
rename to space.nouspiro.tenmon.png
diff --git a/tenmon.desktop b/tenmon.desktop
deleted file mode 100644
index 7fc944c..0000000
--- a/tenmon.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Type=Application
-Exec=Tenmon %U
-Icon=org.nou.tenmon
-Comment=FITS Image viewer
-Name=Tenmon
-Categories=Graphics;2DGraphics;RasterGraphics;Viewer;
-MimeType=image/fits;image/x-xisf;
-Terminal=false