diff --git a/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/views/ChipTanFlickerCodeView.kt b/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/views/ChipTanFlickerCodeView.kt
index f3f6b489..bb01f0e3 100644
--- a/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/views/ChipTanFlickerCodeView.kt
+++ b/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/views/ChipTanFlickerCodeView.kt
@@ -200,11 +200,11 @@ open class ChipTanFlickerCodeView @JvmOverloads constructor(
     open fun togglePauseFlickerCode() {
         if (isFlickerCodePaused == false) {
             animator.pause()
-            btnPauseFlickerCode.setImageResource(android.R.drawable.ic_media_play)
+            btnPauseFlickerCode.setImageResource(R.drawable.ic_baseline_play_arrow_24)
         }
         else {
             animator.resume()
-            btnPauseFlickerCode.setImageResource(android.R.drawable.ic_media_pause)
+            btnPauseFlickerCode.setImageResource(R.drawable.ic_baseline_pause_24)
         }
 
         isFlickerCodePaused = !!! isFlickerCodePaused
diff --git a/ui/BankingAndroidApp/src/main/res/drawable/ic_baseline_directions_run_24.xml b/ui/BankingAndroidApp/src/main/res/drawable/ic_baseline_directions_run_24.xml
new file mode 100644
index 00000000..160dd540
--- /dev/null
+++ b/ui/BankingAndroidApp/src/main/res/drawable/ic_baseline_directions_run_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M13.49,5.48c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM9.89,19.38l1,-4.4 2.1,2v6h2v-7.5l-2.1,-2 0.6,-3c1.3,1.5 3.3,2.5 5.5,2.5v-2c-1.9,0 -3.5,-1 -4.3,-2.4l-1,-1.6c-0.4,-0.6 -1,-1 -1.7,-1 -0.3,0 -0.5,0.1 -0.8,0.1l-5.2,2.2v4.7h2v-3.4l1.8,-0.7 -1.6,8.1 -4.9,-1 -0.4,2 7,1.4z"/>
+</vector>
diff --git a/ui/BankingAndroidApp/src/main/res/drawable/ic_baseline_directions_walk_24.xml b/ui/BankingAndroidApp/src/main/res/drawable/ic_baseline_directions_walk_24.xml
new file mode 100644
index 00000000..0be5a50d
--- /dev/null
+++ b/ui/BankingAndroidApp/src/main/res/drawable/ic_baseline_directions_walk_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M13.5,5.5c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM9.8,8.9L7,23h2.1l1.8,-8 2.1,2v6h2v-7.5l-2.1,-2 0.6,-3C14.8,12 16.8,13 19,13v-2c-1.9,0 -3.5,-1 -4.3,-2.4l-1,-1.6c-0.4,-0.6 -1,-1 -1.7,-1 -0.3,0 -0.5,0.1 -0.8,0.1L6,8.3V13h2V9.6l1.8,-0.7"/>
+</vector>
diff --git a/ui/BankingAndroidApp/src/main/res/drawable/ic_baseline_pause_24.xml b/ui/BankingAndroidApp/src/main/res/drawable/ic_baseline_pause_24.xml
new file mode 100644
index 00000000..13d6d2ec
--- /dev/null
+++ b/ui/BankingAndroidApp/src/main/res/drawable/ic_baseline_pause_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M6,19h4L10,5L6,5v14zM14,5v14h4L18,5h-4z"/>
+</vector>
diff --git a/ui/BankingAndroidApp/src/main/res/drawable/ic_baseline_play_arrow_24.xml b/ui/BankingAndroidApp/src/main/res/drawable/ic_baseline_play_arrow_24.xml
new file mode 100644
index 00000000..13c137a9
--- /dev/null
+++ b/ui/BankingAndroidApp/src/main/res/drawable/ic_baseline_play_arrow_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M8,5v14l11,-7z"/>
+</vector>
diff --git a/ui/BankingAndroidApp/src/main/res/drawable/ic_baseline_zoom_in_24.xml b/ui/BankingAndroidApp/src/main/res/drawable/ic_baseline_zoom_in_24.xml
new file mode 100644
index 00000000..3149411a
--- /dev/null
+++ b/ui/BankingAndroidApp/src/main/res/drawable/ic_baseline_zoom_in_24.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/>
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M12,10h-2v2H9v-2H7V9h2V7h1v2h2v1z"/>
+</vector>
diff --git a/ui/BankingAndroidApp/src/main/res/drawable/ic_baseline_zoom_out_24.xml b/ui/BankingAndroidApp/src/main/res/drawable/ic_baseline_zoom_out_24.xml
new file mode 100644
index 00000000..22c3cd03
--- /dev/null
+++ b/ui/BankingAndroidApp/src/main/res/drawable/ic_baseline_zoom_out_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14zM7,9h5v1L7,10z"/>
+</vector>
diff --git a/ui/BankingAndroidApp/src/main/res/layout/view_flicker_code.xml b/ui/BankingAndroidApp/src/main/res/layout/view_flicker_code.xml
index 5c8eee1d..b467ac79 100644
--- a/ui/BankingAndroidApp/src/main/res/layout/view_flicker_code.xml
+++ b/ui/BankingAndroidApp/src/main/res/layout/view_flicker_code.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -29,18 +30,18 @@
             android:text="@string/view_flicker_code_frequency"
         />
 
-        <Button
-                android:id="@+id/btnDecreaseSpeed"
-                android:layout_width="@dimen/view_tan_image_controls_buttons_width"
-                android:layout_height="@dimen/view_tan_image_controls_buttons_height"
-                android:text="@string/view_flicker_code_decrease_frequency"
+        <ImageButton
+            android:id="@+id/btnDecreaseSpeed"
+            android:layout_width="@dimen/view_tan_image_controls_buttons_width"
+            android:layout_height="@dimen/view_tan_image_controls_buttons_height"
+            app:srcCompat="@drawable/ic_baseline_directions_walk_24"
         />
 
-        <Button
+        <ImageButton
             android:id="@+id/btnIncreaseSpeed"
             android:layout_width="@dimen/view_tan_image_controls_buttons_width"
             android:layout_height="@dimen/view_tan_image_controls_buttons_height"
-            android:text="@string/view_flicker_code_increase_frequency"
+            app:srcCompat="@drawable/ic_baseline_directions_run_24"
         />
 
         <ImageButton
@@ -49,7 +50,7 @@
             android:layout_height="@dimen/view_tan_image_controls_buttons_height"
             android:layout_marginLeft="@dimen/view_flicker_code_controls_sections_space"
             android:layout_marginStart="@dimen/view_flicker_code_controls_sections_space"
-            android:src="@android:drawable/ic_media_pause"
+            app:srcCompat="@drawable/ic_baseline_pause_24"
         />
 
     </LinearLayout>
diff --git a/ui/BankingAndroidApp/src/main/res/layout/view_tan_image_size_controls.xml b/ui/BankingAndroidApp/src/main/res/layout/view_tan_image_size_controls.xml
index 9a36bbcc..a89a1c3d 100644
--- a/ui/BankingAndroidApp/src/main/res/layout/view_tan_image_size_controls.xml
+++ b/ui/BankingAndroidApp/src/main/res/layout/view_tan_image_size_controls.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
         xmlns:android="http://schemas.android.com/apk/res/android"
-        android:orientation="horizontal"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:orientation="horizontal"
         android:layout_width="wrap_content"
         android:layout_height="@dimen/view_tan_image_controls_buttons_height"
         android:layout_gravity="center_horizontal"
@@ -15,18 +16,18 @@
             android:text="@string/view_tan_image_size_controls_size"
     />
 
-    <Button
-            android:id="@+id/btnDecreaseSize"
-            android:layout_width="@dimen/view_tan_image_controls_buttons_width"
-            android:layout_height="@dimen/view_tan_image_controls_buttons_height"
-            android:text="@string/view_tan_image_size_controls_decrease_size"
+    <ImageButton
+        android:id="@+id/btnDecreaseSize"
+        android:layout_width="@dimen/view_tan_image_controls_buttons_width"
+        android:layout_height="@dimen/view_tan_image_controls_buttons_height"
+        app:srcCompat="@drawable/ic_baseline_zoom_out_24"
     />
 
-    <Button
-            android:id="@+id/btnIncreaseSize"
-            android:layout_width="@dimen/view_tan_image_controls_buttons_width"
-            android:layout_height="@dimen/view_tan_image_controls_buttons_height"
-            android:text="@string/view_tan_image_size_controls_increase_size"
+    <ImageButton
+        android:id="@+id/btnIncreaseSize"
+        android:layout_width="@dimen/view_tan_image_controls_buttons_width"
+        android:layout_height="@dimen/view_tan_image_controls_buttons_height"
+        app:srcCompat="@drawable/ic_baseline_zoom_in_24"
     />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/ui/BankingAndroidApp/src/main/res/values-de/strings.xml b/ui/BankingAndroidApp/src/main/res/values-de/strings.xml
index 25319c7c..d1257c72 100644
--- a/ui/BankingAndroidApp/src/main/res/values-de/strings.xml
+++ b/ui/BankingAndroidApp/src/main/res/values-de/strings.xml
@@ -67,12 +67,8 @@
     <string name="transfer_money_from_pdf_error_message_could_not_extract_invoice_data">Überweisungsdaten konnten aus der Datei "%1$s" nicht ausgelesen werden:\n\n%2$s</string>
 
     <string name="view_tan_image_size_controls_size">Größe:</string>
-    <string name="view_tan_image_size_controls_decrease_size">-</string>
-    <string name="view_tan_image_size_controls_increase_size">+</string>
 
-    <string name="view_flicker_code_frequency">Geschwindigkeit:</string>
-    <string name="view_flicker_code_decrease_frequency">-</string>
-    <string name="view_flicker_code_increase_frequency">+</string>
+    <string name="view_flicker_code_frequency">Geschw.:</string>
 
     <string name="dialog_enter_tan_select_tan_procedure">TAN Verfahren</string>
     <string name="dialog_enter_tan_select_tan_medium">TAN Medium</string>
diff --git a/ui/BankingAndroidApp/src/main/res/values/strings.xml b/ui/BankingAndroidApp/src/main/res/values/strings.xml
index 8c947e74..ab1446e2 100644
--- a/ui/BankingAndroidApp/src/main/res/values/strings.xml
+++ b/ui/BankingAndroidApp/src/main/res/values/strings.xml
@@ -67,12 +67,8 @@
     <string name="transfer_money_from_pdf_error_message_could_not_extract_invoice_data">Could not extract cash transfer data from file "%1$s":\n\n%2$s</string>
 
     <string name="view_tan_image_size_controls_size">Size:</string>
-    <string name="view_tan_image_size_controls_decrease_size">-</string>
-    <string name="view_tan_image_size_controls_increase_size">+</string>
 
     <string name="view_flicker_code_frequency">Frequency:</string>
-    <string name="view_flicker_code_decrease_frequency">-</string>
-    <string name="view_flicker_code_increase_frequency">+</string>
 
     <string name="dialog_enter_tan_select_tan_procedure">TAN procedure</string>
     <string name="dialog_enter_tan_select_tan_medium">TAN medium</string>