diff --git a/tools/raw-viewer/.gitignore b/tools/raw-viewer/.gitignore
index 26d169c..4ad48f1 100644
--- a/tools/raw-viewer/.gitignore
+++ b/tools/raw-viewer/.gitignore
@@ -1,3 +1,5 @@
 *.so
 __debug_bin*
-imgui.ini
\ No newline at end of file
+imgui.ini
+*.AppImage
+AppDir/usr
\ No newline at end of file
diff --git a/tools/raw-viewer/AppDir/.DirIcon b/tools/raw-viewer/AppDir/.DirIcon
new file mode 120000
index 0000000..70267a1
--- /dev/null
+++ b/tools/raw-viewer/AppDir/.DirIcon
@@ -0,0 +1 @@
+infiniemu.png
\ No newline at end of file
diff --git a/tools/raw-viewer/AppDir/AppRun b/tools/raw-viewer/AppDir/AppRun
new file mode 100755
index 0000000..07d839f
--- /dev/null
+++ b/tools/raw-viewer/AppDir/AppRun
@@ -0,0 +1,12 @@
+#!/bin/sh
+SELF=$(readlink -f "$0")
+HERE=${SELF%/*}
+export PATH="${HERE}/usr/bin/:${HERE}/usr/sbin/:${HERE}/usr/games/:${HERE}/bin/:${HERE}/sbin/${PATH:+:$PATH}"
+export LD_LIBRARY_PATH="${HERE}/usr/lib/:${HERE}/usr/lib/i386-linux-gnu/:${HERE}/usr/lib/x86_64-linux-gnu/:${HERE}/usr/lib32/:${HERE}/usr/lib64/:${HERE}/lib/:${HERE}/lib/i386-linux-gnu/:${HERE}/lib/x86_64-linux-gnu/:${HERE}/lib32/:${HERE}/lib64/${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
+export PYTHONPATH="${HERE}/usr/share/pyshared/${PYTHONPATH:+:$PYTHONPATH}"
+export XDG_DATA_DIRS="${HERE}/usr/share/${XDG_DATA_DIRS:+:$XDG_DATA_DIRS}"
+export PERLLIB="${HERE}/usr/share/perl5/:${HERE}/usr/lib/perl5/${PERLLIB:+:$PERLLIB}"
+export GSETTINGS_SCHEMA_DIR="${HERE}/usr/share/glib-2.0/schemas/${GSETTINGS_SCHEMA_DIR:+:$GSETTINGS_SCHEMA_DIR}"
+export QT_PLUGIN_PATH="${HERE}/usr/lib/qt4/plugins/:${HERE}/usr/lib/i386-linux-gnu/qt4/plugins/:${HERE}/usr/lib/x86_64-linux-gnu/qt4/plugins/:${HERE}/usr/lib32/qt4/plugins/:${HERE}/usr/lib64/qt4/plugins/:${HERE}/usr/lib/qt5/plugins/:${HERE}/usr/lib/i386-linux-gnu/qt5/plugins/:${HERE}/usr/lib/x86_64-linux-gnu/qt5/plugins/:${HERE}/usr/lib32/qt5/plugins/:${HERE}/usr/lib64/qt5/plugins/${QT_PLUGIN_PATH:+:$QT_PLUGIN_PATH}"
+EXEC=$(grep -e '^Exec=.*' "${HERE}"/*.desktop | head -n 1 | cut -d "=" -f 2 | cut -d " " -f 1)
+exec "${EXEC}" "$@"
\ No newline at end of file
diff --git a/tools/raw-viewer/AppDir/infiniemu.desktop b/tools/raw-viewer/AppDir/infiniemu.desktop
new file mode 100644
index 0000000..e93a083
--- /dev/null
+++ b/tools/raw-viewer/AppDir/infiniemu.desktop
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Name=InfiniEmu
+Exec=raw-viewer
+Icon=infiniemu
+Type=Application
+Categories=Utility;
\ No newline at end of file
diff --git a/tools/raw-viewer/AppDir/infiniemu.png b/tools/raw-viewer/AppDir/infiniemu.png
new file mode 100644
index 0000000..e69de29