diff --git a/resources/systems/macos/es_find_rules.xml b/resources/systems/macos/es_find_rules.xml
index e4ba2561f..70de23ec9 100644
--- a/resources/systems/macos/es_find_rules.xml
+++ b/resources/systems/macos/es_find_rules.xml
@@ -14,6 +14,14 @@
             <entry>/Applications/RetroArch.app/Contents/Resources/cores</entry>
         </rule>
     </core>
+    <emulator name="CITRA">
+        <!-- Nintendo 3DS emulator Citra -->
+        <rule type="staticpath">
+            <entry>/Applications/citra-qt.app/Contents/MacOS/citra-qt</entry>
+            <entry>/Applications/Citra/nightly/citra-qt.app/Contents/MacOS/citra-qt</entry>
+            <entry>/Applications/Citra/canary/citra-qt.app/Contents/MacOS/citra-qt</entry>
+        </rule>
+    </emulator>
     <emulator name="DOLPHIN">
         <!-- Nintendo GameCube and Wii emulator Dolphin -->
         <rule type="staticpath">
diff --git a/resources/systems/macos/es_systems.xml b/resources/systems/macos/es_systems.xml
index d92a90760..734e260f1 100644
--- a/resources/systems/macos/es_systems.xml
+++ b/resources/systems/macos/es_systems.xml
@@ -716,8 +716,7 @@
         <fullname>Nintendo 3DS</fullname>
         <path>%ROMPATH%/n3ds</path>
         <extension>.3ds .3DS .3dsx .3DSX .app .APP .axf .AXF .cci .CCI .cxi .CXI .elf .ELF .7z .7Z .zip .ZIP</extension>
-        <command label="Citra">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/citra_libretro.dylib %ROM%</command>
-        <command label="Citra 2018">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/citra2018_libretro.dylib %ROM%</command>
+        <command label="Citra (Standalone)">%EMULATOR_CITRA% %ROM%</command>
         <platform>n3ds</platform>
         <theme>n3ds</theme>
     </system>
diff --git a/resources/systems/unix/es_find_rules.xml b/resources/systems/unix/es_find_rules.xml
index f16f78dba..37a68a650 100644
--- a/resources/systems/unix/es_find_rules.xml
+++ b/resources/systems/unix/es_find_rules.xml
@@ -34,6 +34,16 @@
             <entry>/usr/pkg/lib/libretro</entry>
         </rule>
     </core>
+    <emulator name="CITRA">
+        <!-- Nintendo 3DS emulator Citra -->
+        <rule type="systempath">
+            <entry>citra-emu.citra-nightly</entry>
+            <entry>org.citra_emu.citra</entry>
+        </rule>
+        <rule type="staticpath">
+            <entry>/var/lib/flatpak/exports/bin/org.citra_emu.citra</entry>
+        </rule>
+    </emulator>
     <emulator name="DOLPHIN">
         <!-- Nintendo GameCube and Wii emulator Dolphin -->
         <rule type="systempath">
diff --git a/resources/systems/unix/es_systems.xml b/resources/systems/unix/es_systems.xml
index 92a31c8d9..13bdfc1dd 100644
--- a/resources/systems/unix/es_systems.xml
+++ b/resources/systems/unix/es_systems.xml
@@ -720,6 +720,7 @@
         <extension>.3ds .3DS .3dsx .3DSX .app .APP .axf .AXF .cci .CCI .cxi .CXI .elf .ELF .7z .7Z .zip .ZIP</extension>
         <command label="Citra">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/citra_libretro.so %ROM%</command>
         <command label="Citra 2018">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/citra2018_libretro.so %ROM%</command>
+        <command label="Citra (Standalone)">%EMULATOR_CITRA% %ROM%</command>
         <platform>n3ds</platform>
         <theme>n3ds</theme>
     </system>
diff --git a/resources/systems/windows/es_find_rules.xml b/resources/systems/windows/es_find_rules.xml
index 13e56da61..2f8ec261f 100644
--- a/resources/systems/windows/es_find_rules.xml
+++ b/resources/systems/windows/es_find_rules.xml
@@ -36,11 +36,31 @@
             <entry>%EMUPATH%\cores</entry>
         </rule>
     </core>
+    <emulator name="CITRA">
+        <!-- Nintendo 3DS emulator Citra -->
+        <rule type="systempath">
+            <entry>citra.exe</entry>
+        </rule>
+        <rule type="staticpath">
+            <entry>~\AppData\Local\Citra\nightly-mingw\citra.exe</entry>
+            <entry>~\AppData\Local\Citra\canary-mingw\citra.exe</entry>
+            <!-- Portable installation -->
+            <entry>%ESPATH%\Citra\nightly-mingw\citra.exe</entry>
+            <entry>%ESPATH%\..\Citra\nightly-mingw\citra.exe</entry>
+            <entry>%ESPATH%\Citra\canary-mingw\citra.exe</entry>
+            <entry>%ESPATH%\..\Citra\canary-mingw\citra.exe</entry>
+        </rule>
+    </emulator>
     <emulator name="DOLPHIN">
         <!-- Nintendo GameCube and Wii emulator Dolphin -->
         <rule type="systempath">
             <entry>dolphin.exe</entry>
         </rule>
+        <rule type="staticpath">
+            <!-- Portable installation -->
+            <entry>%ESPATH%\Dolphin-x64\Dolphin.exe</entry>
+            <entry>%ESPATH%\..\Dolphin-x64\Dolphin.exe</entry>
+        </rule>
     </emulator>
     <emulator name="DOSBOX-STAGING">
         <!-- DOS emulator DOSBox Staging -->
@@ -58,12 +78,22 @@
         <rule type="systempath">
             <entry>fs-uae.exe</entry>
         </rule>
+        <rule type="staticpath">
+            <!-- Portable installation -->
+            <entry>%ESPATH%\FS-UAE\Windows\x86-64\fs-uae.exe</entry>
+            <entry>%ESPATH%\..\FS-UAE\Windows\x86-64\fs-uae.exe</entry>
+        </rule>
     </emulator>
     <emulator name="MAME">
         <!-- Arcade emulator MAME -->
         <rule type="systempath">
             <entry>mame.exe</entry>
         </rule>
+        <rule type="staticpath">
+            <!-- Portable installation -->
+            <entry>%ESPATH%\mame\mame.exe</entry>
+            <entry>%ESPATH%\..\mame\mame.exe</entry>
+        </rule>
     </emulator>
     <emulator name="PCSX2">
         <!-- Sony PlayStation 2 emulator PCSX2 -->
diff --git a/resources/systems/windows/es_systems.xml b/resources/systems/windows/es_systems.xml
index 810a0b386..b79d55665 100644
--- a/resources/systems/windows/es_systems.xml
+++ b/resources/systems/windows/es_systems.xml
@@ -720,6 +720,7 @@
         <extension>.3ds .3DS .3dsx .3DSX .app .APP .axf .AXF .cci .CCI .cxi .CXI .elf .ELF .7z .7Z .zip .ZIP</extension>
         <command label="Citra">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\citra_libretro.dll %ROM%</command>
         <command label="Citra 2018">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\citra2018_libretro.dll %ROM%</command>
+        <command label="Citra (Standalone)">%EMULATOR_CITRA% %ROM%</command>
         <platform>n3ds</platform>
         <theme>n3ds</theme>
     </system>