diff --git a/extras/icons/icon-128px.png b/extras/icons/icon-128px.png
deleted file mode 100644
index 6a3f1eaa5..000000000
Binary files a/extras/icons/icon-128px.png and /dev/null differ
diff --git a/extras/icons/icon-16px.png b/extras/icons/icon-16px.png
deleted file mode 100644
index 628d7afb1..000000000
Binary files a/extras/icons/icon-16px.png and /dev/null differ
diff --git a/extras/icons/icon-256px.png b/extras/icons/icon-256px.png
deleted file mode 100644
index 018004e92..000000000
Binary files a/extras/icons/icon-256px.png and /dev/null differ
diff --git a/extras/icons/icon-32px.png b/extras/icons/icon-32px.png
deleted file mode 100644
index c1260ee56..000000000
Binary files a/extras/icons/icon-32px.png and /dev/null differ
diff --git a/extras/icons/icon-48px.png b/extras/icons/icon-48px.png
deleted file mode 100644
index 5d26d5106..000000000
Binary files a/extras/icons/icon-48px.png and /dev/null differ
diff --git a/extras/icons/icon-64px.png b/extras/icons/icon-64px.png
deleted file mode 100644
index 6b73534da..000000000
Binary files a/extras/icons/icon-64px.png and /dev/null differ
diff --git a/extras/linux-desktop-files/duckstation-nogui.desktop b/extras/linux-desktop-files/duckstation-nogui.desktop
deleted file mode 100644
index 45d7f2931..000000000
--- a/extras/linux-desktop-files/duckstation-nogui.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=DuckStation NoGUI
-GenericName=PlayStation 1 Emulator
-Comment=Fast-ish PlayStation 1 emulator
-Icon=duckstation-nogui
-TryExec=duckstation-nogui
-Exec=duckstation-nogui %f
-Categories=Game;Emulator;
diff --git a/extras/linux-desktop-files/duckstation-qt.desktop b/extras/linux-desktop-files/duckstation-qt.desktop
deleted file mode 100644
index d89c3e605..000000000
--- a/extras/linux-desktop-files/duckstation-qt.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=DuckStation Qt
-GenericName=PlayStation 1 Emulator
-Comment=Fast-ish PlayStation 1 emulator
-Icon=duckstation-qt
-TryExec=duckstation-qt
-Exec=duckstation-qt %f
-Categories=Game;Emulator;Qt;
diff --git a/scripts/generate_appimages.sh b/scripts/generate_appimages.sh
deleted file mode 100755
index 726cec7f4..000000000
--- a/scripts/generate_appimages.sh
+++ /dev/null
@@ -1,117 +0,0 @@
-#!/bin/bash
-
-# NOTE: Keep this script in the same directory as resources for AppImage creation
-APPIMAGE_RESOURCES_DIR=$(dirname $(readlink -f $0))/../extras
-echo "APPIMAGE_RESOURCES_DIR set to ${APPIMAGE_RESOURCES_DIR}"
-
-if [[ "$#" -ne 1 ]]; then
-  echo "Wrong number of arguments (\$# = $# args) provided."
-  echo "Usage: generate_appimages.sh <build_directory_path>"
-  echo "AppImages will be generated in the path this script is called from."
-  exit 1
-else
-  BUILD_DIR=$(readlink -f $1)
-  echo "BUILD_DIR set to ${BUILD_DIR}"
-fi
-
-wget --timestamping --directory-prefix=${BUILD_DIR} \
-  https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage
-chmod a+x ${BUILD_DIR}/linuxdeploy-x86_64.AppImage
-
-wget --timestamping --directory-prefix=${BUILD_DIR} \
-  https://github.com/linuxdeploy/linuxdeploy-plugin-qt/releases/download/continuous/linuxdeploy-plugin-qt-x86_64.AppImage
-chmod a+x ${BUILD_DIR}/linuxdeploy-plugin-qt-x86_64.AppImage
-
-wget --timestamping --directory-prefix=${BUILD_DIR} \
-  https://github.com/linuxdeploy/linuxdeploy-plugin-appimage/releases/download/continuous/linuxdeploy-plugin-appimage-x86_64.AppImage
-chmod a+x ${BUILD_DIR}/linuxdeploy-plugin-appimage-x86_64.AppImage
-
-# Copy icons into the <resolution>/<app_name>.<ext> directory structure that linuxdeploy nominally expects,
-# e.g. 16x16/duckstation-qt.png, 32x32/duckstation-qt.png, etc.
-FRONTENDS=("qt" "nogui")
-ICONS_QT=()
-ICONS_NOGUI=()
-
-for filename in ${APPIMAGE_RESOURCES_DIR}/icons/icon-*px.png; do
-  [[ ${filename} =~ ${APPIMAGE_RESOURCES_DIR}/icons/icon-(.*)px.png ]];
-  res=${BASH_REMATCH[1]}
-  mkdir -p ${BUILD_DIR}/AppImage-icons/${res}x${res}
-  for frontend in ${FRONTENDS[@]}; do
-    # Copy icon to proper directory
-    cp -v ${APPIMAGE_RESOURCES_DIR}/icons/icon-${res}px.png ${BUILD_DIR}/AppImage-icons/${res}x${res}/duckstation-${frontend}.png
-    # Append icon filepath to array that will later be passed to linuxdeploy
-    eval "ICONS_${frontend^^}+=(${BUILD_DIR}/AppImage-icons/${res}x${res}/duckstation-${frontend}.png)"
-  done
-done
-
-# Add data files into the AppDir
-DATA_DIR=${APPIMAGE_RESOURCES_DIR}/../data
-echo "Data directory is: ${DATA_DIR}"
-for frontend in ${FRONTENDS[@]}; do
-  CURRENT_APPDIR=${BUILD_DIR}/duckstation-${frontend}.AppDir
-  mkdir -p ${CURRENT_APPDIR}/usr/bin
-  cp -av ${DATA_DIR}/* ${CURRENT_APPDIR}/usr/bin
-done
-
-# Add translations into the AppDir.
-TRANSLATIONS_DIR=${BUILD_DIR}/bin/translations
-echo "Translation directory is: ${BUILD_DIR}"
-for frontend in ${FRONTENDS[@]}; do
-  CURRENT_APPDIR=${BUILD_DIR}/duckstation-${frontend}.AppDir
-  mkdir -p ${CURRENT_APPDIR}/usr/bin
-  cp -av ${TRANSLATIONS_DIR} ${CURRENT_APPDIR}/usr/bin
-done
-
-# Replace Patchelf
-curl -sSfLO https://github.com/NixOS/patchelf/releases/download/0.12/patchelf-0.12.tar.bz2        
-tar xvf patchelf-0.12.tar.bz2
-cd patchelf-0.12*/ 
-./configure
-make && sudo make install
-cd ${BUILD_DIR}
-
-# Pass UPDATE_INFORMATION and OUTPUT variables (used by linuxdeploy-plugin-appimage)
-# to the environment of the linuxdeploy commands
-
-${BUILD_DIR}/linuxdeploy-x86_64.AppImage --appimage-extract
-mv ${BUILD_DIR}/squashfs-root/usr/bin/patchelf ${BUILD_DIR}/squashfs-root/usr/bin/patchelf.orig
-sudo cp /usr/local/bin/patchelf ${BUILD_DIR}/squashfs-root/usr/bin/patchelf 
-
-${BUILD_DIR}/squashfs-root/AppRun \
-  --appdir=${BUILD_DIR}/duckstation-qt.AppDir \
-  --executable=${BUILD_DIR}/bin/duckstation-qt \
-  --desktop-file=${APPIMAGE_RESOURCES_DIR}/linux-desktop-files/duckstation-qt.desktop \
-  ${ICONS_QT[@]/#/--icon-file=} \
-  --plugin=qt
-
-# Patch AppRun to work around system Qt libraries being loaded ahead of bundled libraries
-sed -i 's|exec "$this_dir"/AppRun.wrapped "$@"|exec env LD_LIBRARY_PATH="$this_dir"/usr/lib:$LD_LIBRARY_PATH "$this_dir"/AppRun.wrapped "$@"|' \
-  ${BUILD_DIR}/duckstation-qt.AppDir/AppRun
-
-mkdir -p ${BUILD_DIR}/duckstation-qt.AppDir/usr/plugins
-mkdir -p ${BUILD_DIR}/duckstation-qt.AppDir/usr/lib/dri
-cp /usr/lib/x86_64-linux-gnu/{libQt5WaylandClient.so.5,libEGL_mesa.so.0} ${BUILD_DIR}/duckstation-qt.AppDir/usr/lib
-cp /usr/lib/x86_64-linux-gnu/dri/swrast_dri.so ${BUILD_DIR}/duckstation-qt.AppDir/usr/lib/dri
-cp -r /usr/lib/x86_64-linux-gnu/qt5/plugins/{xcbglintegrations,platforms,wayland-graphics-integration-client,wayland-decoration-client,wayland-shell-integration} ${BUILD_DIR}/duckstation-qt.AppDir/usr/plugins
-
-cat <<'EOF'>> ${BUILD_DIR}/duckstation-qt.AppDir/apprun-hooks/linuxdeploy-plugin-qt-hook.sh
-if [[ "${WAYLAND_DISPLAY}" == "wayland"* ]]; then
-	if [ -z ${QT_QPA_PLATFORM} ]; then
-		export QT_QPA_PLATFORM=wayland
-	fi
-fi
-EOF
-  
-UPDATE_INFORMATION="zsync|https://github.com/stenzek/duckstation/releases/download/latest/duckstation-qt-x64.AppImage.zsync" \
-OUTPUT="duckstation-qt-x64.AppImage" \
-${BUILD_DIR}/linuxdeploy-plugin-appimage-x86_64.AppImage \
-  --appdir=${BUILD_DIR}/duckstation-qt.AppDir  
-
-UPDATE_INFORMATION="zsync|https://github.com/stenzek/duckstation/releases/download/latest/duckstation-nogui-x64.AppImage.zsync" \
-OUTPUT="duckstation-nogui-x64.AppImage" \
-${BUILD_DIR}/squashfs-root/AppRun \
-  --appdir=${BUILD_DIR}/duckstation-nogui.AppDir \
-  --executable=${BUILD_DIR}/bin/duckstation-nogui \
-  --desktop-file=${APPIMAGE_RESOURCES_DIR}/linux-desktop-files/duckstation-nogui.desktop \
-  ${ICONS_NOGUI[@]/#/--icon-file=} \
-  --output=appimage
diff --git a/scripts/make-appimage.sh b/scripts/make-appimage.sh
index a244187b7..25518b484 100755
--- a/scripts/make-appimage.sh
+++ b/scripts/make-appimage.sh
@@ -286,7 +286,7 @@ TryExec=duckstation-qt
 Exec=duckstation-qt %f
 Categories=Game;Emulator;Qt;
 EOF
-cp "$ROOTDIR/extras/icons/icon-256px.png" "$OUTDIR/duckstation-qt.png"
+cp "$ROOTDIR/data/resources/images/duck.png" "$OUTDIR/duckstation-qt.png"
 
 echo "Creating AppRun..."
 cat > "$OUTDIR/AppRun" << EOF