diff --git a/iphone/Maps/Bookmarks/BookmarksRootVC.mm b/iphone/Maps/Bookmarks/BookmarksRootVC.mm
index 82d49d0d9d..498a46fcb6 100644
--- a/iphone/Maps/Bookmarks/BookmarksRootVC.mm
+++ b/iphone/Maps/Bookmarks/BookmarksRootVC.mm
@@ -2,7 +2,6 @@
 #import "BookmarksVC.h"
 #import "MWMCommon.h"
 #import "Statistics.h"
-#import "UIColor+MapsMeColor.h"
 #import "UIImageView+Coloring.h"
 
 #include "Framework.h"
diff --git a/iphone/Maps/Bookmarks/BookmarksVC.mm b/iphone/Maps/Bookmarks/BookmarksVC.mm
index e4ae898e17..72692c75ac 100644
--- a/iphone/Maps/Bookmarks/BookmarksVC.mm
+++ b/iphone/Maps/Bookmarks/BookmarksVC.mm
@@ -10,7 +10,6 @@
 #import "MapViewController.h"
 #import "MapsAppDelegate.h"
 #import "Statistics.h"
-#import "UIColor+MapsMeColor.h"
 
 #include "Framework.h"
 
diff --git a/iphone/Maps/Categories/CALayer+RuntimeAttributes.mm b/iphone/Maps/Categories/CALayer+RuntimeAttributes.mm
index f7fb0b7833..36dfb07dfd 100644
--- a/iphone/Maps/Categories/CALayer+RuntimeAttributes.mm
+++ b/iphone/Maps/Categories/CALayer+RuntimeAttributes.mm
@@ -1,5 +1,4 @@
 #import "CALayer+RuntimeAttributes.h"
-#import "UIColor+MapsMeColor.h"
 
 @implementation CALayer (RuntimeAttributes)
 
diff --git a/iphone/Maps/Categories/UIButton+RuntimeAttributes.mm b/iphone/Maps/Categories/UIButton+RuntimeAttributes.mm
index 2cc2480547..f83c4ffb57 100644
--- a/iphone/Maps/Categories/UIButton+RuntimeAttributes.mm
+++ b/iphone/Maps/Categories/UIButton+RuntimeAttributes.mm
@@ -1,7 +1,5 @@
 #import <objc/runtime.h>
 #import "UIButton+RuntimeAttributes.h"
-#import "UIColor+MapsMeColor.h"
-#import "UIFont+MapsMeFonts.h"
 
 @implementation UIButton (RuntimeAttributes)
 
diff --git a/iphone/Maps/Categories/UIFont+MapsMeFonts.mm b/iphone/Maps/Categories/UIFont+MapsMeFonts.mm
index 8ca8f33808..6d8e5ae4e8 100644
--- a/iphone/Maps/Categories/UIFont+MapsMeFonts.mm
+++ b/iphone/Maps/Categories/UIFont+MapsMeFonts.mm
@@ -1,5 +1,4 @@
 #import "MWMCommon.h"
-#import "UIFont+MapsMeFonts.h"
 
 NSString * const kMediumFontName = @"HelveticaNeue-Medium";
 NSString * const kLightFontName = @"HelveticaNeue-Light";
diff --git a/iphone/Maps/Categories/UIImageView+Coloring.mm b/iphone/Maps/Categories/UIImageView+Coloring.mm
index d1df0896ac..2f98cad71a 100644
--- a/iphone/Maps/Categories/UIImageView+Coloring.mm
+++ b/iphone/Maps/Categories/UIImageView+Coloring.mm
@@ -1,5 +1,4 @@
 #import "MWMCommon.h"
-#import "UIColor+MapsMeColor.h"
 #import "UIImageView+Coloring.h"
 
 #import <objc/runtime.h>
diff --git a/iphone/Maps/Categories/UIKitCategories.mm b/iphone/Maps/Categories/UIKitCategories.mm
index 7d8f465541..cb973c67bf 100644
--- a/iphone/Maps/Categories/UIKitCategories.mm
+++ b/iphone/Maps/Categories/UIKitCategories.mm
@@ -1,7 +1,6 @@
 #import "UIKitCategories.h"
 #import "MWMCommon.h"
 #import "UIButton+RuntimeAttributes.h"
-#import "UIColor+MapsMeColor.h"
 #import "UIImageView+Coloring.h"
 
 #import <Crashlytics/Crashlytics.h>
diff --git a/iphone/Maps/Categories/UILabel+RuntimeAttributes.mm b/iphone/Maps/Categories/UILabel+RuntimeAttributes.mm
index 4dc885cad3..8ac440368a 100644
--- a/iphone/Maps/Categories/UILabel+RuntimeAttributes.mm
+++ b/iphone/Maps/Categories/UILabel+RuntimeAttributes.mm
@@ -1,6 +1,4 @@
 #import "UILabel+RuntimeAttributes.h"
-#import "UIFont+MapsMeFonts.h"
-#import "UIColor+MapsMeColor.h"
 
 // Runtime attributes for setting localized text in Xib.
 
diff --git a/iphone/Maps/Categories/UISwitch+RuntimeAttributes.m b/iphone/Maps/Categories/UISwitch+RuntimeAttributes.m
index b3e7fccd12..15f397975c 100644
--- a/iphone/Maps/Categories/UISwitch+RuntimeAttributes.m
+++ b/iphone/Maps/Categories/UISwitch+RuntimeAttributes.m
@@ -1,5 +1,4 @@
 #import "UISwitch+RuntimeAttributes.h"
-#import "UIColor+MapsMeColor.h"
 
 @implementation UISwitch (RuntimeAttributes)
 
diff --git a/iphone/Maps/Categories/UITextField+RuntimeAttributes.mm b/iphone/Maps/Categories/UITextField+RuntimeAttributes.mm
index b1994c242f..50d2d78ccb 100644
--- a/iphone/Maps/Categories/UITextField+RuntimeAttributes.mm
+++ b/iphone/Maps/Categories/UITextField+RuntimeAttributes.mm
@@ -1,6 +1,4 @@
 #import "MWMInputValidatorFactory.h"
-#import "UIColor+MapsMeColor.h"
-#import "UIFont+MapsMeFonts.h"
 #import "UITextField+RuntimeAttributes.h"
 #import <objc/runtime.h>
 
diff --git a/iphone/Maps/Categories/UITextView+RuntimeAttributes.mm b/iphone/Maps/Categories/UITextView+RuntimeAttributes.mm
index 9dc3a33ca1..00a9ce7074 100644
--- a/iphone/Maps/Categories/UITextView+RuntimeAttributes.mm
+++ b/iphone/Maps/Categories/UITextView+RuntimeAttributes.mm
@@ -1,6 +1,4 @@
-#import "UIFont+MapsMeFonts.h"
 #import "UITextView+RuntimeAttributes.h"
-#import "UIColor+MapsMeColor.h"
 
 @implementation UITextView (RuntimeAttributes)
 
diff --git a/iphone/Maps/Categories/UIView+RuntimeAttributes.mm b/iphone/Maps/Categories/UIView+RuntimeAttributes.mm
index f0b81bb195..da1e96a6dd 100644
--- a/iphone/Maps/Categories/UIView+RuntimeAttributes.mm
+++ b/iphone/Maps/Categories/UIView+RuntimeAttributes.mm
@@ -1,4 +1,3 @@
-#import "UIColor+MapsMeColor.h"
 #import "UIView+RuntimeAttributes.h"
 
 @implementation UIView  (RuntimeAttributes)
