diff --git a/iphone/Maps/Bookmarks/Categories/Actions/BMCActionsCreateCell.swift b/iphone/Maps/Bookmarks/Categories/Actions/BMCActionsCell.swift
similarity index 52%
rename from iphone/Maps/Bookmarks/Categories/Actions/BMCActionsCreateCell.swift
rename to iphone/Maps/Bookmarks/Categories/Actions/BMCActionsCell.swift
index b137295b97..4f8491bd50 100644
--- a/iphone/Maps/Bookmarks/Categories/Actions/BMCActionsCreateCell.swift
+++ b/iphone/Maps/Bookmarks/Categories/Actions/BMCActionsCell.swift
@@ -1,15 +1,12 @@
-final class BMCActionsCreateCell: MWMTableViewCell {
+final class BMCActionsCell: MWMTableViewCell {
   @IBOutlet private weak var actionImage: UIImageView!
 
   @IBOutlet private weak var actionTitle: UILabel!
 
   private var model: BMCAction! {
     didSet {
-      switch model! {
-      case .create:
-        actionImage.image = #imageLiteral(resourceName: "ic24PxAddCopy")
-        actionTitle.text = L("bookmarks_create_new_group")
-      }
+      actionImage.image = #imageLiteral(resourceName: "ic24PxAddCopy")
+      actionTitle.text = L("bookmarks_create_new_group")
     }
   }
 
diff --git a/iphone/Maps/Bookmarks/Categories/Actions/BMCActionsCreateCell.xib b/iphone/Maps/Bookmarks/Categories/Actions/BMCActionsCell.xib
similarity index 97%
rename from iphone/Maps/Bookmarks/Categories/Actions/BMCActionsCreateCell.xib
rename to iphone/Maps/Bookmarks/Categories/Actions/BMCActionsCell.xib
index 708319a36b..528edcbf40 100644
--- a/iphone/Maps/Bookmarks/Categories/Actions/BMCActionsCreateCell.xib
+++ b/iphone/Maps/Bookmarks/Categories/Actions/BMCActionsCell.xib
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22504"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="KGk-i7-Jjw" customClass="BMCActionsCreateCell" customModule="OMaps" customModuleProvider="target">
+        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="KGk-i7-Jjw" customClass="BMCActionsCell" customModule="Organic_Maps" customModuleProvider="target">
             <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
             <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
diff --git a/iphone/Maps/Bookmarks/Categories/BMCView/BMCViewController.swift b/iphone/Maps/Bookmarks/Categories/BMCView/BMCViewController.swift
index 274af6795a..29160ed386 100644
--- a/iphone/Maps/Bookmarks/Categories/BMCView/BMCViewController.swift
+++ b/iphone/Maps/Bookmarks/Categories/BMCView/BMCViewController.swift
@@ -12,7 +12,7 @@ final class BMCViewController: MWMViewController {
     didSet {
       let cells = [
         BMCCategoryCell.self,
-        BMCActionsCreateCell.self,
+        BMCActionsCell.self,
         BMCNotificationsCell.self,
       ]
       tableView.registerNibs(cells)
@@ -198,7 +198,7 @@ extension BMCViewController: UITableViewDataSource {
       return dequeCell(BMCCategoryCell.self).config(category: viewModel.category(at: indexPath.row),
                                                     delegate: self)
     case .actions:
-      return dequeCell(BMCActionsCreateCell.self).config(model: viewModel.action(at: indexPath.row))
+      return dequeCell(BMCActionsCell.self).config(model: viewModel.action(at: indexPath.row))
     case .notifications:
       return dequeCell(BMCNotificationsCell.self)
     }
diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj
index 5fcc7c39c2..76005f3d07 100644
--- a/iphone/Maps/Maps.xcodeproj/project.pbxproj
+++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj
@@ -33,8 +33,8 @@
 		3404F490202898CC0090E401 /* BMCModels.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3404F48F202898CC0090E401 /* BMCModels.swift */; };
 		3404F4992028A20D0090E401 /* BMCCategoryCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3404F4972028A20D0090E401 /* BMCCategoryCell.swift */; };
 		3404F49A2028A20D0090E401 /* BMCCategoryCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3404F4982028A20D0090E401 /* BMCCategoryCell.xib */; };
-		3404F49D2028A2430090E401 /* BMCActionsCreateCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3404F49B2028A2430090E401 /* BMCActionsCreateCell.swift */; };
-		3404F49E2028A2430090E401 /* BMCActionsCreateCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3404F49C2028A2430090E401 /* BMCActionsCreateCell.xib */; };
+		3404F49D2028A2430090E401 /* BMCActionsCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3404F49B2028A2430090E401 /* BMCActionsCell.swift */; };
+		3404F49E2028A2430090E401 /* BMCActionsCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3404F49C2028A2430090E401 /* BMCActionsCell.xib */; };
 		3406FA161C6E0C3300E9FAD2 /* MWMMapDownloadDialog.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3406FA141C6E0C3300E9FAD2 /* MWMMapDownloadDialog.mm */; };
 		3406FA191C6E0D8F00E9FAD2 /* MWMMapDownloadDialog.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3406FA171C6E0D8F00E9FAD2 /* MWMMapDownloadDialog.xib */; };
 		340708651F2905A500029ECC /* NavigationInfoArea.swift in Sources */ = {isa = PBXBuildFile; fileRef = 340708631F2905A500029ECC /* NavigationInfoArea.swift */; };
