From 53c3b5096ca9e6118d5c0dfb24d722ed8d05fa10 Mon Sep 17 00:00:00 2001
From: Gabriel Machado <97042217+GabrielBRDeveloper@users.noreply.github.com>
Date: Thu, 14 Dec 2023 00:56:35 -0400
Subject: [PATCH] Best Screen Gamepad accessibility

---
 .../main/res/drawable/analog_background.xml   |  26 +++++
 .../main/res/drawable/analog_foreground.xml   |  41 +++++++
 .../app/src/main/res/drawable/button_a.xml    |  39 +++++++
 .../app/src/main/res/drawable/button_b.xml    |  39 +++++++
 .../app/src/main/res/drawable/button_l.xml    |  24 +++++
 .../app/src/main/res/drawable/button_r.xml    |  24 +++++
 .../src/main/res/drawable/button_select.xml   |  38 +++++++
 .../src/main/res/drawable/button_start.xml    |  38 +++++++
 .../app/src/main/res/drawable/button_x.xml    |  39 +++++++
 .../app/src/main/res/drawable/button_y.xml    |  39 +++++++
 .../app/src/main/res/drawable/dpad_down.xml   |  39 +++++++
 .../app/src/main/res/drawable/dpad_left.xml   |  39 +++++++
 .../app/src/main/res/drawable/dpad_right.xml  |  39 +++++++
 .../app/src/main/res/drawable/dpad_up.xml     |  39 +++++++
 .../app/src/main/res/drawable/ic_add.xml      |   5 +
 .../res/drawable/simple_analog_background.xml |  19 ----
 .../res/drawable/simple_circle_button.xml     |  10 --
 .../src/main/res/layout/controller_dpad.xml   |  30 +++---
 .../main/res/layout/controller_gamepad.xml    |  34 +++---
 .../main/res/layout/controller_joystick.xml   |  11 ++
 .../app/src/main/res/layout/controller_l.xml  |  10 ++
 .../app/src/main/res/layout/controller_r.xml  |  10 ++
 .../src/main/res/layout/controller_select.xml |  10 ++
 .../src/main/res/layout/controller_start.xml  |  10 ++
 .../app/src/main/res/layout/game_activity.xml | 100 +++---------------
 .../app/src/main/res/values/styleable.xml     |  10 +-
 26 files changed, 613 insertions(+), 149 deletions(-)
 create mode 100644 src/pandroid/app/src/main/res/drawable/analog_background.xml
 create mode 100644 src/pandroid/app/src/main/res/drawable/analog_foreground.xml
 create mode 100644 src/pandroid/app/src/main/res/drawable/button_a.xml
 create mode 100644 src/pandroid/app/src/main/res/drawable/button_b.xml
 create mode 100644 src/pandroid/app/src/main/res/drawable/button_l.xml
 create mode 100644 src/pandroid/app/src/main/res/drawable/button_r.xml
 create mode 100644 src/pandroid/app/src/main/res/drawable/button_select.xml
 create mode 100644 src/pandroid/app/src/main/res/drawable/button_start.xml
 create mode 100644 src/pandroid/app/src/main/res/drawable/button_x.xml
 create mode 100644 src/pandroid/app/src/main/res/drawable/button_y.xml
 create mode 100644 src/pandroid/app/src/main/res/drawable/dpad_down.xml
 create mode 100644 src/pandroid/app/src/main/res/drawable/dpad_left.xml
 create mode 100644 src/pandroid/app/src/main/res/drawable/dpad_right.xml
 create mode 100644 src/pandroid/app/src/main/res/drawable/dpad_up.xml
 create mode 100644 src/pandroid/app/src/main/res/drawable/ic_add.xml
 delete mode 100644 src/pandroid/app/src/main/res/drawable/simple_analog_background.xml
 delete mode 100644 src/pandroid/app/src/main/res/drawable/simple_circle_button.xml
 create mode 100644 src/pandroid/app/src/main/res/layout/controller_joystick.xml
 create mode 100644 src/pandroid/app/src/main/res/layout/controller_l.xml
 create mode 100644 src/pandroid/app/src/main/res/layout/controller_r.xml
 create mode 100644 src/pandroid/app/src/main/res/layout/controller_select.xml
 create mode 100644 src/pandroid/app/src/main/res/layout/controller_start.xml

