diff --git a/INSTALL.md b/INSTALL.md
index e07b8ebe7..14c1c3693 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -27,16 +27,18 @@ chmod +x imhex-*.AppImage
 ./imhex-*.AppImage
 ```
 
-If you're experiencing glib / libgtk assertion failures, you might need to setup your `XDG_DATA_DIRS` env var correctly. In this case, run the following command before executing the AppImage. (See issue [ImHex/#2038](https://github.com/WerWolv/ImHex/issues/2038))
-```bash
-export XDG_DATA_DIRS="/usr/local/share:/usr/share"
-```
-
 #### Flatpak
 To install the Flatpak, make sure you have the Flathub repository added to your system. Then simply run the following command:
 
 ```bash
 flatpak install flathub net.werwolv.ImHex
+# or install the file directly
+flatpak install ./imhex-*.flatpak
+```
+
+#### Snap
+```bash
+snap install ./imhex-*.snap
 ```
 
 #### Ubuntu DEB Package
diff --git a/dist/AppImage/AppImageBuilder.yml b/dist/AppImage/AppImageBuilder.yml
index 08f100417..73a72aa36 100644
--- a/dist/AppImage/AppImageBuilder.yml
+++ b/dist/AppImage/AppImageBuilder.yml
@@ -11,12 +11,16 @@ AppDir:
     exec_args: $@
   apt:
     arch:
+    - all
     - "{{ARCHITECTURE_PACKAGE}}"
     allow_unauthenticated: true
     sources:
     - sourceline: 'deb [arch=amd64] http://us.archive.ubuntu.com/ubuntu/ oracular main restricted universe multiverse'
     - sourceline: 'deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ oracular main restricted universe multiverse'
     include:
+    - libgdk-pixbuf2.0-0
+    - libgdk-pixbuf2.0-common
+    - shared-mime-info
     - librsvg2-common
     - libbz2-1.0
     - libcap2
@@ -123,6 +127,15 @@ AppDir:
     - usr/share/doc/*/changelog.*
     - usr/share/doc/*/NEWS.*
     - usr/share/doc/*/TODO.*
+
+  runtime:
+    env:
+      APPDIR_LIBRARY_PATH: '$APPDIR/usr/lib/{{ARCHITECTURE_APPIMAGE_BUILDER}}-linux-gnu:$APPDIR/lib/{{ARCHITECTURE_APPIMAGE_BUILDER}}-linux-gnu:$APPDIR/usr/lib:$APPDIR/usr/lib/{{ARCHITECTURE_APPIMAGE_BUILDER}}-linux-gnu/gdk-pixbuf-2.0/2.10.0/loaders'
+      GTK_EXE_PREFIX: $APPDIR/usr
+      GTK_DATA_PREFIX: $APPDIR
+      XDG_DATA_DIRS: '/usr/local/share:/usr/share:$APPDIR/usr/share:$XDG_DATA_DIRS:$APPDIR/usr/local/share:$APPDIR/usr/local/lib:$APPDIR/usr/local/share'
+      XDG_CONFIG_DIRS: '$XDG_CONFIG_DIRS:$APPDIR/usr/local/share'
+
 AppImage:
   arch: "{{ARCHITECTURE_APPIMAGE_BUILDER}}"
   comp: zstd
diff --git a/dist/AppImage/Dockerfile b/dist/AppImage/Dockerfile
index 03fdb98cc..d89772643 100644
--- a/dist/AppImage/Dockerfile
+++ b/dist/AppImage/Dockerfile
@@ -75,7 +75,7 @@ chmod +x /cache/bin/appimagetool
 
 python3 -m venv venv
 . venv/bin/activate
-pip3 install git+https://github.com/WerWolv/appimage-builder@e4dc770
+pip3 install git+https://github.com/AppImageCrafters/appimage-builder@e995e8e
 
 # Package ImHex as AppImage
 export VERSION=$(cat /imhex/VERSION)