Issue 7200 - Adjust UI colors

mobile/android/base/java/org/mozilla/gecko/toolbar/BrowserToolbarPhoneBase.java

 /* -*- Mode: Java; c-basic-offset: 4; tab-width: 20; indent-tabs-mode: nil; -*-
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 package org.mozilla.gecko.toolbar;
 
 import java.util.Arrays;
 
 import android.support.v4.content.ContextCompat;
@@ skipping 45 matching lines @@
 
         focusOrder.add(this);
         focusOrder.addAll(urlDisplayLayout.getFocusOrder());
         focusOrder.addAll(Arrays.asList(tabsButton, menuButton));
 
         roundCornerShape = new Path();
         updateRoundCornerShape();
 
         roundCornerPaint = new Paint();
         roundCornerPaint.setAntiAlias(true);
-        // Using ABB color palette. See https://issues.adblockplus.org/ticket/3769
-        roundCornerPaint.setColor(ContextCompat.getColor(context, R.color.abb_background_light_grey));
+        roundCornerPaint.setColor(ContextCompat.getColor(context, R.color.text_and_tabs_tray_grey));
         roundCornerPaint.setStrokeWidth(0.0f);
     }
 
     private void updateRoundCornerShape() {
         roundCornerShape.reset();
         if (ViewCompat.getLayoutDirection(this) == ViewCompat.LAYOUT_DIRECTION_RTL) {
             int right = getRight();
             roundCornerShape.moveTo(right, 0);
             roundCornerShape.lineTo(right - 30, 0);
             roundCornerShape.cubicTo(right, 0, right, 0, right, 30);
@@ skipping 158 matching lines @@
         ((ThemedImageButton) editCancel).onLightweightThemeChanged();
     }
 
     @Override
     public void onLightweightThemeReset() {
         super.onLightweightThemeReset();
 
         ((ThemedImageButton) editCancel).onLightweightThemeReset();
     }
 }