diff --git a/build.gradle b/build.gradle
index 92c603d5..16cfc33c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -31,6 +31,10 @@ allprojects {
 
 def androidCompileSdk() { return 24 }
 
+def androidTargetSdk() { return 24 }
+
+def androidMinSdk() { return 7 }
+
 subprojects {
     repositories {
         jcenter()
diff --git a/microg-ui-tools/build.gradle b/microg-ui-tools/build.gradle
index cae89799..e7eea6ef 100644
--- a/microg-ui-tools/build.gradle
+++ b/microg-ui-tools/build.gradle
@@ -31,6 +31,8 @@ android {
 
     defaultConfig {
         versionName getMyVersionName()
+        minSdkVersion androidMinSdk()
+        targetSdkVersion androidTargetSdk()
     }
 
     compileOptions {
diff --git a/microg-ui-tools/src/main/AndroidManifest.xml b/microg-ui-tools/src/main/AndroidManifest.xml
index 958a9998..bef003ac 100644
--- a/microg-ui-tools/src/main/AndroidManifest.xml
+++ b/microg-ui-tools/src/main/AndroidManifest.xml
@@ -15,10 +15,4 @@
   ~ limitations under the License.
   -->
 
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.microg.tools.ui">
-
-    <uses-sdk
-        android:minSdkVersion="9"
-        android:targetSdkVersion="23" />
-</manifest>
+<manifest package="org.microg.tools.ui" />
diff --git a/microg-ui-tools/src/main/java/org/microg/tools/ui/SwitchBar.java b/microg-ui-tools/src/main/java/org/microg/tools/ui/SwitchBar.java
index b086b748..6cad9403 100644
--- a/microg-ui-tools/src/main/java/org/microg/tools/ui/SwitchBar.java
+++ b/microg-ui-tools/src/main/java/org/microg/tools/ui/SwitchBar.java
@@ -262,9 +262,4 @@ public class SwitchBar extends LinearLayout implements CompoundButton.OnCheckedC
 
         requestLayout();
     }
-
-    @Override
-    public CharSequence getAccessibilityClassName() {
-        return Switch.class.getName();
-    }
 }
diff --git a/microg-ui-tools/src/main/res/layout/app_bar.xml b/microg-ui-tools/src/main/res/layout/app_bar.xml
index 37e12427..d10f3e79 100644
--- a/microg-ui-tools/src/main/res/layout/app_bar.xml
+++ b/microg-ui-tools/src/main/res/layout/app_bar.xml
@@ -41,6 +41,7 @@
         android:layout_marginLeft="72dp"
         android:layout_marginRight="16dp"
         android:layout_marginStart="72dp"
+        android:gravity="start"
         android:textAlignment="viewStart"
         android:textColor="?android:attr/textColorPrimaryInverse"
         android:theme="@style/TextAppearance.AppCompat.Title.Inverse"/>
diff --git a/microg-ui-tools/src/main/res/layout/switch_bar.xml b/microg-ui-tools/src/main/res/layout/switch_bar.xml
index b320e3c9..25b9b41b 100644
--- a/microg-ui-tools/src/main/res/layout/switch_bar.xml
+++ b/microg-ui-tools/src/main/res/layout/switch_bar.xml
@@ -23,14 +23,13 @@
         android:id="@+id/switch_text"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
+        android:layout_gravity="start|center_vertical"
         android:layout_marginLeft="72dp"
         android:layout_marginStart="72dp"
         android:layout_weight="1"
         android:ellipsize="end"
         android:maxLines="2"
         android:text="@string/v7_preference_on"
-        android:textAlignment="viewStart"
         android:textColor="?android:attr/textColorPrimaryInverse"
         android:theme="@style/TextAppearance.AppCompat.Title.Inverse"/>