diff --git a/iphone/Maps/Bookmarks/BookmarksVC.mm b/iphone/Maps/Bookmarks/BookmarksVC.mm
index 2d3327ffdb..74ad7a77b6 100644
--- a/iphone/Maps/Bookmarks/BookmarksVC.mm
+++ b/iphone/Maps/Bookmarks/BookmarksVC.mm
@@ -104,7 +104,7 @@
   if (indexPath.section == m_infoSection)
   {
     cell = [tableView dequeueReusableCellWithCellClass:MWMCategoryInfoCell.class indexPath:indexPath];
-    MWMCategoryInfoCell * infoCell = (MWMCategoryInfoCell * )cell;
+    MWMCategoryInfoCell * infoCell = (MWMCategoryInfoCell *)cell;
     NSString * title = @(bmManager.GetCategoryName(m_categoryId).c_str());
     auto categoryData = bmManager.GetCategoryData(m_categoryId);
     NSString * author = [NSString stringWithCoreFormat:L(@"author_name_by_prefix")
@@ -257,7 +257,8 @@
   }
 }
 
-- (void)tableView:(UITableView *)tableView willDisplayHeaderView:(UIView *)view forSection:(NSInteger)section {
+- (void)tableView:(UITableView *)tableView willDisplayHeaderView:(UIView *)view forSection:(NSInteger)section
+{
   UITableViewHeaderFooterView *header = (UITableViewHeaderFooterView *)view;
 
   header.textLabel.textColor = [UIColor blackSecondaryText];
@@ -273,7 +274,8 @@
 
 #pragma mark - MWMCategoryInfoCellDelegate
 
-- (void)categoryInfoCellDidPressMore:(MWMCategoryInfoCell *)cell {
+- (void)categoryInfoCellDidPressMore:(MWMCategoryInfoCell *)cell
+{
   [self.tableView beginUpdates];
   cell.expanded = YES;
   [self.tableView endUpdates];
@@ -310,7 +312,8 @@
 //*********** End of Location manager callbacks ********************
 //******************************************************************
 
-- (void)viewDidLoad {
+- (void)viewDidLoad
+{
   [super viewDidLoad];
 
   [self.tableView registerWithCellClass:MWMCategoryInfoCell.class];
diff --git a/iphone/Maps/Bookmarks/Catalog/DownloadedBookmarksDataSource.swift b/iphone/Maps/Bookmarks/Catalog/DownloadedBookmarksDataSource.swift
index db34165013..52ff0e4f91 100644
--- a/iphone/Maps/Bookmarks/Catalog/DownloadedBookmarksDataSource.swift
+++ b/iphone/Maps/Bookmarks/Catalog/DownloadedBookmarksDataSource.swift
@@ -16,8 +16,8 @@ class DownloadedBookmarksDataSource {
     set {
       categories.forEach {
         $0.isVisible = newValue
-        MWMBookmarksManager.setCategory($0.categoryId, isVisible: newValue)
       }
+      MWMBookmarksManager.setCatalogCategoriesVisible(newValue)
     }
   }
 
diff --git a/iphone/Maps/Bookmarks/Catalog/MWMCatalogCategory+Convenience.mm b/iphone/Maps/Bookmarks/Catalog/MWMCatalogCategory+Convenience.mm
index 356ecd314b..ac8bad776e 100644
--- a/iphone/Maps/Bookmarks/Catalog/MWMCatalogCategory+Convenience.mm
+++ b/iphone/Maps/Bookmarks/Catalog/MWMCatalogCategory+Convenience.mm
@@ -2,7 +2,8 @@
 
 @implementation MWMCatalogCategory (Convenience)
 
-- (instancetype)initWithCategoryData:(kml::CategoryData &)categoryData bookmarksCount:(UInt64)count {
+- (instancetype)initWithCategoryData:(kml::CategoryData &)categoryData bookmarksCount:(UInt64)count
+{
   self = [self init];
 
   if (self)
diff --git a/iphone/Maps/Bookmarks/Catalog/MWMCatalogCategory.h b/iphone/Maps/Bookmarks/Catalog/MWMCatalogCategory.h
index e27d9d9d71..ae461521ff 100644
--- a/iphone/Maps/Bookmarks/Catalog/MWMCatalogCategory.h
+++ b/iphone/Maps/Bookmarks/Catalog/MWMCatalogCategory.h
@@ -10,5 +10,4 @@
 @property (nonatomic) NSInteger bookmarksCount;
 @property (nonatomic, getter=isVisible) BOOL visible;
 
-
 @end
diff --git a/iphone/Maps/Bookmarks/Categories/BMCView/BMCViewController.swift b/iphone/Maps/Bookmarks/Categories/BMCView/BMCViewController.swift
index e6922a7c54..1467706d4f 100644
--- a/iphone/Maps/Bookmarks/Categories/BMCView/BMCViewController.swift
+++ b/iphone/Maps/Bookmarks/Categories/BMCView/BMCViewController.swift
@@ -245,7 +245,7 @@ extension BMCViewController: UITableViewDelegate {
     case .permissions: return permissionsHeader
     case .categories:
       let categoriesHeader = tableView.dequeueReusableHeaderFooterView(BMCCategoriesHeader.self)
-      categoriesHeader.isShowAll = !viewModel.areAllCategoriesInvisible()
+      categoriesHeader.isShowAll = !viewModel.areAllCategoriesVisible()
       categoriesHeader.delegate = self
       return categoriesHeader
     case .actions: return actionsHeader
@@ -290,7 +290,7 @@ extension BMCViewController: BMCCategoryCellDelegate {
   func visibilityAction(category: BMCCategory) {
     viewModel.updateCategoryVisibility(category: category)
     let categoriesHeader = tableView.headerView(forSection: viewModel.sectionIndex(section: .categories)) as! BMCCategoriesHeader
-    categoriesHeader.isShowAll = !viewModel.areAllCategoriesInvisible()
+    categoriesHeader.isShowAll = !viewModel.areAllCategoriesVisible()
   }
 
   func moreAction(category: BMCCategory, anchor: UIView) {
@@ -318,6 +318,6 @@ extension BMCViewController: BMCPermissionsHeaderDelegate {
 extension BMCViewController: BMCCategoriesHeaderDelegate {
   func visibilityAction(_ categoriesHeader: BMCCategoriesHeader) {
     viewModel.updateAllCategoriesVisibility(isShowAll: categoriesHeader.isShowAll)
-    categoriesHeader.isShowAll = !viewModel.areAllCategoriesInvisible()
+    categoriesHeader.isShowAll = !viewModel.areAllCategoriesVisible()
   }
 }
diff --git a/iphone/Maps/Bookmarks/Categories/BMCViewModel/BMCDefaultViewModel.swift b/iphone/Maps/Bookmarks/Categories/BMCViewModel/BMCDefaultViewModel.swift
index a69be697d4..c570255cc9 100644
--- a/iphone/Maps/Bookmarks/Categories/BMCViewModel/BMCDefaultViewModel.swift
+++ b/iphone/Maps/Bookmarks/Categories/BMCViewModel/BMCDefaultViewModel.swift
@@ -117,7 +117,7 @@ extension BMCDefaultViewModel: BMCViewModel {
     }
   }
 
-  func areAllCategoriesInvisible() -> Bool {
+  func areAllCategoriesVisible() -> Bool {
     var result = true;
     categories.forEach { if !$0.isVisible { result = false } }
     return result
@@ -126,8 +126,8 @@ extension BMCDefaultViewModel: BMCViewModel {
   func updateAllCategoriesVisibility(isShowAll: Bool) {
     categories.forEach {
       $0.isVisible = isShowAll
-      BM.setCategory($0.identifier, isVisible: isShowAll)
     }
+    BM.setUserCategoriesVisible(isShowAll)
   }
 
   func updateCategoryVisibility(category: BMCCategory) {
diff --git a/iphone/Maps/Bookmarks/Categories/BMCViewModel/BMCViewModel.swift b/iphone/Maps/Bookmarks/Categories/BMCViewModel/BMCViewModel.swift
index 5ce74bd1d0..f95be7d440 100644
--- a/iphone/Maps/Bookmarks/Categories/BMCViewModel/BMCViewModel.swift
+++ b/iphone/Maps/Bookmarks/Categories/BMCViewModel/BMCViewModel.swift
@@ -24,7 +24,7 @@ protocol BMCViewModel: AnyObject {
 
   func item(indexPath: IndexPath) -> BMCModel
 
-  func areAllCategoriesInvisible() -> Bool
+  func areAllCategoriesVisible() -> Bool
 
   func updateAllCategoriesVisibility(isShowAll: Bool)
   func updateCategoryVisibility(category: BMCCategory)
diff --git a/iphone/Maps/Bookmarks/MWMCategoryInfoCell.m b/iphone/Maps/Bookmarks/MWMCategoryInfoCell.m
index f12ae1cff5..3c4a61de59 100644
--- a/iphone/Maps/Bookmarks/MWMCategoryInfoCell.m
+++ b/iphone/Maps/Bookmarks/MWMCategoryInfoCell.m
@@ -5,8 +5,8 @@
 @property (weak, nonatomic) IBOutlet UILabel * titleLabel;
 @property (weak, nonatomic) IBOutlet UILabel * authorLabel;
 @property (weak, nonatomic) IBOutlet UILabel * infoLabel;
-@property (weak, nonatomic) IBOutlet UIButton *moreButton;
-@property (weak, nonatomic) IBOutlet NSLayoutConstraint *infoToBottomConstraint;
+@property (weak, nonatomic) IBOutlet UIButton * moreButton;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint * infoToBottomConstraint;
 
 @property (copy, nonatomic) NSString * info;
 @property (copy, nonatomic) NSString * shortInfo;
@@ -15,7 +15,8 @@
 
 @implementation MWMCategoryInfoCell
 
-- (void)awakeFromNib {
+- (void)awakeFromNib
+{
   [super awakeFromNib];
 
   self.titleLabel.text = nil;
diff --git a/iphone/Maps/Bookmarks/SelectSetVC.mm b/iphone/Maps/Bookmarks/SelectSetVC.mm
index 3ea82cfb9c..5de3961f55 100644
--- a/iphone/Maps/Bookmarks/SelectSetVC.mm
+++ b/iphone/Maps/Bookmarks/SelectSetVC.mm
@@ -41,7 +41,8 @@
 
 }
 
-- (void)reloadData {
+- (void)reloadData
+{
   self.groupIds = [MWMBookmarksManager groupsIdList];
   [self.tableView reloadData];
 }
diff --git a/iphone/Maps/Classes/Components/MWMButton.mm b/iphone/Maps/Classes/Components/MWMButton.mm
index 9d59801a89..d7c70d095d 100644
--- a/iphone/Maps/Classes/Components/MWMButton.mm
+++ b/iphone/Maps/Classes/Components/MWMButton.mm
@@ -112,9 +112,11 @@ namespace
   }
 }
 
-- (void)setEnabled:(BOOL)enabled {
+- (void)setEnabled:(BOOL)enabled
+{
   [super setEnabled:enabled];
-  if (!enabled) {
+  if (!enabled)
+  {
     self.tintColor = [UIColor lightGrayColor];
   }
   else
diff --git a/iphone/Maps/Core/Bookmarks/MWMBookmarksManager.h b/iphone/Maps/Core/Bookmarks/MWMBookmarksManager.h
index 33b3f2a605..dfc5172fc4 100644
--- a/iphone/Maps/Core/Bookmarks/MWMBookmarksManager.h
+++ b/iphone/Maps/Core/Bookmarks/MWMBookmarksManager.h
@@ -21,6 +21,8 @@
 + (void)setCategory:(MWMMarkGroupID)groupId name:(NSString *)name;
 + (BOOL)isCategoryVisible:(MWMMarkGroupID)groupId;
 + (void)setCategory:(MWMMarkGroupID)groupId isVisible:(BOOL)isVisible;
++ (void)setUserCategoriesVisible:(BOOL)isVisible;
++ (void)setCatalogCategoriesVisible:(BOOL)isVisible;
 + (void)deleteCategory:(MWMMarkGroupID)groupId;
 
 + (void)deleteBookmark:(MWMMarkID)bookmarkId;
diff --git a/iphone/Maps/Core/Bookmarks/MWMBookmarksManager.mm b/iphone/Maps/Core/Bookmarks/MWMBookmarksManager.mm
index 5aae07b9a8..6521401239 100644
--- a/iphone/Maps/Core/Bookmarks/MWMBookmarksManager.mm
+++ b/iphone/Maps/Core/Bookmarks/MWMBookmarksManager.mm
@@ -261,6 +261,16 @@ NSString * const CloudErrorToString(Cloud::SynchronizationResult result)
   GetFramework().GetBookmarkManager().GetEditSession().SetIsVisible(groupId, isVisible);
 }
 
++ (void)setUserCategoriesVisible:(BOOL)isVisible {
+  GetFramework().GetBookmarkManager()
+  .SetAllCategoriesVisibility(BookmarkManager::CategoryFilterType::Private, isVisible);
+}
+
++ (void)setCatalogCategoriesVisible:(BOOL)isVisible {
+  GetFramework().GetBookmarkManager()
+  .SetAllCategoriesVisibility(BookmarkManager::CategoryFilterType::Public, isVisible);
+}
+
 + (void)deleteCategory:(MWMMarkGroupID)groupId
 {
   GetFramework().GetBookmarkManager().GetEditSession().DeleteBmCategory(groupId);
diff --git a/iphone/Maps/UI/PlacePage/MWMPlacePageData.mm b/iphone/Maps/UI/PlacePage/MWMPlacePageData.mm
index ddd89b0309..27ec57264e 100644
--- a/iphone/Maps/UI/PlacePage/MWMPlacePageData.mm
+++ b/iphone/Maps/UI/PlacePage/MWMPlacePageData.mm
@@ -736,7 +736,8 @@ NSString * const kUserDefaultsLatLonAsDMSKey = @"UserDefaultsLatLonAsDMS";
   return m_info.GetBookmarkCategoryId();
 }
 
-- (BOOL)isFromCatalog {
+- (BOOL)isFromCatalog
+{
   return self.isBookmark && [MWMBookmarksManager isCategoryFromCatalog:self.bookmarkCategoryId];
 }
 
diff --git a/platform/http_client_apple.mm b/platform/http_client_apple.mm
index 0dbc271c68..05d80b835b 100644
--- a/platform/http_client_apple.mm
+++ b/platform/http_client_apple.mm
@@ -46,15 +46,17 @@ extern NSString * gBrowserUserAgent;
 @implementation Connection
 
 + (NSData *)sendSynchronousRequest:(NSURLRequest *)request
-                 returningResponse:(NSURLResponse *__autoreleasing *)response
-                             error:(NSError *__autoreleasing *)error {
+                 returningResponse:(NSURLResponse * __autoreleasing *)response
+                             error:(NSError * __autoreleasing *)error
+{
   Connection * connection = [[Connection alloc] init];
   return [connection sendSynchronousRequest:request returningResponse:response error:error];
 }
 
 - (NSData *)sendSynchronousRequest:(NSURLRequest *)request
-                 returningResponse:(NSURLResponse *__autoreleasing *)response
-                             error:(NSError *__autoreleasing *)error {
+                 returningResponse:(NSURLResponse * __autoreleasing *)response
+                             error:(NSError * __autoreleasing *)error
+{
   NSURLSession * session = [NSURLSession sessionWithConfiguration:[NSURLSessionConfiguration ephemeralSessionConfiguration]
                                                         delegate:self
                                                    delegateQueue:nil];
@@ -66,7 +68,8 @@ extern NSString * gBrowserUserAgent;
   dispatch_group_enter(group);
   [[session dataTaskWithRequest:request completionHandler:^(NSData * _Nullable data,
                                                             NSURLResponse * _Nullable response,
-                                                            NSError * _Nullable error) {
+                                                            NSError * _Nullable error)
+  {
     resultData = data;
     resultResponse = response;
     resultError = error;
@@ -83,7 +86,8 @@ extern NSString * gBrowserUserAgent;
 - (void)URLSession:(NSURLSession *)session
 didReceiveChallenge:(NSURLAuthenticationChallenge *)challenge
  completionHandler:(void (^)(NSURLSessionAuthChallengeDisposition disposition,
-                             NSURLCredential * _Nullable credential))completionHandler {
+                             NSURLCredential * _Nullable credential))completionHandler
+{
   NSURLCredential * credential = [[NSURLCredential alloc] initWithTrust:[challenge protectionSpace].serverTrust];
   completionHandler(NSURLSessionAuthChallengeUseCredential, credential);
 }