diff --git a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.java b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.java
index be755a6de..404364eff 100644
--- a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.java
+++ b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.java
@@ -15,7 +15,9 @@ import android.os.Environment;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentStatePagerAdapter;
+import android.support.v4.view.MenuItemCompat;
 import android.support.v4.view.ViewPager;
+import android.support.v7.widget.ShareActionProvider;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -130,27 +132,25 @@ public class MediaDetailPagerFragment extends Fragment implements ViewPager.OnPa
         Media m = provider.getMediaAtPosition(pager.getCurrentItem());
         switch(item.getItemId()) {
             case R.id.menu_share_current_image:
+                // Share - this is just logs it, intent set in onCreateOptionsMenu, around line 252
                 EventLog.schema(CommonsApplication.EVENT_SHARE_ATTEMPT)
                         .param("username", app.getCurrentAccount().name)
                         .param("filename", m.getFilename())
                         .log();
-                Intent shareIntent = new Intent();
-                shareIntent.setAction(Intent.ACTION_SEND);
-                shareIntent.setType("text/plain");
-                shareIntent.putExtra(Intent.EXTRA_TEXT, m.getDisplayTitle() + " " + m.getDescriptionUrl());
-                startActivity(shareIntent);
                 return true;
             case R.id.menu_browser_current_image:
+                // View in browser
                 Intent viewIntent = new Intent();
                 viewIntent.setAction(Intent.ACTION_VIEW);
                 viewIntent.setData(Uri.parse(m.getDescriptionUrl()));
                 startActivity(viewIntent);
                 return true;
             case R.id.menu_download_current_image:
+                // Download
                 downloadMedia(m);
                 return true;
             case R.id.menu_retry_current_image:
-                // Is this... sane? :)
+                // Retry
                 ((ContributionsActivity)getActivity()).retryUpload(pager.getCurrentItem());
                 getActivity().getSupportFragmentManager().popBackStack();
                 return true;
@@ -249,6 +249,13 @@ public class MediaDetailPagerFragment extends Fragment implements ViewPager.OnPa
                     menu.findItem(R.id.menu_share_current_image).setEnabled(true).setVisible(true);
                     menu.findItem(R.id.menu_download_current_image).setEnabled(true).setVisible(true);
 
+                    // Set ShareActionProvider Intent
+                    ShareActionProvider mShareActionProvider = (ShareActionProvider) MenuItemCompat.getActionProvider(menu.findItem(R.id.menu_share_current_image));
+                    Intent shareIntent = new Intent(Intent.ACTION_SEND);
+                    shareIntent.setType("text/plain");
+                    shareIntent.putExtra(Intent.EXTRA_TEXT, m.getDisplayTitle() + " " + m.getDescriptionUrl());
+                    mShareActionProvider.setShareIntent(shareIntent);
+
                     if(m instanceof Contribution) {
                         Contribution c = (Contribution)m;
                         switch(c.getState()) {
diff --git a/app/src/main/res/layout/activity_contributions.xml b/app/src/main/res/layout/activity_contributions.xml
index 8a1576f1b..4abbeb3c3 100644
--- a/app/src/main/res/layout/activity_contributions.xml
+++ b/app/src/main/res/layout/activity_contributions.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="horizontal"
@@ -12,6 +13,6 @@
         android:id="@+id/contributionsListFragment"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        />
+        tools:layout="@layout/fragment_contributions" />
 
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/menu/fragment_image_detail.xml b/app/src/main/res/menu/fragment_image_detail.xml
index 670bdf689..3e0fa4f13 100644
--- a/app/src/main/res/menu/fragment_image_detail.xml
+++ b/app/src/main/res/menu/fragment_image_detail.xml
@@ -2,34 +2,34 @@
 
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item android:id="@+id/menu_share_current_image"
-          app:showAsAction="ifRoom|withText"
-          android:icon="@android:drawable/ic_menu_share"
-          android:title="@string/menu_share"
-          />
-    <item android:id="@+id/menu_browser_current_image"
-          app:showAsAction="never"
-          android:icon="@android:drawable/ic_menu_view"
-          android:title="@string/menu_open_in_browser"
-            />
-    <item android:id="@+id/menu_download_current_image"
-          app:showAsAction="never"
-          android:icon="@drawable/ic_menu_download"
-          android:title="@string/menu_download"
-          />
-    <item android:id="@+id/menu_retry_current_image"
-          app:showAsAction="ifRoom|withText"
-          android:icon="@android:drawable/ic_menu_revert"
-          android:title="@string/menu_retry_upload"
-          android:visible="false"
-          android:enabled="false"
-            />
-    <item android:id="@+id/menu_cancel_current_image"
-          app:showAsAction="never"
-          android:icon="@android:drawable/ic_menu_delete"
-          android:title="@string/menu_cancel_upload"
-          android:visible="false"
-          android:enabled="false"
-            />
+    <item
+        android:id="@+id/menu_share_current_image"
+        app:actionProviderClass="android.support.v7.widget.ShareActionProvider"
+        android:title="@string/menu_share"
+        app:showAsAction="ifRoom|withText" />
+    <item
+        android:id="@+id/menu_browser_current_image"
+        android:icon="@android:drawable/ic_menu_view"
+        android:title="@string/menu_open_in_browser"
+        app:showAsAction="never" />
+    <item
+        android:id="@+id/menu_download_current_image"
+        android:icon="@drawable/ic_menu_download"
+        android:title="@string/menu_download"
+        app:showAsAction="never" />
+    <item
+        android:id="@+id/menu_retry_current_image"
+        android:enabled="false"
+        android:icon="@android:drawable/ic_menu_revert"
+        android:title="@string/menu_retry_upload"
+        android:visible="false"
+        app:showAsAction="ifRoom|withText" />
+    <item
+        android:id="@+id/menu_cancel_current_image"
+        android:enabled="false"
+        android:icon="@android:drawable/ic_menu_delete"
+        android:title="@string/menu_cancel_upload"
+        android:visible="false"
+        app:showAsAction="never" />
 
 </menu>
\ No newline at end of file