diff --git a/iphone/Maps/Classes/CustomAlert/MWMOsmAuthAlert.xib b/iphone/Maps/Classes/CustomAlert/MWMOsmAuthAlert.xib
index a2f7652649..8e1c8eab8a 100644
--- a/iphone/Maps/Classes/CustomAlert/MWMOsmAuthAlert.xib
+++ b/iphone/Maps/Classes/CustomAlert/MWMOsmAuthAlert.xib
@@ -1,36 +1,40 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="10117" systemVersion="15G31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11762" systemVersion="16D32" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
     <dependencies>
         <deployment version="2048" identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
         <capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <customFonts key="customFonts">
-        <mutableArray key="HelveticaNeue.ttc">
+        <array key="HelveticaNeue.ttc">
             <string>HelveticaNeue-Medium</string>
-        </mutableArray>
+        </array>
     </customFonts>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
         <view contentMode="scaleToFill" id="J1a-qv-gDF" customClass="MWMOsmAuthAlert">
-            <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+            <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
             <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
             <subviews>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="TM8-yS-nAN" userLabel="ContainerView">
-                    <rect key="frame" x="160" y="103" width="280" height="393"/>
+                    <rect key="frame" x="47.5" y="137" width="280" height="393"/>
                     <subviews>
                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="zn5-ic-jDO" userLabel="Done" customClass="MWMButton">
                             <rect key="frame" x="240" y="0.0" width="40" height="40"/>
-                            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                            <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="40" id="G1f-X1-bIC"/>
                                 <constraint firstAttribute="width" constant="40" id="H82-kb-Oje"/>
                             </constraints>
                             <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="17"/>
                             <state key="normal" image="ic_cancel">
-                                <color key="titleColor" red="0.01176470588" green="0.47843137250000001" blue="1" alpha="1" colorSpace="calibratedRGB"/>
-                                <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                <color key="titleColor" red="0.01176470588" green="0.47843137250000001" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             </state>
                             <userDefinedRuntimeAttributes>
                                 <userDefinedRuntimeAttribute type="string" keyPath="coloringName" value="MWMBlack"/>
@@ -48,7 +52,7 @@
                             <string key="text">Войдите, чтобы ваши изменения увидели 
 другие пользователи</string>
                             <fontDescription key="fontDescription" name="HelveticaNeue-Medium" family="Helvetica Neue" pointSize="17"/>
-                            <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+                            <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             <nil key="highlightedColor"/>
                             <userDefinedRuntimeAttributes>
                                 <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/>
@@ -80,15 +84,19 @@
                                 <action selector="facebookTap" destination="J1a-qv-gDF" eventType="touchUpInside" id="l5P-Sg-dHo"/>
                             </connections>
                         </button>
-                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Gt7-p9-qTx" userLabel="OSM" customClass="MWMButton">
+                        <button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Gt7-p9-qTx" userLabel="OSM" customClass="MWMButton">
                             <rect key="frame" x="20" y="275" width="240" height="44"/>
                             <constraints>
                                 <constraint firstAttribute="width" constant="240" id="FrF-vf-pus"/>
                                 <constraint firstAttribute="height" constant="44" id="U6r-o8-OzE"/>
                             </constraints>
-                            <state key="normal" image="osm_btn_light"/>
+                            <state key="normal" title="OpenStreetMap"/>
                             <userDefinedRuntimeAttributes>
-                                <userDefinedRuntimeAttribute type="string" keyPath="imageName" value="osm_btn"/>
+                                <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="linkBlue"/>
+                                <userDefinedRuntimeAttribute type="string" keyPath="backgroundHighlightedColorName" value="linkBlueHighlighted"/>
+                                <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
+                                    <integer key="value" value="6"/>
+                                </userDefinedRuntimeAttribute>
                             </userDefinedRuntimeAttributes>
                             <connections>
                                 <action selector="osmTap" destination="J1a-qv-gDF" eventType="touchUpInside" id="6yw-kg-9NC"/>
@@ -108,7 +116,7 @@
                                 <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="clearColor"/>
                                 <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="register_at_openstreetmap"/>
                                 <userDefinedRuntimeAttribute type="color" keyPath="layer.borderUIColor">
