1 files changed, 33 insertions, 16 deletions
diff --git a/main/res/menu/map_activity.xml b/main/res/menu/map_activity.xml
index d81a49b..4c1dfd7 100644
--- a/main/res/menu/map_activity.xml
+++ b/main/res/menu/map_activity.xml
@@ -1,10 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:cgeo="http://schemas.android.com/apk/res-auto" >
 
     <item
+        android:id="@+id/menu_toggle_mypos"
+        android:icon="@drawable/ic_menu_myposition"
+        android:showAsAction="always"
+        android:title="@string/menu_centerposition"
+        cgeo:showAsAction="always"/>
+    <item
         android:id="@+id/menu_select_mapview"
         android:icon="@drawable/ic_menu_mapmode"
-        android:title="@string/map_view_map">
+        android:title="@string/map_view_map"
+        cgeo:showAsAction="ifRoom|withText">
         <menu>
             <group
                 android:id="@+id/menu_group_map_sources"
@@ -15,42 +23,51 @@
     <item
         android:id="@+id/menu_map_live"
         android:icon="@drawable/ic_menu_refresh"
-        android:title="@string/map_live_disable">
+        android:title="@string/map_live_disable"
+        cgeo:showAsAction="ifRoom|withText">
     </item>
     <item
         android:id="@+id/menu_store_caches"
-        android:enabled="false"
         android:icon="@drawable/ic_menu_set_as"
-        android:title="@string/caches_store_offline">
+        android:title="@string/caches_store_offline"
+        cgeo:showAsAction="ifRoom|withText">
     </item>
     <item
         android:id="@+id/submenu_modes"
         android:icon="@drawable/ic_menu_mark"
-        android:title="@string/map_modes">
+        android:title="@string/map_modes"
+        cgeo:showAsAction="ifRoom|withText">
         <menu>
             <item
                 android:id="@+id/menu_trail_mode"
+                android:checkable="true"
                 android:icon="@drawable/ic_menu_trail"
-                android:title="@string/map_trail_hide">
+                android:title="@string/map_trail_show"
+                cgeo:showAsAction="ifRoom|withText">
             </item>
             <item
                 android:id="@+id/menu_circle_mode"
+                android:checkable="true"
                 android:icon="@drawable/ic_menu_circle"
-                android:title="@string/map_circles_hide">
-            </item>
-            <item
-            	android:id="@+id/menu_mycaches_mode"
-            	android:icon="@android:drawable/ic_menu_myplaces"
-            	android:title="@string/map_mycaches_hide">
+                android:title="@string/map_circles_show"
+                cgeo:showAsAction="ifRoom|withText">
             </item>
             <item
-                android:id="@+id/menu_theme_mode"
-                android:icon="@drawable/ic_menu_preferences"
-                android:title="@string/map_theme_select">
+                android:id="@+id/menu_mycaches_mode"
+                android:checkable="true"
+                android:icon="@android:drawable/ic_menu_myplaces"
+                android:title="@string/map_mycaches_hide"
+                cgeo:showAsAction="ifRoom|withText">
             </item>
         </menu>
     </item>
     <item
+        android:id="@+id/menu_theme_mode"
+        android:icon="@drawable/ic_menu_preferences"
+        android:title="@string/map_theme_select"
+        cgeo:showAsAction="ifRoom|withText">
+    </item>
+    <item
         android:id="@+id/submenu_strategy"
         android:icon="@drawable/ic_menu_preferences"
         android:title="@string/map_strategy">