diff --git a/src/pandroid/app/src/main/res/drawable/analog_background.xml b/src/pandroid/app/src/main/res/drawable/analog_background.xml
new file mode 100644
index 000000000..3f3747cd7
--- /dev/null
+++ b/src/pandroid/app/src/main/res/drawable/analog_background.xml
@@ -0,0 +1,26 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="100dp"
+    android:height="100dp"
+    android:viewportWidth="100"
+    android:viewportHeight="100">
+  <path
+      android:pathData="M50,7C26.27,7 7,26.27 7,50 7,73.73 26.27,93 50,93 73.73,93 93,73.73 93,50 93,26.27 73.73,7 50,7ZM50,10.06C72.08,10.06 89.94,27.92 89.94,50 89.94,72.08 72.08,89.94 50,89.94 27.92,89.94 10.06,72.08 10.06,50 10.06,27.92 27.92,10.06 50,10.06Z"
+      android:fillColor="#000000"
+      android:fillType="evenOdd"
+      android:fillAlpha="0.285353"/>
+  <path
+      android:pathData="M50,7.55C26.57,7.55 7.55,26.57 7.55,50 7.55,73.43 26.57,92.45 50,92.45 73.43,92.45 92.45,73.43 92.45,50 92.45,26.57 73.43,7.55 50,7.55ZM50,9.51C72.38,9.51 90.49,27.62 90.49,50 90.49,72.38 72.38,90.49 50,90.49 27.62,90.49 9.51,72.38 9.51,50 9.51,27.62 27.62,9.51 50,9.51Z"
+      android:fillType="evenOdd">
+    <aapt:attr name="android:fillColor">
+      <gradient 
+          android:centerX="0.32"
+          android:centerY="14.57"
+          android:gradientRadius="112.13"
+          android:type="radial">
+        <item android:offset="0" android:color="#FFFFFFFF"/>
+        <item android:offset="1" android:color="#FF525252"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+</vector>
diff --git a/src/pandroid/app/src/main/res/drawable/analog_foreground.xml b/src/pandroid/app/src/main/res/drawable/analog_foreground.xml
new file mode 100644
index 000000000..c339e69fb
--- /dev/null
+++ b/src/pandroid/app/src/main/res/drawable/analog_foreground.xml
@@ -0,0 +1,41 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="100dp"
+    android:height="100dp"
+    android:viewportWidth="100"
+    android:viewportHeight="100">
+  <path
+      android:pathData="M50,50m-45,0a45,45 0,1 1,90 0a45,45 0,1 1,-90 0"
+      android:strokeWidth="0.321096"
+      android:fillType="evenOdd">
+    <aapt:attr name="android:fillColor">
+      <gradient 
+          android:centerX="50"
+          android:centerY="50"
+          android:gradientRadius="45"
+          android:type="radial">
+        <item android:offset="0" android:color="#FFFFFFFF"/>
+        <item android:offset="1" android:color="#FF888888"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M50,3.34C24.25,3.34 3.34,24.25 3.34,50 3.34,75.75 24.25,96.66 50,96.66 75.75,96.66 96.66,75.75 96.66,50 96.66,24.25 75.75,3.34 50,3.34ZM50,6.66C73.96,6.66 93.34,26.04 93.34,50 93.34,73.96 73.96,93.34 50,93.34 26.04,93.34 6.66,73.96 6.66,50 6.66,26.04 26.04,6.66 50,6.66Z"
+      android:fillColor="#000000"
+      android:fillType="evenOdd"
+      android:fillAlpha="0.285353"/>
+  <path
+      android:pathData="M50,3.94C24.57,3.94 3.94,24.57 3.94,50 3.94,75.43 24.57,96.06 50,96.06 75.43,96.06 96.06,75.43 96.06,50 96.06,24.57 75.43,3.94 50,3.94ZM50,6.06C74.28,6.06 93.94,25.72 93.94,50 93.94,74.28 74.28,93.94 50,93.94 25.72,93.94 6.06,74.28 6.06,50 6.06,25.72 25.72,6.06 50,6.06Z"
+      android:fillType="evenOdd">
+    <aapt:attr name="android:fillColor">
+      <gradient 
+          android:centerX="-3.9"
+          android:centerY="11.55"
+          android:gradientRadius="121.67"
+          android:type="radial">
+        <item android:offset="0" android:color="#FFFFFFFF"/>
+        <item android:offset="1" android:color="#FF525252"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+</vector>
diff --git a/src/pandroid/app/src/main/res/drawable/button_a.xml b/src/pandroid/app/src/main/res/drawable/button_a.xml
new file mode 100644
index 000000000..d04306b9d
--- /dev/null
+++ b/src/pandroid/app/src/main/res/drawable/button_a.xml
@@ -0,0 +1,39 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="100dp"
+    android:height="100dp"
+    android:viewportWidth="100"
+    android:viewportHeight="100">
+  <path
+      android:pathData="M50,50m-47.79,0a47.79,47.79 0,1 1,95.58 0a47.79,47.79 0,1 1,-95.58 0"
+      android:strokeWidth="0.425"
+      android:strokeColor="#00000000"
+      android:fillType="evenOdd">
+    <aapt:attr name="android:fillColor">
+      <gradient 
+          android:startX="94.17"
+          android:startY="88.44"
+          android:endX="15.07"
+          android:endY="7.22"
+          android:type="linear">
+        <item android:offset="0" android:color="#FF383838"/>
+        <item android:offset="0.6" android:color="#FFFFFFFF"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="m50,2c-26.51,0 -48,21.49 -48,48 0,26.51 21.49,48 48,48 26.51,0 48,-21.49 48,-48 0,-26.51 -21.49,-48 -48,-48zM50,2.43c26.28,0 47.58,21.3 47.58,47.57 0,26.28 -21.3,47.57 -47.58,47.57 -26.28,0 -47.57,-21.3 -47.57,-47.57 0,-26.28 21.3,-47.57 47.57,-47.57z"
+      android:fillColor="#070707"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M50,50m-45,0a45,45 0,1 1,90 0a45,45 0,1 1,-90 0"
+      android:strokeWidth="0.4"
+      android:fillColor="#afafaf"
+      android:strokeColor="#00000000"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="m60.36,69.56q-0.62,-2.03 -1.41,-4.18 -0.73,-2.14 -1.47,-4.29l-15.24,0q-0.73,2.14 -1.52,4.29 -0.73,2.14 -1.35,4.18l-9.14,0q2.2,-6.32 4.18,-11.68 1.98,-5.36 3.84,-10.1 1.92,-4.74 3.73,-8.97 1.86,-4.29 3.84,-8.35l8.41,0q1.92,4.06 3.78,8.35 1.86,4.23 3.73,8.97 1.92,4.74 3.89,10.1 1.98,5.36 4.18,11.68zM49.8,39.3q-0.28,0.85 -0.85,2.31 -0.56,1.47 -1.3,3.39 -0.73,1.92 -1.64,4.23 -0.85,2.31 -1.75,4.85l11.12,0q-0.9,-2.54 -1.75,-4.85 -0.85,-2.31 -1.64,-4.23 -0.73,-1.92 -1.3,-3.39 -0.56,-1.47 -0.9,-2.31z"
+      android:strokeAlpha="0.396361"
+      android:strokeWidth="0.45"
+      android:fillColor="#424242"/>
+</vector>
diff --git a/src/pandroid/app/src/main/res/drawable/button_b.xml b/src/pandroid/app/src/main/res/drawable/button_b.xml
new file mode 100644
index 000000000..1611f28df
--- /dev/null
+++ b/src/pandroid/app/src/main/res/drawable/button_b.xml
@@ -0,0 +1,39 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="100dp"
+    android:height="100dp"
+    android:viewportWidth="100"
+    android:viewportHeight="100">
+  <path
+      android:pathData="M50,50m-47.79,0a47.79,47.79 0,1 1,95.58 0a47.79,47.79 0,1 1,-95.58 0"
+      android:strokeWidth="0.425"
+      android:strokeColor="#00000000"
+      android:fillType="evenOdd">
+    <aapt:attr name="android:fillColor">
+      <gradient 
+          android:startX="94.17"
+          android:startY="88.44"
+          android:endX="15.07"
+          android:endY="7.22"
+          android:type="linear">
+        <item android:offset="0" android:color="#FF383838"/>
+        <item android:offset="0.6" android:color="#FFFFFFFF"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="m50,2c-26.51,0 -48,21.49 -48,48 0,26.51 21.49,48 48,48 26.51,0 48,-21.49 48,-48 0,-26.51 -21.49,-48 -48,-48zM50,2.43c26.28,0 47.58,21.3 47.58,47.57 0,26.28 -21.3,47.57 -47.58,47.57 -26.28,0 -47.57,-21.3 -47.57,-47.57 0,-26.28 21.3,-47.57 47.57,-47.57z"
+      android:fillColor="#070707"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M50,50m-45,0a45,45 0,1 1,90 0a45,45 0,1 1,-90 0"
+      android:strokeWidth="0.4"
+      android:fillColor="#afafaf"
+      android:strokeColor="#00000000"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="m48.59,70.07q-3.22,0 -6.43,-0.23 -3.16,-0.17 -6.6,-0.9l0,-37.93q2.71,-0.51 5.93,-0.73 3.22,-0.28 5.98,-0.28 3.73,0 6.83,0.56 3.16,0.51 5.42,1.81 2.26,1.3 3.5,3.44 1.3,2.09 1.3,5.19 0,4.68 -4.52,7.39 3.73,1.41 5.08,3.84 1.35,2.43 1.35,5.48 0,6.15 -4.52,9.26 -4.46,3.1 -13.32,3.1zM44.13,52.51l0,10.1q0.96,0.11 2.09,0.17 1.13,0.06 2.48,0.06 3.95,0 6.38,-1.13 2.43,-1.13 2.43,-4.18 0,-2.71 -2.03,-3.84 -2.03,-1.19 -5.81,-1.19zM44.13,45.79l4.29,0q4.06,0 5.81,-1.02 1.75,-1.07 1.75,-3.39 0,-2.37 -1.81,-3.33 -1.81,-0.96 -5.31,-0.96 -1.13,0 -2.43,0.06 -1.3,0 -2.31,0.11z"
+      android:strokeAlpha="0.396361"
+      android:strokeWidth="0.45"
+      android:fillColor="#424242"/>
+</vector>
diff --git a/src/pandroid/app/src/main/res/drawable/button_l.xml b/src/pandroid/app/src/main/res/drawable/button_l.xml
new file mode 100644
index 000000000..a2b2f5ad5
--- /dev/null
+++ b/src/pandroid/app/src/main/res/drawable/button_l.xml
@@ -0,0 +1,24 @@
+<vector android:height="24dp" android:viewportHeight="64"
+    android:viewportWidth="264" android:width="99dp"
+    xmlns:aapt="http://schemas.android.com/aapt" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillType="evenOdd"
+        android:pathData="m12.36,1c-5.54,0 -10.12,3.92 -11.14,9.15 -0.14,0.71 -0.21,1.45 -0.21,2.2v39.29c0,6.29 5.06,11.36 11.36,11.36h144.42c0.81,0 1.6,-0.08 2.36,-0.24 58.82,-1.71 103.87,-12.44 103.87,-25.52L263,31.87 263,26.76 263,11 263,10.14c0,-0.17 -0.04,-0.34 -0.09,-0.49 -0.66,-4.89 -4.83,-8.64 -9.91,-8.64h-96.23z"
+        android:strokeColor="#00000000" android:strokeLineCap="butt"
+        android:strokeLineJoin="miter" android:strokeWidth="0.556">
+        <aapt:attr name="android:fillColor">
+            <gradient android:centerX="0" android:centerY="0"
+                android:gradientRadius="132.57" android:type="radial">
+                <item android:color="#FFFCFCFC" android:offset="0"/>
+                <item android:color="#FF484848" android:offset="1"/>
+            </gradient>
+        </aapt:attr>
+    </path>
+    <path android:fillColor="#afafaf" android:fillType="evenOdd"
+        android:pathData="m14.35,4.15c-5.51,0 -9.95,4.44 -9.95,9.95v34.41c0,5.51 4.44,9.95 9.95,9.95h151.37c0.71,0 1.4,-0.07 2.07,-0.21 51.52,-1.5 90.98,-10.9 90.98,-22.35L258.76,31.19 258.76,26.72 258.76,12.91 258.76,12.15c0,-0.15 -0.03,-0.3 -0.08,-0.43 -0.58,-4.29 -4.23,-7.57 -8.68,-7.57h-84.29z"
+        android:strokeColor="#00000000" android:strokeLineCap="butt"
+        android:strokeLineJoin="miter" android:strokeWidth="0.487007"/>
+    <path android:fillColor="#000000" android:fillType="evenOdd" android:pathData="m12.36,0.72c-5.67,0 -10.37,4.02 -11.42,9.38 -0.14,0.73 -0.22,1.48 -0.22,2.26L0.72,51.64c0,6.44 5.19,11.63 11.63,11.63L156.77,63.28c0.81,0 1.6,-0.09 2.37,-0.24 29.42,-0.86 55.4,-3.97 74.05,-8.51 9.32,-2.27 16.81,-4.89 21.99,-7.79 2.59,-1.45 4.6,-2.96 5.98,-4.54 1.38,-1.58 2.12,-3.25 2.12,-4.96L263.28,31.87 263.28,26.76 263.28,11 263.28,10.14c0,-0.2 -0.04,-0.39 -0.11,-0.56C262.48,4.56 258.2,0.72 253,0.72L156.77,0.72ZM12.36,1.28h144.42,96.23c4.94,0 8.99,3.64 9.63,8.4l0,0.03 0.01,0.03c0.05,0.13 0.08,0.26 0.08,0.4v0.87,15.76 5.11,5.37c0,1.55 -0.67,3.08 -1.98,4.6 -1.32,1.51 -3.28,3 -5.83,4.42 -5.11,2.85 -12.56,5.47 -21.85,7.73 -18.59,4.52 -44.54,7.63 -73.93,8.49l-0.03,0 -0.02,0c-0.74,0.16 -1.51,0.24 -2.3,0.24L12.36,62.72c-6.14,0 -11.08,-4.94 -11.08,-11.08L1.28,12.36c0,-0.74 0.07,-1.46 0.21,-2.15 1,-5.1 5.47,-8.93 10.87,-8.93z"/>
+    <path android:fillColor="#424242"
+        android:pathData="m53.32,42.88l0,7.37L27.85,50.25l0,-38.12l8.58,0l0,30.75z"
+        android:strokeAlpha="0.396361" android:strokeWidth="0.38"/>
+</vector>
diff --git a/src/pandroid/app/src/main/res/drawable/button_r.xml b/src/pandroid/app/src/main/res/drawable/button_r.xml
new file mode 100644
index 000000000..24cf739bb
--- /dev/null
+++ b/src/pandroid/app/src/main/res/drawable/button_r.xml
@@ -0,0 +1,24 @@
+<vector android:height="24dp" android:viewportHeight="64"
+    android:viewportWidth="264" android:width="99dp"
+    xmlns:aapt="http://schemas.android.com/aapt" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillType="evenOdd"
+        android:pathData="m251.64,1c5.54,0 10.12,3.92 11.14,9.15 0.14,0.71 0.21,1.45 0.21,2.2v39.29c0,6.29 -5.06,11.36 -11.36,11.36h-144.42c-0.81,0 -1.6,-0.08 -2.36,-0.24C46.05,61.04 1,50.31 1,37.24L1,31.87 1,26.76 1,11 1,10.14c0,-0.17 0.04,-0.34 0.09,-0.49 0.66,-4.89 4.83,-8.64 9.91,-8.64h96.23z"
+        android:strokeColor="#00000000" android:strokeLineCap="butt"
+        android:strokeLineJoin="miter" android:strokeWidth="0.556">
+        <aapt:attr name="android:fillColor">
+            <gradient android:centerX="37.3" android:centerY="23.14"
+                android:gradientRadius="132.57" android:type="radial">
+                <item android:color="#FFFCFCFC" android:offset="0"/>
+                <item android:color="#FF484848" android:offset="0.61"/>
+            </gradient>
+        </aapt:attr>
+    </path>
+    <path android:fillColor="#afafaf" android:fillType="evenOdd"
+        android:pathData="m248.82,4.15c5.51,0 9.95,4.44 9.95,9.95v34.41c0,5.51 -4.44,9.95 -9.95,9.95L97.45,58.46c-0.71,0 -1.4,-0.07 -2.07,-0.21C43.87,56.74 4.4,47.34 4.4,35.89L4.4,31.19 4.4,26.72 4.4,12.91 4.4,12.15c0,-0.15 0.03,-0.3 0.08,-0.43 0.58,-4.29 4.23,-7.57 8.68,-7.57h84.29z"
+        android:strokeColor="#00000000" android:strokeLineCap="butt"
+        android:strokeLineJoin="miter" android:strokeWidth="0.487007"/>
+    <path android:fillColor="#000000" android:fillType="evenOdd" android:pathData="m251.64,0.72c5.67,0 10.37,4.02 11.42,9.38 0.14,0.73 0.22,1.48 0.22,2.26L263.28,51.64c0,6.44 -5.19,11.63 -11.63,11.63L107.23,63.28c-0.81,0 -1.6,-0.09 -2.37,-0.24 -29.42,-0.86 -55.4,-3.97 -74.05,-8.51 -9.32,-2.27 -16.81,-4.89 -21.99,-7.79 -2.59,-1.45 -4.6,-2.96 -5.98,-4.54 -1.38,-1.58 -2.12,-3.25 -2.12,-4.96L0.72,31.87 0.72,26.76 0.72,11 0.72,10.14c0,-0.2 0.04,-0.39 0.11,-0.56 0.69,-5.01 4.97,-8.85 10.17,-8.85h96.23zM251.64,1.28L107.23,1.28 11,1.28c-4.94,0 -8.99,3.64 -9.63,8.4l-0,0.03 -0.01,0.03c-0.05,0.13 -0.08,0.26 -0.08,0.4v0.87,15.76 5.11,5.37c0,1.55 0.67,3.08 1.98,4.6 1.32,1.51 3.28,3 5.83,4.42 5.11,2.85 12.56,5.47 21.85,7.73 18.59,4.52 44.54,7.63 73.93,8.49l0.03,0 0.02,0c0.74,0.16 1.51,0.24 2.3,0.24h31.1,113.32c6.14,0 11.08,-4.94 11.08,-11.08L262.72,12.36c0,-0.74 -0.07,-1.46 -0.21,-2.15 -1,-5.1 -5.47,-8.93 -10.87,-8.93z"/>
+    <path android:fillColor="#424242"
+        android:pathData="m221.58,11.81q8.58,0 13.15,3.08 4.57,3.03 4.57,9.46 0,4.02 -1.87,6.55 -1.82,2.48 -5.28,3.91 1.16,1.43 2.42,3.3 1.27,1.82 2.48,3.85 1.27,1.98 2.42,4.18 1.16,2.15 2.15,4.24l-9.63,0q-1.05,-1.87 -2.15,-3.8 -1.05,-1.93 -2.2,-3.74 -1.1,-1.82 -2.2,-3.41 -1.1,-1.65 -2.2,-2.97l-4.24,0l0,13.92l-8.58,0l0,-37.57q2.81,-0.55 5.78,-0.77 3.03,-0.22 5.39,-0.22zM222.08,19.12q-0.94,0 -1.71,0.06 -0.72,0.06 -1.38,0.11l0,10.34l2.42,0q4.84,0 6.93,-1.21 2.09,-1.21 2.09,-4.13 0,-2.81 -2.15,-3.96 -2.09,-1.21 -6.22,-1.21z"
+        android:strokeAlpha="0.396361" android:strokeWidth="0.38"/>
+</vector>
diff --git a/src/pandroid/app/src/main/res/drawable/button_select.xml b/src/pandroid/app/src/main/res/drawable/button_select.xml
new file mode 100644
index 000000000..c71a3bff7
--- /dev/null
+++ b/src/pandroid/app/src/main/res/drawable/button_select.xml
@@ -0,0 +1,38 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="175dp"
+    android:height="50dp"
+    android:viewportWidth="175"
+    android:viewportHeight="50">
+  <path
+      android:pathData="M7.62,1L167.38,1A6.62,6.62 0,0 1,174 7.62L174,42.38A6.62,6.62 0,0 1,167.38 49L7.62,49A6.62,6.62 0,0 1,1 42.38L1,7.62A6.62,6.62 0,0 1,7.62 1z"
+      android:strokeLineJoin="miter"
+      android:strokeWidth="1.04136"
+      android:fillType="evenOdd"
+      android:strokeLineCap="butt">
+    <aapt:attr name="android:fillColor">
+      <gradient 
+          android:centerX="4.7"
+          android:centerY="0"
+          android:gradientRadius="208.29"
+          android:type="radial">
+        <item android:offset="0" android:color="#FFFFFFFF"/>
+        <item android:offset="0.56" android:color="#FF4D4D4D"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M166.91,4.17C122.64,4.21 78.37,4.16 34.09,4.19 25.08,4.2 16.05,4.18 7.04,4.23 5.09,4.52 3.82,6.66 4.19,8.54c0.01,11.53 -0.08,23.08 0.07,34.6 0.39,1.91 2.53,3.03 4.37,2.67 53.05,0.01 106.1,0.01 159.14,-0.01 2.03,-0.2 3.42,-2.4 3.03,-4.34 -0,-11.53 0.08,-23.07 -0.07,-34.6 -0.35,-1.69 -2.14,-2.89 -3.83,-2.7z"
+      android:strokeLineJoin="miter"
+      android:strokeWidth="1.04136"
+      android:fillColor="#afafaf"
+      android:fillType="evenOdd"
+      android:strokeLineCap="butt"/>
+  <path
+      android:pathData="M33.72,12.26C32.33,12.26 31.09,12.44 29.98,12.79C28.87,13.12 27.93,13.6 27.16,14.24C26.38,14.87 25.78,15.65 25.36,16.56C24.94,17.46 24.72,18.47 24.72,19.6C24.72,20.73 24.92,21.69 25.32,22.49C25.72,23.27 26.24,23.94 26.88,24.5C27.51,25.04 28.23,25.5 29.03,25.88C29.83,26.23 30.63,26.55 31.43,26.83C33.26,27.44 34.55,28.02 35.31,28.56C36.06,29.08 36.44,29.73 36.44,30.53C36.44,30.91 36.38,31.25 36.26,31.56C36.14,31.86 35.93,32.13 35.62,32.37C35.32,32.58 34.91,32.76 34.39,32.9C33.9,33.01 33.26,33.07 32.48,33.07C30.93,33.07 29.62,32.92 28.53,32.61C27.48,32.29 26.58,31.92 25.85,31.52L24.3,35.9C24.63,36.08 25.03,36.28 25.5,36.5C25.99,36.71 26.57,36.91 27.23,37.09C27.91,37.28 28.69,37.44 29.56,37.55C30.43,37.69 31.4,37.77 32.48,37.77C35.71,37.77 38.12,37.14 39.72,35.9C41.32,34.63 42.12,32.85 42.12,30.57C42.12,29.39 41.96,28.39 41.66,27.57C41.35,26.75 40.88,26.03 40.25,25.42C39.63,24.81 38.86,24.28 37.92,23.83C36.98,23.36 35.87,22.89 34.6,22.42C33.99,22.21 33.43,22.01 32.91,21.82C32.41,21.61 31.97,21.38 31.57,21.15C31.19,20.89 30.9,20.61 30.69,20.3C30.47,20 30.37,19.62 30.37,19.17C30.37,18.42 30.65,17.87 31.22,17.52C31.8,17.14 32.76,16.95 34.07,16.95C35.25,16.95 36.25,17.09 37.07,17.37C37.92,17.63 38.68,17.94 39.36,18.29L40.95,13.95C40.18,13.53 39.19,13.14 37.99,12.79C36.79,12.44 35.37,12.26 33.72,12.26zM120.4,12.26C118.61,12.26 116.95,12.54 115.42,13.11C113.89,13.67 112.58,14.51 111.47,15.61C110.37,16.69 109.5,18.03 108.86,19.63C108.23,21.21 107.91,23.01 107.91,25.03C107.91,29.1 108.94,32.24 111.01,34.45C113.11,36.66 116.14,37.77 120.11,37.77C121.97,37.77 123.61,37.58 125.02,37.2C126.43,36.82 127.52,36.4 128.3,35.93L126.78,31.52C126.48,31.66 126.14,31.82 125.76,31.98C125.38,32.14 124.95,32.3 124.45,32.44C123.96,32.56 123.4,32.66 122.76,32.76C122.13,32.85 121.41,32.9 120.61,32.9C119.34,32.9 118.26,32.7 117.36,32.3C116.47,31.87 115.74,31.31 115.18,30.6C114.63,29.9 114.24,29.06 113.98,28.1C113.74,27.11 113.62,26.05 113.62,24.92C113.62,23.51 113.81,22.31 114.19,21.33C114.56,20.34 115.06,19.54 115.67,18.93C116.3,18.29 117.02,17.83 117.82,17.55C118.64,17.27 119.48,17.13 120.33,17.13C121.6,17.13 122.73,17.27 123.71,17.55C124.72,17.83 125.61,18.17 126.36,18.57L127.95,14.13C127.76,14.01 127.45,13.85 127.03,13.64C126.61,13.42 126.08,13.22 125.44,13.04C124.81,12.82 124.07,12.65 123.22,12.51C122.37,12.34 121.43,12.26 120.4,12.26zM46.35,12.82L46.35,37.27L63.67,37.27L63.67,32.65L51.85,32.65L51.85,26.76L61.62,26.76L61.62,22.24L51.85,22.24L51.85,17.45L62.86,17.45L62.86,12.82L46.35,12.82zM67.73,12.82L67.73,37.27L84.06,37.27L84.06,32.54L73.23,32.54L73.23,12.82L67.73,12.82zM87.59,12.82L87.59,37.27L104.91,37.27L104.91,32.65L93.09,32.65L93.09,26.76L102.86,26.76L102.86,22.24L93.09,22.24L93.09,17.45L104.1,17.45L104.1,12.82L87.59,12.82zM130.45,12.82L130.45,17.52L137.82,17.52L137.82,37.27L143.33,37.27L143.33,17.52L150.7,17.52L150.7,12.82L130.45,12.82z"
+      android:fillColor="#424242"/>
+  <path
+      android:pathData="m7.62,0.68c-3.84,0 -6.94,3.1 -6.94,6.94L0.68,42.38c0,3.84 3.1,6.94 6.94,6.94L167.38,49.32c3.84,0 6.94,-3.1 6.94,-6.94L174.32,7.62c0,-3.84 -3.1,-6.94 -6.94,-6.94L27.61,0.68ZM7.62,1.32L167.38,1.32c3.49,0 6.3,2.8 6.3,6.3L173.68,42.38c0,3.49 -2.8,6.3 -6.3,6.3L7.62,48.68c-3.49,0 -6.3,-2.8 -6.3,-6.3L1.32,7.62c0,-3.49 2.8,-6.3 6.3,-6.3z"
+      android:fillColor="#000000"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/src/pandroid/app/src/main/res/drawable/button_start.xml b/src/pandroid/app/src/main/res/drawable/button_start.xml
new file mode 100644
index 000000000..33e0a58b1
--- /dev/null
+++ b/src/pandroid/app/src/main/res/drawable/button_start.xml
@@ -0,0 +1,38 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="175dp"
+    android:height="50dp"
+    android:viewportWidth="175"
+    android:viewportHeight="50">
+  <path
+      android:pathData="M7.62,1L167.38,1A6.62,6.62 0,0 1,174 7.62L174,42.38A6.62,6.62 0,0 1,167.38 49L7.62,49A6.62,6.62 0,0 1,1 42.38L1,7.62A6.62,6.62 0,0 1,7.62 1z"
+      android:strokeLineJoin="miter"
+      android:strokeWidth="1.04136"
+      android:fillType="evenOdd"
+      android:strokeLineCap="butt">
+    <aapt:attr name="android:fillColor">
+      <gradient 
+          android:centerX="4.7"
+          android:centerY="0"
+          android:gradientRadius="208.29"
+          android:type="radial">
+        <item android:offset="0" android:color="#FFFFFFFF"/>
+        <item android:offset="0.56" android:color="#FF4D4D4D"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M166.91,4.17C122.64,4.21 78.37,4.16 34.09,4.19 25.08,4.2 16.05,4.18 7.04,4.23 5.09,4.52 3.82,6.66 4.19,8.54c0.01,11.53 -0.08,23.08 0.07,34.6 0.39,1.91 2.53,3.03 4.37,2.67 53.05,0.01 106.1,0.01 159.14,-0.01 2.03,-0.2 3.42,-2.4 3.03,-4.34 -0,-11.53 0.08,-23.07 -0.07,-34.6 -0.35,-1.69 -2.14,-2.89 -3.83,-2.7z"
+      android:strokeLineJoin="miter"
+      android:strokeWidth="1.04136"
+      android:fillColor="#afafaf"
+      android:fillType="evenOdd"
+      android:strokeLineCap="butt"/>
+  <path
+      android:pathData="M43.49,12.26C42.1,12.26 40.86,12.44 39.75,12.79C38.65,13.12 37.71,13.6 36.93,14.24C36.15,14.87 35.55,15.65 35.13,16.56C34.71,17.46 34.5,18.47 34.5,19.6C34.5,20.73 34.7,21.69 35.1,22.49C35.5,23.27 36.01,23.94 36.65,24.5C37.28,25.04 38,25.5 38.8,25.88C39.6,26.23 40.4,26.55 41.2,26.83C43.03,27.44 44.33,28.02 45.08,28.56C45.83,29.08 46.21,29.73 46.21,30.53C46.21,30.91 46.15,31.25 46.03,31.56C45.91,31.86 45.7,32.13 45.4,32.37C45.09,32.58 44.68,32.76 44.16,32.9C43.67,33.01 43.03,33.07 42.26,33.07C40.7,33.07 39.39,32.92 38.31,32.61C37.25,32.29 36.35,31.92 35.62,31.52L34.07,35.9C34.4,36.08 34.8,36.28 35.27,36.5C35.77,36.71 36.34,36.91 37,37.09C37.68,37.28 38.46,37.44 39.33,37.55C40.2,37.69 41.17,37.77 42.26,37.77C45.48,37.77 47.89,37.14 49.49,35.9C51.09,34.63 51.89,32.85 51.89,30.57C51.89,29.39 51.74,28.39 51.43,27.57C51.12,26.75 50.65,26.03 50.02,25.42C49.41,24.81 48.63,24.28 47.69,23.83C46.75,23.36 45.64,22.89 44.37,22.42C43.76,22.21 43.2,22.01 42.68,21.82C42.19,21.61 41.74,21.38 41.34,21.15C40.96,20.89 40.67,20.61 40.46,20.3C40.25,20 40.14,19.62 40.14,19.17C40.14,18.42 40.42,17.87 40.99,17.52C41.58,17.14 42.53,16.95 43.84,16.95C45.02,16.95 46.02,17.09 46.84,17.37C47.69,17.63 48.45,17.94 49.14,18.29L50.72,13.95C49.95,13.53 48.96,13.14 47.76,12.79C46.56,12.44 45.14,12.26 43.49,12.26zM106.78,12.54C105.77,12.54 104.62,12.59 103.32,12.68C102.05,12.78 100.82,12.94 99.62,13.18L99.62,37.27L105.12,37.27L105.12,28.35L107.84,28.35C108.31,28.91 108.78,29.55 109.25,30.25C109.72,30.93 110.19,31.66 110.66,32.44C111.15,33.21 111.62,34.01 112.07,34.84C112.54,35.66 113,36.47 113.45,37.27L119.62,37.27C119.2,36.38 118.74,35.47 118.24,34.55C117.75,33.61 117.23,32.72 116.69,31.87C116.18,31 115.65,30.18 115.11,29.4C114.56,28.6 114.05,27.9 113.55,27.29C115.03,26.68 116.16,25.84 116.94,24.78C117.74,23.7 118.14,22.3 118.14,20.59C118.14,17.83 117.16,15.81 115.21,14.52C113.26,13.2 110.45,12.54 106.78,12.54zM53.3,12.82L53.3,17.52L60.67,17.52L60.67,37.27L66.18,37.27L66.18,17.52L73.55,17.52L73.55,12.82L53.3,12.82zM81.45,12.82C80.63,14.52 79.83,16.26 79.05,18.04C78.3,19.81 77.52,21.68 76.72,23.65C75.95,25.63 75.15,27.73 74.32,29.97C73.5,32.2 72.63,34.64 71.71,37.27L77.43,37.27C77.69,36.42 77.97,35.55 78.28,34.66C78.6,33.77 78.92,32.87 79.23,31.98L88.75,31.98C89.06,32.87 89.36,33.77 89.67,34.66C90,35.55 90.29,36.42 90.55,37.27L96.44,37.27C95.53,34.64 94.66,32.2 93.83,29.97C93.01,27.73 92.2,25.63 91.4,23.65C90.62,21.68 89.85,19.81 89.07,18.04C88.29,16.26 87.51,14.52 86.71,12.82L81.45,12.82zM120.68,12.82L120.68,17.52L128.05,17.52L128.05,37.27L133.56,37.27L133.56,17.52L140.93,17.52L140.93,12.82L120.68,12.82zM107.1,17.23C108.86,17.23 110.19,17.49 111.08,18.01C112,18.5 112.46,19.35 112.46,20.55C112.46,21.8 112.01,22.68 111.12,23.2C110.23,23.71 108.74,23.97 106.67,23.97L105.12,23.97L105.12,17.34C105.4,17.32 105.7,17.29 106,17.27C106.33,17.25 106.7,17.23 107.1,17.23zM83.96,18.36C84.1,18.72 84.28,19.2 84.52,19.81C84.75,20.42 85.03,21.13 85.33,21.93C85.66,22.73 86,23.61 86.35,24.57C86.71,25.54 87.07,26.55 87.45,27.61L80.5,27.61C80.87,26.55 81.24,25.54 81.59,24.57C81.97,23.61 82.31,22.73 82.61,21.93C82.92,21.13 83.19,20.42 83.43,19.81C83.66,19.2 83.84,18.72 83.96,18.36z"
+      android:fillColor="#424242"/>
+  <path
+      android:pathData="m7.62,0.68c-3.84,0 -6.94,3.1 -6.94,6.94L0.68,42.38c0,3.84 3.1,6.94 6.94,6.94L167.38,49.32c3.84,0 6.94,-3.1 6.94,-6.94L174.32,7.62c0,-3.84 -3.1,-6.94 -6.94,-6.94L27.61,0.68ZM7.62,1.32L167.38,1.32c3.49,0 6.3,2.8 6.3,6.3L173.68,42.38c0,3.49 -2.8,6.3 -6.3,6.3L7.62,48.68c-3.49,0 -6.3,-2.8 -6.3,-6.3L1.32,7.62c0,-3.49 2.8,-6.3 6.3,-6.3z"
+      android:fillColor="#000000"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/src/pandroid/app/src/main/res/drawable/button_x.xml b/src/pandroid/app/src/main/res/drawable/button_x.xml
new file mode 100644
index 000000000..4050c5394
--- /dev/null
+++ b/src/pandroid/app/src/main/res/drawable/button_x.xml
@@ -0,0 +1,39 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="100dp"
+    android:height="100dp"
+    android:viewportWidth="100"
+    android:viewportHeight="100">
+  <path
+      android:pathData="M50,50m-47.79,0a47.79,47.79 0,1 1,95.58 0a47.79,47.79 0,1 1,-95.58 0"
+      android:strokeWidth="0.425"
+      android:strokeColor="#00000000"
+      android:fillType="evenOdd">
+    <aapt:attr name="android:fillColor">
+      <gradient 
+          android:startX="94.17"
+          android:startY="88.44"
+          android:endX="15.07"
+          android:endY="7.22"
+          android:type="linear">
+        <item android:offset="0" android:color="#FF383838"/>
+        <item android:offset="0.6" android:color="#FFFFFFFF"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="m50,2c-26.51,0 -48,21.49 -48,48 0,26.51 21.49,48 48,48 26.51,0 48,-21.49 48,-48 0,-26.51 -21.49,-48 -48,-48zM50,2.43c26.28,0 47.58,21.3 47.58,47.57 0,26.28 -21.3,47.57 -47.58,47.57 -26.28,0 -47.57,-21.3 -47.57,-47.57 0,-26.28 21.3,-47.57 47.57,-47.57z"
+      android:fillColor="#070707"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M50,50m-45,0a45,45 0,1 1,90 0a45,45 0,1 1,-90 0"
+      android:strokeWidth="0.4"
+      android:fillColor="#afafaf"
+      android:strokeColor="#00000000"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="m57.93,69.56q-1.64,-3.27 -3.61,-6.6 -1.92,-3.39 -4.46,-6.89 -0.79,1.02 -2.03,2.82 -1.19,1.81 -2.43,3.84 -1.19,2.03 -2.26,3.89 -1.07,1.86 -1.58,2.94l-10.05,0q2.48,-4.57 5.76,-9.6 3.33,-5.02 7.39,-10.67l-12.59,-18.85l10.67,0l7.62,12.19 7.45,-12.19l10.05,0l-12.42,18.97q4.74,6.15 7.96,11.4 3.22,5.19 5.08,8.75z"
+      android:strokeAlpha="0.396361"
+      android:strokeWidth="0.45"
+      android:fillColor="#424242"/>
+</vector>
diff --git a/src/pandroid/app/src/main/res/drawable/button_y.xml b/src/pandroid/app/src/main/res/drawable/button_y.xml
new file mode 100644
index 000000000..877996917
--- /dev/null
+++ b/src/pandroid/app/src/main/res/drawable/button_y.xml
@@ -0,0 +1,39 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="100dp"
+    android:height="100dp"
+    android:viewportWidth="100"
+    android:viewportHeight="100">
+  <path
+      android:pathData="M50,50m-47.79,0a47.79,47.79 0,1 1,95.58 0a47.79,47.79 0,1 1,-95.58 0"
+      android:strokeWidth="0.425"
+      android:strokeColor="#00000000"
+      android:fillType="evenOdd">
+    <aapt:attr name="android:fillColor">
+      <gradient 
+          android:startX="94.17"
+          android:startY="88.44"
+          android:endX="15.07"
+          android:endY="7.22"
+          android:type="linear">
+        <item android:offset="0" android:color="#FF383838"/>
+        <item android:offset="0.6" android:color="#FFFFFFFF"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="m50,2c-26.51,0 -48,21.49 -48,48 0,26.51 21.49,48 48,48 26.51,0 48,-21.49 48,-48 0,-26.51 -21.49,-48 -48,-48zM50,2.43c26.28,0 47.58,21.3 47.58,47.57 0,26.28 -21.3,47.57 -47.58,47.57 -26.28,0 -47.57,-21.3 -47.57,-47.57 0,-26.28 21.3,-47.57 47.57,-47.57z"
+      android:fillColor="#070707"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M50,50m-45,0a45,45 0,1 1,90 0a45,45 0,1 1,-90 0"
+      android:strokeWidth="0.4"
+      android:fillColor="#afafaf"
+      android:strokeColor="#00000000"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="m50.2,46.53q2.37,-4.01 4.52,-8.02 2.14,-4.01 3.95,-8.07l9.71,0q-3.22,6.32 -6.66,12.25 -3.44,5.93 -7.28,11.91l0,14.96l-8.81,0l0,-14.84q-3.84,-5.98 -7.34,-11.97 -3.44,-5.98 -6.66,-12.3l10.22,0q1.81,4.06 3.89,8.07 2.09,4.01 4.46,8.02z"
+      android:strokeAlpha="0.396361"
+      android:strokeWidth="0.45"
+      android:fillColor="#424242"/>
+</vector>
diff --git a/src/pandroid/app/src/main/res/drawable/dpad_down.xml b/src/pandroid/app/src/main/res/drawable/dpad_down.xml
new file mode 100644
index 000000000..3a904b2d3
--- /dev/null
+++ b/src/pandroid/app/src/main/res/drawable/dpad_down.xml
@@ -0,0 +1,39 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="100dp"
+    android:height="100dp"
+    android:viewportWidth="100"
+    android:viewportHeight="100">
+  <path
+      android:pathData="M50,50m-47.79,0a47.79,47.79 0,1 1,95.58 0a47.79,47.79 0,1 1,-95.58 0"
+      android:strokeWidth="0.425"
+      android:strokeColor="#00000000"
+      android:fillType="evenOdd">
+    <aapt:attr name="android:fillColor">
+      <gradient 
+          android:startX="94.17"
+          android:startY="88.44"
+          android:endX="15.07"
+          android:endY="7.22"
+          android:type="linear">
+        <item android:offset="0" android:color="#FF383838"/>
+        <item android:offset="0.6" android:color="#FFFFFFFF"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="m50,2c-26.51,0 -48,21.49 -48,48 0,26.51 21.49,48 48,48 26.51,0 48,-21.49 48,-48 0,-26.51 -21.49,-48 -48,-48zM50,2.43c26.28,0 47.58,21.3 47.58,47.57 0,26.28 -21.3,47.57 -47.58,47.57 -26.28,0 -47.57,-21.3 -47.57,-47.57 0,-26.28 21.3,-47.57 47.57,-47.57z"
+      android:fillColor="#070707"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M50,50m-45,0a45,45 0,1 1,90 0a45,45 0,1 1,-90 0"
+      android:strokeWidth="0.4"
+      android:fillColor="#afafaf"
+      android:strokeColor="#00000000"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="m67.31,39.29l-34.72,0.58a3.16,2.28 89.04,0 0,-1.52 5.42L46.49,65.95a7.63,5.51 89.04,0 0,7.79 -0.13l14.73,-21.15a3.16,2.28 89.04,0 0,-1.7 -5.37z"
+      android:strokeAlpha="0.396361"
+      android:strokeWidth="0.611288"
+      android:fillColor="#424242"/>
+</vector>
diff --git a/src/pandroid/app/src/main/res/drawable/dpad_left.xml b/src/pandroid/app/src/main/res/drawable/dpad_left.xml
new file mode 100644
index 000000000..8dad75bec
--- /dev/null
+++ b/src/pandroid/app/src/main/res/drawable/dpad_left.xml
@@ -0,0 +1,39 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="100dp"
+    android:height="100dp"
+    android:viewportWidth="100"
+    android:viewportHeight="100">
+  <path
+      android:pathData="M50,50m-47.79,0a47.79,47.79 0,1 1,95.58 0a47.79,47.79 0,1 1,-95.58 0"
+      android:strokeWidth="0.425"
+      android:strokeColor="#00000000"
+      android:fillType="evenOdd">
+    <aapt:attr name="android:fillColor">
+      <gradient 
+          android:startX="94.17"
+          android:startY="88.44"
+          android:endX="15.07"
+          android:endY="7.22"
+          android:type="linear">
+        <item android:offset="0" android:color="#FF383838"/>
+        <item android:offset="0.6" android:color="#FFFFFFFF"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="m50,2c-26.51,0 -48,21.49 -48,48 0,26.51 21.49,48 48,48 26.51,0 48,-21.49 48,-48 0,-26.51 -21.49,-48 -48,-48zM50,2.43c26.28,0 47.58,21.3 47.58,47.57 0,26.28 -21.3,47.57 -47.58,47.57 -26.28,0 -47.57,-21.3 -47.57,-47.57 0,-26.28 21.3,-47.57 47.57,-47.57z"
+      android:fillColor="#070707"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M50,50m-45,0a45,45 0,1 1,90 0a45,45 0,1 1,-90 0"
+      android:strokeWidth="0.4"
+      android:fillColor="#afafaf"
+      android:strokeColor="#00000000"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="m60.04,32.64l0,34.73a2.28,3.16 90,0 1,-5.4 1.61L33.73,53.89a5.51,7.63 90,0 1,0 -7.79l20.91,-15.08a2.28,3.16 90,0 1,5.4 1.61z"
+      android:strokeAlpha="0.396361"
+      android:strokeWidth="0.88"
+      android:fillColor="#424242"/>
+</vector>
diff --git a/src/pandroid/app/src/main/res/drawable/dpad_right.xml b/src/pandroid/app/src/main/res/drawable/dpad_right.xml
new file mode 100644
index 000000000..e0bea7ec8
--- /dev/null
+++ b/src/pandroid/app/src/main/res/drawable/dpad_right.xml
@@ -0,0 +1,39 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="100dp"
+    android:height="100dp"
+    android:viewportWidth="100"
+    android:viewportHeight="100">
+  <path
+      android:pathData="M50,50m-47.79,0a47.79,47.79 0,1 1,95.58 0a47.79,47.79 0,1 1,-95.58 0"
+      android:strokeWidth="0.425"
+      android:strokeColor="#00000000"
+      android:fillType="evenOdd">
+    <aapt:attr name="android:fillColor">
+      <gradient 
+          android:startX="94.17"
+          android:startY="88.44"
+          android:endX="15.07"
+          android:endY="7.22"
+          android:type="linear">
+        <item android:offset="0" android:color="#FF383838"/>
+        <item android:offset="0.6" android:color="#FFFFFFFF"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="m50,2c-26.51,0 -48,21.49 -48,48 0,26.51 21.49,48 48,48 26.51,0 48,-21.49 48,-48 0,-26.51 -21.49,-48 -48,-48zM50,2.43c26.28,0 47.58,21.3 47.58,47.57 0,26.28 -21.3,47.57 -47.58,47.57 -26.28,0 -47.57,-21.3 -47.57,-47.57 0,-26.28 21.3,-47.57 47.57,-47.57z"
+      android:fillColor="#070707"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M50,50m-45,0a45,45 0,1 1,90 0a45,45 0,1 1,-90 0"
+      android:strokeWidth="0.4"
+      android:fillColor="#afafaf"
+      android:strokeColor="#00000000"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="m38.09,67.12l0.58,-34.72a2.28,3.16 90.96,0 1,5.42 -1.52L64.74,46.31a5.51,7.63 90.96,0 1,-0.13 7.79l-21.15,14.73a2.28,3.16 90.96,0 1,-5.37 -1.7z"
+      android:strokeAlpha="0.396361"
+      android:strokeWidth="0.611288"
+      android:fillColor="#424242"/>
+</vector>
diff --git a/src/pandroid/app/src/main/res/drawable/dpad_up.xml b/src/pandroid/app/src/main/res/drawable/dpad_up.xml
new file mode 100644
index 000000000..4bc0a96b0
--- /dev/null
+++ b/src/pandroid/app/src/main/res/drawable/dpad_up.xml
@@ -0,0 +1,39 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="100dp"
+    android:height="100dp"
+    android:viewportWidth="100"
+    android:viewportHeight="100">
+  <path
+      android:pathData="M50,50m-47.79,0a47.79,47.79 0,1 1,95.58 0a47.79,47.79 0,1 1,-95.58 0"
+      android:strokeWidth="0.425"
+      android:strokeColor="#00000000"
+      android:fillType="evenOdd">
+    <aapt:attr name="android:fillColor">
+      <gradient 
+          android:startX="94.17"
+          android:startY="88.44"
+          android:endX="15.07"
+          android:endY="7.22"
+          android:type="linear">
+        <item android:offset="0" android:color="#FF383838"/>
+        <item android:offset="0.6" android:color="#FFFFFFFF"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="m50,2c-26.51,0 -48,21.49 -48,48 0,26.51 21.49,48 48,48 26.51,0 48,-21.49 48,-48 0,-26.51 -21.49,-48 -48,-48zM50,2.43c26.28,0 47.58,21.3 47.58,47.57 0,26.28 -21.3,47.57 -47.58,47.57 -26.28,0 -47.57,-21.3 -47.57,-47.57 0,-26.28 21.3,-47.57 47.57,-47.57z"
+      android:fillColor="#070707"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M50,50m-45,0a45,45 0,1 1,90 0a45,45 0,1 1,-90 0"
+      android:strokeWidth="0.4"
+      android:fillColor="#afafaf"
+      android:strokeColor="#00000000"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="m67.31,61.77l-34.72,-0.58a3.16,2.28 90.96,0 1,-1.52 -5.42L46.49,35.11a7.63,5.51 90.96,0 1,7.79 0.13l14.73,21.15a3.16,2.28 90.96,0 1,-1.7 5.37z"
+      android:strokeAlpha="0.396361"
+      android:strokeWidth="0.611288"
+      android:fillColor="#424242"/>
+</vector>
diff --git a/src/pandroid/app/src/main/res/drawable/ic_add.xml b/src/pandroid/app/src/main/res/drawable/ic_add.xml
new file mode 100644
index 000000000..89633bb12
--- /dev/null
+++ b/src/pandroid/app/src/main/res/drawable/ic_add.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#000000"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
+</vector>
diff --git a/src/pandroid/app/src/main/res/drawable/simple_analog_background.xml b/src/pandroid/app/src/main/res/drawable/simple_analog_background.xml
deleted file mode 100644
index 81855e147..000000000
--- a/src/pandroid/app/src/main/res/drawable/simple_analog_background.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape>
-            <padding
-                android:left="10dp"
-                android:top="10dp"
-                android:right="10dp"
-                android:bottom="10dp"/>
-        </shape>
-    </item>
-    <item>
-        <shape>
-            <solid android:color="#0000"/>
-            <stroke android:color="#6FFF" android:width="1dp"/>
-            <corners android:radius="999dp"/>
-        </shape>
-    </item>
-</layer-list>
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/res/drawable/simple_circle_button.xml b/src/pandroid/app/src/main/res/drawable/simple_circle_button.xml
deleted file mode 100644
index 15879540b..000000000
--- a/src/pandroid/app/src/main/res/drawable/simple_circle_button.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape>
-            <solid android:color="#5FFF"/>
-            <stroke android:color="#6FFF" android:width="1dp"/>
-            <corners android:radius="999dp"/>
-        </shape>
-    </item>
-</selector>
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/res/layout/controller_dpad.xml b/src/pandroid/app/src/main/res/layout/controller_dpad.xml
index 0eea66ace..e3320dafb 100644
--- a/src/pandroid/app/src/main/res/layout/controller_dpad.xml
+++ b/src/pandroid/app/src/main/res/layout/controller_dpad.xml
@@ -1,28 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="96dp"
-    android:layout_height="96dp">
+    android:layout_width="57pt"
+    android:layout_height="57pt"
+    android:layout_gravity="bottom"
+    android:layout_marginBottom="40pt">
 
     <com.panda3ds.pandroid.view.controller.nodes.Button
         android:id="@+id/button_up"
