diff --git a/iphone/Maps/MainWindow.xib b/iphone/Maps/MainWindow.xib
index 3e85a9f5df..7427d3d0ea 100644
--- a/iphone/Maps/MainWindow.xib
+++ b/iphone/Maps/MainWindow.xib
@@ -48,6 +48,7 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{10, 435}, {40, 40}}</string>
 							<reference key="NSSuperview" ref="53915144"/>
+							<reference key="NSWindow"/>
 							<reference key="NSNextKeyView" ref="23888313"/>
 							<string key="NSReuseIdentifierKey">_NS:222</string>
 							<bool key="IBUIOpaque">NO</bool>
@@ -55,7 +56,6 @@
 							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 							<int key="IBUIContentHorizontalAlignment">0</int>
 							<int key="IBUIContentVerticalAlignment">0</int>
-							<int key="IBUIButtonType">1</int>
 							<object class="NSColor" key="IBUIHighlightedTitleColor" id="933778228">
 								<int key="NSColorSpace">3</int>
 								<bytes key="NSWhite">MQA</bytes>
@@ -68,6 +68,10 @@
 								<int key="NSColorSpace">3</int>
 								<bytes key="NSWhite">MC41AA</bytes>
 							</object>
+							<object class="NSCustomResource" key="IBUIHighlightedImage">
+								<string key="NSClassName">NSImage</string>
+								<string key="NSResourceName">location-highlighted.png</string>
+							</object>
 							<object class="NSCustomResource" key="IBUISelectedImage">
 								<string key="NSClassName">NSImage</string>
 								<string key="NSResourceName">location-search.png</string>
@@ -93,6 +97,7 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{60, 435}, {40, 40}}</string>
 							<reference key="NSSuperview" ref="53915144"/>
+							<reference key="NSWindow"/>
 							<reference key="NSNextKeyView" ref="773974234"/>
 							<string key="NSReuseIdentifierKey">_NS:222</string>
 							<bool key="IBUIOpaque">NO</bool>
@@ -100,13 +105,16 @@
 							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 							<int key="IBUIContentHorizontalAlignment">0</int>
 							<int key="IBUIContentVerticalAlignment">0</int>
-							<int key="IBUIButtonType">1</int>
 							<reference key="IBUIHighlightedTitleColor" ref="933778228"/>
 							<object class="NSColor" key="IBUINormalTitleColor">
 								<int key="NSColorSpace">1</int>
 								<bytes key="NSRGB">MC4xOTYwNzg0MzE0IDAuMzA5ODAzOTIxNiAwLjUyMTU2ODYyNzUAA</bytes>
 							</object>
 							<reference key="IBUINormalTitleShadowColor" ref="538042181"/>
+							<object class="NSCustomResource" key="IBUIHighlightedImage">
+								<string key="NSClassName">NSImage</string>
+								<string key="NSResourceName">search-highlighted.png</string>
+							</object>
 							<object class="NSCustomResource" key="IBUINormalImage">
 								<string key="NSClassName">NSImage</string>
 								<string key="NSResourceName">search.png</string>
@@ -119,19 +127,24 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{110, 435}, {40, 40}}</string>
 							<reference key="NSSuperview" ref="53915144"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView"/>
 							<string key="NSReuseIdentifierKey">_NS:222</string>
 							<bool key="IBUIOpaque">NO</bool>
 							<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
 							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 							<int key="IBUIContentHorizontalAlignment">0</int>
 							<int key="IBUIContentVerticalAlignment">0</int>
-							<int key="IBUIButtonType">1</int>
 							<reference key="IBUIHighlightedTitleColor" ref="933778228"/>
 							<object class="NSColor" key="IBUINormalTitleColor">
 								<int key="NSColorSpace">1</int>
 								<bytes key="NSRGB">MC4xOTYwNzg0MzE0IDAuMzA5ODAzOTIxNiAwLjUyMTU2ODYyNzUAA</bytes>
 							</object>
 							<reference key="IBUINormalTitleShadowColor" ref="538042181"/>
+							<object class="NSCustomResource" key="IBUIHighlightedImage">
+								<string key="NSClassName">NSImage</string>
+								<string key="NSResourceName">downloader-highlighted.png</string>
+							</object>
 							<object class="NSCustomResource" key="IBUINormalImage">
 								<string key="NSClassName">NSImage</string>
 								<string key="NSResourceName">downloader.png</string>
@@ -142,6 +155,7 @@
 					</array>
 					<string key="NSFrame">{{0, 20}, {320, 480}}</string>
 					<reference key="NSSuperview"/>
+					<reference key="NSWindow"/>
 					<reference key="NSNextKeyView" ref="803813744"/>
 					<object class="NSColor" key="IBUIBackgroundColor">
 						<int key="NSColorSpace">3</int>
