diff --git a/app/src/main/res/layout-v23/activity_topic_overflow_menu.xml b/app/src/main/res/layout-v23/activity_topic_overflow_menu.xml
new file mode 100644
index 00000000..63fd97a2
--- /dev/null
+++ b/app/src/main/res/layout-v23/activity_topic_overflow_menu.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:background="@color/background_light"
+    android:orientation="vertical">
+
+    <TextView
+        android:id="@+id/post_share_button"
+        android:layout_width="wrap_content"
+        android:layout_height="35dp"
+        android:background="@color/background_light"
+        android:foreground="?android:attr/selectableItemBackground"
+        android:drawablePadding="5dp"
+        android:gravity="center_vertical"
+        android:paddingBottom="6dp"
+        android:paddingEnd="12dp"
+        android:paddingStart="12dp"
+        android:paddingTop="6dp"
+        android:text="@string/post_share_button"
+        android:textColor="@color/primary_text" />
+
+    <TextView
+        android:id="@+id/edit_post"
+        android:layout_width="wrap_content"
+        android:layout_height="35dp"
+        android:background="@color/background_light"
+        android:foreground="?android:attr/selectableItemBackground"
+        android:drawablePadding="5dp"
+        android:gravity="center_vertical"
+        android:paddingBottom="6dp"
+        android:paddingEnd="12dp"
+        android:paddingStart="12dp"
+        android:paddingTop="6dp"
+        android:text="@string/post_edit_button"
+        android:textColor="@color/primary_text" />
+
+    <TextView
+        android:id="@+id/delete_post"
+        android:layout_width="wrap_content"
+        android:layout_height="35dp"
+        android:background="@color/background_light"
+        android:foreground="?android:attr/selectableItemBackground"
+        android:drawablePadding="5dp"
+        android:gravity="center_vertical"
+        android:paddingBottom="6dp"
+        android:paddingEnd="12dp"
+        android:paddingStart="12dp"
+        android:paddingTop="6dp"
+        android:text="@string/post_delete_button"
+        android:textColor="@color/primary_text" />
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_topic_overflow_menu.xml b/app/src/main/res/layout/activity_topic_overflow_menu.xml
index 3341d45f..2b7f1634 100644
--- a/app/src/main/res/layout/activity_topic_overflow_menu.xml
+++ b/app/src/main/res/layout/activity_topic_overflow_menu.xml
@@ -45,5 +45,4 @@
         android:paddingTop="6dp"
         android:text="@string/post_delete_button"
         android:textColor="@color/primary_text" />
-
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/editor_view_color_picker.xml b/app/src/main/res/layout/editor_view_color_picker.xml
index 83f67237..6f988d6d 100644
--- a/app/src/main/res/layout/editor_view_color_picker.xml
+++ b/app/src/main/res/layout/editor_view_color_picker.xml
@@ -4,14 +4,16 @@
     android:layout_height="wrap_content"
     android:background="@color/background_light">
 
-    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:paddingTop="8dp"
+        android:paddingBottom="8dp"
         android:orientation="vertical">
 
         <TextView
             android:id="@+id/black"
-            style="@style/PopupMenuItem.TopItem"
+            style="@style/PopupMenuItem"
             android:text="@string/black"
             android:textColor="@color/black" />
 
@@ -89,7 +91,7 @@
 
         <TextView
             android:id="@+id/lime_green"
-            style="@style/PopupMenuItem.BottomItem"
+            style="@style/PopupMenuItem"
             android:text="@string/lime_green"
             android:textColor="@color/lime_green" />
     </LinearLayout>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 59bbc0c4..1e092378 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -44,20 +44,13 @@
     <style name="PopupMenuItem" parent="Widget.AppCompat.PopupMenu">
         <item name="android:layout_height">32dp</item>
         <item name="android:layout_width">128dp</item>
-        <item name="android:background">?android:attr/selectableItemBackground</item>
+        <item name="android:background">@color/background_light</item>
+        <item name="android:foreground">?android:attr/selectableItemBackground</item>
         <item name="android:gravity">center_vertical</item>
         <item name="android:paddingStart">16dp</item>
         <item name="android:textColor">@color/primary_text</item>
     </style>
 
-    <style name="PopupMenuItem.TopItem" parent="PopupMenuItem">
-        <item name="android:paddingTop">8dp</item>
-    </style>
-
-    <style name="PopupMenuItem.BottomItem" parent="PopupMenuItem">
-        <item name="android:paddingBottom">8dp</item>
-    </style>
-
     <style name="PopupWindow" parent="Widget.AppCompat.PopupWindow">
         <item name="android:background">@android:color/transparent</item>
     </style>
@@ -79,6 +72,7 @@
         <item name="colorAccent">@color/accent</item>
         <item name="android:textColorPrimary">@color/primary_text</item>
         <item name="android:colorBackground">@color/dialog_bg_semi_transparent_dark</item>
+        <item name="android:windowBackground">@color/dialog_bg_semi_transparent_dark</item>
     </style>
 
     <style name="AppCompatAlertDialogStyleTitle" parent="@android:style/TextAppearance.DialogWindowTitle">