-        style="@style/ControllerSimpleButton"
-        android:layout_marginLeft="30dp"/>
+        style="@style/ControllerStyle.SimpleButton"
+        android:background="@drawable/dpad_up"
+        android:layout_marginLeft="19pt"/>
 
     <com.panda3ds.pandroid.view.controller.nodes.Button
         android:id="@+id/button_left"
-        style="@style/ControllerSimpleButton"
-        android:layout_marginTop="30dp"/>
+        style="@style/ControllerStyle.SimpleButton"
+        android:background="@drawable/dpad_left"
+        android:layout_marginTop="19pt"/>
 
     <com.panda3ds.pandroid.view.controller.nodes.Button
         android:id="@+id/button_down"
-        style="@style/ControllerSimpleButton"
-        android:layout_marginTop="60dp"
-        android:layout_marginLeft="30dp"/>
+        style="@style/ControllerStyle.SimpleButton"
+        android:background="@drawable/dpad_down"
+        android:layout_marginTop="38pt"
+        android:layout_marginLeft="19pt"/>
 
     <com.panda3ds.pandroid.view.controller.nodes.Button
         android:id="@+id/button_right"
-        style="@style/ControllerSimpleButton"
-        android:layout_marginTop="30dp"
-        android:layout_marginLeft="60dp"/>
+        style="@style/ControllerStyle.SimpleButton"
+        android:background="@drawable/dpad_right"
+        android:layout_marginTop="19pt"
+        android:layout_marginLeft="38pt"/>
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/res/layout/controller_gamepad.xml b/src/pandroid/app/src/main/res/layout/controller_gamepad.xml
index 16b5ba72e..dce6a60e3 100644
--- a/src/pandroid/app/src/main/res/layout/controller_gamepad.xml
+++ b/src/pandroid/app/src/main/res/layout/controller_gamepad.xml
@@ -1,32 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="96dp"
-    android:layout_height="96dp">
+    android:layout_width="57pt"
+    android:layout_height="57pt"
+    android:layout_gravity="end|bottom"
+    android:layout_marginBottom="30pt">
 
     <com.panda3ds.pandroid.view.controller.nodes.Button
         android:id="@+id/button_x"