@@ -169,6 +183,8 @@
 				<object class="NSPSMatrix" key="NSFrameMatrix"/>
 				<string key="NSFrameSize">{320, 480}</string>
 				<reference key="NSSuperview"/>
+				<reference key="NSWindow"/>
+				<reference key="NSNextKeyView"/>
 				<object class="NSColor" key="IBUIBackgroundColor">
 					<int key="NSColorSpace">1</int>
 					<bytes key="NSRGB">MSAxIDEAA</bytes>
@@ -328,10 +344,10 @@
 				<string key="2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="200.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<real value="2" key="200.IBUIButtonInspectorSelectedEdgeInsetMetadataKey"/>
-				<real value="2" key="200.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
+				<real value="0.0" key="200.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
 				<string key="201.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<real value="0.0" key="201.IBUIButtonInspectorSelectedEdgeInsetMetadataKey"/>
-				<real value="0.0" key="201.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
+				<real value="3" key="201.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
 				<string key="202.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<real value="0.0" key="202.IBUIButtonInspectorSelectedEdgeInsetMetadataKey"/>
 				<real value="0.0" key="202.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
@@ -346,6 +362,14 @@
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
+				<object class="IBPartialClassDescription">
+					<string key="className">EAGLView</string>
+					<string key="superclassName">UIView</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/EAGLView.h</string>
+					</object>
+				</object>
 				<object class="IBPartialClassDescription">
 					<string key="className">FirstResponder</string>
 					<dictionary class="NSMutableDictionary" key="actions">
@@ -372,6 +396,66 @@
 						<string key="minorKey"/>
 					</object>
 				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">MapViewController</string>
+					<string key="superclassName">UIViewController</string>
+					<dictionary class="NSMutableDictionary" key="actions">
+						<string key="OnMyPositionClicked:">id</string>
+						<string key="OnSearchClicked:">id</string>
+						<string key="OnSettingsClicked:">id</string>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="actionInfosByName">
+						<object class="IBActionInfo" key="OnMyPositionClicked:">
+							<string key="name">OnMyPositionClicked:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="OnSearchClicked:">
+							<string key="name">OnSearchClicked:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="OnSettingsClicked:">
+							<string key="name">OnSettingsClicked:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+					</dictionary>
+					<object class="NSMutableDictionary" key="outlets">
+						<string key="NS.key.0">m_myPositionButton</string>
+						<string key="NS.object.0">UIButton</string>
+					</object>
+					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<string key="NS.key.0">m_myPositionButton</string>
+						<object class="IBToOneOutletInfo" key="NS.object.0">
+							<string key="name">m_myPositionButton</string>
+							<string key="candidateClassName">UIButton</string>
+						</object>
+					</object>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/MapViewController.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">MapsAppDelegate</string>
+					<string key="superclassName">NSObject</string>
+					<dictionary class="NSMutableDictionary" key="outlets">
+						<string key="m_mapViewController">MapViewController</string>
+						<string key="m_window">UIWindow</string>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<object class="IBToOneOutletInfo" key="m_mapViewController">
+							<string key="name">m_mapViewController</string>
+							<string key="candidateClassName">MapViewController</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="m_window">
+							<string key="name">m_window</string>
+							<string key="candidateClassName">UIWindow</string>
+						</object>
+					</dictionary>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/MapsAppDelegate.h</string>
+					</object>
+				</object>
 			</array>
 		</object>
 		<int key="IBDocument.localizationMode">0</int>
@@ -391,10 +475,13 @@
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
 		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
-			<string key="downloader.png">{24, 24}</string>
-			<string key="location-search.png">{20, 20}</string>
-			<string key="location.png">{20, 20}</string>
-			<string key="search.png">{24, 24}</string>
+			<string key="downloader-highlighted.png">{48, 48}</string>
+			<string key="downloader.png">{48, 48}</string>
+			<string key="location-highlighted.png">{48, 48}</string>
+			<string key="location-search.png">{48, 48}</string>
+			<string key="location.png">{48, 48}</string>
+			<string key="search-highlighted.png">{48, 48}</string>
+			<string key="search.png">{48, 48}</string>
 		</dictionary>
 		<string key="IBCocoaTouchPluginVersion">933</string>
 	</data>
diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj
index a27f157314..3e8b8d8aab 100644
--- a/iphone/Maps/Maps.xcodeproj/project.pbxproj
+++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj
@@ -58,6 +58,12 @@
 		FA0660041286168700FEA989 /* Default-Landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = FA0660021286168700FEA989 /* Default-Landscape.png */; };
 		FA09E01113F71F6C007E69CA /* SearchVC.mm in Sources */ = {isa = PBXBuildFile; fileRef = FA09E01013F71F6C007E69CA /* SearchVC.mm */; };
 		FA0E845E138554CF008CEABB /* languages.txt in Resources */ = {isa = PBXBuildFile; fileRef = FA0E845D138554CF008CEABB /* languages.txt */; };