diff --git a/iphone/Maps/Classes/AddSetTableViewCell.mm b/iphone/Maps/Classes/AddSetTableViewCell.mm
index cca0f15548..4f7ce28c58 100644
--- a/iphone/Maps/Classes/AddSetTableViewCell.mm
+++ b/iphone/Maps/Classes/AddSetTableViewCell.mm
@@ -1,5 +1,4 @@
 #import "AddSetTableViewCell.h"
-#import "UIColor+MapsMeColor.h"
 
 @interface AddSetTableViewCell () <UITextFieldDelegate>
 
diff --git a/iphone/Maps/Classes/Components/MWMButton.mm b/iphone/Maps/Classes/Components/MWMButton.mm
index c6474f3a0d..448b9e7ae3 100644
--- a/iphone/Maps/Classes/Components/MWMButton.mm
+++ b/iphone/Maps/Classes/Components/MWMButton.mm
@@ -1,6 +1,5 @@
 #import "MWMCommon.h"
 #import "MWMButton.h"
-#import "UIColor+MapsMeColor.h"
 
 namespace
 {
diff --git a/iphone/Maps/Classes/Components/MWMMailViewController.mm b/iphone/Maps/Classes/Components/MWMMailViewController.mm
index 32eba659b4..038436e11c 100644
--- a/iphone/Maps/Classes/Components/MWMMailViewController.mm
+++ b/iphone/Maps/Classes/Components/MWMMailViewController.mm
@@ -1,7 +1,6 @@
 #import "MWMMailViewController.h"
 #import "MWMCommon.h"
 #import "MWMToast.h"
-#import "UIColor+MapsMeColor.h"
 
 @implementation MWMMailViewController
 
diff --git a/iphone/Maps/Classes/Components/MWMNavigationController.mm b/iphone/Maps/Classes/Components/MWMNavigationController.mm
index a1d6d45cd3..b3a9bd2978 100644
--- a/iphone/Maps/Classes/Components/MWMNavigationController.mm
+++ b/iphone/Maps/Classes/Components/MWMNavigationController.mm
@@ -3,7 +3,6 @@
 #import "MWMController.h"
 #import "MWMToast.h"
 #import "MapsAppDelegate.h"
-#import "UIColor+MapsMeColor.h"
 #import "UIViewController+Navigation.h"
 
 #import <SafariServices/SafariServices.h>
diff --git a/iphone/Maps/Classes/Components/MWMStartButton.mm b/iphone/Maps/Classes/Components/MWMStartButton.mm
index 07280d866a..1c921e44c9 100644
--- a/iphone/Maps/Classes/Components/MWMStartButton.mm
+++ b/iphone/Maps/Classes/Components/MWMStartButton.mm
@@ -1,5 +1,4 @@
 #import "MWMStartButton.h"
-#import "UIColor+MapsMeColor.h"
 
 @implementation MWMStartButton
 
diff --git a/iphone/Maps/Classes/Components/MWMStopButton.mm b/iphone/Maps/Classes/Components/MWMStopButton.mm
index 42ec97c949..5c0b1fb43d 100644
--- a/iphone/Maps/Classes/Components/MWMStopButton.mm
+++ b/iphone/Maps/Classes/Components/MWMStopButton.mm
@@ -1,5 +1,4 @@
 #import "MWMStopButton.h"
-#import "UIColor+MapsMeColor.h"
 
 @implementation MWMStopButton
 
diff --git a/iphone/Maps/Classes/Components/MWMTableViewController.mm b/iphone/Maps/Classes/Components/MWMTableViewController.mm
index eaa9541580..d6287b9b20 100644
--- a/iphone/Maps/Classes/Components/MWMTableViewController.mm
+++ b/iphone/Maps/Classes/Components/MWMTableViewController.mm
@@ -3,7 +3,6 @@
 #import "MWMAlertViewController.h"
 #import "MWMTableViewCell.h"
 #import "MWMTableViewController.h"
-#import "UIColor+MapsMeColor.h"
 
 #import "3party/Alohalytics/src/alohalytics_objc.h"
 
diff --git a/iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloadTransitMapAlert.mm b/iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloadTransitMapAlert.mm
index 09125322cd..e7b71196ef 100644
--- a/iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloadTransitMapAlert.mm
+++ b/iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloadTransitMapAlert.mm
@@ -7,7 +7,6 @@
 #import "MWMFrameworkListener.h"
 #import "MWMStorage.h"
 #import "Statistics.h"
-#import "UIColor+MapsMeColor.h"
 #import "UILabel+RuntimeAttributes.h"
 
 #include "Framework.h"
diff --git a/iphone/Maps/Classes/CustomAlert/RateAlert/MWMRateAlert.mm b/iphone/Maps/Classes/CustomAlert/RateAlert/MWMRateAlert.mm
index 7cfcb49a9c..2ebc23adf0 100644
--- a/iphone/Maps/Classes/CustomAlert/RateAlert/MWMRateAlert.mm
+++ b/iphone/Maps/Classes/CustomAlert/RateAlert/MWMRateAlert.mm
@@ -3,7 +3,6 @@
 #import "MWMAlertViewController.h"
 #import "MWMMailViewController.h"
 #import "Statistics.h"
-#import "UIColor+MapsMeColor.h"
 
 #import "3party/Alohalytics/src/alohalytics_objc.h"
 
diff --git a/iphone/Maps/Classes/CustomAlert/RoutingDisclaimerAlert/MWMRoutingDisclaimerAlert.mm b/iphone/Maps/Classes/CustomAlert/RoutingDisclaimerAlert/MWMRoutingDisclaimerAlert.mm
index 0aeb75b5b9..b80d047887 100644
--- a/iphone/Maps/Classes/CustomAlert/RoutingDisclaimerAlert/MWMRoutingDisclaimerAlert.mm
+++ b/iphone/Maps/Classes/CustomAlert/RoutingDisclaimerAlert/MWMRoutingDisclaimerAlert.mm
@@ -2,8 +2,6 @@
 #import "MWMCommon.h"
 #import "MWMAlertViewController.h"
 #import "Statistics.h"
-#import "UIColor+MapsMeColor.h"
-#import "UIFont+MapsMeFonts.h"
 
 static CGFloat const kMinimumOffset = 20.;
 static NSString * const kStatisticsEvent = @"Routing Disclaimer Alert";
diff --git a/iphone/Maps/Classes/CustomAlert/Toast/MWMToast.mm b/iphone/Maps/Classes/CustomAlert/Toast/MWMToast.mm
index e9233a61b8..686a169e81 100644
--- a/iphone/Maps/Classes/CustomAlert/Toast/MWMToast.mm
+++ b/iphone/Maps/Classes/CustomAlert/Toast/MWMToast.mm
@@ -1,6 +1,5 @@
 #import "MWMToast.h"
 #import "MWMCommon.h"
-#import "UIColor+MapsMeColor.h"
 
 namespace
 {
diff --git a/iphone/Maps/Classes/CustomViews/CircularProgress/MWMCircularProgressView.mm b/iphone/Maps/Classes/CustomViews/CircularProgress/MWMCircularProgressView.mm
index 1e3f7e0a97..b55a87548b 100644
--- a/iphone/Maps/Classes/CustomViews/CircularProgress/MWMCircularProgressView.mm
+++ b/iphone/Maps/Classes/CustomViews/CircularProgress/MWMCircularProgressView.mm
@@ -1,6 +1,5 @@
 #import "MWMCircularProgressView.h"
 #import "MWMCommon.h"
-#import "UIColor+MapsMeColor.h"
 #import "UIImageView+Coloring.h"
 
 #include "std/map.hpp"
diff --git a/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationCommon.mm b/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationCommon.mm
index 913c09d59c..0af27b1874 100644
--- a/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationCommon.mm
+++ b/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationCommon.mm
@@ -1,7 +1,6 @@
 #import "MWMCommon.h"
 #import "MWMAuthorizationCommon.h"
 #import "UIButton+RuntimeAttributes.h"
-#import "UIColor+MapsMeColor.h"
 
 #include "base/logging.hpp"
 #include "editor/server_api.hpp"
diff --git a/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationLoginViewController.mm b/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationLoginViewController.mm
index c31a6d3f1e..eb34aa41e2 100644
--- a/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationLoginViewController.mm
+++ b/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationLoginViewController.mm
@@ -5,7 +5,6 @@
 #import "MWMAuthorizationLoginViewController.h"
 #import "MWMAuthorizationWebViewLoginViewController.h"
 #import "Statistics.h"
-#import "UIColor+MapsMeColor.h"
 
 #include "Framework.h"
 
diff --git a/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationOSMLoginViewController.mm b/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationOSMLoginViewController.mm
index 175fffa0e4..ca286aaf58 100644
--- a/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationOSMLoginViewController.mm
+++ b/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationOSMLoginViewController.mm
@@ -4,7 +4,6 @@
 #import "MWMCircularProgress.h"
 #import "MWMSettingsViewController.h"
 #import "Statistics.h"
-#import "UIColor+MapsMeColor.h"
 #import "UITextField+RuntimeAttributes.h"
 
 #include "base/logging.hpp"
diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuCollectionViewCell.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuCollectionViewCell.mm
index f26d61fbe1..cca5deb731 100644
--- a/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuCollectionViewCell.mm
+++ b/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuCollectionViewCell.mm
@@ -1,7 +1,5 @@
 #import "MWMCommon.h"
 #import "MWMBottomMenuCollectionViewCell.h"
-#import "UIFont+MapsMeFonts.h"
-#import "UIColor+MapsMeColor.h"
 #import "UIImageView+Coloring.h"
 
 @interface MWMBottomMenuCollectionViewCell ()
diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuView.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuView.mm
index d77cd6150c..2d8ec55cda 100644
--- a/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuView.mm
+++ b/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuView.mm
@@ -7,8 +7,6 @@
 #import "MWMSideButtons.h"
 #import "MapsAppDelegate.h"
 #import "UIButton+RuntimeAttributes.h"
-#import "UIColor+MapsMeColor.h"
-#import "UIFont+MapsMeFonts.h"
 #import "UIImageView+Coloring.h"
 #import "UIView+RuntimeAttributes.h"
 
diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuViewController.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuViewController.mm
index 08f12515d9..e37752aef3 100644
--- a/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuViewController.mm
+++ b/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuViewController.mm
@@ -20,8 +20,6 @@
 #import "MapsAppDelegate.h"
 #import "Statistics.h"
 #import "SwiftBridge.h"
-#import "UIColor+MapsMeColor.h"
-#import "UIFont+MapsMeFonts.h"
 #import "UIImageView+Coloring.h"
 #import "UIViewController+Navigation.h"
 
diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm
index c3301418e7..cf769d4a83 100644
--- a/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm
+++ b/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm
@@ -21,7 +21,6 @@
 #import "MapViewController.h"
 #import "MapsAppDelegate.h"
 #import "Statistics.h"
-#import "UIColor+MapsMeColor.h"
 
 #import "3party/Alohalytics/src/alohalytics_objc.h"
 
diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/SideButtons/MWMSideButtons.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/SideButtons/MWMSideButtons.mm
index c0eece810b..8608db559f 100644
--- a/iphone/Maps/Classes/CustomViews/MapViewControls/SideButtons/MWMSideButtons.mm
+++ b/iphone/Maps/Classes/CustomViews/MapViewControls/SideButtons/MWMSideButtons.mm
@@ -5,7 +5,6 @@
 #import "MWMSettings.h"
 #import "MWMSideButtonsView.h"
 #import "Statistics.h"
-#import "UIColor+MapsMeColor.h"
 
 #import "3party/Alohalytics/src/alohalytics_objc.h"
 
diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/TrafficButton/MWMTrafficButtonViewController.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/TrafficButton/MWMTrafficButtonViewController.mm
index 70fc06f2e6..d75783534b 100644
--- a/iphone/Maps/Classes/CustomViews/MapViewControls/TrafficButton/MWMTrafficButtonViewController.mm
+++ b/iphone/Maps/Classes/CustomViews/MapViewControls/TrafficButton/MWMTrafficButtonViewController.mm
@@ -7,7 +7,6 @@
 #import "MWMToast.h"
 #import "MWMTrafficManager.h"
 #import "MapViewController.h"
-#import "UIColor+MapsMeColor.h"
 
 namespace
 {
diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/Welcome/PageController/MWMPageController.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/Welcome/PageController/MWMPageController.mm
index 1691aa1fe5..9c2199a322 100644
--- a/iphone/Maps/Classes/CustomViews/MapViewControls/Welcome/PageController/MWMPageController.mm
+++ b/iphone/Maps/Classes/CustomViews/MapViewControls/Welcome/PageController/MWMPageController.mm
@@ -1,7 +1,6 @@
 #import "MWMPageController.h"
 #import "MWMPageControllerDataSource.h"
 #import "Statistics.h"
-#import "UIColor+MapsMeColor.h"
 
 @interface MWMPageController ()
 
diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardEntity.mm b/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardEntity.mm
index 4213c6330c..dc6b7e0aec 100644
--- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardEntity.mm
+++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardEntity.mm
@@ -4,8 +4,6 @@
 #import "MWMSettings.h"
 #import "MapsAppDelegate.h"
 #import "SwiftBridge.h"
-#import "UIColor+MapsMeColor.h"
-#import "UIFont+MapsMeFonts.h"
 
 #include "Framework.h"
 #include "geometry/distance_on_sphere.hpp"
diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationInfoView.mm b/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationInfoView.mm
index 192dfe68f2..555c0418a2 100644
--- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationInfoView.mm
+++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationInfoView.mm
@@ -9,8 +9,6 @@
 #import "MWMRouter.h"
 #import "MWMSearch.h"
 #import "MapViewController.h"
-#import "UIColor+MapsMeColor.h"
-#import "UIFont+MapsMeFonts.h"
 #import "UIImageView+Coloring.h"
 
 #include "geometry/angles.hpp"
diff --git a/iphone/Maps/Classes/MWMTableViewCell.mm b/iphone/Maps/Classes/MWMTableViewCell.mm
index 1b7dc15b25..60a27cb11e 100644
--- a/iphone/Maps/Classes/MWMTableViewCell.mm
+++ b/iphone/Maps/Classes/MWMTableViewCell.mm
@@ -1,5 +1,4 @@
 #import "MWMTableViewCell.h"
-#import "UIColor+MapsMeColor.h"
 
 @implementation MWMTableViewCell
 
diff --git a/iphone/Maps/Classes/MapViewController.mm b/iphone/Maps/Classes/MapViewController.mm
index 7a23786ef5..3dda1ec85d 100644
--- a/iphone/Maps/Classes/MapViewController.mm
+++ b/iphone/Maps/Classes/MapViewController.mm
@@ -28,8 +28,6 @@
 #import "MWMWhatsNewTrafficController.h"
 #import "MapsAppDelegate.h"
 #import "Statistics.h"
-#import "UIColor+MapsMeColor.h"
-#import "UIFont+MapsMeFonts.h"
 #import "UIViewController+Navigation.h"
 
 #import "3party/Alohalytics/src/alohalytics_objc.h"
diff --git a/iphone/Maps/Classes/MapsAppDelegate.mm b/iphone/Maps/Classes/MapsAppDelegate.mm
index 945cd9e8b1..a4b90b30ca 100644
--- a/iphone/Maps/Classes/MapsAppDelegate.mm
+++ b/iphone/Maps/Classes/MapsAppDelegate.mm
@@ -23,8 +23,6 @@
 #import "MWMTextToSpeech.h"
 #import "MapViewController.h"
 #import "Statistics.h"
-#import "UIColor+MapsMeColor.h"
-#import "UIFont+MapsMeFonts.h"
 
 #import "3party/Alohalytics/src/alohalytics_objc.h"
 
diff --git a/iphone/Maps/Classes/Widgets/MWMMapDownloadDialog.mm b/iphone/Maps/Classes/Widgets/MWMMapDownloadDialog.mm
index 6dc3273b20..02d414ab85 100644
--- a/iphone/Maps/Classes/Widgets/MWMMapDownloadDialog.mm
+++ b/iphone/Maps/Classes/Widgets/MWMMapDownloadDialog.mm
@@ -10,7 +10,6 @@
 #import "MapViewController.h"
 #import "MapsAppDelegate.h"
 #import "Statistics.h"
-#import "UIColor+MapsMeColor.h"
 
 #include "Framework.h"
 
diff --git a/iphone/Maps/Maps_Prefix.pch b/iphone/Maps/Maps_Prefix.pch
index 8816476a01..e316166892 100644
--- a/iphone/Maps/Maps_Prefix.pch
+++ b/iphone/Maps/Maps_Prefix.pch
@@ -10,5 +10,7 @@
 
   #import "MWMMacros.h"
   #import "MWMTypes.h"
+  #import "UIColor+MapsMeColor.h"
+  #import "UIFont+MapsMeFonts.h"
   #import "UIKitCategories.h"
 #endif
diff --git a/iphone/Maps/UI/Downloader/Cells/MWMMapDownloaderCellHeader.mm b/iphone/Maps/UI/Downloader/Cells/MWMMapDownloaderCellHeader.mm
index 535210134f..21f867cd2a 100644
--- a/iphone/Maps/UI/Downloader/Cells/MWMMapDownloaderCellHeader.mm
+++ b/iphone/Maps/UI/Downloader/Cells/MWMMapDownloaderCellHeader.mm
@@ -1,6 +1,4 @@
 #import "MWMMapDownloaderCellHeader.h"
-#import "UIColor+MapsMeColor.h"
-#import "UIFont+MapsMeFonts.h"
 
 @implementation MWMMapDownloaderCellHeader
 
diff --git a/iphone/Maps/UI/Downloader/Cells/MWMMapDownloaderPlaceTableViewCell.mm b/iphone/Maps/UI/Downloader/Cells/MWMMapDownloaderPlaceTableViewCell.mm
index a8fc03346a..b32455d49a 100644
--- a/iphone/Maps/UI/Downloader/Cells/MWMMapDownloaderPlaceTableViewCell.mm
+++ b/iphone/Maps/UI/Downloader/Cells/MWMMapDownloaderPlaceTableViewCell.mm
@@ -1,6 +1,5 @@
 #import "MWMMapDownloaderPlaceTableViewCell.h"
 #import "MWMCommon.h"
-#import "UIFont+MapsMeFonts.h"
 
 #include "Framework.h"
 
diff --git a/iphone/Maps/UI/Downloader/Cells/MWMMapDownloaderSubplaceTableViewCell.mm b/iphone/Maps/UI/Downloader/Cells/MWMMapDownloaderSubplaceTableViewCell.mm
index e21927f5b7..838d38806e 100644
--- a/iphone/Maps/UI/Downloader/Cells/MWMMapDownloaderSubplaceTableViewCell.mm
+++ b/iphone/Maps/UI/Downloader/Cells/MWMMapDownloaderSubplaceTableViewCell.mm
@@ -1,6 +1,5 @@
 #import "MWMMapDownloaderSubplaceTableViewCell.h"
 #import "MWMCommon.h"
-#import "UIFont+MapsMeFonts.h"
 
 @interface MWMMapDownloaderTableViewCell ()
 
diff --git a/iphone/Maps/UI/Downloader/Cells/MWMMapDownloaderTableViewCell.mm b/iphone/Maps/UI/Downloader/Cells/MWMMapDownloaderTableViewCell.mm
index 2cff8b57a0..d8772760e6 100644
--- a/iphone/Maps/UI/Downloader/Cells/MWMMapDownloaderTableViewCell.mm
+++ b/iphone/Maps/UI/Downloader/Cells/MWMMapDownloaderTableViewCell.mm
@@ -3,7 +3,6 @@
 #import "MWMCircularProgress.h"
 #import "MWMMapDownloaderLargeCountryTableViewCell.h"
 #import "NSString+Categories.h"
-#import "UIFont+MapsMeFonts.h"
 
 #include "Framework.h"
 
diff --git a/iphone/Maps/UI/Downloader/DataSources/MWMMapDownloaderExtendedDataSourceWithAds.mm b/iphone/Maps/UI/Downloader/DataSources/MWMMapDownloaderExtendedDataSourceWithAds.mm
index d1da953458..078309e330 100644
--- a/iphone/Maps/UI/Downloader/DataSources/MWMMapDownloaderExtendedDataSourceWithAds.mm
+++ b/iphone/Maps/UI/Downloader/DataSources/MWMMapDownloaderExtendedDataSourceWithAds.mm
@@ -1,8 +1,6 @@
 #import "MWMMapDownloaderExtendedDataSourceWithAds.h"
 #import "MWMMapDownloaderAdsTableViewCell.h"
 #import "MWMMyTarget.h"
-#import "UIColor+MapsMeColor.h"
-#import "UIFont+MapsMeFonts.h"
 
 #include "Framework.h"
 
diff --git a/iphone/Maps/UI/Downloader/MWMBaseMapDownloaderViewController.mm b/iphone/Maps/UI/Downloader/MWMBaseMapDownloaderViewController.mm
index bdf6264524..5f2782234b 100644
--- a/iphone/Maps/UI/Downloader/MWMBaseMapDownloaderViewController.mm
+++ b/iphone/Maps/UI/Downloader/MWMBaseMapDownloaderViewController.mm
@@ -18,7 +18,6 @@
 #import "MWMToast.h"
 #import "MapsAppDelegate.h"
 #import "Statistics.h"
-#import "UIColor+MapsMeColor.h"
 #import "UIViewController+Navigation.h"
 
 #include "Framework.h"
diff --git a/iphone/Maps/UI/Downloader/MWMMapDownloaderViewController.mm b/iphone/Maps/UI/Downloader/MWMMapDownloaderViewController.mm
index cc7239b46f..236eeaaf60 100644
--- a/iphone/Maps/UI/Downloader/MWMMapDownloaderViewController.mm
+++ b/iphone/Maps/UI/Downloader/MWMMapDownloaderViewController.mm
@@ -4,7 +4,6 @@
 #import "MWMMapDownloaderSearchDataSource.h"
 #import "MWMNoMapsViewController.h"
 #import "SwiftBridge.h"
-#import "UIColor+MapsMeColor.h"
 
 #include "Framework.h"
 
diff --git a/iphone/Maps/UI/EditBookmark/MWMBookmarkColorViewController.mm b/iphone/Maps/UI/EditBookmark/MWMBookmarkColorViewController.mm
index 64579f2559..cf9c072069 100644
--- a/iphone/Maps/UI/EditBookmark/MWMBookmarkColorViewController.mm
+++ b/iphone/Maps/UI/EditBookmark/MWMBookmarkColorViewController.mm
@@ -1,6 +1,5 @@
 #import "MWMBookmarkColorViewController.h"
 #import "Statistics.h"
-#import "UIColor+MapsMeColor.h"
 #import "UIViewController+Navigation.h"
 
 #include "std/array.hpp"
diff --git a/iphone/Maps/UI/Editor/Cuisine/MWMCuisineEditorViewController.mm b/iphone/Maps/UI/Editor/Cuisine/MWMCuisineEditorViewController.mm
index 5a1b4e75b2..b3a623b26a 100644
--- a/iphone/Maps/UI/Editor/Cuisine/MWMCuisineEditorViewController.mm
+++ b/iphone/Maps/UI/Editor/Cuisine/MWMCuisineEditorViewController.mm
@@ -3,7 +3,6 @@
 #import "MWMKeyboard.h"
 #import "MWMTableViewCell.h"
 #import "MWMToast.h"
-#import "UIColor+MapsMeColor.h"
 
 #include "indexer/cuisines.hpp"
 #include "indexer/search_string_utils.hpp"
diff --git a/iphone/Maps/UI/Editor/MWMEditorCategoryCell.mm b/iphone/Maps/UI/Editor/MWMEditorCategoryCell.mm
index 2a415aae73..c49364b640 100644
--- a/iphone/Maps/UI/Editor/MWMEditorCategoryCell.mm
+++ b/iphone/Maps/UI/Editor/MWMEditorCategoryCell.mm
@@ -1,6 +1,5 @@
 #import "MWMEditorCategoryCell.h"
 #import "MWMEditorCommon.h"
-#import "UIColor+MapsMeColor.h"
 #import "UIImageView+Coloring.h"
 
 namespace
diff --git a/iphone/Maps/UI/Editor/MWMEditorSelectTableViewCell.mm b/iphone/Maps/UI/Editor/MWMEditorSelectTableViewCell.mm
index cece4b6c04..c99ec521fa 100644
--- a/iphone/Maps/UI/Editor/MWMEditorSelectTableViewCell.mm
+++ b/iphone/Maps/UI/Editor/MWMEditorSelectTableViewCell.mm
@@ -1,6 +1,5 @@
 #import "MWMEditorSelectTableViewCell.h"
 #import "MWMCommon.h"
-#import "UIColor+MapsMeColor.h"
 #import "UIImageView+Coloring.h"
 
 @interface MWMEditorSelectTableViewCell ()
diff --git a/iphone/Maps/UI/Editor/MWMEditorSwitchTableViewCell.mm b/iphone/Maps/UI/Editor/MWMEditorSwitchTableViewCell.mm
index f4eb5657ac..613c55f689 100644
--- a/iphone/Maps/UI/Editor/MWMEditorSwitchTableViewCell.mm
+++ b/iphone/Maps/UI/Editor/MWMEditorSwitchTableViewCell.mm
@@ -1,5 +1,4 @@
 #import "MWMEditorSwitchTableViewCell.h"
-#import "UIColor+MapsMeColor.h"
 #import "UIImageView+Coloring.h"
 
 @interface MWMEditorSwitchTableViewCell ()
diff --git a/iphone/Maps/UI/Editor/MWMEditorTextTableViewCell.mm b/iphone/Maps/UI/Editor/MWMEditorTextTableViewCell.mm
index acbbbaca2e..b80efdefa6 100644
--- a/iphone/Maps/UI/Editor/MWMEditorTextTableViewCell.mm
+++ b/iphone/Maps/UI/Editor/MWMEditorTextTableViewCell.mm
@@ -1,6 +1,5 @@
 #import "MWMEditorCommon.h"
 #import "MWMEditorTextTableViewCell.h"
-#import "UIColor+MapsMeColor.h"
 #import "UIImageView+Coloring.h"
 #import "UITextField+RuntimeAttributes.h"
 
diff --git a/iphone/Maps/UI/Editor/MWMNoteCell.mm b/iphone/Maps/UI/Editor/MWMNoteCell.mm
index 42ce5332b0..8054435915 100644
--- a/iphone/Maps/UI/Editor/MWMNoteCell.mm
+++ b/iphone/Maps/UI/Editor/MWMNoteCell.mm
@@ -1,4 +1,3 @@
-#import "UIColor+MapsMeColor.h"
 #import "MWMTextView.h"
 #import "MWMNoteCell.h"
 
diff --git a/iphone/Maps/UI/Editor/MWMObjectsCategorySelectorController.mm b/iphone/Maps/UI/Editor/MWMObjectsCategorySelectorController.mm
index 4519060f45..f21c97f806 100644
--- a/iphone/Maps/UI/Editor/MWMObjectsCategorySelectorController.mm
+++ b/iphone/Maps/UI/Editor/MWMObjectsCategorySelectorController.mm
@@ -6,7 +6,6 @@
 #import "MWMTableViewCell.h"
 #import "MWMToast.h"
 #import "Statistics.h"
-#import "UIColor+MapsMeColor.h"
 #import "UIViewController+Navigation.h"
 
 #include "LocaleTranslator.h"
diff --git a/iphone/Maps/UI/Editor/OpeningHours/Cells/MWMOpeningHoursAllDayTableViewCell.mm b/iphone/Maps/UI/Editor/OpeningHours/Cells/MWMOpeningHoursAllDayTableViewCell.mm
index 27cfde33b8..cef32a1436 100644
--- a/iphone/Maps/UI/Editor/OpeningHours/Cells/MWMOpeningHoursAllDayTableViewCell.mm
+++ b/iphone/Maps/UI/Editor/OpeningHours/Cells/MWMOpeningHoursAllDayTableViewCell.mm
@@ -1,5 +1,4 @@
 #import "MWMOpeningHoursAllDayTableViewCell.h"
-#import "UIColor+MapsMeColor.h"
 
 @interface MWMOpeningHoursAllDayTableViewCell ()
 
diff --git a/iphone/Maps/UI/Editor/OpeningHours/Cells/MWMOpeningHoursClosedSpanTableViewCell.mm b/iphone/Maps/UI/Editor/OpeningHours/Cells/MWMOpeningHoursClosedSpanTableViewCell.mm
index 238f33141d..cb1d875c33 100644
--- a/iphone/Maps/UI/Editor/OpeningHours/Cells/MWMOpeningHoursClosedSpanTableViewCell.mm
+++ b/iphone/Maps/UI/Editor/OpeningHours/Cells/MWMOpeningHoursClosedSpanTableViewCell.mm
@@ -1,6 +1,4 @@
 #import "MWMOpeningHoursClosedSpanTableViewCell.h"
-#import "UIColor+MapsMeColor.h"
-#import "UIFont+MapsMeFonts.h"
 
 static NSString * const kLabelText = L(@"editor_hours_closed");
 
diff --git a/iphone/Maps/UI/Editor/OpeningHours/Cells/MWMOpeningHoursDaysSelectorTableViewCell.mm b/iphone/Maps/UI/Editor/OpeningHours/Cells/MWMOpeningHoursDaysSelectorTableViewCell.mm
index e85e44776a..aec9042b96 100644
--- a/iphone/Maps/UI/Editor/OpeningHours/Cells/MWMOpeningHoursDaysSelectorTableViewCell.mm
+++ b/iphone/Maps/UI/Editor/OpeningHours/Cells/MWMOpeningHoursDaysSelectorTableViewCell.mm
@@ -1,5 +1,4 @@
 #import "MWMOpeningHoursDaysSelectorTableViewCell.h"
-#import "UIColor+MapsMeColor.h"
 #import "UIImageView+Coloring.h"
 
 #include "3party/opening_hours/opening_hours.hpp"
diff --git a/iphone/Maps/UI/Editor/OpeningHours/Cells/MWMOpeningHoursTimeSpanTableViewCell.mm b/iphone/Maps/UI/Editor/OpeningHours/Cells/MWMOpeningHoursTimeSpanTableViewCell.mm
index 70add3faee..76348d7fd6 100644
--- a/iphone/Maps/UI/Editor/OpeningHours/Cells/MWMOpeningHoursTimeSpanTableViewCell.mm
+++ b/iphone/Maps/UI/Editor/OpeningHours/Cells/MWMOpeningHoursTimeSpanTableViewCell.mm
@@ -1,5 +1,4 @@
 #import "MWMOpeningHoursTimeSpanTableViewCell.h"
-#import "UIColor+MapsMeColor.h"
 
 @interface MWMOpeningHoursTimeSpanTableViewCell ()
 
diff --git a/iphone/Maps/UI/Editor/OpeningHours/MWMOpeningHoursEditorViewController.mm b/iphone/Maps/UI/Editor/OpeningHours/MWMOpeningHoursEditorViewController.mm
index 9b97692410..e5c0e3136f 100644
--- a/iphone/Maps/UI/Editor/OpeningHours/MWMOpeningHoursEditorViewController.mm
+++ b/iphone/Maps/UI/Editor/OpeningHours/MWMOpeningHoursEditorViewController.mm
@@ -3,7 +3,6 @@
 #import "MWMOpeningHoursModel.h"
 #import "MWMOpeningHoursSection.h"
 #import "MWMTextView.h"
-#import "UIColor+MapsMeColor.h"
 
 extern NSDictionary * const kMWMOpeningHoursEditorTableCells = @{
   @(MWMOpeningHoursEditorDaysSelectorCell) : @"MWMOpeningHoursDaysSelectorTableViewCell",
diff --git a/iphone/Maps/UI/Migration/MWMMigrationView.mm b/iphone/Maps/UI/Migration/MWMMigrationView.mm
index cfabc4224e..b8d5db02b0 100644
--- a/iphone/Maps/UI/Migration/MWMMigrationView.mm
+++ b/iphone/Maps/UI/Migration/MWMMigrationView.mm
@@ -1,6 +1,5 @@
 #import "MWMCommon.h"
 #import "MWMMigrationView.h"
-#import "UIColor+MapsMeColor.h"
 
 @interface MWMMigrationView ()
 
diff --git a/iphone/Maps/UI/PlacePage/DirectionView/MWMDirectionView.mm b/iphone/Maps/UI/PlacePage/DirectionView/MWMDirectionView.mm
index 73eb046cd7..4c519a160e 100644
--- a/iphone/Maps/UI/PlacePage/DirectionView/MWMDirectionView.mm
+++ b/iphone/Maps/UI/PlacePage/DirectionView/MWMDirectionView.mm
@@ -2,7 +2,6 @@
 #import "MWMMapViewControlsManager.h"
 #import "MapViewController.h"
 #import "MapsAppDelegate.h"
-#import "UIFont+MapsMeFonts.h"
 
 static NSString * const kDirectionViewNibName = @"MWMDirectionView";
 static CGFloat const kDirectionArrowSide = IPAD ? 260. : 160.;
diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/ActionBar/MWMActionBarButton.mm b/iphone/Maps/UI/PlacePage/PlacePageLayout/ActionBar/MWMActionBarButton.mm
index 867298653d..83b707ed1d 100644
--- a/iphone/Maps/UI/PlacePage/PlacePageLayout/ActionBar/MWMActionBarButton.mm
+++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/ActionBar/MWMActionBarButton.mm
@@ -2,7 +2,6 @@
 #import "MWMCommon.h"
 #import "MWMButton.h"
 #import "MWMCircularProgress.h"
-#import "UIColor+MapsMeColor.h"
 
 NSString * titleForButton(EButton type, BOOL isSelected)
 {
diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/Banner/MWMPPPreviewBannerCell.mm b/iphone/Maps/UI/PlacePage/PlacePageLayout/Banner/MWMPPPreviewBannerCell.mm
index 299706ac7b..b725de1b92 100644
--- a/iphone/Maps/UI/PlacePage/PlacePageLayout/Banner/MWMPPPreviewBannerCell.mm
+++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/Banner/MWMPPPreviewBannerCell.mm
@@ -4,8 +4,6 @@
 #import "MWMPlacePageData.h"
 #import "MWMPlacePageLayoutImpl.h"
 #import "Statistics.h"
-#import "UIColor+MapsMeColor.h"
-#import "UIFont+MapsMeFonts.h"
 
 namespace
 {
diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/BookmarkCell/MWMBookmarkCell.mm b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/BookmarkCell/MWMBookmarkCell.mm
index 787a349695..cb4ff80d54 100644
--- a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/BookmarkCell/MWMBookmarkCell.mm
+++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/BookmarkCell/MWMBookmarkCell.mm
@@ -2,8 +2,6 @@
 #import "MWMPlacePageCellUpdateProtocol.h"
 
 #import "MWMPlacePageProtocol.h"
-#import "UIColor+MapsMeColor.h"
-#import "UIFont+MapsMeFonts.h"
 
 namespace
 {
diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/ButtonCell/MWMPlacePageButtonCell.mm b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/ButtonCell/MWMPlacePageButtonCell.mm
index 065c40b8ee..e2c48b78d3 100644
--- a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/ButtonCell/MWMPlacePageButtonCell.mm
+++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/ButtonCell/MWMPlacePageButtonCell.mm
@@ -1,7 +1,6 @@
 #import "MWMPlacePageButtonCell.h"
 #import "MWMCommon.h"
 #import "MWMPlacePageProtocol.h"
-#import "UIColor+MapsMeColor.h"
 
 @interface MWMPlacePageButtonCell ()
 
diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/OpeningHoursCell/MWMOpeningHoursLayoutHelper.mm b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/OpeningHoursCell/MWMOpeningHoursLayoutHelper.mm
index da12f6446e..2969584576 100644
--- a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/OpeningHoursCell/MWMOpeningHoursLayoutHelper.mm
+++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/OpeningHoursCell/MWMOpeningHoursLayoutHelper.mm
@@ -3,8 +3,6 @@
 #import "MWMOpeningHours.h"
 #import "MWMPlacePageData.h"
 #import "MWMTableViewCell.h"
-#import "UIColor+MapsMeColor.h"
-#import "UIFont+MapsMeFonts.h"
 
 #include "std/array.hpp"
 
diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/OpeningHoursCell/MWMPlacePageOpeningHoursDayView.mm b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/OpeningHoursCell/MWMPlacePageOpeningHoursDayView.mm
index 84f3d2b138..0aeec73248 100644
--- a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/OpeningHoursCell/MWMPlacePageOpeningHoursDayView.mm
+++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/OpeningHoursCell/MWMPlacePageOpeningHoursDayView.mm
@@ -1,6 +1,4 @@
 #import "MWMPlacePageOpeningHoursDayView.h"
-#import "UIColor+MapsMeColor.h"
-#import "UIFont+MapsMeFonts.h"
 
 @interface MWMPlacePageOpeningHoursDayView ()
 
diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/RegularCell/MWMPlacePageInfoCell.mm b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/RegularCell/MWMPlacePageInfoCell.mm
index 3b3ae3bd92..eae985b86a 100644
--- a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/RegularCell/MWMPlacePageInfoCell.mm
+++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/RegularCell/MWMPlacePageInfoCell.mm
@@ -3,8 +3,6 @@
 #import "MapViewController.h"
 #import "MapsAppDelegate.h"
 #import "Statistics.h"
-#import "UIColor+MapsMeColor.h"
-#import "UIFont+MapsMeFonts.h"
 #import "UIImageView+Coloring.h"
 
 #include "platform/measurement_utils.hpp"
diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/MWMPlacePageLayout.mm b/iphone/Maps/UI/PlacePage/PlacePageLayout/MWMPlacePageLayout.mm
index 0241e8a1c0..e24ec01608 100644
--- a/iphone/Maps/UI/PlacePage/PlacePageLayout/MWMPlacePageLayout.mm
+++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/MWMPlacePageLayout.mm
@@ -11,7 +11,6 @@
 #import "MWMPlacePageLayoutImpl.h"
 #import "MWMPlacePageTaxiCell.h"
 #import "MWMPPPreviewLayoutHelper.h"
-#import "UIColor+MapsMeColor.h"
 
 #include "storage/storage.hpp"
 
diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/PlacePageView/MWMPPView.mm b/iphone/Maps/UI/PlacePage/PlacePageLayout/PlacePageView/MWMPPView.mm
index e9e9c78eb6..db11a02f71 100644
--- a/iphone/Maps/UI/PlacePage/PlacePageLayout/PlacePageView/MWMPPView.mm
+++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/PlacePageView/MWMPPView.mm
@@ -1,7 +1,6 @@
 #import "MWMCommon.h"
 #import "MWMPlacePageActionBar.h"
 #import "MWMPPView.h"
-#import "UIColor+MapsMeColor.h"
 
 namespace
 {
diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/Preview/MWMPPPreviewLayoutHelper.mm b/iphone/Maps/UI/PlacePage/PlacePageLayout/Preview/MWMPPPreviewLayoutHelper.mm
index 30cdd82b06..0496a6f3e1 100644
--- a/iphone/Maps/UI/PlacePage/PlacePageLayout/Preview/MWMPPPreviewLayoutHelper.mm
+++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/Preview/MWMPPPreviewLayoutHelper.mm
@@ -5,7 +5,6 @@
 #import "MWMPPPreviewBannerCell.h"
 #import "MWMTableViewCell.h"
 #import "Statistics.h"
-#import "UIColor+MapsmeColor.h"
 
 #include "std/array.hpp"
 
diff --git a/iphone/Maps/UI/Search/Filters/MWMSearchFilterPresentationController.mm b/iphone/Maps/UI/Search/Filters/MWMSearchFilterPresentationController.mm
index de42e29d4d..080b53ab54 100644
--- a/iphone/Maps/UI/Search/Filters/MWMSearchFilterPresentationController.mm
+++ b/iphone/Maps/UI/Search/Filters/MWMSearchFilterPresentationController.mm
@@ -1,6 +1,5 @@
 #import "MWMSearchFilterPresentationController.h"
 #import "MWMSearch.h"
-#import "UIColor+MapsMeColor.h"
 
 namespace
 {
diff --git a/iphone/Maps/UI/Search/Filters/MWMSearchHotelsFilterViewController.mm b/iphone/Maps/UI/Search/Filters/MWMSearchHotelsFilterViewController.mm
index fdb2d047cd..a4bb84e8cd 100644
--- a/iphone/Maps/UI/Search/Filters/MWMSearchHotelsFilterViewController.mm
+++ b/iphone/Maps/UI/Search/Filters/MWMSearchHotelsFilterViewController.mm
@@ -1,7 +1,5 @@
 #import "MWMSearchHotelsFilterViewController.h"
 #import "MWMSearchFilterViewController_Protected.h"
-#import "UIColor+MapsMeColor.h"
-#import "UIFont+MapsMeFonts.h"
 
 namespace
 {
diff --git a/iphone/Maps/UI/Search/MWMSearchChangeModeView.mm b/iphone/Maps/UI/Search/MWMSearchChangeModeView.mm
index 19943dc6f2..5dcb771b54 100644
--- a/iphone/Maps/UI/Search/MWMSearchChangeModeView.mm
+++ b/iphone/Maps/UI/Search/MWMSearchChangeModeView.mm
@@ -2,7 +2,6 @@
 #import "MWMButton.h"
 #import "MWMSearch.h"
 #import "UIButton+RuntimeAttributes.h"
-#import "UIColor+MapsMeColor.h"
 
 extern NSString * const kSearchStateWillChangeNotification;
 extern NSString * const kSearchStateKey;
diff --git a/iphone/Maps/UI/Search/MWMSearchManager+Filter.mm b/iphone/Maps/UI/Search/MWMSearchManager+Filter.mm
index d29c399637..6ab38b95c2 100644
--- a/iphone/Maps/UI/Search/MWMSearchManager+Filter.mm
+++ b/iphone/Maps/UI/Search/MWMSearchManager+Filter.mm
@@ -2,8 +2,6 @@
 #import "MWMSearchFilterTransitioningManager.h"
 #import "MWMSearchFilterViewController.h"
 #import "MWMSearchManager+Filter.h"
-#import "UIColor+MapsMeColor.h"
-#import "UIFont+MapsMeFonts.h"
 
 @interface MWMSearchManager ()<UIPopoverPresentationControllerDelegate>
 
diff --git a/iphone/Maps/UI/Search/MWMSearchManager.mm b/iphone/Maps/UI/Search/MWMSearchManager.mm
index c8a4a86537..685c7cbd11 100644
--- a/iphone/Maps/UI/Search/MWMSearchManager.mm
+++ b/iphone/Maps/UI/Search/MWMSearchManager.mm
@@ -17,8 +17,6 @@
 #import "MapViewController.h"
 #import "MapsAppDelegate.h"
 #import "Statistics.h"
-#import "UIColor+MapsMeColor.h"
-#import "UIFont+MapsMeFonts.h"
 
 #import "3party/Alohalytics/src/alohalytics_objc.h"
 
diff --git a/iphone/Maps/UI/Search/MWMSearchTextField.mm b/iphone/Maps/UI/Search/MWMSearchTextField.mm
index 5af935d822..2cdee64173 100644
--- a/iphone/Maps/UI/Search/MWMSearchTextField.mm
+++ b/iphone/Maps/UI/Search/MWMSearchTextField.mm
@@ -1,6 +1,5 @@
 #import "MWMSearchTextField.h"
 #import "MWMSearch.h"
-#import "UIColor+MapsMeColor.h"
 #import "UIImageView+Coloring.h"
 
 namespace
diff --git a/iphone/Maps/UI/Search/TabButtons/MWMSearchTabButtonsView.mm b/iphone/Maps/UI/Search/TabButtons/MWMSearchTabButtonsView.mm
index 2c4e838f35..5df1ec4b9b 100644
--- a/iphone/Maps/UI/Search/TabButtons/MWMSearchTabButtonsView.mm
+++ b/iphone/Maps/UI/Search/TabButtons/MWMSearchTabButtonsView.mm
@@ -1,7 +1,6 @@
 #import "MWMCommon.h"
 #import "MWMSearchManager.h"
 #import "MWMSearchTabButtonsView.h"
-#import "UIColor+MapsMeColor.h"
 
 static CGFloat const kIconToLabelSpacing = 4.0;
 
diff --git a/iphone/Maps/UI/Search/TabbedView/BookmarksTab/MWMSearchBookmarksCell.mm b/iphone/Maps/UI/Search/TabbedView/BookmarksTab/MWMSearchBookmarksCell.mm
index da6f82443f..7adae67e82 100644
--- a/iphone/Maps/UI/Search/TabbedView/BookmarksTab/MWMSearchBookmarksCell.mm
+++ b/iphone/Maps/UI/Search/TabbedView/BookmarksTab/MWMSearchBookmarksCell.mm
@@ -1,8 +1,6 @@
 #import "BookmarksVC.h"
 #import "MWMCommon.h"
 #import "MWMSearchBookmarksCell.h"
-#import "UIColor+MapsMeColor.h"
-#import "UIFont+MapsMeFonts.h"
 
 #include "Framework.h"
 
diff --git a/iphone/Maps/UI/Search/TabbedView/CategoriesTab/MWMSearchCategoryCell.mm b/iphone/Maps/UI/Search/TabbedView/CategoriesTab/MWMSearchCategoryCell.mm
index 503f56810f..b9eea2f492 100644
--- a/iphone/Maps/UI/Search/TabbedView/CategoriesTab/MWMSearchCategoryCell.mm
+++ b/iphone/Maps/UI/Search/TabbedView/CategoriesTab/MWMSearchCategoryCell.mm
@@ -1,7 +1,5 @@
 #import "MWMSearchCategoryCell.h"
 #import "MWMCommon.h"
-#import "UIColor+MapsMeColor.h"
-#import "UIFont+MapsMeFonts.h"
 #import "UIImageView+Coloring.h"
 
 @interface MWMSearchCategoryCell ()
diff --git a/iphone/Maps/UI/Search/TabbedView/HistoryTab/MWMSearchHistoryClearCell.mm b/iphone/Maps/UI/Search/TabbedView/HistoryTab/MWMSearchHistoryClearCell.mm
index 2a2358fda4..59a88216c6 100644
--- a/iphone/Maps/UI/Search/TabbedView/HistoryTab/MWMSearchHistoryClearCell.mm
+++ b/iphone/Maps/UI/Search/TabbedView/HistoryTab/MWMSearchHistoryClearCell.mm
@@ -1,5 +1,4 @@
 #import "MWMSearchHistoryClearCell.h"
-#import "UIColor+MapsMeColor.h"
 
 @interface MWMSearchHistoryClearCell ()
 
diff --git a/iphone/Maps/UI/Search/TabbedView/HistoryTab/MWMSearchHistoryMyPositionCell.mm b/iphone/Maps/UI/Search/TabbedView/HistoryTab/MWMSearchHistoryMyPositionCell.mm
index 66b2f5df5b..7c5c1f1d96 100644
--- a/iphone/Maps/UI/Search/TabbedView/HistoryTab/MWMSearchHistoryMyPositionCell.mm
+++ b/iphone/Maps/UI/Search/TabbedView/HistoryTab/MWMSearchHistoryMyPositionCell.mm
@@ -1,5 +1,4 @@
 #import "MWMSearchHistoryMyPositionCell.h"
-#import "UIColor+MapsMeColor.h"
 
 @implementation MWMSearchHistoryMyPositionCell
 
diff --git a/iphone/Maps/UI/Search/TabbedView/HistoryTab/MWMSearchHistoryRequestCell.mm b/iphone/Maps/UI/Search/TabbedView/HistoryTab/MWMSearchHistoryRequestCell.mm
index 914b16547a..5679c79e4e 100644
--- a/iphone/Maps/UI/Search/TabbedView/HistoryTab/MWMSearchHistoryRequestCell.mm
+++ b/iphone/Maps/UI/Search/TabbedView/HistoryTab/MWMSearchHistoryRequestCell.mm
@@ -1,7 +1,5 @@
 #import "MWMCommon.h"
 #import "MWMSearchHistoryRequestCell.h"
-#import "UIColor+MapsMeColor.h"
-#import "UIFont+MapsMeFonts.h"
 
 @interface MWMSearchHistoryRequestCell ()
 
diff --git a/iphone/Maps/UI/Search/TableView/MWMSearchCell.mm b/iphone/Maps/UI/Search/TableView/MWMSearchCell.mm
index 0b4e52080d..d16c874daf 100644
--- a/iphone/Maps/UI/Search/TableView/MWMSearchCell.mm
+++ b/iphone/Maps/UI/Search/TableView/MWMSearchCell.mm
@@ -1,7 +1,6 @@
 #import "MWMCommon.h"
 #import "MWMSearchCell.h"
 #import "Statistics.h"
-#import "UIColor+MapsMeColor.h"
 
 #include "Framework.h"
 
diff --git a/iphone/Maps/UI/Search/TableView/MWMSearchCommonCell.mm b/iphone/Maps/UI/Search/TableView/MWMSearchCommonCell.mm
index efbd637334..c2066a15b3 100644
--- a/iphone/Maps/UI/Search/TableView/MWMSearchCommonCell.mm
+++ b/iphone/Maps/UI/Search/TableView/MWMSearchCommonCell.mm
@@ -2,8 +2,6 @@
 #import "MWMLocationManager.h"
 #import "MWMSearchCommonCell.h"
 #import "MapsAppDelegate.h"
-#import "UIColor+MapsMeColor.h"
-#import "UIFont+MapsMeFonts.h"
 
 #include "Framework.h"
 
diff --git a/iphone/Maps/UI/Search/TableView/MWMSearchSuggestionCell.mm b/iphone/Maps/UI/Search/TableView/MWMSearchSuggestionCell.mm
index a13ce2f7c1..26851843af 100644
--- a/iphone/Maps/UI/Search/TableView/MWMSearchSuggestionCell.mm
+++ b/iphone/Maps/UI/Search/TableView/MWMSearchSuggestionCell.mm
@@ -1,6 +1,4 @@
 #import "MWMSearchSuggestionCell.h"
-#import "UIColor+MapsMeColor.h"
-#import "UIFont+MapsMeFonts.h"
 
 @interface MWMSearchSuggestionCell ()
 
diff --git a/iphone/Maps/UI/Settings/MWMHelpController.mm b/iphone/Maps/UI/Settings/MWMHelpController.mm
index dd848f6b67..395d2a4e45 100644
--- a/iphone/Maps/UI/Settings/MWMHelpController.mm
+++ b/iphone/Maps/UI/Settings/MWMHelpController.mm
@@ -3,7 +3,6 @@
 #import "MWMCommon.h"
 #import "MWMMailViewController.h"
 #import "Statistics.h"
-#import "UIColor+MapsMeColor.h"
 #import "WebViewController.h"
 
 #import "3party/Alohalytics/src/alohalytics_objc.h"
diff --git a/iphone/Maps/UI/Settings/MWMNightModeController.mm b/iphone/Maps/UI/Settings/MWMNightModeController.mm
index 96e209e88d..74d5efd459 100644
--- a/iphone/Maps/UI/Settings/MWMNightModeController.mm
+++ b/iphone/Maps/UI/Settings/MWMNightModeController.mm
@@ -3,7 +3,6 @@
 #import "MapsAppDelegate.h"
 #import "Statistics.h"
 #import "SwiftBridge.h"
-#import "UIColor+MapsMeColor.h"
 
 #include "Framework.h"
 
diff --git a/iphone/Maps/UI/Settings/MWMTTSLanguageViewController.mm b/iphone/Maps/UI/Settings/MWMTTSLanguageViewController.mm
index 34dff26271..aad7871960 100644
--- a/iphone/Maps/UI/Settings/MWMTTSLanguageViewController.mm
+++ b/iphone/Maps/UI/Settings/MWMTTSLanguageViewController.mm
@@ -2,7 +2,6 @@
 #import "MWMTTSSettingsViewController.h"
 #import "MWMTextToSpeech.h"
 #import "SwiftBridge.h"
-#import "UIColor+MapsMeColor.h"
 
 static NSString * const kUnwingSegueIdentifier = @"UnwindToTTSSettings";
 
diff --git a/iphone/Maps/UI/Settings/MWMTTSSettingsViewController.mm b/iphone/Maps/UI/Settings/MWMTTSSettingsViewController.mm
index 36c040c4a1..5ac1c4db05 100644
--- a/iphone/Maps/UI/Settings/MWMTTSSettingsViewController.mm
+++ b/iphone/Maps/UI/Settings/MWMTTSSettingsViewController.mm
@@ -3,7 +3,6 @@
 #import "MWMTextToSpeech.h"
 #import "Statistics.h"
 #import "SwiftBridge.h"
-#import "UIColor+MapsMeColor.h"
 #import "WebViewController.h"
 
 #include "LocaleTranslator.h"