diff --git a/iphone/Maps/Core/Theme/Colors.swift b/iphone/Maps/Core/Theme/Colors.swift
index 9ef7d2bdc..42fd89e92 100644
--- a/iphone/Maps/Core/Theme/Colors.swift
+++ b/iphone/Maps/Core/Theme/Colors.swift
@@ -1,7 +1,7 @@
 class DayColors: IColors {
   var clear = UIColor.clear
   var primaryDark = UIColor(24, 128, 68, alpha100)
-  var primary = UIColor(88, 129, 87, alpha100)
+  var primary = UIColor.accent
   var secondary = UIColor(55, 101, 63, alpha100)
   // Light green color
   var primaryLight = UIColor(124, 188, 123, alpha100)
@@ -78,7 +78,7 @@ class NightColors: IColors {
   // Orange color (use for status 15 min in place page)
   var orange =  UIColor(250, 190, 10, alpha100)
   // Blue color (use for links and phone numbers)
-  var linkBlue = UIColor.accent
+  var linkBlue = UIColor.alternativeAccent
   var linkBlueHighlighted = UIColor.accent
   var linkBlueDark = UIColor.accent
   var buttonRed = UIColor(244, 67, 67, alpha100)
diff --git a/iphone/Maps/Images.xcassets/Interface/Alternative Accent Color.colorset/Contents.json b/iphone/Maps/Images.xcassets/Interface/Alternative Accent Color.colorset/Contents.json
index 899da0371..0938ee078 100644
--- a/iphone/Maps/Images.xcassets/Interface/Alternative Accent Color.colorset/Contents.json	
+++ b/iphone/Maps/Images.xcassets/Interface/Alternative Accent Color.colorset/Contents.json	
@@ -23,9 +23,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "0.482",
-          "green" : "0.737",
-          "red" : "0.486"
+          "blue" : "0.392",
+          "green" : "0.580",
+          "red" : "0.396"
         }
       },
       "idiom" : "universal"
