diff --git a/indexer/map_style.cpp b/indexer/map_style.cpp
index b9beada060..4a60dcc25f 100644
--- a/indexer/map_style.cpp
+++ b/indexer/map_style.cpp
@@ -53,3 +53,10 @@ std::string DebugPrint(MapStyle mapStyle)
 {
   return MapStyleToString(mapStyle);
 }
+
+
+bool MapStyleIsDark(MapStyle mapStyle)
+{
+  const std::unordered_set<MapStyle> darkStyles {MapStyle::MapStyleDefaultDark, MapStyle::MapStyleVehicleDark, MapStyle::MapStyleOutdoorsDark};
+  return darkStyles.contains(mapStyle);
+}
diff --git a/indexer/map_style.hpp b/indexer/map_style.hpp
index f82bb1abb7..9717367645 100644
--- a/indexer/map_style.hpp
+++ b/indexer/map_style.hpp
@@ -22,3 +22,4 @@ extern MapStyle const kDefaultMapStyle;
 extern MapStyle MapStyleFromSettings(std::string const & str);
 extern std::string MapStyleToString(MapStyle mapStyle);
 extern std::string DebugPrint(MapStyle mapStyle);
+extern bool MapStyleIsDark(MapStyle mapStyle);
diff --git a/qt/draw_widget.cpp b/qt/draw_widget.cpp
index 98f23dc2dd..26110c6874 100644
--- a/qt/draw_widget.cpp
+++ b/qt/draw_widget.cpp
@@ -161,10 +161,7 @@ void DrawWidget::PrepareShutdown()
     routingManager.SaveRoutePoints();
 
     auto style = m_framework.GetMapStyle();
-    if (style == MapStyle::MapStyleVehicleLight)
-      m_framework.MarkMapStyle(MapStyle::MapStyleDefaultLight);
-    else if (style == MapStyle::MapStyleVehicleDark)
-      m_framework.MarkMapStyle(MapStyle::MapStyleDefaultDark);
+    m_framework.MarkMapStyle(MapStyleIsDark(style) ? MapStyle::MapStyleDefaultDark : MapStyle::MapStyleDefaultLight);
   }
 }
 
@@ -656,11 +653,7 @@ void DrawWidget::FollowRoute()
   if (routingManager.IsRoutingActive() && !routingManager.IsRoutingFollowing())
   {
     routingManager.FollowRoute();
-    auto style = m_framework.GetMapStyle();
-    if (style == MapStyle::MapStyleDefaultLight)
-      SetMapStyle(MapStyle::MapStyleVehicleLight);
-    else if (style == MapStyle::MapStyleDefaultDark)
-      SetMapStyle(MapStyle::MapStyleVehicleDark);
+    SetMapStyleToVehicle();
   }
 }
 
@@ -672,13 +665,7 @@ void DrawWidget::ClearRoute()
   routingManager.CloseRouting(true /* remove route points */);
 
   if (wasActive)
-  {
-    auto style = m_framework.GetMapStyle();
-    if (style == MapStyle::MapStyleVehicleLight)
-      SetMapStyle(MapStyle::MapStyleDefaultLight);
-    else if (style == MapStyle::MapStyleVehicleDark)
-      SetMapStyle(MapStyle::MapStyleDefaultDark);
-  }
+    SetMapStyleToDefault();
 
   m_turnsVisualizer.ClearTurns(m_framework.GetDrapeApi());
 }
@@ -781,6 +768,24 @@ void DrawWidget::RefreshDrawingRules()
   SetMapStyle(MapStyleDefaultLight);
 }
 