+		FA1FB8A1147E8CA50052848B /* downloader-highlighted.png in Resources */ = {isa = PBXBuildFile; fileRef = FA1FB89B147E8CA50052848B /* downloader-highlighted.png */; };
+		FA1FB8A2147E8CA50052848B /* downloader-highlighted@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FA1FB89C147E8CA50052848B /* downloader-highlighted@2x.png */; };
+		FA1FB8A3147E8CA50052848B /* location-highlighted.png in Resources */ = {isa = PBXBuildFile; fileRef = FA1FB89D147E8CA50052848B /* location-highlighted.png */; };
+		FA1FB8A4147E8CA50052848B /* location-highlighted@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FA1FB89E147E8CA50052848B /* location-highlighted@2x.png */; };
+		FA1FB8A5147E8CA50052848B /* search-highlighted.png in Resources */ = {isa = PBXBuildFile; fileRef = FA1FB89F147E8CA50052848B /* search-highlighted.png */; };
+		FA1FB8A6147E8CA50052848B /* search-highlighted@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FA1FB8A0147E8CA50052848B /* search-highlighted@2x.png */; };
 		FA29FDAA141E77F8004ADF66 /* Preferences.mm in Sources */ = {isa = PBXBuildFile; fileRef = FA29FDA9141E77F8004ADF66 /* Preferences.mm */; };
 		FA2EF9C713630C3B00E3E484 /* libplatform.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FA2EF9C613630C3B00E3E484 /* libplatform.a */; };
 		FA34BECA1338D72F00FFB2A7 /* CustomAlertView.mm in Sources */ = {isa = PBXBuildFile; fileRef = FA34BEC81338D72F00FFB2A7 /* CustomAlertView.mm */; };
