diff --git a/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java b/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java
index 9af168c33..dcd150a91 100644
--- a/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java
+++ b/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java
@@ -1351,7 +1351,6 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
                 holder.status_privacy.setVisibility(View.VISIBLE);
 
 
-            Helper.changeDrawableColor(context, R.drawable.video_preview, R.color.white);
 
             SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
             int iconColor = prefs.getInt("theme_icons_color", -1);
diff --git a/app/src/main/res/drawable-anydpi/ic_add.xml b/app/src/main/res/drawable-anydpi/ic_add.xml
index a55694af3..c4be63a59 100644
--- a/app/src/main/res/drawable-anydpi/ic_add.xml
+++ b/app/src/main/res/drawable-anydpi/ic_add.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
-        android:fillColor="?attr/iconColor"
+        android:fillColor="?attr/iconColorMenu"
         android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z" />
 </vector>
diff --git a/app/src/main/res/drawable-ldpi/video_preview.png b/app/src/main/res/drawable-ldpi/video_preview.png
deleted file mode 100644
index 6e6bd85f1..000000000
Binary files a/app/src/main/res/drawable-ldpi/video_preview.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/video_preview.png b/app/src/main/res/drawable-mdpi/video_preview.png
deleted file mode 100644
index d0b989940..000000000
Binary files a/app/src/main/res/drawable-mdpi/video_preview.png and /dev/null differ
diff --git a/app/src/main/res/layout/activity_show_account.xml b/app/src/main/res/layout/activity_show_account.xml
index 2e11eae01..e89321087 100644
--- a/app/src/main/res/layout/activity_show_account.xml
+++ b/app/src/main/res/layout/activity_show_account.xml
@@ -526,7 +526,7 @@
                     android:layout_height="30dp"
                     android:layout_gravity="center"
                     android:src="@drawable/ic_refresh"
-                    android:tint="?attr/iconColor"
+                    android:tint="?attr/iconColorMenu"
                     android:layout_marginEnd="10dp"
                     android:gravity="center"
                     android:contentDescription="@string/refresh" />
@@ -537,7 +537,7 @@
                     android:layout_height="30dp"
                     android:layout_gravity="center"
                     android:src="@drawable/ic_more_vert"
-                    android:tint="?attr/iconColor"
+                    android:tint="?attr/iconColorMenu"
                     android:layout_marginEnd="10dp"
                     android:gravity="center"
                     android:contentDescription="@string/display_toot_truncate" />
diff --git a/app/src/main/res/layout/conversation_action_bar.xml b/app/src/main/res/layout/conversation_action_bar.xml
index cf13333d4..80a5083bc 100644
--- a/app/src/main/res/layout/conversation_action_bar.xml
+++ b/app/src/main/res/layout/conversation_action_bar.xml
@@ -35,7 +35,7 @@
     <ImageView
         android:id="@+id/close_conversation"
         android:src="@drawable/ic_close"
-        android:tint="?attr/iconColor"
+        android:tint="?attr/iconColorMenu"
         android:layout_width="30dp"
         android:layout_height="30dp"
         android:gravity="center_vertical"
@@ -64,7 +64,7 @@
         android:layout_height="25dp"
         android:layout_gravity="end"
         android:src="@drawable/ic_show_hidden"
-        android:tint="?attr/iconColor"
+        android:tint="?attr/iconColorMenu"
         android:layout_alignParentEnd="true"
         android:layout_marginEnd="10dp"
         android:gravity="center_vertical"
@@ -76,7 +76,7 @@
         android:layout_height="25dp"
         android:layout_gravity="end"
         android:src="@drawable/ic_refresh"
-        android:tint="?attr/iconColor"
+        android:tint="?attr/iconColorMenu"
         android:layout_alignParentEnd="true"
         android:layout_marginEnd="10dp"
         android:gravity="center_vertical"
@@ -88,7 +88,7 @@
         android:layout_height="25dp"
         android:layout_gravity="end"
         android:src="@drawable/ic_expand_more"
-        android:tint="?attr/iconColor"
+        android:tint="?attr/iconColorMenu"
         android:layout_alignParentEnd="true"
         android:layout_marginEnd="10dp"
         android:gravity="center_vertical"
diff --git a/app/src/main/res/layout/drawer_status.xml b/app/src/main/res/layout/drawer_status.xml
index 1b9da4031..b773dc77b 100644
--- a/app/src/main/res/layout/drawer_status.xml
+++ b/app/src/main/res/layout/drawer_status.xml
@@ -133,7 +133,8 @@
                 android:src="@drawable/ic_bot"
                 android:visibility="gone"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/status_boosted_by_info" />
