diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 7ac24c7..0e23f8e 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -3,8 +3,9 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="distributionType" value="DEFAULT_WRAPPED" />
+        <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleHome" value="$APPLICATION_HOME_DIR$/gradle/gradle-2.14.1" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/app/build.gradle b/app/build.gradle
index 274b9c6..db9d278 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,30 +1,23 @@
 apply plugin: 'com.android.application'
 
 android {
-    signingConfigs {
-        config {
-            keyAlias 'TubTubKey'
-            keyPassword 'tubtub'
-            storeFile file('/home/smedic/Android/android.jks')
-            storePassword 'tubtub'
-        }
-    }
-    compileSdkVersion 23
-    buildToolsVersion "23.0.3"
+    compileSdkVersion 25
+    buildToolsVersion "25.0.2"
     defaultConfig {
         applicationId "com.smedic.tubtub"
         minSdkVersion 16
-        targetSdkVersion 22
+        targetSdkVersion 25
         versionCode 8
         versionName "1.7"
     }
+
     buildTypes {
         debug {
             applicationVariants.all { variant ->
                 variant.outputs.each { output ->
                     def file = output.outputFile
                     def appId = android.defaultConfig.applicationId
-                    def fileName = appId + "-" + variant.buildType.name +".apk"
+                    def fileName = appId + "-" + variant.buildType.name + "-" + defaultConfig.versionName + ".apk"
                     output.outputFile = new File(file.parent, fileName)
                 }
             }
@@ -45,24 +38,17 @@ android {
             }
         }
     }
-    dexOptions {
-        javaMaxHeapSize "4g"
-    }
 }
 
 dependencies {
     provided fileTree(dir: 'libs', include: ['*.jar'])
     testCompile 'junit:junit:4.12'
-    compile(name:'library-release', ext:'aar')
-    compile 'com.android.support:appcompat-v7:23.4.0'
-    compile 'com.android.support:design:23.4.0'
-    compile 'com.android.support:support-v4:23.4.0'
-    compile 'com.android.support:recyclerview-v7:23.4.0'
-    compile 'com.google.android.gms:play-services-auth:9.0.0'
-    compile files('libs/nineoldandroids-2.4.0.jar')
-    compile files('libs/listviewanimations_lib-core-slh_3.1.0.jar')
-    compile files('libs/listviewanimations_lib-manipulation_3.1.0.jar')
-    compile files('libs/listviewanimations_lib-core_3.1.0.jar')
+    compile(name:'color_picker_library-release', ext:'aar')
+    compile 'com.android.support:appcompat-v7'
+    compile 'com.android.support:design:25.1.1'
+    compile 'com.android.support:support-v4:25.1.1'
+    compile 'com.android.support:recyclerview-v7:25.1.1'
+    compile 'com.google.android.gms:play-services-auth:10.0.1'
     compile files('libs/google-api-client-android-1.21.0.jar')
     compile files('libs/google-http-client-android-1.21.0.jar')
     compile files('libs/google-api-client-1.21.0.jar')
@@ -72,7 +58,7 @@ dependencies {
     compile files('libs/jackson-core-2.1.3.jar')
     compile files('libs/jsr305-1.3.9.jar')
     compile files('libs/google-api-services-youtube-v3-rev160-1.21.0.jar')
-    compile files('libs/picasso-2.5.2.jar')
-    compile files('libs/okhttp-3.2.0.jar') //used for picasso caching
+    compile files('libs/picasso-2.5.2.jar');
     compile 'com.github.HaarigerHarald:android-youtubeExtractor:1.5.0'
+    compile 'pub.devrel:easypermissions:0.3.0'
 }
diff --git a/app/libs/library-release.aar b/app/libs/color_picker_library-release.aar
similarity index 100%
rename from app/libs/library-release.aar
rename to app/libs/color_picker_library-release.aar
diff --git a/app/libs/listviewanimations_lib-core-slh_3.1.0.jar b/app/libs/listviewanimations_lib-core-slh_3.1.0.jar
deleted file mode 100644
index fde0f21..0000000
Binary files a/app/libs/listviewanimations_lib-core-slh_3.1.0.jar and /dev/null differ
diff --git a/app/libs/listviewanimations_lib-core_3.1.0.jar b/app/libs/listviewanimations_lib-core_3.1.0.jar
deleted file mode 100644
index 68e3c5a..0000000
Binary files a/app/libs/listviewanimations_lib-core_3.1.0.jar and /dev/null differ
diff --git a/app/libs/listviewanimations_lib-manipulation_3.1.0.jar b/app/libs/listviewanimations_lib-manipulation_3.1.0.jar
deleted file mode 100644
index a973821..0000000
Binary files a/app/libs/listviewanimations_lib-manipulation_3.1.0.jar and /dev/null differ
diff --git a/app/libs/nineoldandroids-2.4.0.jar b/app/libs/nineoldandroids-2.4.0.jar
deleted file mode 100644
index 43ee45f..0000000
Binary files a/app/libs/nineoldandroids-2.4.0.jar and /dev/null differ
diff --git a/app/libs/okhttp-3.2.0.jar b/app/libs/okhttp-3.2.0.jar
deleted file mode 100644
index bd9daaf..0000000
Binary files a/app/libs/okhttp-3.2.0.jar and /dev/null differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index aff797c..6df8b66 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.smedic.tubtub"
-    android:versionName="1.01">
+    package="com.smedic.tubtub">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />
-    <uses-permission android:name="android.permission.READ_CONTACTS" />
     <uses-permission android:name="android.permission.MEDIA_CONTENT_CONTROL" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
@@ -19,6 +17,7 @@
         android:theme="@style/MyMaterialTheme">
         <activity
             android:name=".MainActivity"
+            android:launchMode="singleTop"
             android:screenOrientation="portrait">
             <meta-data
                 android:name="android.app.searchable"
diff --git a/app/src/main/java/com/smedic/tubtub/BackgroundAudioService.java b/app/src/main/java/com/smedic/tubtub/BackgroundAudioService.java
index cc19fa4..e850991 100644
--- a/app/src/main/java/com/smedic/tubtub/BackgroundAudioService.java
+++ b/app/src/main/java/com/smedic/tubtub/BackgroundAudioService.java
@@ -36,6 +36,7 @@
 import android.util.Log;
 import android.util.SparseArray;
 
+import com.smedic.tubtub.model.ItemType;
 import com.smedic.tubtub.model.YouTubeVideo;
 import com.smedic.tubtub.utils.Config;
 import com.squareup.picasso.Picasso;
@@ -67,7 +68,7 @@ public class BackgroundAudioService extends Service implements MediaPlayer.OnCom
     private MediaSessionCompat mSession;
     private MediaControllerCompat mController;
 
-    private int mediaType = Config.YOUTUBE_MEDIA_NO_NEW_REQUEST;
+    private ItemType mediaType = ItemType.YOUTUBE_MEDIA_NONE;
 
     private YouTubeVideo videoItem;
 
@@ -155,20 +156,20 @@ private void handleIntent(Intent intent) {
      * @param intent
      */
     private void handleMedia(Intent intent) {
-        int intentMediaType = intent.getIntExtra(Config.YOUTUBE_TYPE, Config.YOUTUBE_MEDIA_NO_NEW_REQUEST);
+        ItemType intentMediaType = (ItemType) intent.getSerializableExtra(Config.YOUTUBE_TYPE);
         switch (intentMediaType) {
-            case Config.YOUTUBE_MEDIA_NO_NEW_REQUEST: //video is paused,so no new playback requests should be processed
+            case YOUTUBE_MEDIA_NONE: //video is paused,so no new playback requests should be processed
                 mMediaPlayer.start();
                 break;
-            case Config.YOUTUBE_MEDIA_TYPE_VIDEO:
-                mediaType = Config.YOUTUBE_MEDIA_TYPE_VIDEO;
+            case YOUTUBE_MEDIA_TYPE_VIDEO:
+                mediaType = ItemType.YOUTUBE_MEDIA_TYPE_VIDEO;
                 videoItem = (YouTubeVideo) intent.getSerializableExtra(Config.YOUTUBE_TYPE_VIDEO);
                 if (videoItem.getId() != null) {
                     playVideo();
                 }
                 break;
-            case Config.YOUTUBE_MEDIA_TYPE_PLAYLIST: //new playlist playback request
-                mediaType = Config.YOUTUBE_MEDIA_TYPE_PLAYLIST;
+            case YOUTUBE_MEDIA_TYPE_PLAYLIST: //new playlist playback request
+                mediaType = ItemType.YOUTUBE_MEDIA_TYPE_PLAYLIST;
                 youTubeVideos = (ArrayList<YouTubeVideo>) intent.getSerializableExtra(Config.YOUTUBE_TYPE_PLAYLIST);
                 int startPosition = intent.getIntExtra(Config.YOUTUBE_TYPE_PLAYLIST_VIDEO_POS, 0);
                 iterator = youTubeVideos.listIterator(startPosition);
@@ -312,6 +313,7 @@ private void buildNotification(NotificationCompat.Action action) {
      * Field which handles image loading
      */
     private Target target = new Target() {
+
         @Override
         public void onBitmapLoaded(Bitmap bitmap, Picasso.LoadedFrom loadedFrom) {
             updateNotificationLargeIcon(bitmap);
@@ -358,7 +360,7 @@ private NotificationCompat.Action generateAction(int icon, String title, String
      */
     private void playNext() {
         //if media type is video not playlist, just loop it
-        if (mediaType == Config.YOUTUBE_MEDIA_TYPE_VIDEO) {
+        if (mediaType == ItemType.YOUTUBE_MEDIA_TYPE_VIDEO) {
             seekVideo(0);
             restartVideo();
             return;
@@ -383,7 +385,7 @@ private void playNext() {
      */
     private void playPrevious() {
         //if media type is video not playlist, just loop it
-        if (mediaType == Config.YOUTUBE_MEDIA_TYPE_VIDEO) {
+        if (mediaType == ItemType.YOUTUBE_MEDIA_TYPE_VIDEO) {
             restartVideo();
             return;
         }
@@ -507,7 +509,7 @@ public void onTaskRemoved(Intent rootIntent) {
 
     @Override
     public void onCompletion(MediaPlayer _mediaPlayer) {
-        if (mediaType == Config.YOUTUBE_MEDIA_TYPE_PLAYLIST) {
+        if (mediaType == ItemType.YOUTUBE_MEDIA_TYPE_PLAYLIST) {
             playNext();
             buildNotification(generateAction(android.R.drawable.ic_media_pause, "Pause", ACTION_PAUSE));
         } else {
diff --git a/app/src/main/java/com/smedic/tubtub/MainActivity.java b/app/src/main/java/com/smedic/tubtub/MainActivity.java
index 74b7c7f..5dbf4fb 100644
--- a/app/src/main/java/com/smedic/tubtub/MainActivity.java
+++ b/app/src/main/java/com/smedic/tubtub/MainActivity.java
@@ -15,6 +15,7 @@
  */
 package com.smedic.tubtub;
 
+import android.Manifest;
 import android.app.SearchManager;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -24,6 +25,7 @@
 import android.os.Bundle;
 import android.preference.PreferenceManager;
 import android.provider.BaseColumns;
+import android.support.annotation.NonNull;
 import android.support.design.widget.TabLayout;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
@@ -37,6 +39,7 @@
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.SearchView;
 import android.support.v7.widget.Toolbar;
+import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
 
@@ -55,16 +58,21 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import pub.devrel.easypermissions.AfterPermissionGranted;
+import pub.devrel.easypermissions.EasyPermissions;
+
 /**
  * Activity that manages fragments and action bar
  */
-public class MainActivity extends AppCompatActivity {
+public class MainActivity extends AppCompatActivity implements EasyPermissions.PermissionCallbacks {
 
     private static final String TAG = "SMEDIC MAIN ACTIVITY";
     private Toolbar toolbar;
     private TabLayout tabLayout;
     private ViewPager viewPager;
 
+    private final int PERMISSIONS = 1;
+
     private int initialColor = 0xffff0040;
     private int initialColors[] = new int[2];
 
@@ -104,6 +112,35 @@ protected void onCreate(Bundle savedInstanceState) {
         setupTabIcons();
 
         loadColor();
+
+        requestPermissions();
+        /*if (ContextCompat.checkSelfPermission(this,
+                Manifest.permission.GET_ACCOUNTS)
+                != PackageManager.PERMISSION_GRANTED) {
+            ActivityCompat.requestPermissions(this,
+                    new String[]{Manifest.permission.GET_ACCOUNTS},
+                    MY_PERMISSIONS_REQUEST_READ_CONTACTS);
+        }*/
+    }
+
+    @AfterPermissionGranted(PERMISSIONS)
+    private void requestPermissions() {
+        String[] perms = {Manifest.permission.GET_ACCOUNTS, Manifest.permission.READ_PHONE_STATE};
+        if (EasyPermissions.hasPermissions(this, perms)) {
+            // Already have permission, do the thing
+            Log.d(TAG, "requestPermissions: all permissions are there");
+        } else {
+            // Do not have permissions, request them now
+            EasyPermissions.requestPermissions(this, getString(R.string.all_permissions_request),
+                    PERMISSIONS, perms);
+        }
+    }
+
+    @Override
+    public void onRequestPermissionsResult(int requestCode,
+                                           @NonNull String permissions[], @NonNull int[] grantResults) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+        EasyPermissions.onRequestPermissionsResult(requestCode, permissions, grantResults, this);
     }
 
     /**
@@ -165,6 +202,16 @@ private void setupViewPager(ViewPager viewPager) {
         viewPager.setAdapter(adapter);
     }
 
+    @Override
+    public void onPermissionsGranted(int requestCode, List<String> perms) {
+        Log.d(TAG, "onPermissionsGranted:");
+    }
+
+    @Override
+    public void onPermissionsDenied(int requestCode, List<String> perms) {
+        Log.d(TAG, "onPermissionsDenied: ");
+    }
+
     /**
      * Class which provides adapter for fragment pager
      */
@@ -195,6 +242,7 @@ public void addFragment(Fragment fragment, String title) {
         public CharSequence getPageTitle(int position) {
             return mFragmentTitleList.get(position);
         }
+
     }
 
     /**
diff --git a/app/src/main/java/com/smedic/tubtub/adapters/PlaylistsAdapter.java b/app/src/main/java/com/smedic/tubtub/adapters/PlaylistsAdapter.java
index d481fff..8bd362d 100644
--- a/app/src/main/java/com/smedic/tubtub/adapters/PlaylistsAdapter.java
+++ b/app/src/main/java/com/smedic/tubtub/adapters/PlaylistsAdapter.java
@@ -12,6 +12,8 @@
 import android.widget.TextView;
 
 import com.smedic.tubtub.R;
+import com.smedic.tubtub.interfaces.ItemEventsListener;
+import com.smedic.tubtub.model.ItemType;
 import com.smedic.tubtub.model.YouTubePlaylist;
 import com.squareup.picasso.Picasso;
 
@@ -24,6 +26,7 @@ public class PlaylistsAdapter extends ArrayAdapter<YouTubePlaylist> {
 
     private Activity context;
     private List<YouTubePlaylist> playlists;
+    private ItemEventsListener itemEventsListener;
 
     public PlaylistsAdapter(Activity context, List<YouTubePlaylist> playlists) {
         super(context, R.layout.video_item, playlists);
@@ -41,8 +44,9 @@ public View getView(final int position, View convertView, ViewGroup parent) {
         TextView title = (TextView) convertView.findViewById(R.id.playlist_title);
         TextView videosNumber = (TextView) convertView.findViewById(R.id.videos_number);
         TextView privacy = (TextView) convertView.findViewById(R.id.privacy);
+        ImageView shareButton = (ImageView) convertView.findViewById(R.id.share_button);
 
-        YouTubePlaylist searchResult = playlists.get(position);
+        final YouTubePlaylist searchResult = playlists.get(position);
 
         Picasso.with(getContext()).load(searchResult.getThumbnailURL()).into(thumbnail);
         title.setText(searchResult.getTitle());
@@ -51,9 +55,23 @@ public View getView(final int position, View convertView, ViewGroup parent) {
         String status = context.getString(R.string.status) + searchResult.getStatus();
         privacy.setText(status);
 
+        shareButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if (itemEventsListener != null) {
+                    itemEventsListener.onShareClicked(ItemType.YOUTUBE_MEDIA_TYPE_PLAYLIST,
+                            searchResult.getId());
+                }
+            }
+        });
+
         return convertView;
     }
 
+    public void setOnItemEventsListener(ItemEventsListener listener) {
+        itemEventsListener = listener;
+    }
+
     @Override
     public long getItemId(int i) {
         return getItem(i).hashCode();
diff --git a/app/src/main/java/com/smedic/tubtub/adapters/VideosAdapter.java b/app/src/main/java/com/smedic/tubtub/adapters/VideosAdapter.java
index 9936e4d..7af18bd 100644
--- a/app/src/main/java/com/smedic/tubtub/adapters/VideosAdapter.java
+++ b/app/src/main/java/com/smedic/tubtub/adapters/VideosAdapter.java
@@ -26,6 +26,8 @@
 
 import com.smedic.tubtub.R;
 import com.smedic.tubtub.database.YouTubeSqlDb;
+import com.smedic.tubtub.interfaces.ItemEventsListener;
+import com.smedic.tubtub.model.ItemType;
 import com.smedic.tubtub.model.YouTubeVideo;
 import com.squareup.picasso.Picasso;
 
@@ -41,6 +43,7 @@ public class VideosAdapter extends ArrayAdapter<YouTubeVideo> {
     private final List<YouTubeVideo> list;
     private boolean[] itemChecked;
     private boolean isFavoriteList;
+    private ItemEventsListener itemEventsListener;
 
     public VideosAdapter(Activity context, List<YouTubeVideo> list, boolean isFavoriteList) {
         super(context, R.layout.video_item, list);
@@ -59,7 +62,8 @@ public View getView(final int position, View convertView, final ViewGroup parent
         TextView title = (TextView) convertView.findViewById(R.id.video_title);
         TextView duration = (TextView) convertView.findViewById(R.id.video_duration);
         TextView viewCount = (TextView) convertView.findViewById(R.id.views_number);
-        CheckBox checkBox = (CheckBox) convertView.findViewById(R.id.imageButton);
+        CheckBox favoriteCheckBox = (CheckBox) convertView.findViewById(R.id.favoriteButton);
+        ImageView shareButton = (ImageView) convertView.findViewById(R.id.shareButton);
 
         final YouTubeVideo searchResult = list.get(position);
 
@@ -74,15 +78,15 @@ public View getView(final int position, View convertView, final ViewGroup parent
         } else {
             itemChecked[position] = false;
         }
-        checkBox.setChecked(itemChecked[position]);
+        favoriteCheckBox.setChecked(itemChecked[position]);
 
-        checkBox.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+        favoriteCheckBox.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
             public void onCheckedChanged(CompoundButton btn, boolean isChecked) {
                 itemChecked[position] = isChecked;
             }
         });
 
-        checkBox.setOnClickListener(new View.OnClickListener() {
+        favoriteCheckBox.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 if (((CheckBox) v).isChecked()) {
@@ -97,9 +101,23 @@ public void onClick(View v) {
             }
         });
 
+        shareButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if (itemEventsListener != null) {
+                    itemEventsListener.onShareClicked(ItemType.YOUTUBE_MEDIA_TYPE_VIDEO,
+                            searchResult.getId());
+                }
+            }
+        });
+
         return convertView;
     }
 
+    public void setOnItemEventsListener(ItemEventsListener listener) {
+        itemEventsListener = listener;
+    }
+
     @Override
     public long getItemId(int i) {
         return getItem(i).hashCode();
diff --git a/app/src/main/java/com/smedic/tubtub/fragments/BaseFragment.java b/app/src/main/java/com/smedic/tubtub/fragments/BaseFragment.java
new file mode 100644
index 0000000..46fe72c
--- /dev/null
+++ b/app/src/main/java/com/smedic/tubtub/fragments/BaseFragment.java
@@ -0,0 +1,24 @@
+package com.smedic.tubtub.fragments;
+
+import android.content.Intent;
+import android.support.v4.app.Fragment;
+
+import com.smedic.tubtub.interfaces.ItemEventsListener;
+import com.smedic.tubtub.model.ItemType;
+
+/**
+ * Created by smedic on 9.2.17..
+ */
+
+public class BaseFragment extends Fragment implements ItemEventsListener {
+
+    @Override
+    public void onShareClicked(ItemType type, String videoId) {
+        Intent intent = new Intent(Intent.ACTION_SEND);
+        intent.setType("text/plain");
+        intent.putExtra(Intent.EXTRA_TEXT, "https://www.youtube.com/watch?v=" + videoId);
+        intent.putExtra(android.content.Intent.EXTRA_SUBJECT, "Check out this song!");
+        startActivity(Intent.createChooser(intent, "Share"));
+    }
+
+}
diff --git a/app/src/main/java/com/smedic/tubtub/fragments/FavoritesFragment.java b/app/src/main/java/com/smedic/tubtub/fragments/FavoritesFragment.java
index 8fa2aba..734713c 100644
--- a/app/src/main/java/com/smedic/tubtub/fragments/FavoritesFragment.java
+++ b/app/src/main/java/com/smedic/tubtub/fragments/FavoritesFragment.java
@@ -17,19 +17,18 @@
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.ListView;
-import android.widget.TextView;
 import android.widget.Toast;
 
 import com.smedic.tubtub.BackgroundAudioService;
 import com.smedic.tubtub.R;
 import com.smedic.tubtub.adapters.VideosAdapter;
 import com.smedic.tubtub.database.YouTubeSqlDb;
+import com.smedic.tubtub.model.ItemType;
 import com.smedic.tubtub.model.YouTubeVideo;
 import com.smedic.tubtub.utils.Config;
 import com.smedic.tubtub.utils.NetworkConf;
@@ -39,7 +38,7 @@
 /**
  * Created by Stevan Medic on 21.3.16..
  */
-public class FavoritesFragment extends Fragment {
+public class FavoritesFragment extends BaseFragment {
     private static final String TAG = "SMEDIC Favorites";
     private ArrayList<YouTubeVideo> favoriteVideos;
 
@@ -64,10 +63,9 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
         // Inflate the layout for this fragment
         View v = inflater.inflate(R.layout.fragment_list, container, false);
-        TextView fragmentListTitle = (TextView) v.findViewById(R.id.fragment_title_text_view);
-        fragmentListTitle.setText(getString(R.string.favorite_watched_tab));
         favoritesListView = (ListView) v.findViewById(R.id.fragment_list_items);
         videoListAdapter = new VideosAdapter(getActivity(), favoriteVideos, false);
+        videoListAdapter.setOnItemEventsListener(this);
         favoritesListView.setAdapter(videoListAdapter);
 
         //disable swipe to refresh for this tab
@@ -114,7 +112,7 @@ public void onItemClick(AdapterView<?> av, View v, final int pos,
 
                     Intent serviceIntent = new Intent(getContext(), BackgroundAudioService.class);
                     serviceIntent.setAction(BackgroundAudioService.ACTION_PLAY);
-                    serviceIntent.putExtra(Config.YOUTUBE_TYPE, Config.YOUTUBE_MEDIA_TYPE_PLAYLIST);
+                    serviceIntent.putExtra(Config.YOUTUBE_TYPE, ItemType.YOUTUBE_MEDIA_TYPE_PLAYLIST);
                     serviceIntent.putExtra(Config.YOUTUBE_TYPE_PLAYLIST, favoriteVideos);
                     serviceIntent.putExtra(Config.YOUTUBE_TYPE_PLAYLIST_VIDEO_POS, pos);
                     getActivity().startService(serviceIntent);
diff --git a/app/src/main/java/com/smedic/tubtub/fragments/PlaylistsFragment.java b/app/src/main/java/com/smedic/tubtub/fragments/PlaylistsFragment.java
index ddead9b..d5883aa 100644
--- a/app/src/main/java/com/smedic/tubtub/fragments/PlaylistsFragment.java
+++ b/app/src/main/java/com/smedic/tubtub/fragments/PlaylistsFragment.java
@@ -22,7 +22,6 @@
 import android.os.Bundle;
 import android.os.Handler;
 import android.preference.PreferenceManager;
-import android.support.v4.app.Fragment;
 import android.support.v4.widget.SwipeRefreshLayout;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -39,6 +38,7 @@
 import com.smedic.tubtub.database.YouTubeSqlDb;
 import com.smedic.tubtub.interfaces.YouTubePlaylistsReceiver;
 import com.smedic.tubtub.interfaces.YouTubeVideosReceiver;
+import com.smedic.tubtub.model.ItemType;
 import com.smedic.tubtub.model.YouTubePlaylist;
 import com.smedic.tubtub.model.YouTubeVideo;
 import com.smedic.tubtub.utils.Config;
@@ -51,7 +51,7 @@
  * Class that handles list of the playlists acquired from YouTube
  * Created by smedic on 7.3.16..
  */
-public class PlaylistsFragment extends Fragment implements YouTubeVideosReceiver, YouTubePlaylistsReceiver {
+public class PlaylistsFragment extends BaseFragment implements YouTubeVideosReceiver, YouTubePlaylistsReceiver {
 
     private static final String TAG = "SMEDIC PlaylistsFrag";
 
@@ -93,13 +93,8 @@ public void onCreate(Bundle savedInstanceState) {
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
         View v = inflater.inflate(R.layout.fragment_list, container, false);
-        TextView fragmentListTitle = (TextView) v.findViewById(R.id.fragment_title_text_view);
-        fragmentListTitle.setText(getString(R.string.playlists_tab));
-
         /* Setup the ListView */
         playlistsListView = (ListView) v.findViewById(R.id.fragment_list_items);
-        userNameTextView = (TextView) v.findViewById(R.id.user_name);
-        userNameTextView.setVisibility(View.VISIBLE);
         swipeToRefresh = (SwipeRefreshLayout) v.findViewById(R.id.swipe_to_refresh);
 
         setupListViewAndAdapter();
@@ -126,7 +121,6 @@ private void loadAccount() {
 
         if (mChosenAccountName != null) {
             youTubeSearch.setAuthSelectedAccountName(mChosenAccountName);
-            userNameTextView.setText(extractUserName(mChosenAccountName));
             Toast.makeText(getContext(), "Hi " + extractUserName(mChosenAccountName), Toast.LENGTH_SHORT).show();
         }
     }
@@ -138,7 +132,7 @@ private void saveAccount() {
         Log.d(TAG, "Saving account name... " + mChosenAccountName);
         SharedPreferences sp = PreferenceManager
                 .getDefaultSharedPreferences(getActivity());
-        sp.edit().putString(ACCOUNT_KEY, mChosenAccountName).commit();
+        sp.edit().putString(ACCOUNT_KEY, mChosenAccountName).apply();
     }
 
     @Override
@@ -217,6 +211,7 @@ private void chooseAccount() {
      */
     public void setupListViewAndAdapter() {
         playlistsAdapter = new PlaylistsAdapter(getActivity(), playlists);
+        playlistsAdapter.setOnItemEventsListener(this);
         playlistsListView.setAdapter(playlistsAdapter);
 
         swipeToRefresh.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
@@ -267,7 +262,7 @@ public void run() {
         } else {
             Intent serviceIntent = new Intent(getContext(), BackgroundAudioService.class);
             serviceIntent.setAction(BackgroundAudioService.ACTION_PLAY);
-            serviceIntent.putExtra(Config.YOUTUBE_TYPE, Config.YOUTUBE_MEDIA_TYPE_PLAYLIST);
+            serviceIntent.putExtra(Config.YOUTUBE_TYPE, ItemType.YOUTUBE_MEDIA_TYPE_PLAYLIST);
             serviceIntent.putExtra(Config.YOUTUBE_TYPE_PLAYLIST, youTubeVideos);
             getActivity().startService(serviceIntent);
         }
diff --git a/app/src/main/java/com/smedic/tubtub/fragments/RecentlyWatchedFragment.java b/app/src/main/java/com/smedic/tubtub/fragments/RecentlyWatchedFragment.java
index 4133699..e4fe1bf 100644
--- a/app/src/main/java/com/smedic/tubtub/fragments/RecentlyWatchedFragment.java
+++ b/app/src/main/java/com/smedic/tubtub/fragments/RecentlyWatchedFragment.java
@@ -17,19 +17,18 @@
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.ListView;
-import android.widget.TextView;
 import android.widget.Toast;
 
 import com.smedic.tubtub.BackgroundAudioService;
 import com.smedic.tubtub.R;
 import com.smedic.tubtub.adapters.VideosAdapter;
 import com.smedic.tubtub.database.YouTubeSqlDb;
+import com.smedic.tubtub.model.ItemType;
 import com.smedic.tubtub.model.YouTubeVideo;
 import com.smedic.tubtub.utils.Config;
 import com.smedic.tubtub.utils.NetworkConf;
@@ -40,7 +39,7 @@
  * Class that handles list of the recently watched YouTube
  * Created by smedic on 7.3.16..
  */
-public class RecentlyWatchedFragment extends Fragment {
+public class RecentlyWatchedFragment extends BaseFragment {
 
     private static final String TAG = "SMEDIC RecentlyWatched";
     private ArrayList<YouTubeVideo> recentlyPlayedVideos;
@@ -67,10 +66,9 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
         // Inflate the layout for this fragment
         View v = inflater.inflate(R.layout.fragment_list, container, false);
-        TextView fragmentListTitle = (TextView) v.findViewById(R.id.fragment_title_text_view);
-        fragmentListTitle.setText(getString(R.string.recently_watched_tab));
         recentlyPlayedListView = (ListView) v.findViewById(R.id.fragment_list_items);
         videoListAdapter = new VideosAdapter(getActivity(), recentlyPlayedVideos, false);
+        videoListAdapter.setOnItemEventsListener(this);
         recentlyPlayedListView.setAdapter(videoListAdapter);
 
         //disable swipe to refresh for this tab
@@ -123,7 +121,7 @@ public void onItemClick(AdapterView<?> av, View v, final int pos,
 
                     Intent serviceIntent = new Intent(getContext(), BackgroundAudioService.class);
                     serviceIntent.setAction(BackgroundAudioService.ACTION_PLAY);
-                    serviceIntent.putExtra(Config.YOUTUBE_TYPE, Config.YOUTUBE_MEDIA_TYPE_VIDEO);
+                    serviceIntent.putExtra(Config.YOUTUBE_TYPE, ItemType.YOUTUBE_MEDIA_TYPE_VIDEO);
                     serviceIntent.putExtra(Config.YOUTUBE_TYPE_VIDEO, recentlyPlayedVideos.get(pos));
                     getActivity().startService(serviceIntent);
                 } else {
diff --git a/app/src/main/java/com/smedic/tubtub/fragments/SearchFragment.java b/app/src/main/java/com/smedic/tubtub/fragments/SearchFragment.java
index 223e6bf..960ee8b 100644
--- a/app/src/main/java/com/smedic/tubtub/fragments/SearchFragment.java
+++ b/app/src/main/java/com/smedic/tubtub/fragments/SearchFragment.java
@@ -18,7 +18,6 @@
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -26,7 +25,6 @@
 import android.widget.AdapterView;
 import android.widget.ListView;
 import android.widget.ProgressBar;
-import android.widget.TextView;
 import android.widget.Toast;
 
 import com.smedic.tubtub.BackgroundAudioService;
@@ -34,6 +32,7 @@
 import com.smedic.tubtub.adapters.VideosAdapter;
 import com.smedic.tubtub.database.YouTubeSqlDb;
 import com.smedic.tubtub.interfaces.YouTubeVideosReceiver;
+import com.smedic.tubtub.model.ItemType;
 import com.smedic.tubtub.model.YouTubeVideo;
 import com.smedic.tubtub.utils.Config;
 import com.smedic.tubtub.utils.NetworkConf;
@@ -46,7 +45,7 @@
  * Class that handles list of the videos searched on YouTube
  * Created by smedic on 7.3.16..
  */
-public class SearchFragment extends Fragment implements YouTubeVideosReceiver {
+public class SearchFragment extends BaseFragment implements YouTubeVideosReceiver {
 
     private static final String TAG = "SMEDIC search frag";
     private ListView videosFoundListView;
@@ -80,11 +79,10 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
         // Inflate the layout for this fragment
         View v = inflater.inflate(R.layout.fragment_list, container, false);
-        TextView fragmentListTitle = (TextView) v.findViewById(R.id.fragment_title_text_view);
-        fragmentListTitle.setText(getString(R.string.search_tab));
         videosFoundListView = (ListView) v.findViewById(R.id.fragment_list_items);
         loadingProgressBar = (ProgressBar) v.findViewById(R.id.fragment_progress_bar);
         videoListAdapter = new VideosAdapter(getActivity(), searchResultsList, false);
+        videoListAdapter.setOnItemEventsListener(this);
         videosFoundListView.setAdapter(videoListAdapter);
 
         //disable swipe to refresh for this tab
@@ -157,7 +155,7 @@ public void onItemClick(AdapterView<?> av, View v, int pos,
 
                 Intent serviceIntent = new Intent(getContext(), BackgroundAudioService.class);
                 serviceIntent.setAction(BackgroundAudioService.ACTION_PLAY);
-                serviceIntent.putExtra(Config.YOUTUBE_TYPE, Config.YOUTUBE_MEDIA_TYPE_VIDEO);
+                serviceIntent.putExtra(Config.YOUTUBE_TYPE, ItemType.YOUTUBE_MEDIA_TYPE_VIDEO);
                 serviceIntent.putExtra(Config.YOUTUBE_TYPE_VIDEO, searchResultsList.get(pos));
                 getActivity().startService(serviceIntent);
             }
@@ -245,5 +243,4 @@ public void run() {
             });
         }
     }
-
 }
diff --git a/app/src/main/java/com/smedic/tubtub/interfaces/ItemEventsListener.java b/app/src/main/java/com/smedic/tubtub/interfaces/ItemEventsListener.java
new file mode 100644
index 0000000..016ad8c
--- /dev/null
+++ b/app/src/main/java/com/smedic/tubtub/interfaces/ItemEventsListener.java
@@ -0,0 +1,11 @@
+package com.smedic.tubtub.interfaces;
+
+import com.smedic.tubtub.model.ItemType;
+
+/**
+ * Created by smedic on 9.2.17..
+ */
+
+public interface ItemEventsListener {
+    void onShareClicked(ItemType type, String itemId);
+}
diff --git a/app/src/main/java/com/smedic/tubtub/model/ItemType.java b/app/src/main/java/com/smedic/tubtub/model/ItemType.java
new file mode 100644
index 0000000..15e2894
--- /dev/null
+++ b/app/src/main/java/com/smedic/tubtub/model/ItemType.java
@@ -0,0 +1,11 @@
+package com.smedic.tubtub.model;
+
+/**
+ * Created by smedic on 9.2.17..
+ */
+
+public enum ItemType {
+    YOUTUBE_MEDIA_NONE,
+    YOUTUBE_MEDIA_TYPE_VIDEO,
+    YOUTUBE_MEDIA_TYPE_PLAYLIST
+}
diff --git a/app/src/main/java/com/smedic/tubtub/utils/Config.java b/app/src/main/java/com/smedic/tubtub/utils/Config.java
index 892a12d..4b225aa 100644
--- a/app/src/main/java/com/smedic/tubtub/utils/Config.java
+++ b/app/src/main/java/com/smedic/tubtub/utils/Config.java
@@ -10,8 +10,6 @@ public final class Config {
     public static final boolean DEBUG = false;
 
     public static final int YOUTUBE_MEDIA_NO_NEW_REQUEST = -1;
-    public static final int YOUTUBE_MEDIA_TYPE_VIDEO = 0;
-    public static final int YOUTUBE_MEDIA_TYPE_PLAYLIST = 1;
 
     public static final String YOUTUBE_TYPE = "YT_MEDIA_TYPE";
     public static final String YOUTUBE_TYPE_VIDEO = "YT_VIDEO";
diff --git a/app/src/main/res/drawable-hdpi/ic_action_share.png b/app/src/main/res/drawable-hdpi/ic_action_share.png
new file mode 100644
index 0000000..6630a82
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_action_share.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_action_share_pressed.png b/app/src/main/res/drawable-hdpi/ic_action_share_pressed.png
new file mode 100644
index 0000000..e44e7e0
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_action_share_pressed.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_action_share.png b/app/src/main/res/drawable-mdpi/ic_action_share.png
new file mode 100644
index 0000000..522bae5
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_action_share.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_action_share_pressed.png b/app/src/main/res/drawable-mdpi/ic_action_share_pressed.png
new file mode 100644
index 0000000..df4042b
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_action_share_pressed.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_share.png b/app/src/main/res/drawable-xhdpi/ic_action_share.png
new file mode 100644
index 0000000..37b613b
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_action_share.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_share_pressed.png b/app/src/main/res/drawable-xhdpi/ic_action_share_pressed.png
new file mode 100644
index 0000000..b5f69b8
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_action_share_pressed.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_share.png b/app/src/main/res/drawable-xxhdpi/ic_action_share.png
new file mode 100644
index 0000000..e6543e4
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_action_share.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_share_pressed.png b/app/src/main/res/drawable-xxhdpi/ic_action_share_pressed.png
new file mode 100644
index 0000000..c846418
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_action_share_pressed.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_action_share.png b/app/src/main/res/drawable-xxxhdpi/ic_action_share.png
new file mode 100644
index 0000000..01ff736
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_action_share.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_action_share_pressed.png b/app/src/main/res/drawable-xxxhdpi/ic_action_share_pressed.png
new file mode 100644
index 0000000..5e460d5
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_action_share_pressed.png differ
diff --git a/app/src/main/res/drawable/share_button_selector.xml b/app/src/main/res/drawable/share_button_selector.xml
new file mode 100644
index 0000000..5e5142c
--- /dev/null
+++ b/app/src/main/res/drawable/share_button_selector.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/ic_action_share_pressed" android:state_pressed="true" />
+    <item android:drawable="@drawable/ic_action_share" />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 7bc1c79..58bc38d 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -9,27 +9,24 @@
         android:layout_height="wrap_content"
         android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
 
-        <android.support.v7.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android"
-            xmlns:local="http://schemas.android.com/apk/res-auto"
+        <android.support.v7.widget.Toolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="?attr/actionBarSize"
             android:background="?attr/colorPrimary"
-            android:minHeight="?attr/actionBarSize"
-            local:popupTheme="@style/ThemeOverlay.AppCompat.Light"
-            local:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" />
+            app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
+            app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" />
 
         <android.support.design.widget.TabLayout
             android:id="@+id/tabs"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:tabGravity="fill"
-            app:tabMode="fixed" />
+            app:tabGravity="fill" />
     </android.support.design.widget.AppBarLayout>
 
     <android.support.v4.view.ViewPager
         android:id="@+id/viewpager"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
         app:layout_behavior="@string/appbar_scrolling_view_behavior" />
 </android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_list.xml b/app/src/main/res/layout/fragment_list.xml
index 43946b9..03c64ce 100644
--- a/app/src/main/res/layout/fragment_list.xml
+++ b/app/src/main/res/layout/fragment_list.xml
@@ -1,53 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <TextView
-        android:id="@+id/user_name"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="5dp"
-        android:layout_marginStart="5dp"
-        android:layout_marginTop="10dp"
-        android:maxWidth="200dp"
-        android:textAppearance="?android:attr/textAppearanceSmall"
-        android:visibility="gone" />
-
-    <TextView
-        android:id="@+id/fragment_title_text_view"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerHorizontal="true"
-        android:layout_marginTop="10dp"
-        android:textAllCaps="true"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:textStyle="bold" />
-
-    <FrameLayout
+    <android.support.v4.widget.SwipeRefreshLayout
+        android:id="@+id/swipe_to_refresh"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_below="@id/fragment_title_text_view"
-        android:layout_marginTop="10dp">
+        android:layout_height="wrap_content">
 
-        <android.support.v4.widget.SwipeRefreshLayout
-            android:id="@+id/swipe_to_refresh"
+        <ListView
+            android:id="@+id/fragment_list_items"
             android:layout_width="match_parent"
-            android:layout_height="match_parent">
-            <ListView
-                android:id="@+id/fragment_list_items"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:dividerHeight="3dp" />
-        </android.support.v4.widget.SwipeRefreshLayout>
-
-        <ProgressBar
-            android:id="@+id/fragment_progress_bar"
-            style="?android:attr/progressBarStyleLarge"
-            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:visibility="gone" />
-    </FrameLayout>
+            android:dividerHeight="3dp" />
+    </android.support.v4.widget.SwipeRefreshLayout>
 
-</RelativeLayout>
\ No newline at end of file
+    <ProgressBar
+        android:id="@+id/fragment_progress_bar"
+        style="?android:attr/progressBarStyleLarge"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:visibility="gone" />
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/playlist_item.xml b/app/src/main/res/layout/playlist_item.xml
index ba3f34d..f90b603 100644
--- a/app/src/main/res/layout/playlist_item.xml
+++ b/app/src/main/res/layout/playlist_item.xml
@@ -16,13 +16,13 @@
         android:layout_marginRight="10dp"
         android:layout_weight="30" />
 
-    <LinearLayout
+    <RelativeLayout
         android:id="@+id/infoFrameLayout"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="3dp"
         android:layout_weight="60"
-        android:orientation="vertical">
+        >
 
         <TextView
             android:id="@+id/playlist_title"
@@ -34,19 +34,31 @@
             android:id="@+id/videos_number"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="center|start"
+            android:layout_below="@+id/playlist_title"
             android:maxLines="1"
             android:textSize="12sp"
             android:textStyle="bold" />
 
         <TextView
             android:id="@+id/privacy"
+            android:layout_below="@+id/videos_number"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="bottom|start"
             android:maxLines="1"
             android:textSize="12sp"
             android:textStyle="bold" />
-    </LinearLayout>
+
+        <ImageView
+            android:id="@+id/share_button"
+            android:layout_width="30dp"
+            android:layout_height="30dp"
+            android:layout_alignParentBottom="true"
+            android:layout_alignParentEnd="true"
+            android:layout_alignParentRight="true"
+            android:layout_marginEnd="10dp"
+            android:layout_marginRight="10dp"
+            android:background="@drawable/share_button_selector" />
+    </RelativeLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/video_item.xml b/app/src/main/res/layout/video_item.xml
index c498ca7..9dbb772 100644
--- a/app/src/main/res/layout/video_item.xml
+++ b/app/src/main/res/layout/video_item.xml
@@ -33,7 +33,6 @@
     </FrameLayout>
 
     <RelativeLayout
-        android:id="@+id/info_frame_layout"
         android:layout_width="0dp"
         android:layout_height="match_parent"
         android:layout_weight="60">
@@ -54,9 +53,9 @@
             android:textSize="13sp" />
 
         <CheckBox
-            android:id="@+id/imageButton"
-            android:layout_width="24dp"
-            android:layout_height="24dp"
+            android:id="@+id/favoriteButton"
+            android:layout_width="30dp"
+            android:layout_height="30dp"
             android:layout_alignParentBottom="true"
             android:layout_alignParentEnd="true"
             android:layout_alignParentRight="true"
@@ -64,5 +63,17 @@
             android:layout_marginRight="5dp"
             android:background="@drawable/favorite_button_selector"
             android:button="@null" />
+
+        <ImageView
+            android:id="@+id/shareButton"
+            android:layout_width="30dp"
+            android:layout_height="30dp"
+            android:layout_alignParentBottom="true"
+            android:layout_marginEnd="15dp"
+            android:layout_marginRight="15dp"
+            android:layout_toLeftOf="@id/favoriteButton"
+            android:layout_toStartOf="@id/favoriteButton"
+            android:background="@drawable/share_button_selector" />
+
     </RelativeLayout>
 </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 5b37ab5..9e16681 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -30,4 +30,5 @@
 
     <string name="number_of_videos">Number of videos:</string>
     <string name="status">Status:</string>
+    <string name="all_permissions_request">Request permissions</string>
 </resources>
diff --git a/build.gradle b/build.gradle
index 7235062..665ddc9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.2'
+        classpath 'com.android.tools.build:gradle:2.2.3'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 5b2cd35..acc25e8 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip