diff --git a/app/src/main/res/drawable/baseline_info_24.xml b/app/src/main/res/drawable/baseline_info_24.xml
deleted file mode 100644
index 17255b7ae3..0000000000
--- a/app/src/main/res/drawable/baseline_info_24.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<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="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,17h-2v-6h2v6zM13,9h-2L11,7h2v2z"/>
-</vector>
diff --git a/app/src/main/res/drawable/baseline_timelapse_24.xml b/app/src/main/res/drawable/baseline_timelapse_24.xml
deleted file mode 100644
index b03e05f6fd..0000000000
--- a/app/src/main/res/drawable/baseline_timelapse_24.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<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="M16.24,7.76C15.07,6.59 13.54,6 12,6v6l-4.24,4.24c2.34,2.34 6.14,2.34 8.49,0 2.34,-2.34 2.34,-6.14 -0.01,-8.48zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8z"/>
-</vector>
diff --git a/app/src/main/res/layout/dialog_junk.xml b/app/src/main/res/layout/dialog_junk.xml
index 0362ef9ac5..07c4692d5a 100644
--- a/app/src/main/res/layout/dialog_junk.xml
+++ b/app/src/main/res/layout/dialog_junk.xml
@@ -41,7 +41,7 @@
             android:tooltipText="@string/title_info"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="@id/tvJunkHint"
-            app:srcCompat="@drawable/baseline_info_24" />
+            app:srcCompat="@drawable/twotone_info_24" />
 
         <CheckBox
             android:id="@+id/cbBlockSender"
diff --git a/app/src/main/res/layout/dialog_send.xml b/app/src/main/res/layout/dialog_send.xml
index 992fd046f4..6559676173 100644
--- a/app/src/main/res/layout/dialog_send.xml
+++ b/app/src/main/res/layout/dialog_send.xml
@@ -238,7 +238,7 @@
             android:tooltipText="@string/title_send_at"
             app:layout_constraintBottom_toBottomOf="@id/spEncrypt"
             app:layout_constraintEnd_toEndOf="parent"
-            app:srcCompat="@drawable/baseline_info_24" />
+            app:srcCompat="@drawable/twotone_info_24" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvPriority"
@@ -298,7 +298,7 @@
             android:tooltipText="@string/title_send_at"
             app:layout_constraintBottom_toBottomOf="@id/tvSendAt"
             app:layout_constraintEnd_toEndOf="parent"
-            app:srcCompat="@drawable/baseline_timelapse_24" />
+            app:srcCompat="@drawable/twotone_timelapse_24" />
 
         <CheckBox
             android:id="@+id/cbNotAgain"
diff --git a/app/src/main/res/layout/fragment_options_encryption.xml b/app/src/main/res/layout/fragment_options_encryption.xml
index 9f305ac23a..1cb0c5b907 100644
--- a/app/src/main/res/layout/fragment_options_encryption.xml
+++ b/app/src/main/res/layout/fragment_options_encryption.xml
@@ -37,7 +37,7 @@
             android:tooltipText="@string/title_info"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvCaptionGeneral"
-            app:srcCompat="@drawable/baseline_info_24" />
+            app:srcCompat="@drawable/twotone_info_24" />
 
         <androidx.appcompat.widget.SwitchCompat
             android:id="@+id/swSign"
diff --git a/app/src/main/res/layout/fragment_options_privacy.xml b/app/src/main/res/layout/fragment_options_privacy.xml
index cdd0ba7ce7..d2282dfb3d 100644
--- a/app/src/main/res/layout/fragment_options_privacy.xml
+++ b/app/src/main/res/layout/fragment_options_privacy.xml
@@ -283,7 +283,7 @@
             android:tooltipText="@string/title_info"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/swSafeBrowsing"
-            app:srcCompat="@drawable/baseline_info_24" />
+            app:srcCompat="@drawable/twotone_info_24" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvDisconnectBlacklist"
@@ -307,7 +307,7 @@
             android:tooltipText="@string/title_info"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvDisconnectBlacklist"
-            app:srcCompat="@drawable/baseline_info_24" />
+            app:srcCompat="@drawable/twotone_info_24" />
 
         <Button
             android:id="@+id/btnDisconnectBlacklist"
diff --git a/app/src/main/res/layout/fragment_options_synchronize.xml b/app/src/main/res/layout/fragment_options_synchronize.xml
index 340b53f74c..6a7fccdb3e 100644
--- a/app/src/main/res/layout/fragment_options_synchronize.xml
+++ b/app/src/main/res/layout/fragment_options_synchronize.xml
@@ -99,7 +99,7 @@
             android:tooltipText="@string/title_info"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="@id/tvOptimizeHint"
-            app:srcCompat="@drawable/baseline_info_24" />
+            app:srcCompat="@drawable/twotone_info_24" />
 
         <Spinner
             android:id="@+id/spPollInterval"