diff --git a/iphone/Maps/Images.xcassets/Interface/Place Page/Direction Indicator.imageset/direction_indicator_dark.svg b/iphone/Maps/Images.xcassets/Interface/Place Page/Direction Indicator.imageset/direction_indicator_dark.svg
index 80b420d1c..0704cad91 100644
--- a/iphone/Maps/Images.xcassets/Interface/Place Page/Direction Indicator.imageset/direction_indicator_dark.svg	
+++ b/iphone/Maps/Images.xcassets/Interface/Place Page/Direction Indicator.imageset/direction_indicator_dark.svg	
@@ -1 +1,8 @@
-<svg height="32" viewBox="0 0 33 32" width="33" xmlns="http://www.w3.org/2000/svg"><g fill="none" fill-rule="evenodd" transform="translate(.5)"><circle cx="16" cy="16" fill="#fff" fill-opacity=".1" r="16"/><path d="m16 3.97983342 7 9.99999998-3.912-.00011-1.0307516 14.0404432h-4.1144968l-1.0317516-14.0404432-3.911.00011z" fill="#7cbc7b"/></g></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="33px" height="32px" viewBox="0 0 33 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>direction_indicator_dark</title>
+    <g id="direction_indicator_dark" stroke="none" fill="none" fill-rule="nonzero">
+        <circle id="Oval" fill-opacity="0.1" fill="#FFFFFF" cx="16.5" cy="16" r="16"></circle>
+        <polygon id="Path" fill="#5E8A5D" points="16.5 3.97983342 23.5 13.9798334 19.588 13.9797234 18.5572484 28.0201666 14.4427516 28.0201666 13.411 13.9797234 9.5 13.9798334"></polygon>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/btn_float_more_dark.imageset/Contents.json b/iphone/Maps/Images.xcassets/btn_float_more_dark.imageset/Contents.json
deleted file mode 100644
index fd1fb7b32..000000000
--- a/iphone/Maps/Images.xcassets/btn_float_more_dark.imageset/Contents.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "btn_float_more_dark.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "btn_float_more_dark@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "btn_float_more_dark@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
diff --git a/iphone/Maps/Images.xcassets/btn_float_more_dark.imageset/btn_float_more_dark.png b/iphone/Maps/Images.xcassets/btn_float_more_dark.imageset/btn_float_more_dark.png
deleted file mode 100644
index 654a38427..000000000
Binary files a/iphone/Maps/Images.xcassets/btn_float_more_dark.imageset/btn_float_more_dark.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/btn_float_more_dark.imageset/btn_float_more_dark@2x.png b/iphone/Maps/Images.xcassets/btn_float_more_dark.imageset/btn_float_more_dark@2x.png
deleted file mode 100644
index a42585d50..000000000
Binary files a/iphone/Maps/Images.xcassets/btn_float_more_dark.imageset/btn_float_more_dark@2x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/btn_float_more_dark.imageset/btn_float_more_dark@3x.png b/iphone/Maps/Images.xcassets/btn_float_more_dark.imageset/btn_float_more_dark@3x.png
deleted file mode 100644
index d8113e529..000000000
Binary files a/iphone/Maps/Images.xcassets/btn_float_more_dark.imageset/btn_float_more_dark@3x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/btn_float_more_light.imageset/Contents.json b/iphone/Maps/Images.xcassets/btn_float_more_light.imageset/Contents.json
deleted file mode 100644
index 09279c129..000000000
--- a/iphone/Maps/Images.xcassets/btn_float_more_light.imageset/Contents.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "btn_float_more_light.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "btn_float_more_light@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "btn_float_more_light@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
diff --git a/iphone/Maps/Images.xcassets/btn_float_more_light.imageset/btn_float_more_light.png b/iphone/Maps/Images.xcassets/btn_float_more_light.imageset/btn_float_more_light.png
deleted file mode 100644
index 9d27f4387..000000000
Binary files a/iphone/Maps/Images.xcassets/btn_float_more_light.imageset/btn_float_more_light.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/btn_float_more_light.imageset/btn_float_more_light@2x.png b/iphone/Maps/Images.xcassets/btn_float_more_light.imageset/btn_float_more_light@2x.png
deleted file mode 100644
index 3ec867e7d..000000000
Binary files a/iphone/Maps/Images.xcassets/btn_float_more_light.imageset/btn_float_more_light@2x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/btn_float_more_light.imageset/btn_float_more_light@3x.png b/iphone/Maps/Images.xcassets/btn_float_more_light.imageset/btn_float_more_light@3x.png
deleted file mode 100644
index fb68e57fc..000000000
Binary files a/iphone/Maps/Images.xcassets/btn_float_more_light.imageset/btn_float_more_light@3x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/ic_add_dark.imageset/Contents.json b/iphone/Maps/Images.xcassets/ic_add_dark.imageset/Contents.json
deleted file mode 100644
index 3de423e89..000000000
--- a/iphone/Maps/Images.xcassets/ic_add_dark.imageset/Contents.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "ic_add_dark.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "ic_add_dark@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "ic_add_dark@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
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
deleted file mode 100644
index fd19f1632..000000000
Binary files a/iphone/Maps/Images.xcassets/ic_add_dark.imageset/ic_add_dark.png and /dev/null 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
deleted file mode 100644
index eab5abf0a..000000000
Binary files a/iphone/Maps/Images.xcassets/ic_add_dark.imageset/ic_add_dark@2x.png and /dev/null 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
deleted file mode 100644
index 10092b055..000000000
Binary files a/iphone/Maps/Images.xcassets/ic_add_dark.imageset/ic_add_dark@3x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/ic_add_highlighted_dark.imageset/Contents.json b/iphone/Maps/Images.xcassets/ic_add_highlighted_dark.imageset/Contents.json
deleted file mode 100644
index f9e6c3c11..000000000
--- a/iphone/Maps/Images.xcassets/ic_add_highlighted_dark.imageset/Contents.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "ic_add_highlighted_dark.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "ic_add_highlighted_dark@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "ic_add_highlighted_dark@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
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
deleted file mode 100644
index 09fc5874f..000000000
Binary files a/iphone/Maps/Images.xcassets/ic_add_highlighted_dark.imageset/ic_add_highlighted_dark.png and /dev/null 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
deleted file mode 100644
index e7fe842cb..000000000
Binary files a/iphone/Maps/Images.xcassets/ic_add_highlighted_dark.imageset/ic_add_highlighted_dark@2x.png and /dev/null 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
deleted file mode 100644
index 0453e3a0e..000000000
Binary files a/iphone/Maps/Images.xcassets/ic_add_highlighted_dark.imageset/ic_add_highlighted_dark@3x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/ic_add_highlighted_light.imageset/Contents.json b/iphone/Maps/Images.xcassets/ic_add_highlighted_light.imageset/Contents.json
deleted file mode 100644
index 78fc4dce8..000000000
--- a/iphone/Maps/Images.xcassets/ic_add_highlighted_light.imageset/Contents.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "ic_add_highlighted_light.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "ic_add_highlighted_light@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "ic_add_highlighted_light@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
diff --git a/iphone/Maps/Images.xcassets/ic_add_highlighted_light.imageset/ic_add_highlighted_light.png b/iphone/Maps/Images.xcassets/ic_add_highlighted_light.imageset/ic_add_highlighted_light.png
deleted file mode 100644
index 0db242a70..000000000
Binary files a/iphone/Maps/Images.xcassets/ic_add_highlighted_light.imageset/ic_add_highlighted_light.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/ic_add_highlighted_light.imageset/ic_add_highlighted_light@2x.png b/iphone/Maps/Images.xcassets/ic_add_highlighted_light.imageset/ic_add_highlighted_light@2x.png
deleted file mode 100644
index 25f65abb6..000000000
Binary files a/iphone/Maps/Images.xcassets/ic_add_highlighted_light.imageset/ic_add_highlighted_light@2x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/ic_add_highlighted_light.imageset/ic_add_highlighted_light@3x.png b/iphone/Maps/Images.xcassets/ic_add_highlighted_light.imageset/ic_add_highlighted_light@3x.png
deleted file mode 100644
index e50eb98c9..000000000
Binary files a/iphone/Maps/Images.xcassets/ic_add_highlighted_light.imageset/ic_add_highlighted_light@3x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/ic_add_light.imageset/Contents.json b/iphone/Maps/Images.xcassets/ic_add_light.imageset/Contents.json
deleted file mode 100644
index 51d4538ae..000000000
--- a/iphone/Maps/Images.xcassets/ic_add_light.imageset/Contents.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "ic_add_light.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "ic_add_light@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "ic_add_light@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
diff --git a/iphone/Maps/Images.xcassets/ic_add_light.imageset/ic_add_light.png b/iphone/Maps/Images.xcassets/ic_add_light.imageset/ic_add_light.png
deleted file mode 100644
index 903dad675..000000000
Binary files a/iphone/Maps/Images.xcassets/ic_add_light.imageset/ic_add_light.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/ic_add_light.imageset/ic_add_light@2x.png b/iphone/Maps/Images.xcassets/ic_add_light.imageset/ic_add_light@2x.png
deleted file mode 100644
index 903d11fb3..000000000
Binary files a/iphone/Maps/Images.xcassets/ic_add_light.imageset/ic_add_light@2x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/ic_add_light.imageset/ic_add_light@3x.png b/iphone/Maps/Images.xcassets/ic_add_light.imageset/ic_add_light@3x.png
deleted file mode 100644
index 360216190..000000000
Binary files a/iphone/Maps/Images.xcassets/ic_add_light.imageset/ic_add_light@3x.png and /dev/null differ
diff --git a/iphone/Maps/UI/Editor/Cells/MWMEditorAddAdditionalNameTableViewCell.xib b/iphone/Maps/UI/Editor/Cells/MWMEditorAddAdditionalNameTableViewCell.xib
index b983448fa..785391766 100644
--- a/iphone/Maps/UI/Editor/Cells/MWMEditorAddAdditionalNameTableViewCell.xib
+++ b/iphone/Maps/UI/Editor/Cells/MWMEditorAddAdditionalNameTableViewCell.xib
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="23727" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina6_12" orientation="portrait" appearance="light"/>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23721"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -21,9 +23,8 @@
                         </constraints>
                         <inset key="contentEdgeInsets" minX="12" minY="0.0" maxX="0.0" maxY="0.0"/>
                         <inset key="titleEdgeInsets" minX="14" minY="0.0" maxX="0.0" maxY="0.0"/>
