diff --git a/android-app/src/main/res/drawable/cpp_wizard_button_shape_normal.xml b/android-app/src/main/res/drawable/cpp_wizard_button_shape_normal.xml
index bdaa77ea..045b0f01 100644
--- a/android-app/src/main/res/drawable/cpp_wizard_button_shape_normal.xml
+++ b/android-app/src/main/res/drawable/cpp_wizard_button_shape_normal.xml
@@ -20,7 +20,7 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-	<solid android:color="@color/cpp_wizard_button_normal"/>
-	<corners android:radius="1dp"/>
+<shape xmlns:a="http://schemas.android.com/apk/res/android">
+	<solid a:color="@color/cpp_wizard_button_normal"/>
+	<corners a:radius="1dp"/>
 </shape>
diff --git a/android-app/src/main/res/drawable/cpp_wizard_button_shape_pressed.xml b/android-app/src/main/res/drawable/cpp_wizard_button_shape_pressed.xml
index 0743967c..1bcffc65 100644
--- a/android-app/src/main/res/drawable/cpp_wizard_button_shape_pressed.xml
+++ b/android-app/src/main/res/drawable/cpp_wizard_button_shape_pressed.xml
@@ -20,7 +20,7 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-	<solid android:color="@color/cpp_wizard_button_pressed"/>
-	<corners android:radius="1dp"/>
+<shape xmlns:a="http://schemas.android.com/apk/res/android">
+	<solid a:color="@color/cpp_wizard_button_pressed"/>
+	<corners a:radius="1dp"/>
 </shape>
diff --git a/android-app/src/main/res/drawable/metro_blue_button_shape.xml b/android-app/src/main/res/drawable/metro_blue_button_shape.xml
index 5e2a4a99..444dba47 100644
--- a/android-app/src/main/res/drawable/metro_blue_button_shape.xml
+++ b/android-app/src/main/res/drawable/metro_blue_button_shape.xml
@@ -20,7 +20,7 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-	<solid android:color="@color/cpp_metro_blue"/>
-	<corners android:radius="1dp"/>
+<shape xmlns:a="http://schemas.android.com/apk/res/android">
+	<solid a:color="@color/cpp_metro_blue"/>
+	<corners a:radius="1dp"/>
 </shape>
\ No newline at end of file
diff --git a/android-app/src/main/res/drawable/metro_button_dark_shape.xml b/android-app/src/main/res/drawable/metro_button_dark_shape.xml
index c51c55ac..01ebba9b 100644
--- a/android-app/src/main/res/drawable/metro_button_dark_shape.xml
+++ b/android-app/src/main/res/drawable/metro_button_dark_shape.xml
@@ -20,7 +20,7 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-	<solid android:color="@color/cpp_metro_button"/>
-	<corners android:radius="1dp"/>
+<shape xmlns:a="http://schemas.android.com/apk/res/android">
+	<solid a:color="@color/cpp_metro_button"/>
+	<corners a:radius="1dp"/>
 </shape>
\ No newline at end of file
diff --git a/android-app/src/main/res/drawable/metro_button_green_shape.xml b/android-app/src/main/res/drawable/metro_button_green_shape.xml
index d9f9f488..f7283980 100644
--- a/android-app/src/main/res/drawable/metro_button_green_shape.xml
+++ b/android-app/src/main/res/drawable/metro_button_green_shape.xml
@@ -20,7 +20,7 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-	<solid android:color="@color/cpp_metro_green"/>
-	<corners android:radius="1dp"/>
+<shape xmlns:a="http://schemas.android.com/apk/res/android">
+	<solid a:color="@color/cpp_metro_green"/>
+	<corners a:radius="1dp"/>
 </shape>
\ No newline at end of file
diff --git a/android-app/src/main/res/drawable/metro_button_light_shape.xml b/android-app/src/main/res/drawable/metro_button_light_shape.xml
index 36d69510..cc79ee29 100644
--- a/android-app/src/main/res/drawable/metro_button_light_shape.xml
+++ b/android-app/src/main/res/drawable/metro_button_light_shape.xml
@@ -20,7 +20,7 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-	<solid android:color="@color/cpp_metro_button_light"/>
-	<corners android:radius="1dp"/>
+<shape xmlns:a="http://schemas.android.com/apk/res/android">
+	<solid a:color="@color/cpp_metro_button_light"/>
+	<corners a:radius="1dp"/>
 </shape>
diff --git a/android-app/src/main/res/drawable/metro_button_pressed.xml b/android-app/src/main/res/drawable/metro_button_pressed.xml
index c2951a77..986e9493 100644
--- a/android-app/src/main/res/drawable/metro_button_pressed.xml
+++ b/android-app/src/main/res/drawable/metro_button_pressed.xml
@@ -20,7 +20,7 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-	<solid android:color="#ff4d4d4d"/>
-	<corners android:radius="1dp"/>
+<shape xmlns:a="http://schemas.android.com/apk/res/android">
+	<solid a:color="#ff4d4d4d"/>
+	<corners a:radius="1dp"/>
 </shape>
\ No newline at end of file
diff --git a/android-app/src/main/res/drawable/metro_button_purple_shape.xml b/android-app/src/main/res/drawable/metro_button_purple_shape.xml
index 1ffbb8fd..272d6d0d 100644
--- a/android-app/src/main/res/drawable/metro_button_purple_shape.xml
+++ b/android-app/src/main/res/drawable/metro_button_purple_shape.xml
@@ -20,7 +20,7 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-	<solid android:color="@color/cpp_metro_purple"/>
-	<corners android:radius="1dp"/>
+<shape xmlns:a="http://schemas.android.com/apk/res/android">
+	<solid a:color="@color/cpp_metro_purple"/>
+	<corners a:radius="1dp"/>
 </shape>
\ No newline at end of file
diff --git a/android-app/src/main/res/drawable/pane_background.xml b/android-app/src/main/res/drawable/pane_background.xml
index eba530f5..be8b33f7 100644
--- a/android-app/src/main/res/drawable/pane_background.xml
+++ b/android-app/src/main/res/drawable/pane_background.xml
@@ -20,7 +20,7 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-	<solid android:color="@color/cpp_pane_background"/>
-	<corners android:radius="1dp"/>
+<shape xmlns:a="http://schemas.android.com/apk/res/android">
+	<solid a:color="@color/cpp_pane_background"/>
+	<corners a:radius="1dp"/>
 </shape>
\ No newline at end of file