Merge branch 'madness/icons' into 'master'

Resource renaming to comply with the Freedesktop rules

See merge request Remmina/Remmina!2327

70 files changed, 98 insertions, 96 deletions

diff --git a/data/desktop/16x16/status/remmina-status.svg b/data/desktop/16x16/status/org.remmina.Remmina-status.svg
index a034b4928..a034b4928 100644
--- a/data/desktop/16x16/status/remmina-status.svg
+++ b/data/desktop/16x16/status/org.remmina.Remmina-status.svg
diff --git a/data/desktop/22x22/status/remmina-status.svg b/data/desktop/22x22/status/org.remmina.Remmina-status.svg
index 2ae339369..2ae339369 100644
--- a/data/desktop/22x22/status/remmina-status.svg
+++ b/data/desktop/22x22/status/org.remmina.Remmina-status.svg
diff --git a/data/desktop/24x24/status/remmina-status.svg b/data/desktop/24x24/status/org.remmina.Remmina-status.svg
index d3256bcb4..d3256bcb4 100644
--- a/data/desktop/24x24/status/remmina-status.svg
+++ b/data/desktop/24x24/status/org.remmina.Remmina-status.svg
diff --git a/data/desktop/32x32/status/remmina-status.svg b/data/desktop/32x32/status/org.remmina.Remmina-status.svg
index 46815fb19..46815fb19 100644
--- a/data/desktop/32x32/status/remmina-status.svg
+++ b/data/desktop/32x32/status/org.remmina.Remmina-status.svg
diff --git a/data/desktop/48x48/status/remmina-status.svg b/data/desktop/48x48/status/org.remmina.Remmina-status.svg
index c37c15600..c37c15600 100644
--- a/data/desktop/48x48/status/remmina-status.svg
+++ b/data/desktop/48x48/status/org.remmina.Remmina-status.svg
diff --git a/data/desktop/64x64/status/remmina-status.svg b/data/desktop/64x64/status/org.remmina.Remmina-status.svg
index aacb9e60a..aacb9e60a 100644
--- a/data/desktop/64x64/status/remmina-status.svg
+++ b/data/desktop/64x64/status/org.remmina.Remmina-status.svg
diff --git a/data/desktop/CMakeLists.txt b/data/desktop/CMakeLists.txt
index fef8262da..ca4191668 100644
--- a/data/desktop/CMakeLists.txt
+++ b/data/desktop/CMakeLists.txt
@@ -66,12 +66,12 @@ set(ICON96_DATA 96x96/apps/${REMMINA_ICON}.png)
 set(ICON128_DATA 128x128/apps/${REMMINA_ICON}.png)
 set(ICON256_DATA 256x256/apps/${REMMINA_ICON}.png)
 set(ICON512_DATA 512x512/apps/${REMMINA_ICON}.png)
-set(STATUS16_DATA 16x16/status/remmina-status.svg)
-set(STATUS22_DATA 22x22/status/remmina-status.svg)
-set(STATUS24_DATA 24x24/status/remmina-status.svg)
-set(STATUS32_DATA 32x32/status/remmina-status.svg)
-set(STATUS48_DATA 48x48/status/remmina-status.svg)
-set(STATUS64_DATA 64x64/status/remmina-status.svg)
+set(STATUS16_DATA 16x16/status/org.remmina.Remmina-status.svg)
+set(STATUS22_DATA 22x22/status/org.remmina.Remmina-status.svg)
+set(STATUS24_DATA 24x24/status/org.remmina.Remmina-status.svg)
+set(STATUS32_DATA 32x32/status/org.remmina.Remmina-status.svg)
+set(STATUS48_DATA 48x48/status/org.remmina.Remmina-status.svg)
+set(STATUS64_DATA 64x64/status/org.remmina.Remmina-status.svg)
 set(ICONSVG_DATA scalable/apps/${REMMINA_ICON}.svg)
 set(ICONSVG_RM_DATA scalable/apps/remmina-symbolic.svg)
 set(ICONSVG_ORG_DATA scalable/apps/${REMMINA_ICON}-symbolic.svg)
@@ -104,13 +104,13 @@ set(REMMINA_BINARY_PATH ${CMAKE_INSTALL_FULL_BINDIR}/remmina)
 
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${REMMINA_APP_ID}.desktop.in
     ${CMAKE_CURRENT_BINARY_DIR}/${REMMINA_APP_ID}.desktop @ONLY)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/remmina-file.desktop.in
-    ${CMAKE_CURRENT_BINARY_DIR}/remmina-file.desktop @ONLY)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/org.remmina.Remmina-file.desktop.in
+    ${CMAKE_CURRENT_BINARY_DIR}/org.remmina.Remmina-file.desktop @ONLY)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/remmina-file-wrapper.in
     ${CMAKE_CURRENT_BINARY_DIR}/remmina-file-wrapper @ONLY)
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${REMMINA_APP_ID}.desktop
     DESTINATION "${REMMINA_DATADIR}/applications")
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/remmina-file.desktop
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.remmina.Remmina-file.desktop
     DESTINATION "${REMMINA_DATADIR}/applications")
 install(FILES ${REMMINA_APP_ID}.appdata.xml
     DESTINATION "${REMMINA_DATADIR}/metainfo")