-                        <state key="normal" title="add_language" image="ic_add_light"/>
+                        <state key="normal" title="add_language" image="plus.circle.fill" catalog="system"/>
                         <userDefinedRuntimeAttributes>
-                            <userDefinedRuntimeAttribute type="string" keyPath="imageName" value="ic_add"/>
                             <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="FlatNormalTransButtonBig"/>
                             <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="add_language"/>
                         </userDefinedRuntimeAttributes>
@@ -49,6 +50,6 @@
         </tableViewCell>
     </objects>
     <resources>
-        <image name="ic_add_light" width="22" height="22"/>
+        <image name="plus.circle.fill" catalog="system" width="128" height="123"/>
     </resources>
 </document>
diff --git a/iphone/Maps/UI/PlacePage/PlacePage.storyboard b/iphone/Maps/UI/PlacePage/PlacePage.storyboard
index 8e423a15f..613671100 100644
--- a/iphone/Maps/UI/PlacePage/PlacePage.storyboard
+++ b/iphone/Maps/UI/PlacePage/PlacePage.storyboard
@@ -1118,14 +1118,13 @@
                                                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="7vg-3k-GS4">
                                                     <rect key="frame" x="0.0" y="55" width="160" height="84"/>
                                                     <subviews>
-                                                        <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="vRP-2J-LW2">
-                                                            <rect key="frame" x="52" y="0.0" width="56" height="56"/>
+                                                        <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="arrow.forward.circle.fill" catalog="system" translatesAutoresizingMaskIntoConstraints="NO" id="vRP-2J-LW2">
+                                                            <rect key="frame" x="52" y="0.5" width="56" height="55"/>
                                                             <constraints>
                                                                 <constraint firstAttribute="width" constant="56" id="NDQ-ud-eh3"/>
                                                                 <constraint firstAttribute="height" constant="56" id="qBt-XP-S5F"/>
                                                             </constraints>
                                                             <userDefinedRuntimeAttributes>
-                                                                <userDefinedRuntimeAttribute type="string" keyPath="mwm_name" value="btn_float_more"/>
                                                                 <userDefinedRuntimeAttribute type="string" keyPath="coloring" value="MWMOther"/>
                                                             </userDefinedRuntimeAttributes>
                                                         </imageView>
@@ -1493,6 +1492,7 @@
     </scenes>
     <resources>
         <image name="Place Page/Direction Indicator" width="32" height="32"/>
+        <image name="arrow.forward.circle.fill" catalog="system" width="128" height="123"/>
         <image name="dialog_btn_press" width="280" height="44"/>
         <image name="ic_arrow_gray_down" width="28" height="28"/>
         <image name="ic_operator" width="28" height="28"/>