diff --git a/iphone/Maps/Categories/UIColor+MapsMeColor.mm b/iphone/Maps/Categories/UIColor+MapsMeColor.mm
index 10d206a9cf..47317e5b9f 100644
--- a/iphone/Maps/Categories/UIColor+MapsMeColor.mm
+++ b/iphone/Maps/Categories/UIColor+MapsMeColor.mm
@@ -143,7 +143,8 @@ UIColor * color(SEL cmd)
 - (UIColor *)opposite
 {
   NSString * key = [(isNightMode ? day : night) allKeysForObject:self].firstObject;
-  return key == nil ? nil : (isNightMode ? night : day)[key];
+  UIColor * color = (key == nil ? nil : (isNightMode ? night : day)[key]);
+  return color ?: self;
 }
 
 // Dark green color
diff --git a/iphone/Maps/Classes/Components/ExpandableTextView/ExpandableTextView.swift b/iphone/Maps/Classes/Components/ExpandableTextView/ExpandableTextView.swift
index 76846b9957..e21e0d42fc 100644
--- a/iphone/Maps/Classes/Components/ExpandableTextView/ExpandableTextView.swift
+++ b/iphone/Maps/Classes/Components/ExpandableTextView/ExpandableTextView.swift
@@ -135,6 +135,12 @@ import UIKit
     setup()
   }
 
+  override func mwm_refreshUI() {
+    super.mwm_refreshUI()
+    textColor = textColor?.opposite()
+    expandTextColor = expandTextColor?.opposite()
+  }
+
   private func setup() {
     layer.backgroundColor = UIColor.clear.cgColor
     isOpaque = true
diff --git a/iphone/Maps/Classes/Components/RatingView/RatingView.swift b/iphone/Maps/Classes/Components/RatingView/RatingView.swift
index 48f676872e..71ea81cc9c 100644
--- a/iphone/Maps/Classes/Components/RatingView/RatingView.swift
+++ b/iphone/Maps/Classes/Components/RatingView/RatingView.swift
@@ -330,6 +330,18 @@ import UIKit
     return viewSize
   }
 
+  override func mwm_refreshUI() {
+    super.mwm_refreshUI()
+    leftTextColor = leftTextColor.opposite()
+    rightTextColor = rightTextColor.opposite()
+    topTextColor = topTextColor.opposite()
+    bottomTextColor = bottomTextColor.opposite()
+    filledColor = filledColor.opposite()
+    emptyColor = emptyColor.opposite()
+    emptyBorderColor = emptyBorderColor.opposite()
+    filledBorderColor = filledBorderColor.opposite()
+  }
+
   private func createLayers() -> [CALayer] {
     return combineLayers(starLayers: createStarLayers(), textLayers: createTextLayers())
   }