Grid image favourite focus

src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java

@@ -232,6 +232,10 @@ public class OCFileListFragment extends ExtendedListFragment implements OCFileLi
                         switch (item.getItemId()) {
                             case R.id.nav_bar_files:
                                 EventBus.getDefault().post(new MenuItemClickEvent(item));
+                                menuItemAddRemoveValue = MenuItemAddRemove.ADD_GRID_AND_SORT;
+                                if (getActivity() != null) {
+                                    getActivity().invalidateOptionsMenu();
+                                }
                                 break;
                             case R.id.nav_bar_favorites:
                                 EventBus.getDefault().post(new SearchEvent("", SearchOperation.SearchType.FAVORITE_SEARCH,

src/main/res/layout/grid_image.xml

@@ -44,8 +44,9 @@
             android:layout_height="24dp"
             android:layout_marginStart="6dp"
             android:layout_marginEnd="6dp"
-            android:layout_gravity="bottom|start"
-            android:background="@drawable/favorite_button_selector"/>
+            android:layout_gravity="top|start"
+            android:background="@drawable/favorite_button_selector"
+            android:focusable="false"/>
 
         <ImageView
             android:id="@+id/sharedIcon"