diff --git a/data/desktop/remmina-file.desktop.in b/data/desktop/org.remmina.Remmina-file.desktop.in
index d0f79fa31..d0f79fa31 100644
--- a/data/desktop/remmina-file.desktop.in
+++ b/data/desktop/org.remmina.Remmina-file.desktop.in
diff --git a/data/icons/CMakeLists.txt b/data/icons/CMakeLists.txt
index 645c09ef6..ac84ba008 100644
--- a/data/icons/CMakeLists.txt
+++ b/data/icons/CMakeLists.txt
@@ -36,32 +36,31 @@ set(APPICONSCALE_ACTIONS_DIR "${REMMINA_DATADIR}/icons/hicolor/scalable/actions"
 set(APPICONSCALE_EMBLEMS_DIR "${REMMINA_DATADIR}/icons/hicolor/scalable/emblems")
 
 set(APPICONSCALE_ACTIONS_DATA
-    scalable/actions/remmina-camera-photo-symbolic.svg
-    scalable/actions/remmina-connect-symbolic.svg
-    scalable/actions/remmina-disconnect-symbolic.svg
-    scalable/actions/remmina-document-save-symbolic.svg
-    scalable/actions/remmina-document-send-symbolic.svg
-    scalable/actions/remmina-duplicate-symbolic.svg
-    scalable/actions/remmina-dynres-symbolic.svg
-    scalable/actions/remmina-fit-window-symbolic.svg
-    scalable/actions/remmina-fullscreen-symbolic.svg
-    scalable/actions/remmina-multi-monitor-symbolic.svg
-    scalable/actions/remmina-go-bottom-symbolic.svg
-    scalable/actions/remmina-keyboard-symbolic.svg
-    scalable/actions/remmina-pan-down-symbolic.svg
-    scalable/actions/remmina-pan-up-symbolic.svg
-    scalable/actions/remmina-pin-down-symbolic.svg
-    scalable/actions/remmina-pin-up-symbolic.svg
-    scalable/actions/remmina-preferences-system-symbolic.svg
-    scalable/actions/remmina-scale-symbolic.svg
-    scalable/actions/remmina-switch-page-symbolic.svg
-    scalable/actions/remmina-system-run-symbolic.svg
-    scalable/actions/view-list.svg
+    scalable/actions/org.remmina.Remmina-camera-photo-symbolic.svg
+    scalable/actions/org.remmina.Remmina-connect-symbolic.svg
+    scalable/actions/org.remmina.Remmina-disconnect-symbolic.svg
+    scalable/actions/org.remmina.Remmina-document-save-symbolic.svg
+    scalable/actions/org.remmina.Remmina-document-send-symbolic.svg
+    scalable/actions/org.remmina.Remmina-duplicate-symbolic.svg
+    scalable/actions/org.remmina.Remmina-dynres-symbolic.svg
+    scalable/actions/org.remmina.Remmina-fit-window-symbolic.svg
+    scalable/actions/org.remmina.Remmina-fullscreen-symbolic.svg
+    scalable/actions/org.remmina.Remmina-multi-monitor-symbolic.svg
+    scalable/actions/org.remmina.Remmina-go-bottom-symbolic.svg
+    scalable/actions/org.remmina.Remmina-keyboard-symbolic.svg
+    scalable/actions/org.remmina.Remmina-pan-down-symbolic.svg
+    scalable/actions/org.remmina.Remmina-pan-up-symbolic.svg
+    scalable/actions/org.remmina.Remmina-pin-down-symbolic.svg
+    scalable/actions/org.remmina.Remmina-pin-up-symbolic.svg
+    scalable/actions/org.remmina.Remmina-preferences-system-symbolic.svg
+    scalable/actions/org.remmina.Remmina-scale-symbolic.svg
+    scalable/actions/org.remmina.Remmina-switch-page-symbolic.svg
+    scalable/actions/org.remmina.Remmina-system-run-symbolic.svg
     )
 
 set(APPICONSCALE_EMBLEMS_DATA
-    scalable/emblems/remmina-sftp-symbolic.svg
-    scalable/emblems/remmina-ssh-symbolic.svg
+    scalable/emblems/org.remmina.Remmina-sftp-symbolic.svg
+    scalable/emblems/org.remmina.Remmina-ssh-symbolic.svg
     )
 
 install(FILES ${APPICONSCALE_ACTIONS_DATA} DESTINATION ${APPICONSCALE_ACTIONS_DIR})
diff --git a/data/icons/scalable/actions/remmina-camera-photo-symbolic.svg b/data/icons/scalable/actions/org.remmina.Remmina-camera-photo-symbolic.svg
index c2a34b9be..c2a34b9be 100644
--- a/data/icons/scalable/actions/remmina-camera-photo-symbolic.svg
+++ b/data/icons/scalable/actions/org.remmina.Remmina-camera-photo-symbolic.svg
diff --git a/data/icons/scalable/actions/remmina-connect-symbolic.svg b/data/icons/scalable/actions/org.remmina.Remmina-connect-symbolic.svg
index f0e82b8a7..f0e82b8a7 100644
--- a/data/icons/scalable/actions/remmina-connect-symbolic.svg
+++ b/data/icons/scalable/actions/org.remmina.Remmina-connect-symbolic.svg
diff --git a/data/icons/scalable/actions/remmina-disconnect-symbolic.svg b/data/icons/scalable/actions/org.remmina.Remmina-disconnect-symbolic.svg
index 0bd16f48d..0bd16f48d 100644
--- a/data/icons/scalable/actions/remmina-disconnect-symbolic.svg
+++ b/data/icons/scalable/actions/org.remmina.Remmina-disconnect-symbolic.svg
diff --git a/data/icons/scalable/actions/remmina-document-save-symbolic.svg b/data/icons/scalable/actions/org.remmina.Remmina-document-save-symbolic.svg
index d383f09a3..d383f09a3 100644
--- a/data/icons/scalable/actions/remmina-document-save-symbolic.svg
+++ b/data/icons/scalable/actions/org.remmina.Remmina-document-save-symbolic.svg
diff --git a/data/icons/scalable/actions/remmina-document-send-symbolic.svg b/data/icons/scalable/actions/org.remmina.Remmina-document-send-symbolic.svg
index 8c0134d49..8c0134d49 100644
--- a/data/icons/scalable/actions/remmina-document-send-symbolic.svg
+++ b/data/icons/scalable/actions/org.remmina.Remmina-document-send-symbolic.svg
diff --git a/data/icons/scalable/actions/remmina-duplicate-symbolic.svg b/data/icons/scalable/actions/org.remmina.Remmina-duplicate-symbolic.svg
index ab751875d..ab751875d 100644
--- a/data/icons/scalable/actions/remmina-duplicate-symbolic.svg
+++ b/data/icons/scalable/actions/org.remmina.Remmina-duplicate-symbolic.svg
diff --git a/data/icons/scalable/actions/remmina-dynres-symbolic.svg b/data/icons/scalable/actions/org.remmina.Remmina-dynres-symbolic.svg
index 312901b5e..312901b5e 100644
--- a/data/icons/scalable/actions/remmina-dynres-symbolic.svg
+++ b/data/icons/scalable/actions/org.remmina.Remmina-dynres-symbolic.svg
diff --git a/data/icons/scalable/actions/remmina-fit-window-symbolic.svg b/data/icons/scalable/actions/org.remmina.Remmina-fit-window-symbolic.svg
index 7277d160a..7277d160a 100644
--- a/data/icons/scalable/actions/remmina-fit-window-symbolic.svg
+++ b/data/icons/scalable/actions/org.remmina.Remmina-fit-window-symbolic.svg
diff --git a/data/icons/scalable/actions/remmina-fullscreen-symbolic.svg b/data/icons/scalable/actions/org.remmina.Remmina-fullscreen-symbolic.svg
index 7c35ca1de..7c35ca1de 100644
--- a/data/icons/scalable/actions/remmina-fullscreen-symbolic.svg
+++ b/data/icons/scalable/actions/org.remmina.Remmina-fullscreen-symbolic.svg
diff --git a/data/icons/scalable/actions/remmina-go-bottom-symbolic.svg b/data/icons/scalable/actions/org.remmina.Remmina-go-bottom-symbolic.svg
index 001a65928..001a65928 100644
--- a/data/icons/scalable/actions/remmina-go-bottom-symbolic.svg
+++ b/data/icons/scalable/actions/org.remmina.Remmina-go-bottom-symbolic.svg
diff --git a/data/icons/scalable/actions/remmina-keyboard-symbolic.svg b/data/icons/scalable/actions/org.remmina.Remmina-keyboard-symbolic.svg
index e553684f2..e553684f2 100644
--- a/data/icons/scalable/actions/remmina-keyboard-symbolic.svg
+++ b/data/icons/scalable/actions/org.remmina.Remmina-keyboard-symbolic.svg
diff --git a/data/icons/scalable/actions/remmina-multi-monitor-symbolic.svg b/data/icons/scalable/actions/org.remmina.Remmina-multi-monitor-symbolic.svg
index 255547898..255547898 100644
--- a/data/icons/scalable/actions/remmina-multi-monitor-symbolic.svg
+++ b/data/icons/scalable/actions/org.remmina.Remmina-multi-monitor-symbolic.svg
diff --git a/data/icons/scalable/actions/remmina-pan-down-symbolic.svg b/data/icons/scalable/actions/org.remmina.Remmina-pan-down-symbolic.svg
index 545f9e265..545f9e265 100644
--- a/data/icons/scalable/actions/remmina-pan-down-symbolic.svg
+++ b/data/icons/scalable/actions/org.remmina.Remmina-pan-down-symbolic.svg
diff --git a/data/icons/scalable/actions/remmina-pan-up-symbolic.svg b/data/icons/scalable/actions/org.remmina.Remmina-pan-up-symbolic.svg
index 205132d61..205132d61 100644
--- a/data/icons/scalable/actions/remmina-pan-up-symbolic.svg
+++ b/data/icons/scalable/actions/org.remmina.Remmina-pan-up-symbolic.svg
diff --git a/data/icons/scalable/actions/remmina-pin-down-symbolic.svg b/data/icons/scalable/actions/org.remmina.Remmina-pin-down-symbolic.svg
index 9a86b829d..9a86b829d 100644
--- a/data/icons/scalable/actions/remmina-pin-down-symbolic.svg
+++ b/data/icons/scalable/actions/org.remmina.Remmina-pin-down-symbolic.svg
diff --git a/data/icons/scalable/actions/remmina-pin-up-symbolic.svg b/data/icons/scalable/actions/org.remmina.Remmina-pin-up-symbolic.svg
index 205132d61..205132d61 100644
--- a/data/icons/scalable/actions/remmina-pin-up-symbolic.svg
+++ b/data/icons/scalable/actions/org.remmina.Remmina-pin-up-symbolic.svg
diff --git a/data/icons/scalable/actions/remmina-preferences-system-symbolic.svg b/data/icons/scalable/actions/org.remmina.Remmina-preferences-system-symbolic.svg
index f95948c39..f95948c39 100644
--- a/data/icons/scalable/actions/remmina-preferences-system-symbolic.svg
+++ b/data/icons/scalable/actions/org.remmina.Remmina-preferences-system-symbolic.svg
diff --git a/data/icons/scalable/actions/remmina-scale-symbolic.svg b/data/icons/scalable/actions/org.remmina.Remmina-scale-symbolic.svg
index 18efc707c..18efc707c 100644
--- a/data/icons/scalable/actions/remmina-scale-symbolic.svg
+++ b/data/icons/scalable/actions/org.remmina.Remmina-scale-symbolic.svg
diff --git a/data/icons/scalable/actions/remmina-switch-page-symbolic.svg b/data/icons/scalable/actions/org.remmina.Remmina-switch-page-symbolic.svg
index 884620b76..884620b76 100644
--- a/data/icons/scalable/actions/remmina-switch-page-symbolic.svg
+++ b/data/icons/scalable/actions/org.remmina.Remmina-switch-page-symbolic.svg
diff --git a/data/icons/scalable/actions/remmina-system-run-symbolic.svg b/data/icons/scalable/actions/org.remmina.Remmina-system-run-symbolic.svg
index cde2ebc5f..cde2ebc5f 100644
--- a/data/icons/scalable/actions/remmina-system-run-symbolic.svg
+++ b/data/icons/scalable/actions/org.remmina.Remmina-system-run-symbolic.svg
diff --git a/data/icons/scalable/actions/view-list.svg b/data/icons/scalable/actions/view-list.svg
deleted file mode 100644
index 80579f48a..000000000
--- a/data/icons/scalable/actions/view-list.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" version="1.1">
- <path style="fill:#5c616c" d="M 8,10 H 14 V 12 H 8 Z"/>
- <path style="fill:#5c616c" d="M 8,4 H 14 V 6 H 8 Z"/>
- <path style="fill:#5c616c" d="M 2.25,3 H 5.75 C 5.8885,3 6,3.1115 6,3.25 V 6.75 C 6,6.8885 5.8885,7 5.75,7 H 2.25 C 2.1115,7 2,6.8885 2,6.75 V 3.25 C 2,3.1115 2.1115,3 2.25,3 Z"/>
- <path style="fill:#5c616c" d="M 2.25,9 H 5.75 C 5.8885,9 6,9.1115 6,9.25 V 12.75 C 6,12.889 5.8885,13 5.75,13 H 2.25 C 2.1115,13 2,12.889 2,12.75 V 9.25 C 2,9.1115 2.1115,9 2.25,9 Z"/>
-</svg>
diff --git a/data/icons/scalable/emblems/remmina-sftp-symbolic.svg b/data/icons/scalable/emblems/org.remmina.Remmina-sftp-symbolic.svg
index 0ec5645a6..0ec5645a6 100644
--- a/data/icons/scalable/emblems/remmina-sftp-symbolic.svg
+++ b/data/icons/scalable/emblems/org.remmina.Remmina-sftp-symbolic.svg
diff --git a/data/icons/scalable/emblems/remmina-ssh-symbolic.svg b/data/icons/scalable/emblems/org.remmina.Remmina-ssh-symbolic.svg
index f443bad94..f443bad94 100644
--- a/data/icons/scalable/emblems/remmina-ssh-symbolic.svg
+++ b/data/icons/scalable/emblems/org.remmina.Remmina-ssh-symbolic.svg
diff --git a/flatpak/org.remmina.Remmina.json b/flatpak/org.remmina.Remmina.json
index 0502c50b0..1d31e6d2e 100644
--- a/flatpak/org.remmina.Remmina.json
+++ b/flatpak/org.remmina.Remmina.json
@@ -41,6 +41,7 @@
         "--talk-name=org.gnome.Shell",
         "--talk-name=com.canonical.Unity",
         "--system-talk-name=org.freedesktop.Avahi",
+        "--filesystem=xdg-run/pipewire-0",
         "--filesystem=home",
         "--filesystem=xdg-download"
     ],