+void DrawWidget::SetMapStyleToDefault()
+{
+  auto style = m_framework.GetMapStyle();
+  SetMapStyle(MapStyleIsDark(style) ? MapStyle::MapStyleDefaultDark : MapStyle::MapStyleDefaultLight);
+}
+
+void DrawWidget::SetMapStyleToVehicle()
+{
+  auto style = m_framework.GetMapStyle();
+  SetMapStyle(MapStyleIsDark(style) ? MapStyle::MapStyleVehicleDark : MapStyle::MapStyleVehicleLight);
+}
+
+void DrawWidget::SetMapStyleToOutdoors()
+{
+  auto style = m_framework.GetMapStyle();
+  SetMapStyle(MapStyleIsDark(style) ? MapStyle::MapStyleOutdoorsDark : MapStyle::MapStyleOutdoorsLight);
+}
+
 m2::PointD DrawWidget::P2G(m2::PointD const & pt) const
 {
   return m_framework.P3dtoG(pt);
diff --git a/qt/draw_widget.hpp b/qt/draw_widget.hpp
index 335611cd4c..05790e64b8 100644
--- a/qt/draw_widget.hpp
+++ b/qt/draw_widget.hpp
@@ -69,6 +69,9 @@ public:
   void OnRouteRecommendation(RoutingManager::Recommendation recommendation);
 
   void RefreshDrawingRules();
+  void SetMapStyleToDefault();
+  void SetMapStyleToVehicle();
+  void SetMapStyleToOutdoors();
 
 protected:
   /// @name Overriden from MapWidget.
diff --git a/qt/mainwindow.cpp b/qt/mainwindow.cpp
index 4515d8526a..d3684b2ebb 100644
--- a/qt/mainwindow.cpp
+++ b/qt/mainwindow.cpp
@@ -294,6 +294,10 @@ void MainWindow::CreateNavigationBar()
                         std::bind(&MainWindow::OnLayerEnabled, this, LayerType::ISOLINES), true);
     m_layers->setChecked(LayerType::ISOLINES, m_pDrawWidget->GetFramework().LoadIsolinesEnabled());
 
+    m_layers->addAction(QIcon(":/navig64/isolines.png"), tr("Outdoors"),
+                        std::bind(&MainWindow::OnLayerEnabled, this, LayerType::OUTDOORS), true);
+    m_layers->setChecked(LayerType::OUTDOORS, m_pDrawWidget->GetFramework().LoadOutdoorsEnabled());
+
     pToolBar->addWidget(m_layers->create());
     m_layers->setMainIcon(QIcon(":/navig64/layers.png"));
 
@@ -884,24 +888,19 @@ void MainWindow::SetLayerEnabled(LayerType type, bool enable)
     frm.GetIsolinesManager().SetEnabled(enable);
     frm.SaveIsolinesEnabled(enable);
     break;
-  default:
-    UNREACHABLE();
+  case LayerType::OUTDOORS:
+    frm.SaveOutdoorsEnabled(enable);
+    if (enable)
+      m_pDrawWidget->SetMapStyleToOutdoors();
+    else
+      m_pDrawWidget->SetMapStyleToDefault();
     break;
   }
 }
 
 void MainWindow::OnLayerEnabled(LayerType layer)
 {
-  for (size_t i = 0; i < LayerType::COUNT; ++i)
-  {
-    if (i == layer)
-      SetLayerEnabled(static_cast<LayerType>(i), m_layers->isChecked(i));
-    else
-    {
-      m_layers->setChecked(i, false);
-      SetLayerEnabled(static_cast<LayerType>(i), false);
-    }
-  }
+  SetLayerEnabled(layer, m_layers->isChecked(layer));
 }
 
 void MainWindow::OnRulerEnabled()
diff --git a/qt/mainwindow.hpp b/qt/mainwindow.hpp
index 88c1f90092..e3073e9e95 100644
--- a/qt/mainwindow.hpp
+++ b/qt/mainwindow.hpp
@@ -53,9 +53,7 @@ class MainWindow : public QMainWindow, location::LocationObserver
     TRAFFIC = 0,
     TRANSIT,      // Metro scheme
     ISOLINES,
-
-    // Should be the last
-    COUNT
+    OUTDOORS,
   };
   PopupMenuHolder * m_layers = nullptr;
   PopupMenuHolder * m_routing = nullptr;