+                app:layout_constraintTop_toBottomOf="@id/status_boosted_by_info"
+                android:contentDescription="@string/bot" />
 
             <!-- New badge -->
             <ImageView
@@ -276,7 +277,7 @@
                 android:layout_marginEnd="5dp"
                 android:contentDescription="@string/cached_status"
                 android:src="@drawable/ic_cached_black"
-                android:tint="?attr/iconColor"
+                android:tint="?attr/iconColorMenu"
                 android:visibility="gone"
                 app:layout_constraintBottom_toBottomOf="@id/status_account_displayname_owner"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -343,7 +344,6 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:drawableStart="@drawable/ic_remove_red_eye"
-                        android:drawableLeft="@drawable/ic_remove_red_eye"
                         android:drawablePadding="5dp"
                         android:gravity="center_vertical"
                         android:maxLines="1"
@@ -424,7 +424,7 @@
                             android:layout_marginStart="10dp"
                             android:paddingStart="2dp"
                             android:paddingEnd="2dp"
-                            android:text="Translation"
+                            android:text="@string/translation"
                             app:layout_constraintStart_toStartOf="parent"
                             app:layout_constraintTop_toTopOf="parent" />
 
@@ -479,7 +479,6 @@
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
                             android:layout_marginStart="5dp"
-                            android:layout_marginLeft="5dp"
                             android:layout_weight="1"
                             android:gravity="center_vertical"
                             android:orientation="vertical"
@@ -530,14 +529,15 @@
                                 android:id="@+id/webview_preview_card"
                                 android:layout_width="match_parent"
                                 android:layout_height="match_parent"
-                                android:scaleType="centerCrop" />
+                                android:scaleType="centerCrop"
+                                android:contentDescription="@string/card_view_image" />
 
                             <ImageView
                                 android:layout_width="30dp"
                                 android:layout_height="30dp"
                                 android:layout_centerInParent="true"
                                 android:contentDescription="@string/videos"
-                                android:src="@drawable/video_preview"
+                                android:src="@drawable/ic_play_arrow"
                                 android:tint="@color/white"/>
 
                         </RelativeLayout>
@@ -583,7 +583,8 @@
                                             android:layout_width="match_parent"
                                             android:layout_height="match_parent"
                                             android:adjustViewBounds="true"
-                                            android:scaleType="fitCenter" />
+                                            android:scaleType="fitCenter"
+                                            android:contentDescription="@string/image_preview" />
 
                                         <ImageView
                                             android:id="@+id/status_prev1_play_h"
@@ -601,7 +602,6 @@
                                         android:layout_width="0dp"
                                         android:layout_height="match_parent"
                                         android:layout_marginStart="1dp"
-                                        android:layout_marginLeft="1dp"
                                         android:layout_weight="1">
 
                                         <ImageView
@@ -609,7 +609,8 @@
                                             android:layout_width="match_parent"
                                             android:layout_height="match_parent"
                                             android:adjustViewBounds="true"
-                                            android:scaleType="fitCenter" />
+                                            android:scaleType="fitCenter"
+                                            android:contentDescription="@string/image_preview" />
 
                                         <ImageView
                                             android:id="@+id/status_prev2_play_h"
@@ -642,6 +643,7 @@
                                             android:layout_width="match_parent"
                                             android:layout_height="match_parent"
                                             android:adjustViewBounds="true"
+                                            android:contentDescription="@string/image_preview"
                                             android:scaleType="fitCenter" />
 
                                         <ImageView
@@ -659,7 +661,6 @@
                                         android:layout_width="0dp"
                                         android:layout_height="match_parent"
                                         android:layout_marginStart="1dp"
-                                        android:layout_marginLeft="1dp"
                                         android:layout_weight="1">
 
                                         <ImageView
@@ -667,6 +668,7 @@
                                             android:layout_width="match_parent"
                                             android:layout_height="match_parent"
                                             android:adjustViewBounds="true"
+                                            android:contentDescription="@string/image_preview"
                                             android:scaleType="fitCenter" />
 
                                         <ImageView
@@ -721,7 +723,7 @@
                                     android:layout_height="30dp"
                                     android:layout_centerInParent="true"
                                     android:src="@drawable/ic_play_arrow"
-                                    android:tint="@color/white"
+                                    android:contentDescription="@string/image_preview"
                                     android:visibility="gone" />
 
                                 <ImageView
@@ -755,6 +757,7 @@
                                         android:id="@+id/status_prev2"
                                         android:layout_width="match_parent"
                                         android:layout_height="match_parent"
