diff --git a/iphone/Maps/Bookmarks/BookmarksRootVC.mm b/iphone/Maps/Bookmarks/BookmarksRootVC.mm
index ab712f7741..3cade06b65 100644
--- a/iphone/Maps/Bookmarks/BookmarksRootVC.mm
+++ b/iphone/Maps/Bookmarks/BookmarksRootVC.mm
@@ -157,7 +157,7 @@
 {
   // Remove cell selection
   UITableViewCell * cell = [tableView cellForRowAtIndexPath:indexPath];
-  [cell setSelected:NO animated:!tableView.editing];
+  [self.tableView deselectRowAtIndexPath:indexPath animated:YES];
 
   if (tableView.editing)
   {
diff --git a/iphone/Maps/Bookmarks/BookmarksVC.mm b/iphone/Maps/Bookmarks/BookmarksVC.mm
index f8506cd068..d24f2b6dd4 100644
--- a/iphone/Maps/Bookmarks/BookmarksVC.mm
+++ b/iphone/Maps/Bookmarks/BookmarksVC.mm
@@ -116,6 +116,7 @@
           cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleValue1 reuseIdentifier:@"BookmarksVCSetVisibilityCell"] autorelease];
           cell.textLabel.text = NSLocalizedString(@"visible", nil);
           cell.accessoryView = [[[UISwitch alloc] init] autorelease];
+          cell.selectionStyle = UITableViewCellSelectionStyleNone;
         }
         UISwitch * sw = (UISwitch *)cell.accessoryView;
         sw.on = cat->IsVisible();
@@ -197,7 +198,7 @@
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
 {
   // Remove cell selection
-  [[tableView cellForRowAtIndexPath:indexPath] setSelected:NO animated:NO];
+  [self.tableView deselectRowAtIndexPath:indexPath animated:YES];
 
   Framework & f = GetFramework();
   switch (indexPath.section)
diff --git a/iphone/Maps/Bookmarks/PlacePageVC.mm b/iphone/Maps/Bookmarks/PlacePageVC.mm
index 350bd8bac1..0370e11faf 100644
--- a/iphone/Maps/Bookmarks/PlacePageVC.mm
+++ b/iphone/Maps/Bookmarks/PlacePageVC.mm
@@ -214,7 +214,7 @@
 
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
 {
-  [[tableView cellForRowAtIndexPath:indexPath] setSelected:NO animated:YES];
+  [self.tableView deselectRowAtIndexPath:indexPath animated:YES];
 
   if (indexPath.section == 0)
   {
diff --git a/iphone/Maps/Bookmarks/SelectColorVC.mm b/iphone/Maps/Bookmarks/SelectColorVC.mm
index 1d4c1fc9c0..51445a6fa1 100644
--- a/iphone/Maps/Bookmarks/SelectColorVC.mm
+++ b/iphone/Maps/Bookmarks/SelectColorVC.mm
@@ -57,8 +57,8 @@ static NSString * g_colors [] = {
 
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
 {
+  [self.tableView deselectRowAtIndexPath:indexPath animated:YES];
   UITableViewCell * cell = [tableView cellForRowAtIndexPath:indexPath];
-  [cell setSelected:NO animated:YES];
   m_balloon.pinImage.image = cell.imageView.image;
   m_balloon.color = g_colors[indexPath.row];
   [self.navigationController popViewControllerAnimated:YES];
diff --git a/iphone/Maps/Bookmarks/SelectSetVC.mm b/iphone/Maps/Bookmarks/SelectSetVC.mm
index 0fc3fa9cca..d3dfa32c98 100644
--- a/iphone/Maps/Bookmarks/SelectSetVC.mm
+++ b/iphone/Maps/Bookmarks/SelectSetVC.mm
@@ -64,8 +64,7 @@
 
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
 {
-  UITableViewCell * cell = [tableView cellForRowAtIndexPath:indexPath];
-  [cell setSelected:NO animated:YES];
+  [self.tableView deselectRowAtIndexPath:indexPath animated:YES];
   if (indexPath.section == 0)
   {
     AddSetVC * asVC = [[AddSetVC alloc] initWithBalloonView:m_balloon andRootNavigationController:self.navigationController];