4 files changed, 28 insertions, 14 deletions
diff --git a/app/src/main/res/menu/view_gif_activity.xml b/app/src/main/res/menu/view_gif_activity.xml
index f97218ce..0dc5aba5 100644
--- a/app/src/main/res/menu/view_gif_activity.xml
+++ b/app/src/main/res/menu/view_gif_activity.xml
@@ -2,9 +2,16 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
-        android:id="@+id/action_download_view_gif"
+        android:id="@+id/action_download_view_gif_activity"
         android:orderInCategory="1"
         android:title="@string/action_download"
         android:icon="@drawable/ic_file_download_toolbar_white_24dp"
-        app:showAsAction="always" />
+        app:showAsAction="ifRoom" />
+
+    <item
+        android:id="@+id/action_share_view_gif_activity"
+        android:orderInCategory="2"
+        android:title="@string/action_share"
+        android:icon="@drawable/ic_share_toolbar_white_24dp"
+        app:showAsAction="ifRoom" />
 </menu>
 \ No newline at end of file
diff --git a/app/src/main/res/menu/view_image.xml b/app/src/main/res/menu/view_image.xml
deleted file mode 100644
index c09ff1f8..00000000
--- a/app/src/main/res/menu/view_image.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?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">
-    <item
-        android:id="@+id/action_download_view_image"
-        android:orderInCategory="1"
-        android:title="@string/action_download"
-        android:icon="@drawable/ic_file_download_toolbar_white_24dp"
-        app:showAsAction="always" />
-</menu>
-\ No newline at end of file
diff --git a/app/src/main/res/menu/view_image_activity.xml b/app/src/main/res/menu/view_image_activity.xml
new file mode 100644
index 00000000..1f86092b
--- /dev/null
+++ b/app/src/main/res/menu/view_image_activity.xml
@@ -0,0 +1,17 @@
+<?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">
+    <item
+        android:id="@+id/action_download_view_image_activity"
+        android:orderInCategory="1"
+        android:title="@string/action_download"
+        android:icon="@drawable/ic_file_download_toolbar_white_24dp"
+        app:showAsAction="ifRoom" />
+
+    <item
+        android:id="@+id/action_share_view_image_activity"
+        android:orderInCategory="2"
+        android:title="@string/action_share"
+        android:icon="@drawable/ic_share_toolbar_white_24dp"
+        app:showAsAction="ifRoom" />
+</menu>
+\ No newline at end of file
diff --git a/app/src/main/res/menu/view_video.xml b/app/src/main/res/menu/view_video.xml
index 71a52c58..fa54098f 100644
--- a/app/src/main/res/menu/view_video.xml
+++ b/app/src/main/res/menu/view_video.xml
@@ -2,9 +2,9 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
-        android:id="@+id/action_download_view_video"
+        android:id="@+id/action_download_view_video_activity"
         android:orderInCategory="1"
         android:title="@string/action_download"
         android:icon="@drawable/ic_file_download_toolbar_white_24dp"
-        app:showAsAction="always" />
+        app:showAsAction="ifRoom" />
 </menu>
 \ No newline at end of file