diff --git a/plugins/exec/CMakeLists.txt b/plugins/exec/CMakeLists.txt
index 9e8d5c5cf..3673e00e5 100644
--- a/plugins/exec/CMakeLists.txt
+++ b/plugins/exec/CMakeLists.txt
@@ -47,5 +47,9 @@ target_link_libraries(remmina-plugin-exec ${REMMINA_COMMON_LIBRARIES})
 install(TARGETS remmina-plugin-exec DESTINATION ${REMMINA_PLUGINDIR})
 
 install(FILES
-    scalable/emblems/remmina-tool-symbolic.svg
+    scalable/emblems/org.remmina.Remmina-tool-symbolic.svg
     DESTINATION ${APPICONSCALE_EMBLEMS_DIR})
+
+if(WITH_ICON_CACHE)
+    gtk_update_icon_cache("${REMMINA_DATADIR}/icons/hicolor")
+endif()
diff --git a/plugins/exec/exec_plugin_config.h b/plugins/exec/exec_plugin_config.h
index cec7f46ce..bdba2ca8c 100644
--- a/plugins/exec/exec_plugin_config.h
+++ b/plugins/exec/exec_plugin_config.h
@@ -40,4 +40,4 @@
 #define PLUGIN_NAME        "EXEC"
 #define PLUGIN_DESCRIPTION N_("Execute a command")
 #define PLUGIN_VERSION     "1.0"