+                                        android:contentDescription="@string/image_preview"
                                         android:scaleType="centerCrop" />
 
                                     <ImageView
@@ -786,6 +789,7 @@
                                             android:id="@+id/status_prev3"
                                             android:layout_width="match_parent"
                                             android:layout_height="match_parent"
+                                            android:contentDescription="@string/image_preview"
                                             android:scaleType="centerCrop" />
 
                                         <ImageView
@@ -804,13 +808,13 @@
                                         android:layout_width="0dp"
                                         android:layout_height="wrap_content"
                                         android:layout_marginStart="2dp"
-                                        android:layout_marginLeft="2dp"
                                         android:layout_weight="1">
 
                                         <ImageView
                                             android:id="@+id/status_prev4"
                                             android:layout_width="match_parent"
                                             android:layout_height="match_parent"
+                                            android:contentDescription="@string/image_preview"
                                             android:scaleType="centerCrop" />
 
                                         <ImageView
@@ -925,6 +929,7 @@
                     android:layout_height="30dp"
                     android:src="@drawable/ic_reply"
                     android:tint="?attr/iconColor"
+                    android:contentDescription="@string/reply"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
diff --git a/app/src/main/res/layout/drawer_status_compact.xml b/app/src/main/res/layout/drawer_status_compact.xml
index e0fa49ffd..69bc8643a 100644
--- a/app/src/main/res/layout/drawer_status_compact.xml
+++ b/app/src/main/res/layout/drawer_status_compact.xml
@@ -262,7 +262,7 @@
                         android:layout_height="20dp"
                         android:contentDescription="@string/cached_status"
                         android:src="@drawable/ic_cached_black"
-                        android:tint="?attr/iconColor"
+                        android:tint="?attr/iconColorMenu"
                         android:visibility="gone"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintTop_toTopOf="parent" />
@@ -494,7 +494,7 @@
                                         android:layout_height="30dp"
                                         android:layout_centerInParent="true"
                                         android:contentDescription="@string/play_video"
-                                        android:src="@drawable/video_preview"
+                                        android:src="@drawable/ic_play_arrow"
                                         android:tint="@color/white"/>
                                 </RelativeLayout>
 
@@ -965,7 +965,7 @@
                                 android:layout_marginTop="5dp"
                                 android:contentDescription="@string/delete"
                                 android:src="@drawable/ic_clear_toot"
-                                android:tint="?attr/iconColor"
+                                android:tint="?attr/iconColorMenu"
                                 android:visibility="gone"
                                 app:layout_constraintBottom_toBottomOf="parent"
                                 app:layout_constraintStart_toEndOf="@id/new_element"
diff --git a/app/src/main/res/layout/drawer_status_console.xml b/app/src/main/res/layout/drawer_status_console.xml
index 48387d340..ac1d988c6 100644
--- a/app/src/main/res/layout/drawer_status_console.xml
+++ b/app/src/main/res/layout/drawer_status_console.xml
@@ -192,7 +192,7 @@
             <ImageView
                 android:id="@+id/cached_status"
                 android:src="@drawable/ic_cached_black"
-                android:tint="?attr/iconColor"
+                android:tint="?attr/iconColorMenu"
                 android:visibility="gone"
                 android:layout_width="20dp"
                 android:layout_height="20dp"
@@ -429,7 +429,7 @@
                 <ImageView
                     android:layout_centerInParent="true"
                     android:layout_width="30dp"
-                    android:src="@drawable/video_preview"
+                    android:src="@drawable/ic_play_arrow"
                     android:tint="@color/white"
                     android:layout_height="30dp"
                     android:contentDescription="@string/play_video" />
diff --git a/app/src/main/res/layout/drawer_status_focused.xml b/app/src/main/res/layout/drawer_status_focused.xml
index 0abae2e93..c0f48e0f6 100644
--- a/app/src/main/res/layout/drawer_status_focused.xml
+++ b/app/src/main/res/layout/drawer_status_focused.xml
@@ -189,7 +189,7 @@
                         android:layout_height="20dp"
                         android:contentDescription="@string/cached_status"
                         android:src="@drawable/ic_cached_black"
-                        android:tint="?attr/iconColor"
+                        android:tint="?attr/iconColorMenu"
                         android:visibility="gone" />
 
                     <TextView
@@ -408,7 +408,7 @@
                         android:layout_height="30dp"
                         android:layout_centerInParent="true"
                         android:contentDescription="@string/play_video"
-                        android:src="@drawable/video_preview"
+                        android:src="@drawable/ic_play_arrow"
                         android:tint="@color/white"/>
 
                 </RelativeLayout>