@@ -663,6 +669,12 @@
 		FA09E00F13F71F6C007E69CA /* SearchVC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SearchVC.h; sourceTree = "<group>"; };
 		FA09E01013F71F6C007E69CA /* SearchVC.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = SearchVC.mm; sourceTree = "<group>"; };
 		FA0E845D138554CF008CEABB /* languages.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = languages.txt; path = ../../data/languages.txt; sourceTree = SOURCE_ROOT; };
+		FA1FB89B147E8CA50052848B /* downloader-highlighted.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "downloader-highlighted.png"; sourceTree = "<group>"; };
+		FA1FB89C147E8CA50052848B /* downloader-highlighted@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "downloader-highlighted@2x.png"; sourceTree = "<group>"; };
+		FA1FB89D147E8CA50052848B /* location-highlighted.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "location-highlighted.png"; sourceTree = "<group>"; };
+		FA1FB89E147E8CA50052848B /* location-highlighted@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "location-highlighted@2x.png"; sourceTree = "<group>"; };
+		FA1FB89F147E8CA50052848B /* search-highlighted.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "search-highlighted.png"; sourceTree = "<group>"; };
+		FA1FB8A0147E8CA50052848B /* search-highlighted@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "search-highlighted@2x.png"; sourceTree = "<group>"; };
 		FA29FDA8141E77F8004ADF66 /* Preferences.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Preferences.h; path = Settings/Preferences.h; sourceTree = "<group>"; };
 		FA29FDA9141E77F8004ADF66 /* Preferences.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = Preferences.mm; path = Settings/Preferences.mm; sourceTree = "<group>"; };
 		FA2EF9C613630C3B00E3E484 /* libplatform.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libplatform.a; sourceTree = SOURCE_ROOT; };
@@ -1309,6 +1321,12 @@
 		29B97317FDCFA39411CA2CEA /* Resources */ = {
 			isa = PBXGroup;
 			children = (
+				FA1FB89B147E8CA50052848B /* downloader-highlighted.png */,
+				FA1FB89C147E8CA50052848B /* downloader-highlighted@2x.png */,
+				FA1FB89D147E8CA50052848B /* location-highlighted.png */,
+				FA1FB89E147E8CA50052848B /* location-highlighted@2x.png */,
+				FA1FB89F147E8CA50052848B /* search-highlighted.png */,
+				FA1FB8A0147E8CA50052848B /* search-highlighted@2x.png */,
 				FA7A0ECE1472DA3E00E57AD3 /* InfoPlist.strings */,
 				FA99CB71147089B100689A9A /* Localizable.strings */,
 				490830531426B0900088EE84 /* downloader.png */,
@@ -2575,6 +2593,12 @@
 				FA99CB73147089B100689A9A /* Localizable.strings in Resources */,
 				FA7A0ECD1472DA0000E57AD3 /* drules_proto.txt in Resources */,
 				FA7A0ED01472DA3E00E57AD3 /* InfoPlist.strings in Resources */,
+				FA1FB8A1147E8CA50052848B /* downloader-highlighted.png in Resources */,
+				FA1FB8A2147E8CA50052848B /* downloader-highlighted@2x.png in Resources */,
+				FA1FB8A3147E8CA50052848B /* location-highlighted.png in Resources */,
+				FA1FB8A4147E8CA50052848B /* location-highlighted@2x.png in Resources */,
+				FA1FB8A5147E8CA50052848B /* search-highlighted.png in Resources */,
+				FA1FB8A6147E8CA50052848B /* search-highlighted@2x.png in Resources */,
 				F7FDD823147F30CC005900FA /* drules_proto.bin in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
diff --git a/iphone/Maps/downloader-highlighted.png b/iphone/Maps/downloader-highlighted.png
new file mode 100644
index 0000000000..a15cf262a9
Binary files /dev/null and b/iphone/Maps/downloader-highlighted.png differ
diff --git a/iphone/Maps/downloader-highlighted@2x.png b/iphone/Maps/downloader-highlighted@2x.png
new file mode 100644
index 0000000000..e12074f632
Binary files /dev/null and b/iphone/Maps/downloader-highlighted@2x.png differ
diff --git a/iphone/Maps/downloader.png b/iphone/Maps/downloader.png
index 6556e5d60d..996808a0b8 100644
Binary files a/iphone/Maps/downloader.png and b/iphone/Maps/downloader.png differ
diff --git a/iphone/Maps/downloader@2x.png b/iphone/Maps/downloader@2x.png
index 7d51599f62..b5e1f8ae54 100644
Binary files a/iphone/Maps/downloader@2x.png and b/iphone/Maps/downloader@2x.png differ
diff --git a/iphone/Maps/location-highlighted.png b/iphone/Maps/location-highlighted.png
new file mode 100644
index 0000000000..80a9f22bf9
Binary files /dev/null and b/iphone/Maps/location-highlighted.png differ
diff --git a/iphone/Maps/location-highlighted@2x.png b/iphone/Maps/location-highlighted@2x.png
new file mode 100644
index 0000000000..3c13bb75df
Binary files /dev/null and b/iphone/Maps/location-highlighted@2x.png differ
diff --git a/iphone/Maps/location-search.png b/iphone/Maps/location-search.png
index 623e4e951f..80a9f22bf9 100644
Binary files a/iphone/Maps/location-search.png and b/iphone/Maps/location-search.png differ
diff --git a/iphone/Maps/location-search@2x.png b/iphone/Maps/location-search@2x.png
index b7e9cf893b..3c13bb75df 100644
Binary files a/iphone/Maps/location-search@2x.png and b/iphone/Maps/location-search@2x.png differ
diff --git a/iphone/Maps/location-selected.png b/iphone/Maps/location-selected.png
index 34f93935fa..8b6e7fa175 100644
Binary files a/iphone/Maps/location-selected.png and b/iphone/Maps/location-selected.png differ
diff --git a/iphone/Maps/location-selected@2x.png b/iphone/Maps/location-selected@2x.png
index 5c4a8c4854..541617a975 100644
Binary files a/iphone/Maps/location-selected@2x.png and b/iphone/Maps/location-selected@2x.png differ
diff --git a/iphone/Maps/location.png b/iphone/Maps/location.png
index 96b1a947f0..753095e3a1 100644
Binary files a/iphone/Maps/location.png and b/iphone/Maps/location.png differ
diff --git a/iphone/Maps/location@2x.png b/iphone/Maps/location@2x.png
index 85ddf32cca..b52455c6c8 100644
Binary files a/iphone/Maps/location@2x.png and b/iphone/Maps/location@2x.png differ
diff --git a/iphone/Maps/search-highlighted.png b/iphone/Maps/search-highlighted.png
new file mode 100644
index 0000000000..7feb9292a1
Binary files /dev/null and b/iphone/Maps/search-highlighted.png differ
diff --git a/iphone/Maps/search-highlighted@2x.png b/iphone/Maps/search-highlighted@2x.png
new file mode 100644
index 0000000000..e599fc7bdc
Binary files /dev/null and b/iphone/Maps/search-highlighted@2x.png differ
diff --git a/iphone/Maps/search.png b/iphone/Maps/search.png
index 9bcc44cc9a..3a49ba9243 100644
Binary files a/iphone/Maps/search.png and b/iphone/Maps/search.png differ
diff --git a/iphone/Maps/search@2x.png b/iphone/Maps/search@2x.png
index a783f3bc37..8b102039e9 100644
Binary files a/iphone/Maps/search@2x.png and b/iphone/Maps/search@2x.png differ