diff --git a/app/src/main/java/app/fedilab/android/activities/TootActivity.java b/app/src/main/java/app/fedilab/android/activities/TootActivity.java
index cda92be94..fbc9d8b46 100644
--- a/app/src/main/java/app/fedilab/android/activities/TootActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/TootActivity.java
@@ -1691,7 +1691,7 @@ public class TootActivity extends BaseActivity implements UploadStatusDelegate,
     }
 
     @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
+    public boolean onOptionsItemSelected(@NotNull MenuItem item) {
         final SQLiteDatabase db = Sqlite.getInstance(getApplicationContext(), Sqlite.DB_NAME, null, Sqlite.DB_VERSION).open();
         int style;
         SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, MODE_PRIVATE);
diff --git a/app/src/main/res/drawable/menu_selector.xml b/app/src/main/res/drawable/menu_selector.xml
new file mode 100644
index 000000000..21368eece
--- /dev/null
+++ b/app/src/main/res/drawable/menu_selector.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@color/cyanea_accent" android:state_checked="true" />
+    <item android:drawable="@color/cyanea_accent" android:state_pressed="true" />
+    <item android:drawable="@color/cyanea_accent" android:state_focused="true" />
+    <item android:drawable="@color/cyanea_primary_dark" />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout-sw600dp/activity_show_account.xml b/app/src/main/res/layout-sw600dp/activity_show_account.xml
index bc6bdccb5..f5fad8804 100644
--- a/app/src/main/res/layout-sw600dp/activity_show_account.xml
+++ b/app/src/main/res/layout-sw600dp/activity_show_account.xml
@@ -474,7 +474,8 @@
             android:layout_height="wrap_content"
             android:minHeight="?attr/actionBarSize"
             app:layout_collapseMode="pin"
-            app:theme="@style/ThemeOverlay.AppCompat.Light">
+            app:theme="@style/ThemeOverlay.AppCompat.Light"
+          >
 
             <LinearLayout
                 android:id="@+id/toolbar_content"
@@ -490,7 +491,6 @@
                     android:layout_height="30dp"
                     android:layout_gravity="center_vertical"
                     android:layout_marginEnd="10dp"
-                    android:layout_marginRight="10dp"
                     android:contentDescription="@string/profile_picture"
                     android:gravity="center_vertical" />
 
diff --git a/app/src/main/res/layout/activity_group.xml b/app/src/main/res/layout/activity_group.xml
index ce69f8589..7c0c30a7e 100644
--- a/app/src/main/res/layout/activity_group.xml
+++ b/app/src/main/res/layout/activity_group.xml
@@ -37,7 +37,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:background="?colorPrimary"
-                app:layout_scrollFlags="scroll|enterAlways" />
+                app:layout_scrollFlags="scroll|enterAlways"
+               />
         </com.google.android.material.appbar.AppBarLayout>
 
         <RelativeLayout
@@ -57,7 +58,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:divider="@null"
-                    android:scrollbars="none"></androidx.recyclerview.widget.RecyclerView>
+                    android:scrollbars="none"/>
             </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
             <RelativeLayout
diff --git a/app/src/main/res/layout/activity_hashtag.xml b/app/src/main/res/layout/activity_hashtag.xml
index a64d2252c..a7f241fa0 100644
--- a/app/src/main/res/layout/activity_hashtag.xml
+++ b/app/src/main/res/layout/activity_hashtag.xml
@@ -37,7 +37,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:background="?colorPrimary"
-                app:layout_scrollFlags="scroll|enterAlways" />
+                app:layout_scrollFlags="scroll|enterAlways"
+                />
         </com.google.android.material.appbar.AppBarLayout>
 
         <RelativeLayout
diff --git a/app/src/main/res/layout/activity_list.xml b/app/src/main/res/layout/activity_list.xml
index 32ea1e91e..8e57f197f 100644
--- a/app/src/main/res/layout/activity_list.xml
+++ b/app/src/main/res/layout/activity_list.xml
@@ -39,7 +39,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:background="?colorPrimary"
-                app:layout_scrollFlags="scroll|enterAlways" />
+                app:layout_scrollFlags="scroll|enterAlways"
+                />
         </com.google.android.material.appbar.AppBarLayout>
 
         <RelativeLayout
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 52889e698..2ef43dfbe 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -38,7 +38,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:background="?colorPrimary"
-                app:layout_scrollFlags="scroll|enterAlways">
+                app:layout_scrollFlags="scroll|enterAlways"
+                >
 
                 <ImageView
                     android:id="@+id/iconbar"
