diff --git a/snap/gui/drive.desktop b/snap/gui/drive.desktop
index 819a43e..e2f6e65 100644
--- a/snap/gui/drive.desktop
+++ b/snap/gui/drive.desktop
@@ -7,4 +7,4 @@ Type=Application
 Categories=Office
 Icon=${SNAP}/meta/gui/drive.png
 Exec=icloud-for-linux.drive
-StartupWMClass=icloud-for-linux.iclouddrive
+StartupWMClass=icloud-for-linux.drive
diff --git a/snap/gui/find-devices.desktop b/snap/gui/find-devices.desktop
new file mode 100644
index 0000000..363e3b3
--- /dev/null
+++ b/snap/gui/find-devices.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Version=0.11
+Name=iCloud Find Devices
+GenericName=iCloud Find Devices
+Comment=iCloud Find Devices
+Type=Application
+Categories=Office
+Icon=${SNAP}/meta/gui/find-devices.png
+Exec=icloud-for-linux.find-devices
+StartupWMClass=icloud-for-linux.find-devices
diff --git a/snap/gui/find-my-iphone.png b/snap/gui/find-devices.png
similarity index 100%
rename from snap/gui/find-my-iphone.png
rename to snap/gui/find-devices.png
diff --git a/snap/gui/find-my-friends.desktop b/snap/gui/find-my-friends.desktop
deleted file mode 100644
index bb04ff7..0000000
--- a/snap/gui/find-my-friends.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Version=0.11
-Name=iCloud Find My Friend
-GenericName=iCloud Find My Friend
-Comment=iCloud Find My Friend
-Type=Application
-Categories=Office
-Icon=${SNAP}/meta/gui/find-my-friends.png
-Exec=icloud-for-linux.find-my-friends
-StartupWMClass=icloud-for-linux.fmf
diff --git a/snap/gui/find-my-friends.png b/snap/gui/find-my-friends.png
deleted file mode 100644
index d4a1adf..0000000
Binary files a/snap/gui/find-my-friends.png and /dev/null differ
diff --git a/snap/gui/find-my-iphone.desktop b/snap/gui/find-my-iphone.desktop
deleted file mode 100644
index 3de8244..0000000
--- a/snap/gui/find-my-iphone.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Version=0.11
-Name=iCloud Find My iPhone
-GenericName=iCloud Find My iPhone
-Comment=iCloud Find My iPhone
-Type=Application
-Categories=Office
-Icon=${SNAP}/meta/gui/find-my-iphone.png
-Exec=icloud-for-linux.find-my-iphone
-StartupWMClass=icloud-for-linux.find
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index d5ff473..79a5e7d 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -75,12 +75,7 @@ apps:
     extensions: *extensions
     plugs: *plugs
     environment: *environment
-  find-my-friends:
-    command: usr/bin/icloud-for-linux fmf
-    extensions: *extensions
-    plugs: *plugs
-    environment: *environment
-  find-my-iphone:
+  find-devices:
     command: usr/bin/icloud-for-linux find
     extensions: *extensions
     plugs: *plugs