-#define PLUGIN_APPICON     "remmina-tool-symbolic"
+#define PLUGIN_APPICON     "org.remmina.Remmina-tool-symbolic"
diff --git a/plugins/exec/scalable/emblems/remmina-tool-symbolic.svg b/plugins/exec/scalable/emblems/org.remmina.Remmina-tool-symbolic.svg
index e5225de58..e5225de58 100644
--- a/plugins/exec/scalable/emblems/remmina-tool-symbolic.svg
+++ b/plugins/exec/scalable/emblems/org.remmina.Remmina-tool-symbolic.svg
diff --git a/plugins/gvnc/CMakeLists.txt b/plugins/gvnc/CMakeLists.txt
index 0fd54df9f..d5e3f6909 100644
--- a/plugins/gvnc/CMakeLists.txt
+++ b/plugins/gvnc/CMakeLists.txt
@@ -46,7 +46,7 @@ target_link_libraries(remmina-plugin-gvnc ${REMMINA_COMMON_LIBRARIES} ${GTK-VNC_
 install(TARGETS remmina-plugin-gvnc DESTINATION ${REMMINA_PLUGINDIR})
 
 install(FILES
-    scalable/emblems/remmina-gvnc-symbolic.svg
+    scalable/emblems/org.remmina.Remmina-gvnc-symbolic.svg
     DESTINATION ${APPICONSCALE_EMBLEMS_DIR})
 
 if(WITH_ICON_CACHE)
diff --git a/plugins/gvnc/gvnc_plugin_config.h b/plugins/gvnc/gvnc_plugin_config.h
index 69bced2b5..0a06a7c52 100644
--- a/plugins/gvnc/gvnc_plugin_config.h
+++ b/plugins/gvnc/gvnc_plugin_config.h
@@ -39,5 +39,5 @@
 #define PLUGIN_NAME        "GVNC"
 #define PLUGIN_DESCRIPTION N_("Remmina VNC plugin for GNOME and KVM")
 #define PLUGIN_VERSION     "0.1b"
-#define PLUGIN_APPICON     "remmina-gvnc-symbolic"
+#define PLUGIN_APPICON     "org.remmina.Remmina-gvnc-symbolic"
 #endif
diff --git a/plugins/gvnc/scalable/emblems/remmina-gvnc-ssh-symbolic.svg b/plugins/gvnc/scalable/emblems/org.remmina.Remmina-gvnc-ssh-symbolic.svg
index 6c1da590e..6c1da590e 100644
--- a/plugins/gvnc/scalable/emblems/remmina-gvnc-ssh-symbolic.svg
+++ b/plugins/gvnc/scalable/emblems/org.remmina.Remmina-gvnc-ssh-symbolic.svg
diff --git a/plugins/gvnc/scalable/emblems/remmina-gvnc-symbolic.svg b/plugins/gvnc/scalable/emblems/org.remmina.Remmina-gvnc-symbolic.svg
index 060a62a94..060a62a94 100644
--- a/plugins/gvnc/scalable/emblems/remmina-gvnc-symbolic.svg
+++ b/plugins/gvnc/scalable/emblems/org.remmina.Remmina-gvnc-symbolic.svg
diff --git a/plugins/pyvnc/pyvnc.py b/plugins/pyvnc/pyvnc.py
index 362c605ee..04c6c24e1 100644
--- a/plugins/pyvnc/pyvnc.py
+++ b/plugins/pyvnc/pyvnc.py
@@ -23,10 +23,10 @@ class Plugin:
         self.type = "protocol"
         self.description = "VNC but in Python!"
         self.version  = "1.0"
-        self.icon_name = "remmina-vnc-symbolic"
-        self.icon_name_ssh = "remmina-vnc-ssh-symbolic"
+        self.icon_name = "org.remmina.Remmina-vnc-symbolic"
+        self.icon_name_ssh = "org.remmina.Remmina-vnc-ssh-symbolic"
         self.ssh_setting = remmina.PROTOCOL_SSH_SETTING_TUNNEL
-        
+
         self.features = [
             remmina.Feature(
                 type=remmina.PROTOCOL_FEATURE_TYPE_PREF,
@@ -42,7 +42,7 @@ class Plugin:
             ,remmina.Feature(remmina.PROTOCOL_FEATURE_TYPE_SCALE, VncFeature.Scale, None, None, None)
             ,remmina.Feature(remmina.PROTOCOL_FEATURE_TYPE_UNFOCUS, VncFeature.Unfocus, None, None, None)
         ]
-        
+
         colordepths = ("8", "256 colors (8 bpp)", "16", "High color (16 bpp)", "32", "True color (32 bpp)")
         print(type(colordepths))
         qualities = ("0", "Poor (fastest)", "1","Medium", "2","Good", "9","Best (slowest)")
@@ -64,7 +64,7 @@ class Plugin:
             , remmina.Setting(remmina.PROTOCOL_SETTING_TYPE_CHECK, "disableserverinput",     "Disable server input",     True,  None, None)
             , remmina.Setting(remmina.PROTOCOL_SETTING_TYPE_CHECK, "disablepasswordstoring", "Disable password storing", False, None, None)
         ]
-        
+
     def init(self, gp):
         print("[PyVNC.init]: Called!")
         pass
@@ -94,4 +94,4 @@ class Plugin:
         pass
 
 myPlugin = Plugin()
-remmina.register_plugin(myPlugin)
\ No newline at end of file
+remmina.register_plugin(myPlugin)
diff --git a/plugins/rdp/CMakeLists.txt b/plugins/rdp/CMakeLists.txt
index 0e28b31dd..a84534461 100644
--- a/plugins/rdp/CMakeLists.txt
+++ b/plugins/rdp/CMakeLists.txt
@@ -97,8 +97,8 @@ endif()
 install(TARGETS remmina-plugin-rdp DESTINATION ${REMMINA_PLUGINDIR})
 
 install(FILES
-    scalable/emblems/remmina-rdp-ssh-symbolic.svg
-    scalable/emblems/remmina-rdp-symbolic.svg
+    scalable/emblems/org.remmina.Remmina-rdp-ssh-symbolic.svg
+    scalable/emblems/org.remmina.Remmina-rdp-symbolic.svg
     DESTINATION ${APPICONSCALE_EMBLEMS_DIR})
 
 if(WITH_ICON_CACHE)
diff --git a/plugins/rdp/rdp_plugin.c b/plugins/rdp/rdp_plugin.c
index 35234b619..31dcf370e 100644
--- a/plugins/rdp/rdp_plugin.c
+++ b/plugins/rdp/rdp_plugin.c
@@ -2787,8 +2787,8 @@ static RemminaProtocolPlugin remmina_rdp =
 	N_("RDP - Remote Desktop Protocol"),            // Description
 	GETTEXT_PACKAGE,                                // Translation domain
 	remmina_plugin_rdp_version,                     // Version number
-	"remmina-rdp-symbolic",                         // Icon for normal connection
-	"remmina-rdp-ssh-symbolic",                     // Icon for SSH connection
+	"org.remmina.Remmina-rdp-symbolic",                         // Icon for normal connection
+	"org.remmina.Remmina-rdp-ssh-symbolic",                     // Icon for SSH connection
 	remmina_rdp_basic_settings,                     // Array for basic settings
 	remmina_rdp_advanced_settings,                  // Array for advanced settings
 	REMMINA_PROTOCOL_SSH_SETTING_TUNNEL,            // SSH settings type
diff --git a/plugins/rdp/scalable/emblems/remmina-rdp-ssh-symbolic.svg b/plugins/rdp/scalable/emblems/org.remmina.Remmina-rdp-ssh-symbolic.svg
index 6a345cf1d..6a345cf1d 100644
--- a/plugins/rdp/scalable/emblems/remmina-rdp-ssh-symbolic.svg
+++ b/plugins/rdp/scalable/emblems/org.remmina.Remmina-rdp-ssh-symbolic.svg
diff --git a/plugins/rdp/scalable/emblems/remmina-rdp-symbolic.svg b/plugins/rdp/scalable/emblems/org.remmina.Remmina-rdp-symbolic.svg
index af2b9708a..af2b9708a 100644
--- a/plugins/rdp/scalable/emblems/remmina-rdp-symbolic.svg
+++ b/plugins/rdp/scalable/emblems/org.remmina.Remmina-rdp-symbolic.svg
diff --git a/plugins/spice/CMakeLists.txt b/plugins/spice/CMakeLists.txt
index 21291fe26..87989be40 100644
--- a/plugins/spice/CMakeLists.txt
+++ b/plugins/spice/CMakeLists.txt
@@ -46,8 +46,8 @@ target_link_libraries(remmina-plugin-spice ${REMMINA_COMMON_LIBRARIES} ${SPICE_L
 install(TARGETS remmina-plugin-spice DESTINATION ${REMMINA_PLUGINDIR})
 
 install(FILES
-    scalable/emblems/remmina-spice-ssh-symbolic.svg
-    scalable/emblems/remmina-spice-symbolic.svg
+    scalable/emblems/org.remmina.Remmina-spice-ssh-symbolic.svg
+    scalable/emblems/org.remmina.Remmina-spice-symbolic.svg
     DESTINATION ${APPICONSCALE_EMBLEMS_DIR})
 
 if(WITH_ICON_CACHE)
diff --git a/plugins/spice/scalable/emblems/remmina-spice-ssh-symbolic.svg b/plugins/spice/scalable/emblems/org.remmina.Remmina-spice-ssh-symbolic.svg
index db98dabf6..db98dabf6 100644
--- a/plugins/spice/scalable/emblems/remmina-spice-ssh-symbolic.svg
+++ b/plugins/spice/scalable/emblems/org.remmina.Remmina-spice-ssh-symbolic.svg
diff --git a/plugins/spice/scalable/emblems/remmina-spice-symbolic.svg b/plugins/spice/scalable/emblems/org.remmina.Remmina-spice-symbolic.svg
index 7019006d5..7019006d5 100644
--- a/plugins/spice/scalable/emblems/remmina-spice-symbolic.svg
+++ b/plugins/spice/scalable/emblems/org.remmina.Remmina-spice-symbolic.svg
diff --git a/plugins/spice/spice_plugin.c b/plugins/spice/spice_plugin.c
index 31d83b90a..528b43378 100644
--- a/plugins/spice/spice_plugin.c
+++ b/plugins/spice/spice_plugin.c
@@ -727,8 +727,8 @@ static RemminaProtocolPlugin remmina_plugin_spice =
 	N_("SPICE - Simple Protocol for Independent Computing Environments"),   // Description
 	GETTEXT_PACKAGE,                                                        // Translation domain
 	VERSION,                                                                // Version number
-	"remmina-spice-symbolic",                                               // Icon for normal connection
-	"remmina-spice-ssh-symbolic",                                               // Icon for SSH connection
+	"org.remmina.Remmina-spice-symbolic",                                   // Icon for normal connection
+	"org.remmina.Remmina-spice-ssh-symbolic",                               // Icon for SSH connection
 	remmina_plugin_spice_basic_settings,                                    // Array for basic settings
 	remmina_plugin_spice_advanced_settings,                                 // Array for advanced settings
 	REMMINA_PROTOCOL_SSH_SETTING_TUNNEL,                                    // SSH settings type
diff --git a/plugins/tool_hello_world/CMakeLists.txt b/plugins/tool_hello_world/CMakeLists.txt
index ccf660725..354cb43b9 100644
--- a/plugins/tool_hello_world/CMakeLists.txt
+++ b/plugins/tool_hello_world/CMakeLists.txt
@@ -47,5 +47,9 @@ target_link_libraries(remmina-plugin-tool_hello_world ${REMMINA_COMMON_LIBRARIES
 install(TARGETS remmina-plugin-tool_hello_world DESTINATION ${REMMINA_PLUGINDIR})
 
 install(FILES
-    scalable/emblems/remmina-tool-symbolic.svg
+    scalable/emblems/org.remmina.Remmina-tool-symbolic.svg
     DESTINATION ${APPICONSCALE_EMBLEMS_DIR})
+
+if(WITH_ICON_CACHE)
+    gtk_update_icon_cache("${REMMINA_DATADIR}/icons/hicolor")
+endif()
diff --git a/plugins/tool_hello_world/plugin_config.h b/plugins/tool_hello_world/plugin_config.h
index 68e02f344..e648049d7 100644
--- a/plugins/tool_hello_world/plugin_config.h
+++ b/plugins/tool_hello_world/plugin_config.h
@@ -39,5 +39,5 @@
 #define PLUGIN_NAME        "HELLO"
 #define PLUGIN_DESCRIPTION N_("Hello, World!")
 #define PLUGIN_VERSION     "1.0"
-#define PLUGIN_APPICON     "remmina-tool"
+#define PLUGIN_APPICON     "org.remmina.Remmina-tool-symbolic"
 #endif
diff --git a/plugins/tool_hello_world/scalable/emblems/remmina-tool-symbolic.svg b/plugins/tool_hello_world/scalable/emblems/org.remmina.Remmina-tool-symbolic.svg
index e5225de58..e5225de58 100644
--- a/plugins/tool_hello_world/scalable/emblems/remmina-tool-symbolic.svg
+++ b/plugins/tool_hello_world/scalable/emblems/org.remmina.Remmina-tool-symbolic.svg
diff --git a/plugins/tool_hello_world_python/toolsdevler.py b/plugins/tool_hello_world_python/toolsdevler.py
index 4597f73f3..d47d86d5e 100644
--- a/plugins/tool_hello_world_python/toolsdevler.py
+++ b/plugins/tool_hello_world_python/toolsdevler.py
@@ -15,8 +15,8 @@ class HelloPlugin:
         self.type = "protocol"
         self.description = "Hello World!"
         self.version  = "1.0"
-        self.icon_name = "remmina-tool"
-        self.icon_name_ssh = "remmina-tool"
+        self.icon_name = "org.remmina.Remmina-tool-symbolic"
+        self.icon_name_ssh = "org.remmina.Remmina-tool-symbolic"
         self.btn = Gtk.Button(label="Hello!")
         self.btn.connect("clicked", self.callback_add, "hello")
         pass
diff --git a/plugins/vnc/CMakeLists.txt b/plugins/vnc/CMakeLists.txt
index c40bac778..220bfbe06 100644
--- a/plugins/vnc/CMakeLists.txt
+++ b/plugins/vnc/CMakeLists.txt
@@ -50,8 +50,8 @@ target_link_libraries(remmina-plugin-vnc ${REMMINA_COMMON_LIBRARIES} ${LIBVNCSER
 install(TARGETS remmina-plugin-vnc DESTINATION ${REMMINA_PLUGINDIR})
 
 install(FILES
-    scalable/emblems/remmina-vnc-ssh-symbolic.svg
-    scalable/emblems/remmina-vnc-symbolic.svg
+    scalable/emblems/org.remmina.Remmina-vnc-ssh-symbolic.svg
+    scalable/emblems/org.remmina.Remmina-vnc-symbolic.svg
     DESTINATION ${APPICONSCALE_EMBLEMS_DIR})
 
 if(WITH_ICON_CACHE)
diff --git a/plugins/vnc/scalable/emblems/remmina-vnc-ssh-symbolic.svg b/plugins/vnc/scalable/emblems/org.remmina.Remmina-vnc-ssh-symbolic.svg
index 6c1da590e..6c1da590e 100644
--- a/plugins/vnc/scalable/emblems/remmina-vnc-ssh-symbolic.svg
+++ b/plugins/vnc/scalable/emblems/org.remmina.Remmina-vnc-ssh-symbolic.svg
diff --git a/plugins/vnc/scalable/emblems/remmina-vnc-symbolic.svg b/plugins/vnc/scalable/emblems/org.remmina.Remmina-vnc-symbolic.svg
index 060a62a94..060a62a94 100644
--- a/plugins/vnc/scalable/emblems/remmina-vnc-symbolic.svg
+++ b/plugins/vnc/scalable/emblems/org.remmina.Remmina-vnc-symbolic.svg
diff --git a/plugins/vnc/vnc_plugin.h b/plugins/vnc/vnc_plugin.h
index 82d583539..78607d1eb 100644
--- a/plugins/vnc/vnc_plugin.h
+++ b/plugins/vnc/vnc_plugin.h
@@ -40,13 +40,13 @@
 #define VNC_PLUGIN_NAME        "VNC"
 #define VNC_PLUGIN_DESCRIPTION N_("Remmina VNC Plugin")
 #define VNC_PLUGIN_VERSION     VERSION
-#define VNC_PLUGIN_APPICON     "remmina-vnc-symbolic"
-#define VNC_PLUGIN_SSH_APPICON     "remmina-vnc-ssh-symbolic"
+#define VNC_PLUGIN_APPICON     "org.remmina.Remmina-vnc-symbolic"
+#define VNC_PLUGIN_SSH_APPICON     "org.remmina.Remmina-vnc-ssh-symbolic"
 #define VNCI_PLUGIN_NAME        "VNCI"
 #define VNCI_PLUGIN_DESCRIPTION N_("Remmina VNC listener Plugin")
 #define VNCI_PLUGIN_VERSION     VERSION
-#define VNCI_PLUGIN_APPICON     "remmina-vnc-symbolic"
-#define VNCI_PLUGIN_SSH_APPICON     "remmina-vnc-ssh-symbolic"
+#define VNCI_PLUGIN_APPICON     "org.remmina.Remmina-vnc-symbolic"
+#define VNCI_PLUGIN_SSH_APPICON     "org.remmina.Remmina-vnc-ssh-symbolic"
 #endif
 
 typedef struct _RemminaPluginVncData {
diff --git a/plugins/www/CMakeLists.txt b/plugins/www/CMakeLists.txt
index d76014911..6884f7664 100644
--- a/plugins/www/CMakeLists.txt
+++ b/plugins/www/CMakeLists.txt
@@ -50,7 +50,7 @@ target_link_libraries(remmina-plugin-www ${REMMINA_COMMON_LIBRARIES} ${WEBKIT2_L
 install(TARGETS remmina-plugin-www DESTINATION ${REMMINA_PLUGINDIR})
 
 install(FILES
-    scalable/emblems/remmina-www-symbolic.svg
+    scalable/emblems/org.remmina.Remmina-www-symbolic.svg
     DESTINATION ${APPICONSCALE_EMBLEMS_DIR})
 
 if(WITH_ICON_CACHE)
diff --git a/plugins/www/scalable/emblems/remmina-www-symbolic.svg b/plugins/www/scalable/emblems/org.remmina.Remmina-www-symbolic.svg
index 23a1e7b49..23a1e7b49 100644
--- a/plugins/www/scalable/emblems/remmina-www-symbolic.svg
+++ b/plugins/www/scalable/emblems/org.remmina.Remmina-www-symbolic.svg
diff --git a/plugins/www/www_config.h b/plugins/www/www_config.h
index 3147b4d99..d09cf70c4 100644
--- a/plugins/www/www_config.h
+++ b/plugins/www/www_config.h
@@ -42,5 +42,5 @@
 #define PLUGIN_NAME        "WWW"
 #define PLUGIN_DESCRIPTION N_("Remmina web-browser plugin")
 #define PLUGIN_VERSION     "0.1.0"
-#define PLUGIN_APPICON     "remmina-www-symbolic"
+#define PLUGIN_APPICON     "org.remmina.Remmina-www-symbolic"
 #endif
diff --git a/plugins/x2go/16x16/emblems/remmina-x2go.png b/plugins/x2go/16x16/emblems/org.remmina.Remmina-x2go.png
index 6452b5115..6452b5115 100644
--- a/plugins/x2go/16x16/emblems/remmina-x2go.png
+++ b/plugins/x2go/16x16/emblems/org.remmina.Remmina-x2go.png
diff --git a/plugins/x2go/22x22/emblems/remmina-x2go.png b/plugins/x2go/22x22/emblems/org.remmina.Remmina-x2go.png
index 1608876ee..1608876ee 100644
--- a/plugins/x2go/22x22/emblems/remmina-x2go.png
+++ b/plugins/x2go/22x22/emblems/org.remmina.Remmina-x2go.png
diff --git a/plugins/x2go/CMakeLists.txt b/plugins/x2go/CMakeLists.txt
index dd2119b11..73abd6806 100644
--- a/plugins/x2go/CMakeLists.txt
+++ b/plugins/x2go/CMakeLists.txt
@@ -58,9 +58,9 @@ target_link_libraries(remmina-plugin-x2go
 install(TARGETS remmina-plugin-x2go DESTINATION ${REMMINA_PLUGINDIR})
 
 set(APPICON16_EMBLEMS_DIR "${REMMINA_DATADIR}/icons/hicolor/16x16/emblems")
-install(FILES 16x16/emblems/remmina-x2go.png DESTINATION ${APPICON16_EMBLEMS_DIR})
+install(FILES 16x16/emblems/org.remmina.Remmina-x2go.png DESTINATION ${APPICON16_EMBLEMS_DIR})
 
 set(APPICON22_EMBLEMS_DIR "${REMMINA_DATADIR}/icons/hicolor/22x22/emblems")
-install(FILES 22x22/emblems/remmina-x2go.png DESTINATION ${APPICON22_EMBLEMS_DIR})
+install(FILES 22x22/emblems/org.remmina.Remmina-x2go.png DESTINATION ${APPICON22_EMBLEMS_DIR})
 
 gtk_update_icon_cache("${REMMINA_DATADIR}/icons/hicolor")
diff --git a/plugins/x2go/x2go_plugin.h b/plugins/x2go/x2go_plugin.h
index 7c140c936..b8884d276 100644
--- a/plugins/x2go/x2go_plugin.h
+++ b/plugins/x2go/x2go_plugin.h
@@ -42,4 +42,4 @@
 #define PLUGIN_NAME        "X2GO"
 #define PLUGIN_DESCRIPTION N_("X2Go - Launch an X2Go session")
 #define PLUGIN_VERSION     "2.0.0"
-#define PLUGIN_APPICON     "remmina-x2go"
+#define PLUGIN_APPICON     "org.remmina.Remmina-x2go"
diff --git a/src/rcw.c b/src/rcw.c
index 01ea950c7..88510a7b1 100644
--- a/src/rcw.c
+++ b/src/rcw.c
@@ -2306,7 +2306,7 @@ rcw_create_toolbar(RemminaConnectionWindow *cnnwin, gint mode)
 
 	/* Duplicate session */
 	toolitem = gtk_tool_button_new(NULL, "Duplicate connection");
-	gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(toolitem), "remmina-duplicate-symbolic");
+	gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(toolitem), "org.remmina.Remmina-duplicate-symbolic");
 	gtk_tool_item_set_tooltip_text(toolitem, _("Duplicate current connection"));
 	gtk_toolbar_insert(GTK_TOOLBAR(toolbar), toolitem, -1);
 	gtk_widget_show(GTK_WIDGET(toolitem));
@@ -2323,7 +2323,7 @@ rcw_create_toolbar(RemminaConnectionWindow *cnnwin, gint mode)
 
 	/* Auto-Fit */
 	toolitem = gtk_tool_button_new(NULL, NULL);
-	gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(toolitem), "remmina-fit-window-symbolic");
+	gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(toolitem), "org.remmina.Remmina-fit-window-symbolic");
 	rcw_set_tooltip(GTK_WIDGET(toolitem), _("Resize the window to fit in remote resolution"),
 			remmina_pref.shortcutkey_autofit, 0);
 	g_signal_connect(G_OBJECT(toolitem), "clicked", G_CALLBACK(rcw_toolbar_autofit), cnnwin);
@@ -2334,7 +2334,7 @@ rcw_create_toolbar(RemminaConnectionWindow *cnnwin, gint mode)
 
 	/* Fullscreen toggle */
 	toolitem = gtk_toggle_tool_button_new();
-	gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(toolitem), "remmina-fullscreen-symbolic");
+	gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(toolitem), "org.remmina.Remmina-fullscreen-symbolic");
 	rcw_set_tooltip(GTK_WIDGET(toolitem), _("Toggle fullscreen mode"),
 			remmina_pref.shortcutkey_fullscreen, 0);
 	gtk_toolbar_insert(GTK_TOOLBAR(toolbar), toolitem, -1);
@@ -2366,7 +2366,7 @@ rcw_create_toolbar(RemminaConnectionWindow *cnnwin, gint mode)
 	gtk_container_add(GTK_CONTAINER(toolitem), widget);
 
 #if GTK_CHECK_VERSION(3, 14, 0)
-	arrow = gtk_image_new_from_icon_name("remmina-pan-down-symbolic", GTK_ICON_SIZE_SMALL_TOOLBAR);
+	arrow = gtk_image_new_from_icon_name("org.remmina.Remmina-pan-down-symbolic", GTK_ICON_SIZE_SMALL_TOOLBAR);
 #else
 	arrow = gtk_arrow_new(GTK_ARROW_DOWN, GTK_SHADOW_NONE);
 #endif
@@ -2380,7 +2380,7 @@ rcw_create_toolbar(RemminaConnectionWindow *cnnwin, gint mode)
 	/* Multi monitor */
 	if (n_monitors > 1) {
 		toolitem = gtk_toggle_tool_button_new();
-		gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(toolitem), "remmina-multi-monitor-symbolic");
+		gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(toolitem), "org.remmina.Remmina-multi-monitor-symbolic");
 		rcw_set_tooltip(GTK_WIDGET(toolitem), _("Multi monitor"),
 				remmina_pref.shortcutkey_multimon, 0);
 		gtk_toolbar_insert(GTK_TOOLBAR(toolbar), toolitem, -1);
@@ -2396,7 +2396,7 @@ rcw_create_toolbar(RemminaConnectionWindow *cnnwin, gint mode)
 
 	/* Dynamic Resolution Update */
 	toolitem = gtk_toggle_tool_button_new();
-	gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(toolitem), "remmina-dynres-symbolic");
+	gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(toolitem), "org.remmina.Remmina-dynres-symbolic");
 	rcw_set_tooltip(GTK_WIDGET(toolitem), _("Toggle dynamic resolution update"),
 			remmina_pref.shortcutkey_dynres, 0);
 	gtk_toolbar_insert(GTK_TOOLBAR(toolbar), toolitem, -1);
@@ -2406,7 +2406,7 @@ rcw_create_toolbar(RemminaConnectionWindow *cnnwin, gint mode)
 
 	/* Scaler button */
 	toolitem = gtk_toggle_tool_button_new();
-	gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(toolitem), "remmina-scale-symbolic");
+	gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(toolitem), "org.remmina.Remmina-scale-symbolic");
 	rcw_set_tooltip(GTK_WIDGET(toolitem), _("Toggle scaled mode"), remmina_pref.shortcutkey_scale, 0);
 	gtk_toolbar_insert(GTK_TOOLBAR(toolbar), toolitem, -1);
 	gtk_widget_show(GTK_WIDGET(toolitem));
@@ -2430,7 +2430,7 @@ rcw_create_toolbar(RemminaConnectionWindow *cnnwin, gint mode)
 		gtk_widget_set_name(widget, "remmina-small-button");
 	gtk_container_add(GTK_CONTAINER(toolitem), widget);
 #if GTK_CHECK_VERSION(3, 14, 0)
-	arrow = gtk_image_new_from_icon_name("remmina-pan-down-symbolic", GTK_ICON_SIZE_SMALL_TOOLBAR);
+	arrow = gtk_image_new_from_icon_name("org.remmina.Remmina-pan-down-symbolic", GTK_ICON_SIZE_SMALL_TOOLBAR);
 #else
 	arrow = gtk_arrow_new(GTK_ARROW_DOWN, GTK_SHADOW_NONE);
 #endif
@@ -2446,7 +2446,7 @@ rcw_create_toolbar(RemminaConnectionWindow *cnnwin, gint mode)
 
 	/* Switch tabs */
 	toolitem = gtk_toggle_tool_button_new();
-	gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(toolitem), "remmina-switch-page-symbolic");
+	gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(toolitem), "org.remmina.Remmina-switch-page-symbolic");
 	rcw_set_tooltip(GTK_WIDGET(toolitem), _("Switch tab pages"), remmina_pref.shortcutkey_prevtab,
 			remmina_pref.shortcutkey_nexttab);
 	gtk_toolbar_insert(GTK_TOOLBAR(toolbar), toolitem, -1);