diff --git a/app/src/main/res/layout/activity_ower_notifications.xml b/app/src/main/res/layout/activity_ower_notifications.xml
index 24d4e6aa5..6aca79cee 100644
--- a/app/src/main/res/layout/activity_ower_notifications.xml
+++ b/app/src/main/res/layout/activity_ower_notifications.xml
@@ -22,7 +22,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:background="?colorPrimary"
-                app:layout_scrollFlags="scroll|enterAlways" />
+                app:layout_scrollFlags="scroll|enterAlways"
+                />
         </com.google.android.material.appbar.AppBarLayout>
 
         <RelativeLayout
diff --git a/app/src/main/res/layout/activity_ower_status.xml b/app/src/main/res/layout/activity_ower_status.xml
index 0ad2f0757..64b67e06b 100644
--- a/app/src/main/res/layout/activity_ower_status.xml
+++ b/app/src/main/res/layout/activity_ower_status.xml
@@ -22,7 +22,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:background="?colorPrimary"
-                app:layout_scrollFlags="scroll|enterAlways" />
+                app:layout_scrollFlags="scroll|enterAlways"
+                />
         </com.google.android.material.appbar.AppBarLayout>
 
         <RelativeLayout
diff --git a/app/src/main/res/layout/activity_playlists.xml b/app/src/main/res/layout/activity_playlists.xml
index c66150ac9..52396b648 100644
--- a/app/src/main/res/layout/activity_playlists.xml
+++ b/app/src/main/res/layout/activity_playlists.xml
@@ -39,7 +39,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:background="?colorPrimary"
-                app:layout_scrollFlags="scroll|enterAlways" />
+                app:layout_scrollFlags="scroll|enterAlways"
+                />
         </com.google.android.material.appbar.AppBarLayout>
 
         <RelativeLayout
diff --git a/app/src/main/res/layout/activity_show_account.xml b/app/src/main/res/layout/activity_show_account.xml
index a20a8a0a4..0b91eac9c 100644
--- a/app/src/main/res/layout/activity_show_account.xml
+++ b/app/src/main/res/layout/activity_show_account.xml
@@ -482,7 +482,8 @@
             android:layout_height="wrap_content"
             android:minHeight="?attr/actionBarSize"
             app:layout_collapseMode="pin"
-            app:theme="@style/ThemeOverlay.AppCompat.Light">
+            app:theme="@style/ThemeOverlay.AppCompat.Light"
+            >
 
             <LinearLayout
                 android:id="@+id/toolbar_content"
diff --git a/app/src/main/res/layout/activity_who_to_follow.xml b/app/src/main/res/layout/activity_who_to_follow.xml
index 60364862c..29dd2abeb 100644
--- a/app/src/main/res/layout/activity_who_to_follow.xml
+++ b/app/src/main/res/layout/activity_who_to_follow.xml
@@ -38,7 +38,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:background="?colorPrimary"
-                app:layout_scrollFlags="scroll|enterAlways" />
+                app:layout_scrollFlags="scroll|enterAlways"
+               />
         </com.google.android.material.appbar.AppBarLayout>
 
         <RelativeLayout
@@ -54,7 +55,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:divider="@null"
-                android:scrollbars="none"></ListView>
+                android:scrollbars="none"/>
 
             <RelativeLayout
                 android:id="@+id/no_action"
diff --git a/app/src/main/res/layout/toot_action_bar.xml b/app/src/main/res/layout/toot_action_bar.xml
index 9e3091ca4..433a3b527 100644
--- a/app/src/main/res/layout/toot_action_bar.xml
+++ b/app/src/main/res/layout/toot_action_bar.xml
@@ -14,7 +14,8 @@
     You should have received a copy of the GNU General Public License along with Fedilab; if not,
     see <http://www.gnu.org/licenses>.
 -->
-<androidx.appcompat.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.appcompat.widget.Toolbar
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/toolbar"
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 0aced80cc..fd35821b5 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -9,6 +9,7 @@
     <attr name="textColor" type="color" />
     <attr name="linkColor" type="color" />
 
+
     <!-- Light theme -->
     <style name="AppTheme_Fedilab" parent="Theme.Cyanea.Light">
         <item name="cardviewColor">@color/white</item>
@@ -20,6 +21,8 @@
         <item name="textColor">@color/black</item>
         <item name="android:textColor">@color/black</item>
         <item name="linkColor">@color/light_link_toot</item>
