diff --git a/setup/gui/anbox.desktop b/setup/gui/anbox.desktop
index 3bd5a62..74b42e7 100644
--- a/setup/gui/anbox.desktop
+++ b/setup/gui/anbox.desktop
@@ -3,5 +3,6 @@ Name=Anbox
 GenericName=Android in a box
 Version=1.0
 Type=Application
+Icon=${SNAP}/meta/gui/icon.png
 Exec=anbox launch --package=org.anbox.appmgr --component=org.anbox.appmgr.AppViewActivity
 Terminal=false
diff --git a/setup/gui/icon.png b/setup/gui/icon.png
new file mode 100644
index 0000000..240a38c
Binary files /dev/null and b/setup/gui/icon.png differ
diff --git a/snapcraft.yaml b/snapcraft.yaml
index f660c03..79f9022 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -18,18 +18,16 @@ apps:
 
 parts:
   android-images:
-    plugin: copy
+    plugin: dump
     source: android-images
-    files:
-      android.img: android.img
   anbox-common:
-    plugin: copy
-    source: .
-    files:
-      scripts/snap-wrapper.sh: bin/anbox-wrapper.sh
-      scripts/container-manager.sh: bin/container-manager.sh
-      scripts/anbox-bridge.sh: bin/anbox-bridge.sh
-    snap:
+    plugin: dump
+    source: scripts
+    organize:
+      snap-wrapper.sh: bin/anbox-wrapper.sh
+      container-manager.sh: bin/container-manager.sh
+      anbox-bridge.sh: bin/anbox-bridge.sh
+    prime:
       - bin/anbox-bridge.sh
       - bin/anbox-wrapper.sh
       - bin/container-manager.sh
@@ -62,7 +60,7 @@ parts:
       - --disable-seccomp
       - --enable-capabilities
       - --with-rootfs-path=/var/snap/anbox/common/lxc/
-    snap:
+    prime:
       - bin/lxc-attach
       - bin/lxc-ls
       - bin/lxc-start
@@ -100,8 +98,10 @@ parts:
       - libegl1-mesa-dev
       - libgles2-mesa-dev
       - libglib2.0-dev
+      - libglm-dev
       - libgtest-dev
       - libprotobuf-dev
+      - libproperties-cpp-dev
       - libsdl2-dev
       - pkg-config
       - protobuf-compiler
@@ -111,6 +111,6 @@ parts:
       - libgl1-mesa-glx
       - libsdl2-2.0-0
       - libsdl2-gfx-1.0-0
-    snap:
+    prime:
       - usr/bin/anbox
       - usr/lib/*-linux-*/