diff --git a/drape_frontend/route_renderer.cpp b/drape_frontend/route_renderer.cpp
index 4f9f9a5f1c..38e8f59849 100644
--- a/drape_frontend/route_renderer.cpp
+++ b/drape_frontend/route_renderer.cpp
@@ -27,9 +27,7 @@ std::string const kRouteArrowsMaskCar = "RouteArrowsMaskCar";
 std::string const kRouteMaskBicycle = "RouteMaskBicycle";
 std::string const kRouteArrowsMaskBicycle = "RouteArrowsMaskBicycle";
 std::string const kRouteMaskPedestrian = "RouteMaskPedestrian";
-
-// TODO(@darina) Use separate colors.
-std::string const kTransitOutlineColor = "RouteMarkPrimaryTextOutline";
+std::string const kTransitStopInnerMarkerColor = "TransitStopInnerMarker";
 
 namespace
 {
diff --git a/drape_frontend/route_renderer.hpp b/drape_frontend/route_renderer.hpp
index 33cd910d43..8442bcba83 100644
--- a/drape_frontend/route_renderer.hpp
+++ b/drape_frontend/route_renderer.hpp
@@ -22,7 +22,7 @@ extern std::string const kRouteColor;
 extern std::string const kRouteOutlineColor;
 extern std::string const kRoutePedestrian;
 extern std::string const kRouteBicycle;
-extern std::string const kTransitOutlineColor;
+extern std::string const kTransitStopInnerMarkerColor;
 
 class RouteRenderer final
 {
diff --git a/drape_frontend/transit_scheme_builder.cpp b/drape_frontend/transit_scheme_builder.cpp
index efe8202427..0d5fdad937 100644
--- a/drape_frontend/transit_scheme_builder.cpp
+++ b/drape_frontend/transit_scheme_builder.cpp
@@ -44,11 +44,11 @@ float const kOuterMarkerDepth = kBaseMarkerDepth + 0.5f;
 float const kInnerMarkerDepth = kBaseMarkerDepth + 1.0f;
 uint32_t const kTransitOverlayIndex = 1000;
 
-// TODO(@darina) Use separate colors.
-std::string const kTransitMarkText = "RouteMarkPrimaryText";
-std::string const kTransitMarkTextOutline = "RouteMarkPrimaryTextOutline";
-std::string const kTransitTransferOuterColor = "RouteMarkPrimaryText";
-std::string const kTransitStopInnerColor = "RouteMarkPrimaryTextOutline";
+std::string const kTransitMarkText = "TransitMarkPrimaryText";
+std::string const kTransitMarkTextOutline = "TransitMarkPrimaryTextOutline";
+std::string const kTransitTransferOuterColor = "TransitTransferOuterMarker";
+std::string const kTransitTransferInnerColor = "TransitTransferInnerMarker";
+std::string const kTransitStopInnerColor = "TransitStopInnerMarker";
 
 float const kTransitMarkTextSize = 12.0f;
 
@@ -622,7 +622,7 @@ void TransitSchemeBuilder::GenerateTransfer(StopNodeParams const & params, m2::P
   float const kInnerScale = 1.0f;
   float const kOuterScale = 1.5f;
   auto const outerColor = GetColorConstant(kTransitTransferOuterColor);
-  auto const innerColor = GetColorConstant(kTransitStopInnerColor);
+  auto const innerColor = GetColorConstant(kTransitTransferInnerColor);
 
   float const widthLinesCount = maxLinesCount > 3 ? 1.6f : 1.0f;
   float const innerScale = maxLinesCount == 1 ? 1.4f : kInnerScale;
diff --git a/map/routing_mark.cpp b/map/routing_mark.cpp
index 2d35be7265..1a43dcb79d 100644
--- a/map/routing_mark.cpp
+++ b/map/routing_mark.cpp
@@ -11,9 +11,10 @@ static std::string const kRouteMarkPrimaryTextOutline = "RouteMarkPrimaryTextOut
 static std::string const kRouteMarkSecondaryText = "RouteMarkSecondaryText";
 static std::string const kRouteMarkSecondaryTextOutline = "RouteMarkSecondaryTextOutline";
 
-// TODO(@darina) Use separate colors.
-static std::string const kTransitMarkText = "RouteMarkPrimaryText";
-static std::string const kTransitMarkTextOutline = "RouteMarkPrimaryTextOutline";
+static std::string const kTransitMarkPrimaryText = "TransitMarkPrimaryText";
+static std::string const kTransitMarkPrimaryTextOutline = "TransitMarkPrimaryTextOutline";
+static std::string const kTransitMarkSecondaryText = "TransitMarkSecondaryText";
+static std::string const kTransitMarkSecondaryTextOutline = "TransitMarkSecondaryTextOutline";
 
 float const kRouteMarkPrimaryTextSize = 11.0f;
 float const kRouteMarkSecondaryTextSize = 10.0f;
@@ -504,10 +505,10 @@ drape_ptr<df::UserPointMark::SymbolNameZoomInfo> TransitMark::GetSymbolNames() c
 void TransitMark::GetDefaultTransitTitle(dp::TitleDecl & titleDecl)
 {
   titleDecl = dp::TitleDecl();
-  titleDecl.m_primaryTextFont.m_color = df::GetColorConstant(kTransitMarkText);
-  titleDecl.m_primaryTextFont.m_outlineColor = df::GetColorConstant(kTransitMarkTextOutline);
+  titleDecl.m_primaryTextFont.m_color = df::GetColorConstant(kTransitMarkPrimaryText);
+  titleDecl.m_primaryTextFont.m_outlineColor = df::GetColorConstant(kTransitMarkPrimaryTextOutline);
   titleDecl.m_primaryTextFont.m_size = kTransitMarkTextSize;
-  titleDecl.m_secondaryTextFont.m_color = df::GetColorConstant(kTransitMarkText);
-  titleDecl.m_secondaryTextFont.m_outlineColor = df::GetColorConstant(kTransitMarkTextOutline);
+  titleDecl.m_secondaryTextFont.m_color = df::GetColorConstant(kTransitMarkSecondaryText);
+  titleDecl.m_secondaryTextFont.m_outlineColor = df::GetColorConstant(kTransitMarkSecondaryTextOutline);
   titleDecl.m_secondaryTextFont.m_size = kTransitMarkTextSize;
 }
diff --git a/map/transit/transit_display.cpp b/map/transit/transit_display.cpp
index 1609562aa2..001ac2ba6c 100644
--- a/map/transit/transit_display.cpp
+++ b/map/transit/transit_display.cpp
@@ -318,7 +318,7 @@ void TransitRouteDisplay::ProcessSubroute(vector<RouteSegment> const & segments,
 
       if (marker.m_colors.size() > 1)
       {
-        marker.m_innerColor = df::kTransitOutlineColor;
+        marker.m_innerColor = df::kTransitStopInnerMarkerColor;
         marker.m_up = (currentDir - lastDir).Normalize();
         if (m2::CrossProduct(marker.m_up, -lastDir) < 0)
           marker.m_up = -marker.m_up;