@@ -2456,7 +2456,7 @@ rcw_create_toolbar(RemminaConnectionWindow *cnnwin, gint mode)
 
 	/* Grab keyboard button */
 	toolitem = gtk_toggle_tool_button_new();
-	gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(toolitem), "remmina-keyboard-symbolic");
+	gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(toolitem), "org.remmina.Remmina-keyboard-symbolic");
 	rcw_set_tooltip(GTK_WIDGET(toolitem), _("Grab all keyboard events"),
 			remmina_pref.shortcutkey_grab, 0);
 	gtk_toolbar_insert(GTK_TOOLBAR(toolbar), toolitem, -1);
@@ -2466,7 +2466,7 @@ rcw_create_toolbar(RemminaConnectionWindow *cnnwin, gint mode)
 
 	/* Preferences */
 	toolitem = gtk_toggle_tool_button_new();
-	gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(toolitem), "remmina-preferences-system-symbolic");
+	gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(toolitem), "org.remmina.Remmina-preferences-system-symbolic");
 	gtk_tool_item_set_tooltip_text(toolitem, _("Preferences"));
 	gtk_toolbar_insert(GTK_TOOLBAR(toolbar), toolitem, -1);
 	gtk_widget_show(GTK_WIDGET(toolitem));
@@ -2475,7 +2475,7 @@ rcw_create_toolbar(RemminaConnectionWindow *cnnwin, gint mode)
 
 	/* Tools */
 	toolitem = gtk_toggle_tool_button_new();
