use the Pencil icon for Edit, do not ever show Rename as an icon

app/src/main/res/layout/bottom_actions.xml

@@ -26,7 +26,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:padding="@dimen/medium_margin"
-        android:src="@drawable/ic_edit"
+        android:src="@drawable/ic_rename"
         app:layout_constraintEnd_toStartOf="@+id/bottom_share"
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toEndOf="@+id/bottom_favorite"/>

app/src/main/res/menu/menu_viewpager.xml

@@ -82,7 +82,7 @@
         app:showAsAction="never"/>
     <item
         android:id="@+id/menu_edit"
-        android:icon="@drawable/ic_edit"
+        android:icon="@drawable/ic_rename"
         android:title="@string/edit"
         app:showAsAction="ifRoom"/>
     <item
@@ -92,9 +92,8 @@
         app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/menu_rename"
-        android:icon="@drawable/ic_rename"
         android:title="@string/rename"
-        app:showAsAction="ifRoom"/>
+        app:showAsAction="never"/>
     <item
         android:id="@+id/menu_show_on_map"
         android:title="@string/show_on_map"

app/src/main/res/menu/photo_video_menu.xml

@@ -13,7 +13,7 @@
         app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/menu_edit"
-        android:icon="@drawable/ic_edit"
+        android:icon="@drawable/ic_rename"
         android:title="@string/edit"
         app:showAsAction="ifRoom"/>
     <item