diff --git a/overlay/etc/skel/.navit/navit.xml b/overlay/etc/skel/.navit/navit.xml
index 7a3d283..5f300bd 100644
--- a/overlay/etc/skel/.navit/navit.xml
+++ b/overlay/etc/skel/.navit/navit.xml
@@ -69,26 +69,24 @@
 		The action that appears on map click is configurable with the attribute "on_map_click".
 		To get the previous behaviour of showing the map point menu use on_map_click='menu("#Map Point")'
 		-->
-		<gui type="internal" enabled="yes" fullscreen="1" font_size="500" icon_xs="48" icon_s="48" icon_l="192"><![CDATA[
+		<gui type="internal" enabled="yes" fullscreen="1" font_size="460" icon_xs="48" icon_s="48" icon_l="128"><![CDATA[
 			<html>
 				<a name='Main Menu'><text>Main menu</text>
-					<a href='#Actions'><img src='gui_actions'>Actions</img></a>
+					<a href='#Actions'><img src='navit'>Navigation</img></a>
 					<img cond='flags&amp;2' src='gui_map' onclick='back_to_map()'><text>Show
 Map</text></img>
-					<a href='#Settings'><img src='gui_settings'><text>Settings</text></img></a>
-				<a href='#Tools'><img src='gui_tools'><text>Tools</text></img></a>
-				<a href='#Route'><img src='gui_settings'><text>Route</text></img></a>
-				<img src='gui_about' onclick='about()'><text>About</text></img>
+				<a href='#Settings'><img src='gui_rules'><text>Settings</text></img></a>
+				<a href='#Route'><img src='gui_maps'><text>Route</text></img></a>
 				<img src='gui_quit' onclick='quit()'><text>Quit</text></img>
 				</a>
 			<a name='Actions'><text>Actions</text>
 				<img src='gui_bookmark' onclick='bookmarks()'><text>Bookmarks</text></img>
 				<img src='gui_formerdests' onclick='formerdests()'><text>Former
 Destinations</text></img>
-				<img cond='click_coord_geo' src='gui_map' onclick='position(click_coord_geo,_("Map Point"),8|16|32|64|256)'><script>write(click_coord_geo)</script></img>
-				<img cond='position_coord_geo' src='gui_vehicle' onclick='position(position_coord_geo,_("Vehicle Position"),8|32|64|128|256)'><script>write(position_coord_geo)</script></img>
-				<img src='gui_town' onclick='town()'><text>Town</text></img>
-				<img src='gui_map' onclick='enter_coord()'><text>Coordinates</text></img>
+				<img cond='click_coord_geo' src='gui_map' onclick='position(click_coord_geo,_("Current Map Position"),8|16|32|64|256)'><script>write(click_coord_geo)</script></img>
+				<img cond='position_coord_geo' src='gui_vehicle' onclick='position(position_coord_geo,_("Current Vehicle Position"),8|32|64|128|256)'><script>write("Vehicle Position")</script></img>
+				<img src='gui_zoom_route' onclick='town()'><text>Address Search</text></img>
+				<img src='follow' onclick='enter_coord()'><text>Enter Lat/Lon</text></img>
 				<img cond='navit.route.route_status&amp;1' src='gui_stop' onclick='abort_navigation();refresh()'><text>Stop
 Navigation</text></img>
 			</a>
@@ -112,12 +110,11 @@ Navigation</text></img>
   				<a href='#Settings Layers'><img src='gui_layers'><text>Layers</text></img></a>
 			</a>
 			<a name='Tools'><text>Tools</text>
-				<img src='gui_actions' onclick='locale()'><text>Show Locale</text></img>
 				<img src='gui_tools' onclick='network_info()'><text>Network info</text></img>
 			</a>
 			<a name='Route'><text>Route</text>
 				<img cond='navit.route.route_status&amp;1' src='gui_zoom_route' onclick='navit.zoom_to_route();redraw_map();back_to_map()'><text>Zoom to route</text></img>
-				<img src='gui_actions' onclick='route_description()'><text>Description</text></img>
+				<img src='gui_log' onclick='route_description()'><text>Directions</text></img>
 				<img src='gui_heightprofile' onclick='route_height_profile()'><text>Height Profile</text></img>
 				<img cond='navit.waypoints_flag &amp;&amp; (navit.route.route_status&amp;1)' src='cursor_still' onclick='waypoints()'><text>Waypoints</text></img>
 				<img cond='navit.waypoints_flag &amp;&amp; (navit.route.route_status&amp;1)' src='gui_stop' onclick='navit.route_remove_last_waypoint()'><text>Drop last
@@ -232,9 +229,9 @@ Waypoint</text></img>
                 <osd enabled="yes" type="gps_status" x="-50" y="-40" w="50" h="40" background_color="#000000c8"/>
 
                 <!-- RIGHT CONTROLS -->
-                <osd type="button" x="-65" y="55" command="zoom_in()" src="zoom_in.png" />
+                <osd type="button" x="-65" y="55" command="zoom_in()" src="zoom_in.png" w="64" h="64" />
                 <osd enabled="yes" type="scale" x="-90" y="290" font_size="150" w="100" h="30" align="0"/>
-                <osd type="button" x="-65" y="150" command="zoom_out()" src="zoom_out.xpm"  />
+                <osd type="button" x="-65" y="150" command="zoom_out()" src="zoom_out.xpm" w="64" h="64" />
 
 
                 <!-- Enable/Disable routing information depending upon the route status -->