diff --git a/apk/controller/.gitignore b/apk/controller/.gitignore
index abddfff..a2a7a3a 100644
--- a/apk/controller/.gitignore
+++ b/apk/controller/.gitignore
@@ -1,5 +1,16 @@
-.gradle
-.idea/deploymentTargetSelector.xml
-app/.externalNativeBuild
-app/build
-app/release
+local.properties
+
+.gradle/
+build/
+*/build/
+app/release/
+
+.idea/
+*.iml
+
+.externalNativeBuild/
+*/.externalNativeBuild/
+.cxx/
+*/.cxx/
+
+.DS_Store
diff --git a/apk/controller/.idea/.gitignore b/apk/controller/.idea/.gitignore
deleted file mode 100644
index 26d3352..0000000
--- a/apk/controller/.idea/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
diff --git a/apk/controller/.idea/AndroidProjectSystem.xml b/apk/controller/.idea/AndroidProjectSystem.xml
deleted file mode 100644
index 4a53bee..0000000
--- a/apk/controller/.idea/AndroidProjectSystem.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/apk/controller/.idea/assetWizardSettings.xml b/apk/controller/.idea/assetWizardSettings.xml
deleted file mode 100644
index fc877cc..0000000
--- a/apk/controller/.idea/assetWizardSettings.xml
+++ /dev/null
@@ -1,291 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/apk/controller/.idea/caches/deviceStreaming.xml b/apk/controller/.idea/caches/deviceStreaming.xml
deleted file mode 100644
index 6a3e9f5..0000000
--- a/apk/controller/.idea/caches/deviceStreaming.xml
+++ /dev/null
@@ -1,1550 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/apk/controller/.idea/compiler.xml b/apk/controller/.idea/compiler.xml
deleted file mode 100644
index b86273d..0000000
--- a/apk/controller/.idea/compiler.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/apk/controller/.idea/deviceManager.xml b/apk/controller/.idea/deviceManager.xml
deleted file mode 100644
index 91f9558..0000000
--- a/apk/controller/.idea/deviceManager.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/apk/controller/.idea/gradle.xml b/apk/controller/.idea/gradle.xml
deleted file mode 100644
index 639c779..0000000
--- a/apk/controller/.idea/gradle.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/apk/controller/.idea/markdown.xml b/apk/controller/.idea/markdown.xml
deleted file mode 100644
index c61ea33..0000000
--- a/apk/controller/.idea/markdown.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/apk/controller/.idea/migrations.xml b/apk/controller/.idea/migrations.xml
deleted file mode 100644
index f8051a6..0000000
--- a/apk/controller/.idea/migrations.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/apk/controller/.idea/misc.xml b/apk/controller/.idea/misc.xml
deleted file mode 100644
index b2c751a..0000000
--- a/apk/controller/.idea/misc.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/apk/controller/.idea/runConfigurations.xml b/apk/controller/.idea/runConfigurations.xml
deleted file mode 100644
index 16660f1..0000000
--- a/apk/controller/.idea/runConfigurations.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/apk/controller/.idea/studiobot.xml b/apk/controller/.idea/studiobot.xml
deleted file mode 100644
index 539e3b8..0000000
--- a/apk/controller/.idea/studiobot.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/apk/controller/.idea/vcs.xml b/apk/controller/.idea/vcs.xml
deleted file mode 100644
index 0f4e7ba..0000000
--- a/apk/controller/.idea/vcs.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/apk/controller/app/src/main/res/drawable/ic_menu_preferences.xml b/apk/controller/app/src/main/res/drawable/ic_menu_preferences.xml
new file mode 100644
index 0000000..968e3f6
--- /dev/null
+++ b/apk/controller/app/src/main/res/drawable/ic_menu_preferences.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/apk/controller/app/src/main/res/drawable/ic_menu_settings.xml b/apk/controller/app/src/main/res/drawable/ic_menu_settings.xml
new file mode 100644
index 0000000..dae79dc
--- /dev/null
+++ b/apk/controller/app/src/main/res/drawable/ic_menu_settings.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/apk/controller/app/src/main/res/layout/activity_setup.xml b/apk/controller/app/src/main/res/layout/activity_setup.xml
index 1f71cf5..92946ad 100644
--- a/apk/controller/app/src/main/res/layout/activity_setup.xml
+++ b/apk/controller/app/src/main/res/layout/activity_setup.xml
@@ -1,136 +1,18 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/apk/controller/app/src/main/res/layout/main.xml b/apk/controller/app/src/main/res/layout/main.xml
index fad8ac3..f3e889b 100644
--- a/apk/controller/app/src/main/res/layout/main.xml
+++ b/apk/controller/app/src/main/res/layout/main.xml
@@ -7,24 +7,24 @@
android:background="?android:attr/windowBackground">
-
@@ -48,27 +46,25 @@
android:id="@+id/btn_settings"
android:layout_width="48dp"
android:layout_height="48dp"
- android:layout_toStartOf="@id/theme_toggle"
- android:layout_centerVertical="true"
android:background="?android:attr/selectableItemBackgroundBorderless"
- android:src="@android:drawable/ic_menu_preferences"
+ android:src="@drawable/ic_menu_preferences"
android:contentDescription="Settings"
android:padding="10dp"
- android:scaleType="fitCenter" />
+ android:scaleType="fitCenter"
+ android:tint="#FFFFFF" />
-
+ android:padding="10dp"
+ android:scaleType="fitCenter"
+ android:tint="#FFFFFF" />
+