diff --git a/iphone/Maps/Classes/MapsAppDelegate.mm b/iphone/Maps/Classes/MapsAppDelegate.mm
index aefc5fd8e9..d05d129e1b 100644
--- a/iphone/Maps/Classes/MapsAppDelegate.mm
+++ b/iphone/Maps/Classes/MapsAppDelegate.mm
@@ -22,6 +22,7 @@
 
 #include <sys/xattr.h>
 
+#include "map/gps_tracker.hpp"
 #include "storage/storage_defines.hpp"
 
 #import "platform/http_thread_apple.h"
@@ -47,6 +48,7 @@ static NSString * const kUDWatchEventAlreadyTracked = @"WatchEventAlreadyTracked
 static NSString * const kPushDeviceTokenLogEvent = @"iOSPushDeviceToken";
 static NSString * const kIOSIDFA = @"IFA";
 static NSString * const kBundleVersion = @"BundleVersion";
+static NSString * const kUDEnableTrackingKey = @"EnableTrackingForTheFirstTime";
 
 extern string const kCountryCodeKey;
 extern string const kUniqueIdKey;
@@ -276,6 +278,7 @@ void InitLocalizedStrings()
     [self incrementSessionsCountAndCheckForAlert];
 
   [self enableTTSForTheFirstTime];
+  [self enableTrackingForTheFirstTime];
   [MWMTextToSpeech activateAudioSession];
 
   return returnValue;
@@ -592,6 +595,19 @@ void InitLocalizedStrings()
     return;
   [ud setBool:YES forKey:kUserDafaultsNeedToEnableTTS];
   [ud synchronize];
+  
+}
+
+#pragma mark - Tracks
+
+- (void)enableTrackingForTheFirstTime
+{
+  NSUserDefaults * ud = [NSUserDefaults standardUserDefaults];
+  if ([ud boolForKey:kUDEnableTrackingKey])
+    return;
+  [ud setBool:YES forKey:kUDEnableTrackingKey];
+  [ud synchronize];
+  GpsTracker::Instance().SetDuration(hours(48));
 }
 
 #pragma mark - Standby
diff --git a/iphone/Maps/MWMRecentTrackSettingsController.mm b/iphone/Maps/MWMRecentTrackSettingsController.mm
index a21224ba6a..7cbf98771f 100644
--- a/iphone/Maps/MWMRecentTrackSettingsController.mm
+++ b/iphone/Maps/MWMRecentTrackSettingsController.mm
@@ -11,7 +11,8 @@ typedef NS_ENUM(NSUInteger, DurationInHours)
   Two = 2,
   Six = 6,
   Twelve = 12,
-  Day = 24
+  Day = 24,
+  TwoDays = 48
 };
 
 @interface MWMRecentTrackSettingsController ()
@@ -22,6 +23,7 @@ typedef NS_ENUM(NSUInteger, DurationInHours)
 @property (weak, nonatomic) IBOutlet SelectableCell * sixHours;
 @property (weak, nonatomic) IBOutlet SelectableCell * twelveHours;
 @property (weak, nonatomic) IBOutlet SelectableCell * oneDay;
+@property (weak, nonatomic) IBOutlet SelectableCell * twoDays;
 @property (weak, nonatomic) SelectableCell * selectedCell;
 
 @end
@@ -56,6 +58,9 @@ typedef NS_ENUM(NSUInteger, DurationInHours)
     case Day:
       _selectedCell = self.oneDay;
       break;
+    case TwoDays:
+      _selectedCell = self.twoDays;
+      break;
     default:
       NSAssert(false, @"Incorrect hours value");
       break;
@@ -86,8 +91,10 @@ typedef NS_ENUM(NSUInteger, DurationInHours)
       GpsTracker::Instance().SetDuration(hours(Six));
     else if ([selectedCell isEqual:self.twelveHours])
       GpsTracker::Instance().SetDuration(hours(Twelve));
-    else
+    else if ([selectedCell isEqual:self.oneDay])
       GpsTracker::Instance().SetDuration(hours(Day));
+    else
+      GpsTracker::Instance().SetDuration(hours(TwoDays));
   }
   selectedCell.accessoryType = UITableViewCellAccessoryCheckmark;
 }
diff --git a/iphone/Maps/Mapsme.storyboard b/iphone/Maps/Mapsme.storyboard
index 715a81906a..772416c096 100644
--- a/iphone/Maps/Mapsme.storyboard
+++ b/iphone/Maps/Mapsme.storyboard
@@ -174,7 +174,7 @@
                     <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="static" style="grouped" separatorStyle="default" rowHeight="44" sectionHeaderHeight="18" sectionFooterHeight="18" id="Ai6-eS-WuL">
                         <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="calibratedRGB"/>
+                        <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
                         <sections>
                             <tableViewSection id="0dw-og-Sit">
                                 <cells>
@@ -328,6 +328,31 @@
                                             <outlet property="titleLabel" destination="uhN-0k-BL7" id="9Mv-uo-A5S"/>
                                         </connections>
                                     </tableViewCell>
+                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SelectableCell" id="js7-Hu-EdJ" customClass="SelectableCell">
+                                        <rect key="frame" x="0.0" y="299" width="600" height="44"/>
+                                        <autoresizingMask key="autoresizingMask"/>
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="js7-Hu-EdJ" id="8rz-AY-REp">
+                                            <rect key="frame" x="0.0" y="0.0" width="600" height="43.5"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <subviews>
+                                                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="2 days" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="b4c-Ji-Ctk">
+                                                    <rect key="frame" x="16" y="11" width="477" height="21"/>
+                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                                    <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
+                                            </subviews>
+                                            <constraints>
+                                                <constraint firstAttribute="trailingMargin" secondItem="b4c-Ji-Ctk" secondAttribute="trailing" constant="99" id="Mi8-fq-jsL"/>
+                                                <constraint firstItem="b4c-Ji-Ctk" firstAttribute="top" secondItem="8rz-AY-REp" secondAttribute="topMargin" constant="3" id="dDC-N5-e9p"/>
+                                                <constraint firstItem="b4c-Ji-Ctk" firstAttribute="leading" secondItem="8rz-AY-REp" secondAttribute="leadingMargin" constant="8" id="uur-nG-gmT"/>
+                                                <constraint firstAttribute="bottomMargin" secondItem="b4c-Ji-Ctk" secondAttribute="bottom" constant="3.5" id="x6j-3w-06X"/>
+                                            </constraints>
+                                        </tableViewCellContentView>
+                                        <connections>
+                                            <outlet property="titleLabel" destination="b4c-Ji-Ctk" id="7Tt-gY-BnY"/>
+                                        </connections>
+                                    </tableViewCell>
                                 </cells>
                             </tableViewSection>
                         </sections>
@@ -342,6 +367,7 @@
                         <outlet property="oneHour" destination="8Cq-dm-roX" id="th5-s5-8wh"/>
                         <outlet property="sixHours" destination="1Mm-WA-eyt" id="lsg-lo-4YV"/>
                         <outlet property="twelveHours" destination="JLY-Qt-y88" id="uvV-xr-gOM"/>
+                        <outlet property="twoDays" destination="js7-Hu-EdJ" id="H1o-vQ-re3"/>
                         <outlet property="twoHours" destination="DIL-q2-mUp" id="GBk-7j-k2T"/>
                     </connections>
                 </tableViewController>