Recovered changes lost in complex rebase

res/menu/file_actions_menu.xml

@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><!--
+<?xml version="1.0" encoding="utf-8"?>
+<!--
   ownCloud Android client application
 
   Copyright (C) 2012  Bartek Przybylski

res/menu/main_menu.xml

@@ -36,7 +36,7 @@
         android:contentDescription="@string/actionbar_mkdir"/>
     <item
         android:id="@+id/action_switch_view"
-        android:icon="@android:drawable/ic_menu_view"
+        android:icon="@drawable/ic_view_module"
         android:orderInCategory="2"
         app:showAsAction="never"
         android:title="@string/action_switch_grid_view" />