diff --git a/snapcraft.yaml b/snapcraft.yaml
index 8ca2d8f..f50d40c 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -62,15 +62,14 @@ parts:
     override-pull: |
       craftctl default
       craftctl set version=$(git describe --tags --abbrev=10)
+      sed -i.bak -e 's|Icon=@app_id@$|Icon=snap.gnome-calculator.icon|g' data/org.gnome.Calculator.desktop.in
     override-build: |
       # valadoc fails, but we don't need it in the snap anyway
       sed -i.bak -e "s|subdir('doc')||g" $CRAFT_PART_SRC/meson.build
       # Don't symlink media it leaves dangling symlinks in the snap
       sed -i.bak -e 's|media: gnome_calculator_help_media|media: gnome_calculator_help_media, symlink_media: false|g' $CRAFT_PART_SRC/help/meson.build
-      # Use bundled icon rather than themed icon, needed for 18.04
-      sed -i.bak -e 's|Icon=org.gnome.Calculator$|Icon=${SNAP}/meta/gui/org.gnome.Calculator.svg|g' $CRAFT_PART_SRC/data/org.gnome.Calculator.desktop.in
-      mkdir -p $CRAFT_PART_INSTALL/meta/gui/
-      cp $CRAFT_PART_SRC/data/icons/hicolor/scalable/apps/org.gnome.Calculator.svg $CRAFT_PART_INSTALL/meta/gui/
+      mkdir -p ${CRAFT_PART_INSTALL}/meta/gui/icons/hicolor/scalable/apps
+      cp ../src/data/icons/hicolor/scalable/apps/org.gnome.Calculator.svg ${CRAFT_PART_INSTALL}/meta/gui/icons/hicolor/scalable/apps/snap.gnome-calculator.icon.svg
       craftctl default
 
   # Find files provided by the base and platform snap and ensure they aren't