diff --git a/es-app/src/PlatformId.cpp b/es-app/src/PlatformId.cpp
index 2760f11e7..3077cdc30 100644
--- a/es-app/src/PlatformId.cpp
+++ b/es-app/src/PlatformId.cpp
@@ -22,6 +22,7 @@ namespace PlatformIds
         "amiga",                // Commodore Amiga
         "amigacd32",            // Commodore Amiga CD32
         "amstradcpc",           // Amstrad CPC
+        "android",              // Google Android
         "apple2",               // Apple II
         "apple2gs",             // Apple IIGS
         "arcade",               // Arcade
diff --git a/es-app/src/PlatformId.h b/es-app/src/PlatformId.h
index ea0ba5719..892e5eb0d 100644
--- a/es-app/src/PlatformId.h
+++ b/es-app/src/PlatformId.h
@@ -21,6 +21,7 @@ namespace PlatformIds
         COMMODORE_AMIGA,
         COMMODORE_AMIGA_CD32,
         AMSTRAD_CPC,
+        GOOGLE_ANDROID,
         APPLE_II,
         APPLE_IIGS,
         ARCADE,
diff --git a/es-app/src/scrapers/GamesDBJSONScraper.cpp b/es-app/src/scrapers/GamesDBJSONScraper.cpp
index f1c78853f..33b832acb 100644
--- a/es-app/src/scrapers/GamesDBJSONScraper.cpp
+++ b/es-app/src/scrapers/GamesDBJSONScraper.cpp
@@ -61,6 +61,7 @@ const std::map<PlatformId, std::string> gamesdb_new_platformid_map{
     {DAPHNE, "23"},
     {INTELLIVISION, "32"},
     {APPLE_MACINTOSH, "37"},
+    {GOOGLE_ANDROID, "4916"},
     {MICROSOFT_XBOX, "14"},
     {MICROSOFT_XBOX_360, "15"},
     {MOONLIGHT, "1"},
diff --git a/es-app/src/scrapers/ScreenScraper.cpp b/es-app/src/scrapers/ScreenScraper.cpp
index 8f83375e5..99f2935cb 100644
--- a/es-app/src/scrapers/ScreenScraper.cpp
+++ b/es-app/src/scrapers/ScreenScraper.cpp
@@ -54,6 +54,7 @@ const std::map<PlatformId, unsigned short> screenscraper_platformid_map{
     {INTELLIVISION, 115},
     {GAMEENGINE_LUTRO, 206},
     {APPLE_MACINTOSH, 146},
+    {GOOGLE_ANDROID, 63},
     {MICROSOFT_XBOX, 32},
     {MICROSOFT_XBOX_360, 33},
     {MOONLIGHT, 138},
diff --git a/resources/systems/macos/es_systems.xml b/resources/systems/macos/es_systems.xml
index 036451860..46db7d38b 100644
--- a/resources/systems/macos/es_systems.xml
+++ b/resources/systems/macos/es_systems.xml
@@ -74,6 +74,15 @@
         <platform>amstradcpc</platform>
         <theme>amstradcpc</theme>
     </system>
+    <system>
+        <name>android</name>
+        <fullname>Google Android</fullname>
+        <path>%ROMPATH%/android</path>
+        <extension>.7z .7Z .zip .ZIP</extension>
+        <command>PLACEHOLDER %ROM%</command>
+        <platform>android</platform>
+        <theme>android</theme>
+    </system>
     <system>
         <name>apple2</name>
         <fullname>Apple II</fullname>
diff --git a/resources/systems/unix/es_systems.xml b/resources/systems/unix/es_systems.xml
index d970efb2f..bd043c894 100644
--- a/resources/systems/unix/es_systems.xml
+++ b/resources/systems/unix/es_systems.xml
@@ -75,6 +75,15 @@
         <platform>amstradcpc</platform>
         <theme>amstradcpc</theme>
     </system>
+    <system>
+        <name>android</name>
+        <fullname>Google Android</fullname>
+        <path>%ROMPATH%/android</path>
+        <extension>.7z .7Z .zip .ZIP</extension>
+        <command>PLACEHOLDER %ROM%</command>
+        <platform>android</platform>
+        <theme>android</theme>
+    </system>
     <system>
         <name>apple2</name>
         <fullname>Apple II</fullname>
diff --git a/resources/systems/windows/es_systems.xml b/resources/systems/windows/es_systems.xml
index 1d6c8dc28..e092dfc2b 100644
--- a/resources/systems/windows/es_systems.xml
+++ b/resources/systems/windows/es_systems.xml
@@ -75,6 +75,15 @@
         <platform>amstradcpc</platform>
         <theme>amstradcpc</theme>
     </system>
+    <system>
+        <name>android</name>
+        <fullname>Google Android</fullname>
+        <path>%ROMPATH%\android</path>
+        <extension>.7z .7Z .zip .ZIP</extension>
+        <command>PLACEHOLDER %ROM%</command>
+        <platform>android</platform>
+        <theme>android</theme>
+    </system>
     <system>
         <name>apple2</name>
         <fullname>Apple II</fullname>
diff --git a/themes/rbsimple-DE/android/colors.xml b/themes/rbsimple-DE/android/colors.xml
new file mode 100644
index 000000000..fa70ad569
--- /dev/null
+++ b/themes/rbsimple-DE/android/colors.xml
@@ -0,0 +1,18 @@
+<theme>
+    <formatVersion>7</formatVersion>
+
+    <view name="system, basic, detailed, grid, video">
+        <image name="band1" extra="true">
+            <color>4086F4</color>
+        </image>
+        <image name="band2" extra="true">
+            <color>EB4132</color>
+        </image>
+        <image name="band3" extra="true">
+            <color>FBBD00</color>
+        </image>
+        <image name="band4" extra="true">
+            <color>31AA52</color>
+        </image>
+    </view>
+</theme>
\ No newline at end of file
diff --git a/themes/rbsimple-DE/android/images/console.svg b/themes/rbsimple-DE/android/images/console.svg
new file mode 100644
index 000000000..345a518f0
--- /dev/null
+++ b/themes/rbsimple-DE/android/images/console.svg
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="42" height="42" version="1.1" viewBox="0 0 42 42" xmlns="http://www.w3.org/2000/svg">
+</svg>
diff --git a/themes/rbsimple-DE/android/images/consolegame.svg b/themes/rbsimple-DE/android/images/consolegame.svg
new file mode 100644
index 000000000..345a518f0
--- /dev/null
+++ b/themes/rbsimple-DE/android/images/consolegame.svg
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="42" height="42" version="1.1" viewBox="0 0 42 42" xmlns="http://www.w3.org/2000/svg">
+</svg>
diff --git a/themes/rbsimple-DE/android/images/controller.svg b/themes/rbsimple-DE/android/images/controller.svg
new file mode 100644
index 000000000..345a518f0
--- /dev/null
+++ b/themes/rbsimple-DE/android/images/controller.svg
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="42" height="42" version="1.1" viewBox="0 0 42 42" xmlns="http://www.w3.org/2000/svg">
+</svg>
diff --git a/themes/rbsimple-DE/android/images/logo.svg b/themes/rbsimple-DE/android/images/logo.svg
new file mode 100644
index 000000000..b409a241f
--- /dev/null
+++ b/themes/rbsimple-DE/android/images/logo.svg
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   viewBox="0 0 788 120"
+   version="1.1"
+   id="svg16"
+   sodipodi:docname="logo.svg"
+   width="788"
+   height="120"
+   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)">
+  <metadata
+     id="metadata22">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs20" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="3840"
+     inkscape:window-height="2065"
+     id="namedview18"
+     showgrid="false"
+     inkscape:zoom="1.0834617"
+     inkscape:cx="-269.83177"
+     inkscape:cy="341.18424"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg16" />
+  <g
+     transform="matrix(0.09585593,0,0,0.09585593,-540.69137,-133.09854)"
+     id="g4789">
+    <path
+       inkscape:export-ydpi="4.6700001"
+       inkscape:export-xdpi="4.6700001"
+       inkscape:export-filename="G:\Users\suitedoalex\sites\android-logo-8.png"
+       style="stroke-width:9.48392963"
+       inkscape:connector-curvature="0"
+       id="path22"
+       d="m 6036.621,1790.6455 c 117.6008,0 215.2852,60.6972 261.7565,126.1363 v -110.0136 h 179.2462 v 816.5663 h -128.9814 c -28.4518,0 -51.2132,-22.7614 -51.2132,-51.2132 v -58.8004 c -45.5229,66.3875 -143.2073,127.0847 -260.8081,127.0847 -223.8207,0 -393.583,-191.5754 -393.583,-424.88 0,-233.3047 169.7623,-424.8801 393.583,-424.8801 m 32.2454,163.1236 c -145.1041,0 -243.737,114.7556 -243.737,261.7565 0,147.0009 97.6845,261.7564 243.737,261.7564 145.1041,0 243.737,-114.7555 243.737,-261.7564 0,-147.0009 -97.6845,-261.7565 -243.737,-261.7565" />
+    <path
+       inkscape:export-ydpi="4.6700001"
+       inkscape:export-xdpi="4.6700001"
+       inkscape:export-filename="G:\Users\suitedoalex\sites\android-logo-8.png"
+       style="stroke-width:9.48392963"
+       inkscape:connector-curvature="0"
+       id="path24"
+       d="m 6681.5282,1806.7682 h 180.1947 v 110.962 c 49.3164,-81.5618 142.2589,-127.0847 248.4789,-127.0847 189.6786,0 312.0213,133.7234 312.0213,341.4215 v 491.2675 h -128.9814 c -28.4518,0 -51.2132,-22.7614 -51.2132,-51.2132 v -410.6541 c 0,-128.9815 -65.4392,-207.6981 -169.7624,-207.6981 -119.4975,0 -210.5432,92.9425 -210.5432,267.4468 v 402.1186 h -128.9815 c -28.4517,0 -51.2132,-22.7614 -51.2132,-51.2132 z" />
+    <path
+       inkscape:export-ydpi="4.6700001"
+       inkscape:export-xdpi="4.6700001"
+       inkscape:export-filename="G:\Users\suitedoalex\sites\android-logo-8.png"
+       style="stroke-width:9.48392963"
+       inkscape:connector-curvature="0"
+       id="path26"
+       d="m 7958.0651,1790.6455 c 117.6007,0 215.2852,60.6972 261.7565,126.1363 v -517.8226 h 179.2462 v 1225.3237 h -128.9814 c -28.4518,0 -51.2132,-22.7614 -51.2132,-51.2132 v -58.8004 c -45.5229,65.4391 -144.1557,126.1363 -261.7565,126.1363 -223.8207,0 -393.583,-191.5754 -393.583,-424.88 0.9484,-233.3047 170.7107,-424.8801 394.5314,-424.8801 m 32.2454,163.1236 c -145.1041,0 -243.737,114.7556 -243.737,261.7565 0,147.0009 97.6845,261.7564 243.737,261.7564 145.1041,0 243.737,-114.7555 243.737,-261.7564 0,-147.0009 -98.6329,-261.7565 -243.737,-261.7565" />
+    <path
+       inkscape:export-ydpi="4.6700001"
+       inkscape:export-xdpi="4.6700001"
+       inkscape:export-filename="G:\Users\suitedoalex\sites\android-logo-8.png"
+       style="stroke-width:9.48392963"
+       inkscape:connector-curvature="0"
+       id="path28"
+       d="m 8602.9723,1806.7682 h 179.2463 v 145.1041 c 31.297,-92.9425 122.3427,-153.6396 215.2852,-153.6396 22.7614,0 45.5228,1.8968 70.1811,6.6387 v 184.9366 c -31.297,-9.4839 -56.9036,-15.1742 -90.0974,-15.1742 -103.3748,0 -196.3173,86.3037 -196.3173,250.3757 v 398.325 h -128.9814 c -28.4518,0 -51.2133,-22.7614 -51.2133,-51.2132 v -765.3531 z" />
+    <path
+       inkscape:export-ydpi="4.6700001"
+       inkscape:export-xdpi="4.6700001"
+       inkscape:export-filename="G:\Users\suitedoalex\sites\android-logo-8.png"
+       style="stroke-width:9.48392963"
+       inkscape:connector-curvature="0"
+       id="path30"
+       d="m 9553.262,2640.4056 c -241.8402,0 -427.7252,-187.7818 -427.7252,-424.88 0,-237.0983 185.885,-424.8801 427.7252,-424.8801 241.8402,0 427.7253,187.7818 427.7253,424.8801 0,237.0982 -185.8851,424.88 -427.7253,424.88 m 0,-166.9172 c 144.1558,0 244.6854,-112.8587 244.6854,-257.9628 0,-145.1042 -101.478,-257.9629 -244.6854,-257.9629 -145.1041,0 -246.5821,112.8587 -246.5821,257.9629 0,145.1041 101.478,257.9628 246.5821,257.9628" />
+    <path
+       inkscape:export-ydpi="4.6700001"
+       inkscape:export-xdpi="4.6700001"
+       inkscape:export-filename="G:\Users\suitedoalex\sites\android-logo-8.png"
+       style="stroke-width:9.48392963"
+       inkscape:connector-curvature="0"
+       id="path32"
+       d="m 10216.188,1628.4703 c -65.439,0 -120.445,-54.0584 -120.445,-120.4459 0,-65.4391 55.955,-119.4975 120.445,-119.4975 67.336,0 119.498,54.0584 119.498,119.4975 0,67.3359 -52.162,120.4459 -119.498,120.4459 m -89.149,178.2979 h 179.247 v 816.5663 h -128.033 c -28.452,0 -51.214,-22.7614 -51.214,-51.2132 z" />
+    <path
+       inkscape:export-ydpi="4.6700001"
+       inkscape:export-xdpi="4.6700001"
+       inkscape:export-filename="G:\Users\suitedoalex\sites\android-logo-8.png"
+       style="stroke-width:9.48392963"
+       inkscape:connector-curvature="0"
+       id="path34"
+       d="m 10847.818,1790.6455 c 117.601,0 215.285,60.6972 261.757,126.1363 v -517.8226 h 179.246 v 1225.3237 h -128.982 c -28.451,0 -51.213,-22.7614 -51.213,-51.2132 v -58.8004 c -45.523,65.4391 -144.156,126.1363 -261.756,126.1363 -223.821,0 -393.583,-191.5754 -393.583,-424.88 0.948,-233.3047 170.71,-424.8801 394.531,-424.8801 m 33.194,163.1236 c -145.104,0 -243.737,114.7556 -243.737,261.7565 0,147.0009 97.684,261.7564 243.737,261.7564 145.104,0 243.737,-114.7555 243.737,-261.7564 0,-147.0009 -98.633,-261.7565 -243.737,-261.7565" />
+    <path
+       inkscape:export-ydpi="4.6700001"
+       inkscape:export-xdpi="4.6700001"
+       inkscape:export-filename="G:\Users\suitedoalex\sites\android-logo-8.png"
+       inkscape:connector-curvature="0"
+       style="fill:#3ddc84;fill-opacity:1;stroke-width:9.48392963"
+       id="path36"
+       d="m 13271.91,2315.1068 c -50.264,0 -91.045,-40.7809 -91.045,-91.0457 0,-50.2648 40.781,-91.0457 91.045,-91.0457 50.265,0 91.046,40.7809 91.046,91.0457 0,50.2648 -40.781,91.0457 -91.046,91.0457 m -1002.451,0 c -50.265,0 -91.046,-40.7809 -91.046,-91.0457 0,-50.2648 40.781,-91.0457 91.046,-91.0457 50.265,0 91.046,40.7809 91.046,91.0457 0,50.2648 -40.781,91.0457 -91.046,91.0457 m 1034.697,-546.2743 182.091,-313.9181 c 10.433,-18.0194 3.794,-40.7809 -14.226,-51.2132 -18.019,-10.4323 -40.781,-3.7936 -51.213,14.2259 l -183.988,317.7116 c -140.362,-64.4907 -297.795,-100.5296 -465.661,-100.5296 -167.866,0 -326.247,36.0389 -466.609,99.5812 l -183.989,-317.7116 c -10.432,-18.0195 -33.193,-24.6582 -51.213,-14.2259 -18.019,10.4323 -24.658,33.1938 -14.226,51.2132 l 181.143,313.9181 c -311.073,169.7623 -524.461,484.6288 -555.758,857.3472 h 2178.459 c -30.349,-371.77 -242.789,-686.6365 -554.81,-856.3988"
+       class="logo-android__andy-icon " />
+  </g>
+</svg>
diff --git a/themes/rbsimple-DE/android/systeminfo.xml b/themes/rbsimple-DE/android/systeminfo.xml
new file mode 100644
index 000000000..07b6637dd
--- /dev/null
+++ b/themes/rbsimple-DE/android/systeminfo.xml
@@ -0,0 +1,27 @@
+<theme>
+    <formatVersion>7</formatVersion>
+
+    <view name="system">
+        <text name="info1" extra="true">
+            <text>The Android operating system, developed by</text>
+        </text>
+        <text name="info2" extra="true">
+            <text>Android Inc. and later acquired by Google is by</text>
+        </text>
+        <text name="info3" extra="true">
+            <text>far the most popular mobile OS in the world.</text>
+        </text>
+        <text name="info5" extra="true">
+            <text>Due to the power of modern mobile devices and</text>
+        </text>
+        <text name="info6" extra="true">
+            <text>the popularity of the platform there is a rich</text>
+        </text>
+        <text name="info7" extra="true">
+            <text>library of games available, some even rivalling</text>
+        </text>
+        <text name="info8" extra="true">
+            <text>those on dedicated game consoles.</text>
+        </text>
+    </view>
+</theme>
\ No newline at end of file
diff --git a/themes/rbsimple-DE/android/theme.xml b/themes/rbsimple-DE/android/theme.xml
new file mode 100644
index 000000000..077d05361
--- /dev/null
+++ b/themes/rbsimple-DE/android/theme.xml
@@ -0,0 +1,21 @@
+<theme>
+    <formatVersion>7</formatVersion>
+    <include>./../theme.xml</include>
+    <include>./colors.xml</include>
+    <include>./systeminfo.xml</include>
+
+    <view name="system">
+        <image name="controller" extra="true">
+            <path>./images/controller.svg</path>
+        </image>
+    </view>
+
+    <view name="system, basic, detailed, video, grid">
+        <image name="logo">
+            <path>./images/logo.svg</path>
+        </image>
+        <image name="consolegame" extra="true">
+            <path>./images/consolegame.svg</path>
+        </image>
+    </view>
+</theme>
\ No newline at end of file