Issue 3769 - UI colours gone bad

mobile/android/base/toolbar/BrowserToolbar.java

Index: mobile/android/base/toolbar/BrowserToolbar.java
===================================================================
--- a/mobile/android/base/toolbar/BrowserToolbar.java
+++ b/mobile/android/base/toolbar/BrowserToolbar.java
@@ -198,18 +198,19 @@ public abstract class BrowserToolbar ext
 
         // The focusOrder List should be filled by sub-classes.
         focusOrder = new ArrayList<View>();
 
         final Resources res = getResources();
         shadowSize = res.getDimensionPixelSize(R.dimen.browser_toolbar_shadow_size);
 
         shadowPaint = new Paint();
-        shadowColor = ColorUtils.getColor(context, R.color.url_bar_shadow);
-        shadowPrivateColor = ColorUtils.getColor(context, R.color.url_bar_shadow_private);
+        // Using ABB color for toolbar divider. See https://issues.adblockplus.org/ticket/3769
+        shadowColor = ColorUtils.getColor(context, R.color.abb_text_divider_grey);
+        shadowPrivateColor = ColorUtils.getColor(context, R.color.abb_text_divider_grey);
         shadowPaint.setColor(shadowColor);
         shadowPaint.setStrokeWidth(0.0f);
 
         setUIMode(UIMode.DISPLAY);
 
         prefs = new ToolbarPrefs();
         urlDisplayLayout.setToolbarPrefs(prefs);
         urlEditLayout.setToolbarPrefs(prefs);
@@ -828,16 +829,18 @@ public abstract class BrowserToolbar ext
 
     @Override
     public void setPrivateMode(boolean isPrivate) {
         super.setPrivateMode(isPrivate);
 
         tabsButton.setPrivateMode(isPrivate);
         menuButton.setPrivateMode(isPrivate);
         urlEditLayout.setPrivateMode(isPrivate);
+        // Changing color in private mode. See https://issues.adblockplus.org/ticket/3769
+        menuIcon.setPrivateMode(isPrivate);
 
         shadowPaint.setColor(isPrivate ? shadowPrivateColor : shadowColor);
     }
 
     public void show() {
         setVisibility(View.VISIBLE);
     }