diff --git a/app/src/main/res/layout/nav_header_main.xml b/app/src/main/res/layout/nav_header_main.xml
index 819a83fdd..715c3d3ae 100644
--- a/app/src/main/res/layout/nav_header_main.xml
+++ b/app/src/main/res/layout/nav_header_main.xml
@@ -72,7 +72,7 @@
             <ImageView
                 android:gravity="center_vertical|end"
                 android:src="@drawable/ic_more_vert"
-                android:tint="?attr/iconColor"
+                android:tint="?attr/iconColorMenu"
                 android:id="@+id/header_option_menu"
                 android:layout_width="30dp"
                 android:layout_height="30dp"
@@ -100,7 +100,7 @@
                 android:layout_marginStart="5dp"
                 android:id="@+id/owner_accounts"
                 android:src="@drawable/ic_arrow_drop_down"
-                android:tint="?attr/iconColor"
+                android:tint="?attr/iconColorMenu"
                 android:layout_width="30dp"
                 android:layout_height="30dp"
                 tools:ignore="ContentDescription" />
@@ -116,7 +116,7 @@
         <ImageView
             android:layout_gravity="center_vertical|end"
             android:src="@drawable/ic_info_outline"
-            android:tint="?attr/iconColor"
+            android:tint="?attr/iconColorMenu"
             android:id="@+id/header_option_info"
             android:layout_width="20dp"
             android:layout_height="20dp"
diff --git a/app/src/main/res/layout/simple_action_bar.xml b/app/src/main/res/layout/simple_action_bar.xml
index 473003658..75e539e8e 100644
--- a/app/src/main/res/layout/simple_action_bar.xml
+++ b/app/src/main/res/layout/simple_action_bar.xml
@@ -34,7 +34,7 @@
     <ImageView
         android:id="@+id/close_conversation"
         android:src="@drawable/ic_close"
-        android:tint="?attr/iconColor"
+        android:tint="?attr/iconColorMenu"
         android:layout_width="30dp"
         android:layout_height="30dp"
         android:gravity="center_vertical"
diff --git a/app/src/main/res/layout/simple_bar.xml b/app/src/main/res/layout/simple_bar.xml
index 8de75a9f3..cdb09cc87 100644
--- a/app/src/main/res/layout/simple_bar.xml
+++ b/app/src/main/res/layout/simple_bar.xml
@@ -34,7 +34,7 @@
     <ImageView
         android:id="@+id/toolbar_close"
         android:src="@drawable/ic_close"
-        android:tint="?attr/iconColor"
+        android:tint="?attr/iconColorMenu"
         android:layout_width="30dp"
         android:layout_height="30dp"
         android:gravity="center_vertical"
diff --git a/app/src/main/res/layout/simple_bar_add.xml b/app/src/main/res/layout/simple_bar_add.xml
index 35c7dd3d7..b0c6280b1 100644
--- a/app/src/main/res/layout/simple_bar_add.xml
+++ b/app/src/main/res/layout/simple_bar_add.xml
@@ -39,7 +39,7 @@
         <ImageView
             android:id="@+id/toolbar_close"
             android:src="@drawable/ic_close"
-            android:tint="?attr/iconColor"
+            android:tint="?attr/iconColorMenu"
             android:layout_width="30dp"
             android:layout_height="30dp"
             android:gravity="center_vertical"
diff --git a/app/src/main/res/layout/toot_action_bar.xml b/app/src/main/res/layout/toot_action_bar.xml
index 6c3e148af..5e63dac36 100644
--- a/app/src/main/res/layout/toot_action_bar.xml
+++ b/app/src/main/res/layout/toot_action_bar.xml
@@ -34,7 +34,7 @@
     <ImageView
         android:id="@+id/close_toot"
         android:src="@drawable/ic_close"
-        android:tint="?attr/iconColor"
+        android:tint="?attr/iconColorMenu"
         android:layout_width="30dp"
         android:layout_height="30dp"
         android:gravity="center_vertical"
diff --git a/app/src/main/res/layout/update_account.xml b/app/src/main/res/layout/update_account.xml
index 48e8f43bc..70df21faa 100644
--- a/app/src/main/res/layout/update_account.xml
+++ b/app/src/main/res/layout/update_account.xml
@@ -20,7 +20,7 @@
     android:gravity="center_vertical"
     android:layout_gravity="center_vertical">
 
-    <ImageView xmlns:android="http://schemas.android.com/apk/res/android"
+    <ImageView
         android:layout_gravity="center"
         android:gravity="center"
         android:layout_marginRight="5dp"
