diff --git a/app/src/main/res/drawable/ic_edit_black_24dp.xml b/app/src/main/res/drawable/ic_edit_black_24dp.xml
new file mode 100644
index 00000000..46462b57
--- /dev/null
+++ b/app/src/main/res/drawable/ic_edit_black_24dp.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z"/>
+</vector>
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 9ea4b0d2..8a143bb7 100644
--- a/app/src/main/res/layout/activity_topic_overflow_menu.xml
+++ b/app/src/main/res/layout/activity_topic_overflow_menu.xml
@@ -34,4 +34,19 @@
         android:text="@string/post_delete_button"
         android:textColor="@color/primary_text" />
 
+    <TextView
+        android:id="@+id/edit_post"
+        android:layout_width="wrap_content"
+        android:layout_height="35dp"
+        android:background="?android:attr/selectableItemBackground"
+        android:drawablePadding="5dp"
+        android:drawableStart="@drawable/ic_edit_black_24dp"
+        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"/>
+
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e14b0335..1e0e3803 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -42,6 +42,7 @@
     <string name="post_overflow_menu_button">Overflow menu button</string>
     <string name="post_share_button">Share</string>
     <string name="post_delete_button">Delete</string>
+    <string name="post_edit_button">Edit</string>
     <string name="user_number_of_posts">#%1$d</string>
     <string name="button_first">first</string>
     <string name="button_previous">previous</string>