-        style="@style/ControllerSimpleButton"
-        android:layout_marginLeft="30dp"
-        android:text="X"/>
+        style="@style/ControllerStyle.SimpleButton"
+        android:layout_marginStart="19pt"
+        android:background="@drawable/button_x"/>
 
     <com.panda3ds.pandroid.view.controller.nodes.Button
         android:id="@+id/button_y"
-        style="@style/ControllerSimpleButton"
-        android:layout_marginTop="30dp"
-        android:text="Y"/>
+        style="@style/ControllerStyle.SimpleButton"
+        android:layout_marginTop="19pt"
+        android:background="@drawable/button_y"/>
 
     <com.panda3ds.pandroid.view.controller.nodes.Button
         android:id="@+id/button_b"
-        style="@style/ControllerSimpleButton"
-        android:layout_marginTop="60dp"
-        android:layout_marginLeft="30dp"
-        android:text="B"/>
+        style="@style/ControllerStyle.SimpleButton"
+        android:layout_marginTop="38pt"
+        android:layout_marginStart="19pt"
+        android:background="@drawable/button_b"/>
 
     <com.panda3ds.pandroid.view.controller.nodes.Button
         android:id="@+id/button_a"
-        style="@style/ControllerSimpleButton"
-        android:layout_marginTop="30dp"
-        android:layout_marginLeft="60dp"
-        android:text="A"/>
+        style="@style/ControllerStyle.SimpleButton"
+        android:layout_marginTop="19pt"
+        android:layout_marginStart="38pt"
+        android:background="@drawable/button_a"/>
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/res/layout/controller_joystick.xml b/src/pandroid/app/src/main/res/layout/controller_joystick.xml
new file mode 100644
index 000000000..d758822fb
--- /dev/null
+++ b/src/pandroid/app/src/main/res/layout/controller_joystick.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.panda3ds.pandroid.view.controller.nodes.Joystick
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/left_analog"
+    android:layout_width="50pt"
+    android:layout_height="50pt"
+    android:background="@drawable/analog_background"
+    android:foreground="@drawable/analog_foreground"
+    android:padding="16pt"
+    android:layout_gravity="bottom"
+    android:layout_marginStart="35pt"/>
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/res/layout/controller_l.xml b/src/pandroid/app/src/main/res/layout/controller_l.xml
new file mode 100644
index 000000000..96ec7582e
--- /dev/null
+++ b/src/pandroid/app/src/main/res/layout/controller_l.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.panda3ds.pandroid.view.controller.nodes.Button
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/button_l"
+    android:layout_width="50pt"
+    android:layout_height="12pt"
+    style="@style/ControllerStyle.SimpleButton"
+    android:background="@drawable/button_l"
+    android:layout_gravity="bottom"
+    android:layout_marginBottom="125pt"/>
diff --git a/src/pandroid/app/src/main/res/layout/controller_r.xml b/src/pandroid/app/src/main/res/layout/controller_r.xml
new file mode 100644
index 000000000..8aa2fba17
--- /dev/null
+++ b/src/pandroid/app/src/main/res/layout/controller_r.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.panda3ds.pandroid.view.controller.nodes.Button
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/button_r"
+    android:layout_width="50pt"
+    android:layout_height="12pt"
+    style="@style/ControllerStyle.SimpleButton"
+    android:background="@drawable/button_r"
+    android:layout_gravity="end|bottom"
+    android:layout_marginBottom="125pt"/>
diff --git a/src/pandroid/app/src/main/res/layout/controller_select.xml b/src/pandroid/app/src/main/res/layout/controller_select.xml
new file mode 100644
index 000000000..a77855bec
--- /dev/null
+++ b/src/pandroid/app/src/main/res/layout/controller_select.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.panda3ds.pandroid.view.controller.nodes.Button
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/button_select"
+    android:layout_width="35pt"
+    android:layout_height="10pt"
+    android:background="@drawable/button_select"
+    style="@style/ControllerStyle.SimpleButton"
+    android:layout_marginBottom="112pt"
+    android:layout_gravity="start|bottom"/>
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/res/layout/controller_start.xml b/src/pandroid/app/src/main/res/layout/controller_start.xml
new file mode 100644
index 000000000..94f12eb77
--- /dev/null
+++ b/src/pandroid/app/src/main/res/layout/controller_start.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.panda3ds.pandroid.view.controller.nodes.Button
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/button_start"
+    android:layout_width="35pt"
+    android:layout_height="10pt"
+    android:background="@drawable/button_start"
+    style="@style/ControllerStyle.SimpleButton"
+    android:layout_gravity="end|bottom"
+    android:layout_marginBottom="112pt"/>
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/res/layout/game_activity.xml b/src/pandroid/app/src/main/res/layout/game_activity.xml
index 6f6f65d7e..9536a847f 100644
--- a/src/pandroid/app/src/main/res/layout/game_activity.xml
+++ b/src/pandroid/app/src/main/res/layout/game_activity.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="#000">
@@ -18,95 +19,18 @@
         <FrameLayout
             android:id="@+id/overlay_controller"
             android:layout_width="match_parent"