+        <item name="android:popupMenuStyle">@style/Fedilab.PopupMenu.Light</item>
+
     </style>
 
 
@@ -33,6 +36,7 @@
         <item name="textColor">@color/black</item>
         <item name="android:textColor">@color/black</item>
         <item name="linkColor">@color/light_link_toot</item>
+        <item name="android:popupMenuStyle">@style/Fedilab.PopupMenu.Light</item>
     </style>
     <!-- BLACK theme -->
     <style name="AppThemeBlack" parent="Theme.Cyanea.Dark">
@@ -45,6 +49,7 @@
         <item name="textColor">@color/dark_text</item>
         <item name="android:textColor">@color/dark_text</item>
         <item name="linkColor">@color/black_link_toot</item>
+        <item name="android:popupMenuStyle">@style/Fedilab.PopupMenu.Dark</item>
     </style>
 
     <style name="AppThemeBlack_NoActionBar" parent="Theme.Cyanea.Dark.NoActionBar">
@@ -57,6 +62,7 @@
         <item name="textColor">@color/dark_text</item>
         <item name="android:textColor">@color/dark_text</item>
         <item name="linkColor">@color/black_link_toot</item>
+        <item name="android:popupMenuStyle">@style/Fedilab.PopupMenu.Dark</item>
     </style>
 
 
@@ -71,6 +77,8 @@
         <item name="textColor">@color/dark_text</item>
         <item name="android:textColor">@color/dark_text</item>
         <item name="linkColor">@color/dark_link_toot</item>
+        <item name="android:popupMenuStyle">@style/Fedilab.PopupMenu.Dark</item>
+        <item name="android:itemBackground">@drawable/menu_selector</item>
     </style>
 
     <style name="AppThemeDark_NoActionBar" parent="Theme.Cyanea.Dark.NoActionBar">
@@ -83,6 +91,8 @@
         <item name="textColor">@color/dark_text</item>
         <item name="android:textColor">@color/dark_text</item>
         <item name="linkColor">@color/dark_link_toot</item>
+        <item name="android:popupMenuStyle">@style/Fedilab.PopupMenu.Dark</item>
+        <item name="android:itemBackground">@drawable/menu_selector</item>
     </style>
 
 
@@ -97,6 +107,7 @@
         <item name="android:textColor">@color/black</item>
         <item name="buttonBarButtonStyle">@style/DialogButton</item>
         <item name="linkColor">@color/light_link_toot</item>
+        <item name="android:windowBackground">@color/cyanea_primary_reference</item>
     </style>
 
     <style name="DialogDark" parent="Cyanea.AlertDialog.Theme.Dark">
@@ -104,6 +115,7 @@
         <item name="android:textColor">@color/dark_text</item>
         <item name="buttonBarButtonStyle">@style/DialogButton</item>
         <item name="linkColor">@color/dark_link_toot</item>
+        <item name="android:windowBackground">@color/cyanea_primary_reference</item>
     </style>
 
     <style name="DialogBlack" parent="Cyanea.AlertDialog.Theme.Dark">
@@ -111,6 +123,7 @@
         <item name="android:textColor">@color/dark_text</item>
         <item name="buttonBarButtonStyle">@style/DialogButton</item>
         <item name="linkColor">@color/black_link_toot</item>
+        <item name="android:windowBackground">@color/cyanea_primary_reference</item>
     </style>
 
     <style name="TransparentLight" parent="Theme.Cyanea.Light">black_icon_theme
@@ -132,6 +145,7 @@
         <item name="android:windowContentOverlay">@null</item>
         <item name="android:textColor">@color/dark_text</item>
         <item name="linkColor">@color/dark_link_toot</item>
+        <item name="android:itemBackground">@drawable/menu_selector</item>
     </style>
 
     <style name="TransparentBlack" parent="Theme.Cyanea.Dark">
@@ -144,6 +158,12 @@
         <item name="linkColor">@color/black_link_toot</item>
     </style>
 
+    <style name="Fedilab.PopupMenu.Light" parent="Cyanea.PopupMenu.Light">
+        <item name="android:colorBackground">@color/cyanea_primary_reference</item>
+    </style>
+    <style name="Fedilab.PopupMenu.Dark" parent="Cyanea.PopupMenu.Dark">
+        <item name="android:colorBackground">@color/cyanea_primary_reference</item>
+    </style>
 
     <!-- Light theme -->
     <style name="AppAdminTheme" parent="Theme.Cyanea.Dark">