-	gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(toolitem), "remmina-system-run-symbolic");
+	gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(toolitem), "org.remmina.Remmina-system-run-symbolic");
 	gtk_tool_button_set_label(GTK_TOOL_BUTTON(toolitem), _("_Tools"));
 	gtk_tool_item_set_tooltip_text(toolitem, _("Tools"));
 	gtk_toolbar_insert(GTK_TOOLBAR(toolbar), toolitem, -1);
@@ -2489,7 +2489,7 @@ rcw_create_toolbar(RemminaConnectionWindow *cnnwin, gint mode)
 	gtk_widget_show(GTK_WIDGET(toolitem));
 
 	toolitem = gtk_tool_button_new(NULL, "_Screenshot");
-	gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(toolitem), "remmina-camera-photo-symbolic");
+	gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(toolitem), "org.remmina.Remmina-camera-photo-symbolic");
 	rcw_set_tooltip(GTK_WIDGET(toolitem), _("Screenshot"), remmina_pref.shortcutkey_screenshot, 0);
 	gtk_toolbar_insert(GTK_TOOLBAR(toolbar), toolitem, -1);
 	gtk_widget_show(GTK_WIDGET(toolitem));
@@ -2503,7 +2503,7 @@ rcw_create_toolbar(RemminaConnectionWindow *cnnwin, gint mode)
 
 	/* Minimize */
 	toolitem = gtk_tool_button_new(NULL, "_Bottom");