@@ -741,8 +741,8 @@
 		3404F48F202898CC0090E401 /* BMCModels.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BMCModels.swift; sourceTree = "<group>"; };
 		3404F4972028A20D0090E401 /* BMCCategoryCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BMCCategoryCell.swift; sourceTree = "<group>"; };
 		3404F4982028A20D0090E401 /* BMCCategoryCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = BMCCategoryCell.xib; sourceTree = "<group>"; };
-		3404F49B2028A2430090E401 /* BMCActionsCreateCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BMCActionsCreateCell.swift; sourceTree = "<group>"; };
-		3404F49C2028A2430090E401 /* BMCActionsCreateCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = BMCActionsCreateCell.xib; sourceTree = "<group>"; };
+		3404F49B2028A2430090E401 /* BMCActionsCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BMCActionsCell.swift; sourceTree = "<group>"; };
+		3404F49C2028A2430090E401 /* BMCActionsCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = BMCActionsCell.xib; sourceTree = "<group>"; };
 		340537621BBED98600D452C6 /* MWMMapViewControlsCommon.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = MWMMapViewControlsCommon.h; path = APIBar/MWMMapViewControlsCommon.h; sourceTree = "<group>"; };
 		3406FA131C6E0C3300E9FAD2 /* MWMMapDownloadDialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMMapDownloadDialog.h; sourceTree = "<group>"; };
 		3406FA141C6E0C3300E9FAD2 /* MWMMapDownloadDialog.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMMapDownloadDialog.mm; sourceTree = "<group>"; };
@@ -2019,8 +2019,8 @@
 		343D7B6D202AF4CA007D56A8 /* Actions */ = {
 			isa = PBXGroup;
 			children = (
-				3404F49B2028A2430090E401 /* BMCActionsCreateCell.swift */,
-				3404F49C2028A2430090E401 /* BMCActionsCreateCell.xib */,
+				3404F49B2028A2430090E401 /* BMCActionsCell.swift */,
+				3404F49C2028A2430090E401 /* BMCActionsCell.xib */,
 			);
 			path = Actions;
 			sourceTree = "<group>";
@@ -3867,7 +3867,7 @@
 				6741A9981BF340DE002C974C /* resources-xhdpi_clear in Resources */,
 				6741A9611BF340DE002C974C /* resources-xhdpi_dark in Resources */,
 				6741A94D1BF340DE002C974C /* resources-xxhdpi_clear in Resources */,
-				3404F49E2028A2430090E401 /* BMCActionsCreateCell.xib in Resources */,
+				3404F49E2028A2430090E401 /* BMCActionsCell.xib in Resources */,
 				6741A9551BF340DE002C974C /* resources-xxhdpi_dark in Resources */,
 				340E1EF51E2F614400CE49BF /* SearchFilters.storyboard in Resources */,
 				340E1EF81E2F614400CE49BF /* Settings.storyboard in Resources */,
@@ -3950,7 +3950,7 @@
 				F6E2FED01E097BA00083EBEC /* MWMSearchFilterViewController.mm in Sources */,
 				34D3B01B1E389D05004100F9 /* MWMButtonCell.m in Sources */,
 				337F98B421D3C9F200C8AC27 /* SearchHistoryViewController.swift in Sources */,
-				3404F49D2028A2430090E401 /* BMCActionsCreateCell.swift in Sources */,
+				3404F49D2028A2430090E401 /* BMCActionsCell.swift in Sources */,
 				F6E2FD8F1E097BA00083EBEC /* MWMNoMapsViewController.mm in Sources */,
 				993DF12C23F6BDB100AC231A /* Theme.swift in Sources */,
 				47CA68D8250044C500671019 /* BookmarksListRouter.swift in Sources */,