diff --git a/.SRCINFO b/.SRCINFO
index e54b32b33e942..ed99ab29b5878 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mages-bin
 	pkgdesc = Mages desktop (early testing)
-	pkgver = 0.8.3
+	pkgver = 0.8.4
 	pkgrel = 1
 	url = https://github.com/mlm-games/mages
 	arch = x86_64
@@ -11,9 +11,9 @@ pkgbase = mages-bin
 	provides = mages
 	conflicts = mages
 	options = !strip
-	source_x86_64 = mages-0.8.3-x86_64.AppImage::https://github.com/mlm-games/mages/releases/download/0.8.3/mages-0.8.3-x86_64.AppImage
-	sha256sums_x86_64 = 52d3630dfc08debceca8d74d5d5431aa067f9d3f12abe37afd96a1587120894d
-	source_aarch64 = mages-0.8.3-aarch64.AppImage::https://github.com/mlm-games/mages/releases/download/0.8.3/mages-0.8.3-aarch64.AppImage
-	sha256sums_aarch64 = 7718f1eea1f2082a3f3d9babf61825f891200307b17c382b29c7aba0308575b1
+	source_x86_64 = mages-0.8.4-x86_64.AppImage::https://github.com/mlm-games/mages/releases/download/0.8.4/mages-0.8.4-x86_64.AppImage
+	sha256sums_x86_64 = e143721292e03ed61565ff0353870d0906d9d7f4982d406db53db6160eb4734a
+	source_aarch64 = mages-0.8.4-aarch64.AppImage::https://github.com/mlm-games/mages/releases/download/0.8.4/mages-0.8.4-aarch64.AppImage
+	sha256sums_aarch64 = 9685a6a52c33b7e7f359174c21fae76f48f485876e30312ebd7d0a3df4705aa6
 
 pkgname = mages-bin
diff --git a/PKGBUILD b/PKGBUILD
index 581a048b0bffb..3fcb710c336ac 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: MLM-stuff <gfxoxinzh@mozmail.com>
 pkgname=mages-bin
 _pkgname=mages
-pkgver=0.8.3
+pkgver=0.8.4
 pkgrel=1
 pkgdesc="Mages desktop (early testing)"
 arch=('x86_64' 'aarch64')
@@ -15,24 +15,18 @@ options=('!strip')
 source_x86_64=("${_pkgname}-${pkgver}-x86_64.AppImage::https://github.com/mlm-games/mages/releases/download/${pkgver}/mages-${pkgver}-x86_64.AppImage")
 source_aarch64=("${_pkgname}-${pkgver}-aarch64.AppImage::https://github.com/mlm-games/mages/releases/download/${pkgver}/mages-${pkgver}-aarch64.AppImage")
 
-sha256sums_x86_64=('52d3630dfc08debceca8d74d5d5431aa067f9d3f12abe37afd96a1587120894d')
-sha256sums_aarch64=('7718f1eea1f2082a3f3d9babf61825f891200307b17c382b29c7aba0308575b1')
+sha256sums_x86_64=('e143721292e03ed61565ff0353870d0906d9d7f4982d406db53db6160eb4734a')
+sha256sums_aarch64=('9685a6a52c33b7e7f359174c21fae76f48f485876e30312ebd7d0a3df4705aa6')
 
 prepare() {
   chmod +x "${_pkgname}-${pkgver}-${CARCH}.AppImage"
-  
-  # Extract .desktop file and icons from AppImage
-  "./${_pkgname}-${pkgver}-${CARCH}.AppImage" --appimage-extract "${_pkgname}.desktop" 2>/dev/null || true
-  "./${_pkgname}-${pkgver}-${CARCH}.AppImage" --appimage-extract "usr/share/icons" 2>/dev/null || true
-  "./${_pkgname}-${pkgver}-${CARCH}.AppImage" --appimage-extract "*.png" 2>/dev/null || true
+  "./${_pkgname}-${pkgver}-${CARCH}.AppImage" --appimage-extract
 }
 
 package() {
-  # Install AppImage
   install -Dm755 "${srcdir}/${_pkgname}-${pkgver}-${CARCH}.AppImage" \
     "${pkgdir}/opt/${_pkgname}/${_pkgname}.AppImage"
   
-  # Create wrapper script
   install -dm755 "${pkgdir}/usr/bin"
   cat > "${pkgdir}/usr/bin/${_pkgname}" << 'WRAPPER'
 #!/bin/sh
@@ -40,15 +34,7 @@ exec /opt/mages/mages.AppImage "$@"
 WRAPPER
   chmod 755 "${pkgdir}/usr/bin/${_pkgname}"
 
-  # Install .desktop file
-  if [ -f "squashfs-root/${_pkgname}.desktop" ]; then
-    install -Dm644 "squashfs-root/${_pkgname}.desktop" \
-      "${pkgdir}/usr/share/applications/${_pkgname}.desktop"
-    # Fix Exec path in desktop file
-    sed -i 's|Exec=Mages|Exec=mages|g' "${pkgdir}/usr/share/applications/${_pkgname}.desktop"
-  else
-    # Fallback desktop entry if extraction failed
-    install -Dm644 /dev/stdin "${pkgdir}/usr/share/applications/${_pkgname}.desktop" << DESKTOP_EOF
+  install -Dm644 /dev/stdin "${pkgdir}/usr/share/applications/${_pkgname}.desktop" << DESKTOP_EOF
 [Desktop Entry]
 Name=Mages
 Comment=Mages matrix client (desktop)
@@ -60,14 +46,7 @@ Type=Application
 Categories=Network;InstantMessaging;
 StartupNotify=true
 DESKTOP_EOF
-  fi
 
-  # Install icons
-  if [ -d "squashfs-root/usr/share/icons" ]; then
-    cp -r squashfs-root/usr/share/icons "${pkgdir}/usr/share/"
-  elif [ -f "squashfs-root/${_pkgname}.png" ]; then
-    # Fallback: install single icon
-    install -Dm644 "squashfs-root/${_pkgname}.png" \
-      "${pkgdir}/usr/share/pixmaps/${_pkgname}.png"
-  fi
+  install -Dm644 "squashfs-root/mages.png" \
+    "${pkgdir}/usr/share/icons/hicolor/512x512/apps/${_pkgname}.png"
 }