-                                    <color key="value" red="0.11764705882352941" green="0.58823529411764708" blue="0.94117647058823528" alpha="1" colorSpace="calibratedRGB"/>
+                                    <color key="value" red="0.11764705882352941" green="0.58823529411764708" blue="0.94117647058823528" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 </userDefinedRuntimeAttribute>
                             </userDefinedRuntimeAttributes>
                             <connections>
@@ -165,7 +173,7 @@
                     </variation>
                 </view>
             </subviews>
-            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+            <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
             <constraints>
                 <constraint firstItem="TM8-yS-nAN" firstAttribute="centerX" secondItem="J1a-qv-gDF" secondAttribute="centerX" id="rY8-Ie-aSn"/>
                 <constraint firstItem="TM8-yS-nAN" firstAttribute="centerY" secondItem="J1a-qv-gDF" secondAttribute="centerY" id="t5z-q7-9wM"/>
@@ -180,6 +188,5 @@
         <image name="google_btn_highlighted" width="115" height="44"/>
         <image name="ic_cancel" width="40" height="40"/>
         <image name="img_login" width="120" height="120"/>
-        <image name="osm_btn_light" width="240" height="44"/>
     </resources>
 </document>
diff --git a/iphone/Maps/Images.xcassets/ic_add_dark.imageset/ic_add_dark.png b/iphone/Maps/Images.xcassets/ic_add_dark.imageset/ic_add_dark.png
index 0e5d603e89..38eb56ae34 100644
Binary files a/iphone/Maps/Images.xcassets/ic_add_dark.imageset/ic_add_dark.png and b/iphone/Maps/Images.xcassets/ic_add_dark.imageset/ic_add_dark.png differ
diff --git a/iphone/Maps/Images.xcassets/ic_add_dark.imageset/ic_add_dark@2x.png b/iphone/Maps/Images.xcassets/ic_add_dark.imageset/ic_add_dark@2x.png
index b5310e6d90..b0827cce31 100644
Binary files a/iphone/Maps/Images.xcassets/ic_add_dark.imageset/ic_add_dark@2x.png and b/iphone/Maps/Images.xcassets/ic_add_dark.imageset/ic_add_dark@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/ic_add_dark.imageset/ic_add_dark@3x.png b/iphone/Maps/Images.xcassets/ic_add_dark.imageset/ic_add_dark@3x.png
index 1120f24fbb..1e2ff25e98 100644
Binary files a/iphone/Maps/Images.xcassets/ic_add_dark.imageset/ic_add_dark@3x.png and b/iphone/Maps/Images.xcassets/ic_add_dark.imageset/ic_add_dark@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/ic_add_highlighted_dark.imageset/ic_add_highlighted_dark.png b/iphone/Maps/Images.xcassets/ic_add_highlighted_dark.imageset/ic_add_highlighted_dark.png
index b3b3d186b5..b4e3847bb9 100644
Binary files a/iphone/Maps/Images.xcassets/ic_add_highlighted_dark.imageset/ic_add_highlighted_dark.png and b/iphone/Maps/Images.xcassets/ic_add_highlighted_dark.imageset/ic_add_highlighted_dark.png differ
diff --git a/iphone/Maps/Images.xcassets/ic_add_highlighted_dark.imageset/ic_add_highlighted_dark@2x.png b/iphone/Maps/Images.xcassets/ic_add_highlighted_dark.imageset/ic_add_highlighted_dark@2x.png
index eed057384d..002c5b7fab 100644
Binary files a/iphone/Maps/Images.xcassets/ic_add_highlighted_dark.imageset/ic_add_highlighted_dark@2x.png and b/iphone/Maps/Images.xcassets/ic_add_highlighted_dark.imageset/ic_add_highlighted_dark@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/ic_add_highlighted_dark.imageset/ic_add_highlighted_dark@3x.png b/iphone/Maps/Images.xcassets/ic_add_highlighted_dark.imageset/ic_add_highlighted_dark@3x.png
index 8aa62946ee..3115b356a9 100644
Binary files a/iphone/Maps/Images.xcassets/ic_add_highlighted_dark.imageset/ic_add_highlighted_dark@3x.png and b/iphone/Maps/Images.xcassets/ic_add_highlighted_dark.imageset/ic_add_highlighted_dark@3x.png differ