@@ -33,5 +33,6 @@
         android:scaleType="center"
         android:layout_height="wrap_content"
         android:src="@drawable/ic_cancel"
+        android:tint="?attr/iconColor"
         android:contentDescription="@string/cancel" />
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/menu/tag_pin.xml b/app/src/main/res/menu/tag_pin.xml
index 986febd8f..b3c7a4317 100644
--- a/app/src/main/res/menu/tag_pin.xml
+++ b/app/src/main/res/menu/tag_pin.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    app:itemTextColor="?attr/iconColor"
-    app:itemIconTint="?attr/iconColor">
+    app:itemTextColor="?attr/iconColorMenu"
+    app:itemIconTint="?attr/iconColorMenu">
     <item
         android:id="@+id/action_pin"
         android:icon="@drawable/ic_add"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 43dadfff0..c6bde756a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1265,4 +1265,6 @@
     <string name="logo_of_the_instance">Logo of the instance</string>
     <string name="edit_profile">Edite profile</string>
     <string name="make_an_action">Make an action</string>
+    <string name="translation">Translation</string>
+    <string name="image_preview">Image preview</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 6b4ffabae..c3c9fcadc 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -2,6 +2,7 @@
 
     <attr name="cardviewColor" type="color"/>
     <attr name="iconColor" type="color"/>
+    <attr name="iconColorMenu" type="color"/>
     <attr name="textHeader" type="color"/>
     <attr name="customFeature" type="color"/>
     <attr name="cardviewHeaderBoostColor" type="color"/>
@@ -11,6 +12,7 @@
     <style name="AppTheme_Fedilab" parent="Theme.Cyanea.Light">
         <item name="cardviewColor">@color/white</item>
         <item name="iconColor">@color/black</item>
+        <item name="iconColorMenu">@color/black</item>
         <item name="textHeader">@color/black</item>
         <item name="customFeature">@color/mastodonC4</item>
         <item name="cardviewHeaderBoostColor">@color/mastodonC2</item>
@@ -23,6 +25,7 @@
     <style name="AppTheme_NoActionBar_Fedilab" parent="Theme.Cyanea.Light.NoActionBar">
         <item name="cardviewColor">@color/white</item>
         <item name="iconColor">@color/black</item>
+        <item name="iconColorMenu">@color/black</item>
         <item name="textHeader">@color/black</item>
         <item name="customFeature">@color/mastodonC4</item>
         <item name="colorPrimary">@color/white</item>
@@ -34,6 +37,7 @@
     <style name="AppThemeBlack" parent="Theme.Cyanea.Dark">
         <item name="cardviewColor">@color/black</item>
         <item name="iconColor">@color/black_icon_theme</item>
+        <item name="iconColorMenu">@color/dark_icon_theme</item>
         <item name="textHeader">@color/dark_text_toot_header</item>
         <item name="customFeature">@color/custom_features_button_black</item>
         <item name="colorPrimary">@color/black</item>
@@ -45,6 +49,7 @@
     <style name="AppThemeBlack_NoActionBar" parent="Theme.Cyanea.Dark.NoActionBar">
         <item name="cardviewColor">@color/black</item>
         <item name="iconColor">@color/black_icon_theme</item>
+        <item name="iconColorMenu">@color/dark_icon_theme</item>
         <item name="textHeader">@color/dark_text_toot_header</item>
         <item name="customFeature">@color/custom_features_button_black</item>
         <item name="colorPrimary">@color/black</item>
@@ -58,6 +63,7 @@
     <style name="AppThemeDark" parent="Theme.Cyanea.Dark">
         <item name="cardviewColor">@color/mastodonC1_</item>
         <item name="iconColor">@color/dark_icon_theme</item>
+        <item name="iconColorMenu">@color/dark_icon_theme</item>
         <item name="textHeader">@color/dark_text_toot_header</item>
         <item name="customFeature">@color/mastodonC4</item>
         <item name="colorPrimary">@color/mastodonC1</item>
@@ -69,6 +75,7 @@
     <style name="AppThemeDark_NoActionBar" parent="Theme.Cyanea.Dark.NoActionBar">
         <item name="cardviewColor">@color/mastodonC1_</item>
         <item name="iconColor">@color/dark_icon_theme</item>
+        <item name="iconColorMenu">@color/dark_icon_theme</item>
         <item name="textHeader">@color/dark_text_toot_header</item>
         <item name="customFeature">@color/mastodonC4</item>
         <item name="colorPrimary">@color/mastodonC1</item>