-	gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(toolitem), "remmina-go-bottom-symbolic");
+	gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(toolitem), "org.remmina.Remmina-go-bottom-symbolic");
 	rcw_set_tooltip(GTK_WIDGET(toolitem), _("Minimize window"), remmina_pref.shortcutkey_minimize, 0);
 	gtk_toolbar_insert(GTK_TOOLBAR(toolbar), toolitem, -1);
 	gtk_widget_show(GTK_WIDGET(toolitem));
@@ -2513,7 +2513,7 @@ rcw_create_toolbar(RemminaConnectionWindow *cnnwin, gint mode)
 
 	/* Disconnect */
 	toolitem = gtk_tool_button_new(NULL, "_Disconnect");
-	gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(toolitem), "remmina-disconnect-symbolic");
+	gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(toolitem), "org.remmina.Remmina-disconnect-symbolic");
 	rcw_set_tooltip(GTK_WIDGET(toolitem), _("Disconnect"), remmina_pref.shortcutkey_disconnect, 0);
 	gtk_toolbar_insert(GTK_TOOLBAR(toolbar), toolitem, -1);
 	gtk_widget_show(GTK_WIDGET(toolitem));
@@ -3022,10 +3022,10 @@ static void rcw_update_pin(RemminaConnectionWindow *cnnwin)
 	TRACE_CALL(__func__);
 	if (cnnwin->priv->pin_down)
 		gtk_button_set_image(GTK_BUTTON(cnnwin->priv->pin_button),
-				     gtk_image_new_from_icon_name("remmina-pin-down-symbolic", GTK_ICON_SIZE_MENU));
+				     gtk_image_new_from_icon_name("org.remmina.Remmina-pin-down-symbolic", GTK_ICON_SIZE_MENU));
 	else
 		gtk_button_set_image(GTK_BUTTON(cnnwin->priv->pin_button),
-				     gtk_image_new_from_icon_name("remmina-pin-up-symbolic", GTK_ICON_SIZE_MENU));
+				     gtk_image_new_from_icon_name("org.remmina.Remmina-pin-up-symbolic", GTK_ICON_SIZE_MENU));
 }
 
 static void rcw_toolbar_pin(GtkWidget *widget, RemminaConnectionWindow *cnnwin)