-            android:layout_height="match_parent">
+            android:layout_height="match_parent"
+            android:alpha="0.6"
+            android:padding="14pt">
+
+            <include layout="@layout/controller_l"/>
+            <include layout="@layout/controller_r"/>
+            <include layout="@layout/controller_joystick"/>
+            <include layout="@layout/controller_dpad"/>
+            <include layout="@layout/controller_gamepad"/>
+            <include layout="@layout/controller_select"/>
+            <include layout="@layout/controller_start"/>
 
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:gravity="bottom"
-                android:padding="20dp">
-
-                <FrameLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
-
-                    <com.panda3ds.pandroid.view.controller.nodes.Button
-                        android:id="@+id/button_l"
-                        android:layout_width="100dp"
-                        android:layout_height="25dp"
-                        android:layout_gravity="left"
-                        style="@style/ControllerSimpleButton"
-                        android:background="@drawable/simple_card_button_left"
-                        android:text="L"/>
-
-                    <com.panda3ds.pandroid.view.controller.nodes.Button
-                        android:id="@+id/button_r"
-                        android:layout_width="100dp"
-                        android:layout_height="25dp"
-                        android:layout_gravity="right"
-                        style="@style/ControllerSimpleButton"
-                        android:background="@drawable/simple_card_button_right"
-                        android:text="R"/>
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:orientation="vertical"
-                        android:paddingTop="60dp">
-
-                        <include layout="@layout/controller_dpad"/>
-
-                        <com.panda3ds.pandroid.view.controller.nodes.Joystick
-                            android:id="@+id/left_analog"
-                            android:layout_width="100dp"
-                            android:layout_height="100dp"
-                            android:layout_marginTop="20dp"
-                            android:background="@drawable/simple_analog_background"
-                            android:foreground="@drawable/simple_circle_button"
-                            android:padding="40dp"/>
-
-                    </LinearLayout>
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:gravity="end|bottom"
-                        android:orientation="vertical"
-                        android:layout_gravity="center">
-
-                        <include layout="@layout/controller_gamepad"/>
-
-                    </LinearLayout>
-
-                    <LinearLayout
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="bottom|center">
-
-                        <com.panda3ds.pandroid.view.controller.nodes.Button
-                            android:id="@+id/button_start"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:background="@drawable/simple_card_button"
-                            style="@style/ControllerSimpleButton"
-                            android:paddingHorizontal="10dp"
-                            android:text="START"/>
-
-                        <com.panda3ds.pandroid.view.controller.nodes.Button
-                            android:id="@+id/button_select"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:background="@drawable/simple_card_button"
-                            style="@style/ControllerSimpleButton"
-                            android:paddingHorizontal="10dp"
-                            android:layout_marginLeft="10dp"
-                            android:text="SELECT"/>
-
-                    </LinearLayout>
-
-                </FrameLayout>
-
-            </LinearLayout>
         </FrameLayout>
 
     </com.panda3ds.pandroid.view.PandaLayoutController>
diff --git a/src/pandroid/app/src/main/res/values/styleable.xml b/src/pandroid/app/src/main/res/values/styleable.xml
index c5fc43296..692197243 100644
--- a/src/pandroid/app/src/main/res/values/styleable.xml
+++ b/src/pandroid/app/src/main/res/values/styleable.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <style name="ControllerSimpleButton">
-        <item name="android:layout_height">32dp</item>
-        <item name="android:layout_width">32dp</item>
+    <style name="ControllerStyle"/>
+    <style name="ControllerStyle.SimpleButton">
+        <item name="android:layout_height">19pt</item>
+        <item name="android:layout_width">19pt</item>
         <item name="android:textColor">#FFF</item>
         <item name="textAllCaps">true</item>
-        <item name="android:background">@drawable/simple_circle_button</item>
+        <item name="android:backgroundTintMode">multiply</item>
+        <item name="android:backgroundTint">#FFF</item>
     </style>
 </resources>
\ No newline at end of file