diff --git a/snapcraft.yaml b/snapcraft.yaml
index b8d9747ec..fd2ca7b8d 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -41,6 +41,8 @@ parts:
       - libxtst-dev
       - libyubikey-dev
       - libykpers-1-dev
+    stage-packages:
+      - dbus
     install: |
       sed -i 's|Icon=keepassxc|Icon=${SNAP}/usr/share/icons/hicolor/256x256/apps/keepassxc.png|g' $SNAPCRAFT_PART_INSTALL/usr/share/applications/org.keepassxc.KeePassXC.desktop
     after: [desktop-qt5]
@@ -52,19 +54,12 @@ parts:
       - ttf-ubuntu-font-family
       - dmz-cursor-theme
       - light-themes
+      - adwaita-icon-theme
+      - gnome-themes-standard
       - shared-mime-info
       - libqt5gui5
       - libgdk-pixbuf2.0-0
       - libqt5svg5 # for loading icon themes which are svg
       - locales-all
+      - xdg-user-dirs
 
-  # Overcome limitation in snapd to support URL loading (CTRL+U)
-  # client needs to install "snapd-xdg-open" on their system
-  snapd-xdg-open:
-    source: https://github.com/ubuntu-core/snapd-xdg-open.git
-    source-depth: 1
-    plugin: nil
-    install: |
-      install -D -t $SNAPCRAFT_PART_INSTALL/usr/bin/ data/xdg-open
-    stage-packages:
-      - dbus