diff --git a/src/remmina_chat_window.c b/src/remmina_chat_window.c
index e6b9c55a5..c77bf3dbc 100644
--- a/src/remmina_chat_window.c
+++ b/src/remmina_chat_window.c
@@ -224,7 +224,7 @@ remmina_chat_window_new(GtkWindow* parent, const gchar* chat_with)
 	window->send_text = widget;
 
 	/* Send button */
-	image = gtk_image_new_from_icon_name("remmina-document-send-symbolic", GTK_ICON_SIZE_BUTTON);
+	image = gtk_image_new_from_icon_name("org.remmina.Remmina-document-send-symbolic", GTK_ICON_SIZE_BUTTON);
 	gtk_widget_show(image);
 
 	widget = gtk_button_new_with_mnemonic(_("_Send"));
diff --git a/src/remmina_ftp_client.c b/src/remmina_ftp_client.c
index b8c5caa3b..2b74b57e7 100644
--- a/src/remmina_ftp_client.c
+++ b/src/remmina_ftp_client.c
@@ -648,14 +648,14 @@ static void remmina_ftp_client_popup_menu(RemminaFTPClient *client, GdkEventButt
 
 	menuitem = gtk_menu_item_new_with_label(_("Download"));
 	gtk_widget_show(menuitem);
-	image = gtk_image_new_from_icon_name("remmina-document-save-symbolic", GTK_ICON_SIZE_MENU);
+	image = gtk_image_new_from_icon_name("org.remmina.Remmina-document-save-symbolic", GTK_ICON_SIZE_MENU);
 	gtk_widget_show(image);
 	gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
 	g_signal_connect(G_OBJECT(menuitem), "activate", G_CALLBACK(remmina_ftp_client_action_download), client);
 
 	menuitem = gtk_menu_item_new_with_label(_("Upload"));
 	gtk_widget_show(menuitem);
-	image = gtk_image_new_from_icon_name("remmina-document-send-symbolic", GTK_ICON_SIZE_MENU);
+	image = gtk_image_new_from_icon_name("org.remmina.Remmina-document-send-symbolic", GTK_ICON_SIZE_MENU);
 	gtk_widget_show(image);
 	gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
 	g_signal_connect(G_OBJECT(menuitem), "activate", G_CALLBACK(remmina_ftp_client_action_upload), client);
diff --git a/src/remmina_icon.c b/src/remmina_icon.c
index 20b5bf941..2ef171883 100644
--- a/src/remmina_icon.c
+++ b/src/remmina_icon.c
@@ -339,7 +339,7 @@ void remmina_icon_init(void)
 	gboolean sni_supported;
 	char msg[200];
 
-	g_stpcpy(remmina_panel, "remmina-status");
+	g_stpcpy(remmina_panel, "org.remmina.Remmina-status");
 
 	/* Print on stdout the availability of appindicators on DBUS */
 	sni_supported = remmina_sysinfo_is_appindicator_available();
diff --git a/src/remmina_sftp_plugin.c b/src/remmina_sftp_plugin.c
index cdd009527..9470e9ab4 100644
--- a/src/remmina_sftp_plugin.c
+++ b/src/remmina_sftp_plugin.c
@@ -367,8 +367,8 @@ static RemminaProtocolPlugin remmina_plugin_sftp =
 	N_("SFTP - Secure File Transfer"),              // Description
 	GETTEXT_PACKAGE,                                // Translation domain
 	VERSION,                                        // Version number
-	"remmina-sftp-symbolic",                        // Icon for normal connection
-	"remmina-sftp-symbolic",                        // Icon for SSH connection
+	"org.remmina.Remmina-sftp-symbolic",                        // Icon for normal connection
+	"org.remmina.Remmina-sftp-symbolic",                        // Icon for SSH connection
 	remmina_sftp_basic_settings,                    // Array for basic settings
 	NULL,                                           // Array for advanced settings
 	REMMINA_PROTOCOL_SSH_SETTING_TUNNEL,            // SSH settings type
diff --git a/src/remmina_ssh_plugin.c b/src/remmina_ssh_plugin.c
index 7fe571d19..7f17fe387 100644
--- a/src/remmina_ssh_plugin.c
+++ b/src/remmina_ssh_plugin.c
@@ -1540,8 +1540,8 @@ static RemminaProtocolPlugin remmina_plugin_ssh =
 	N_("SSH - Secure Shell"),                       /**< Description */
 	GETTEXT_PACKAGE,                                /**< Translation domain */
 	VERSION,                                        /**< Version number */
-	"remmina-ssh-symbolic",                         /**< Icon for normal connection */
-	"remmina-ssh-symbolic",                         /**< Icon for SSH connection */
+	"org.remmina.Remmina-ssh-symbolic",                         /**< Icon for normal connection */
+	"org.remmina.Remmina-ssh-symbolic",                         /**< Icon for SSH connection */
 	remmina_ssh_basic_settings,                     /**< Array for basic settings */
 	remmina_ssh_advanced_settings,                  /**< Array for advanced settings */
 	REMMINA_PROTOCOL_SSH_SETTING_TUNNEL,            /**< SSH settings type */