diff --git a/data/gupnp-av-cp.desktop.in b/data/gupnp-av-cp.desktop.in
index 934156c103e6100c51f0f734cbb9c9c0377cc1e3..5914fc39b7f32d5e27dc7b68c5d5dbb01844775a 100644
--- a/data/gupnp-av-cp.desktop.in
+++ b/data/gupnp-av-cp.desktop.in
@@ -5,7 +5,7 @@ Comment=Browse and control UPnP multimedia devices
 Categories=GTK;Development;
 Exec=gupnp-av-cp
 # Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-Icon=av-cp
+Icon=gupnp-av-cp
 Terminal=false
 Type=Application
 StartupNotify=true
diff --git a/data/gupnp-network-light.desktop.in b/data/gupnp-network-light.desktop.in
index d9fa071235ef070f15c20422971a42dd36aa4373..a46283ce10a81ce17064204d520d6494b97bef41 100644
--- a/data/gupnp-network-light.desktop.in
+++ b/data/gupnp-network-light.desktop.in
@@ -5,7 +5,7 @@ Comment=Sample UPnP application for controlling lights
 Categories=GTK;Development;
 Exec=gupnp-network-light
 # Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-Icon=network-light
+Icon=gupnp-network-light
 Terminal=false
 Type=Application
 StartupNotify=true
diff --git a/data/gupnp-universal-cp.desktop.in b/data/gupnp-universal-cp.desktop.in
index 3e9c6a12ad81bc4bb06d558411bb1c4146f81d98..9336fbf5576e82220b64ceca09b9f3a62030a1e5 100644
--- a/data/gupnp-universal-cp.desktop.in
+++ b/data/gupnp-universal-cp.desktop.in
@@ -5,7 +5,7 @@ Comment=Inspect and control UPnP devices across your local network
 Categories=GTK;Development;
 Exec=gupnp-universal-cp
 # Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-Icon=universal-cp
+Icon=gupnp-universal-cp
 Terminal=false
 Type=Application
 StartupNotify=true
diff --git a/data/org.gupnp.Tools.Common.gresource.xml b/data/org.gupnp.Tools.Common.gresource.xml
index f8af93e985b7525edfe01eebda2a72942487b457..7f20274000ffdf60f62777e68b8d4aa1ae6e5aa2 100644
--- a/data/org.gupnp.Tools.Common.gresource.xml
+++ b/data/org.gupnp.Tools.Common.gresource.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
     <gresource prefix='/org/gupnp/Tools/Common'>
-        <file alias="pixmaps/av-cp.png">pixmaps/hicolor/256x256/apps/av-cp.png</file>
+        <file alias="pixmaps/av-cp.png">pixmaps/hicolor/256x256/apps/gupnp-av-cp.png</file>
         <file>pixmaps/media-renderer.png</file>
         <file>pixmaps/upnp-action-arg-in.png</file>
         <file>pixmaps/upnp-action-arg-out.png</file>
diff --git a/data/org.gupnp.Tools.Network-Light.gresource.xml b/data/org.gupnp.Tools.Network-Light.gresource.xml
index c56426b7de96a06b612a1ce0de0d155a3569cf9b..e411fb405bfc75e369422906e0df44370336d90c 100644
--- a/data/org.gupnp.Tools.Network-Light.gresource.xml
+++ b/data/org.gupnp.Tools.Network-Light.gresource.xml
@@ -2,7 +2,7 @@
 <gresources>
     <gresource prefix='/org/gupnp/Tools/Network-Light'>
         <file preprocess='xml-stripblanks'>gupnp-network-light.ui</file>
-        <file alias="pixmaps/network-light.png">pixmaps/hicolor/256x256/apps/network-light.png</file>
+        <file alias="pixmaps/network-light.png">pixmaps/hicolor/256x256/apps/gupnp-network-light.png</file>
         <file>pixmaps/network-light-on.png</file>
         <file>pixmaps/network-light-off.png</file>
    </gresource>
diff --git a/data/org.gupnp.Tools.Universal-CP.gresource.xml b/data/org.gupnp.Tools.Universal-CP.gresource.xml
index c7eec76e715c4e85965bffca33c5db96bc6a31e0..b5912ac4e8ccc53856d720409b06589a23ad5ded 100644
--- a/data/org.gupnp.Tools.Universal-CP.gresource.xml
+++ b/data/org.gupnp.Tools.Universal-CP.gresource.xml
@@ -2,6 +2,6 @@
 <gresources>
     <gresource prefix='/org/gupnp/Tools/Universal-CP'>
         <file preprocess='xml-stripblanks'>gupnp-universal-cp.ui</file>
-        <file alias="pixmaps/universal-cp.png">pixmaps/hicolor/256x256/apps/universal-cp.png</file>
+        <file alias="pixmaps/universal-cp.png">pixmaps/hicolor/256x256/apps/gupnp-universal-cp.png</file>
    </gresource>
 </gresources>
diff --git a/data/pixmaps/hicolor/256x256/apps/av-cp.png b/data/pixmaps/hicolor/256x256/apps/gupnp-av-cp.png
similarity index 100%
rename from data/pixmaps/hicolor/256x256/apps/av-cp.png
rename to data/pixmaps/hicolor/256x256/apps/gupnp-av-cp.png
diff --git a/data/pixmaps/hicolor/256x256/apps/network-light.png b/data/pixmaps/hicolor/256x256/apps/gupnp-network-light.png
similarity index 100%
rename from data/pixmaps/hicolor/256x256/apps/network-light.png
rename to data/pixmaps/hicolor/256x256/apps/gupnp-network-light.png
diff --git a/data/pixmaps/hicolor/256x256/apps/universal-cp.png b/data/pixmaps/hicolor/256x256/apps/gupnp-universal-cp.png
similarity index 100%
rename from data/pixmaps/hicolor/256x256/apps/universal-cp.png
rename to data/pixmaps/hicolor/256x256/apps/gupnp-universal-cp.png
diff --git a/data/pixmaps/hicolor/64x64/apps/av-cp.png b/data/pixmaps/hicolor/64x64/apps/gupnp-av-cp.png
similarity index 100%
rename from data/pixmaps/hicolor/64x64/apps/av-cp.png
rename to data/pixmaps/hicolor/64x64/apps/gupnp-av-cp.png
diff --git a/data/pixmaps/hicolor/64x64/apps/network-light.png b/data/pixmaps/hicolor/64x64/apps/gupnp-network-light.png
similarity index 100%
rename from data/pixmaps/hicolor/64x64/apps/network-light.png
rename to data/pixmaps/hicolor/64x64/apps/gupnp-network-light.png
diff --git a/data/pixmaps/hicolor/64x64/apps/universal-cp.png b/data/pixmaps/hicolor/64x64/apps/gupnp-universal-cp.png
similarity index 100%
rename from data/pixmaps/hicolor/64x64/apps/universal-cp.png
rename to data/pixmaps/hicolor/64x64/apps/gupnp-universal-cp.png