Issue 7200 - Adjust UI colors

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

 /* 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 android.support.v4.content.ContextCompat;
 import org.mozilla.gecko.R;
 import org.mozilla.gecko.lwt.LightweightThemeDrawable;
 import org.mozilla.gecko.widget.themed.ThemedImageButton;
@@ skipping 49 matching lines @@
     }
 
     @Override
     public void defaultDraw(Canvas canvas) {
         super.draw(canvas);
     }
 
     // The drawable is constructed as per @drawable/shaped_button.
     @Override
     public void onLightweightThemeChanged() {
-        // Using ABB color palette. See https://issues.adblockplus.org/ticket/3769
-        final int background = ContextCompat.getColor(getContext(), R.color.abb_background_light_grey);
+        final int background = ContextCompat.getColor(getContext(), R.color.text_and_tabs_tray_grey);
         final LightweightThemeDrawable lightWeight = getTheme().getColorDrawable(this, background);
 
         if (lightWeight == null)
             return;
 
         lightWeight.setAlpha(34, 34);
 
         final StateListDrawable stateList = new StateListDrawable();
         stateList.addState(PRESSED_ENABLED_STATE_SET, getColorDrawable(R.color.highlight_shaped));
         stateList.addState(FOCUSED_STATE_SET, getColorDrawable(R.color.highlight_shaped_focused));
-        // Using ABB color palette. See https://issues.adblockplus.org/ticket/3769
-        stateList.addState(PRIVATE_STATE_SET, getColorDrawable(R.color.abb_background_light_grey));
+        stateList.addState(PRIVATE_STATE_SET, getColorDrawable(R.color.text_and_tabs_tray_grey));
         stateList.addState(EMPTY_STATE_SET, lightWeight);
 
         setBackgroundDrawable(stateList);
     }
 
     @Override
     public void onLightweightThemeReset() {
         setBackgroundResource(R.drawable.shaped_button);
     }
 
@@ skipping 13 matching lines @@
         super.setBackgroundDrawable(drawable);
 
         ViewCompat.setPaddingRelative(this, padding[0], padding[1], padding[2], padding[3]);
     }
 
     @Override
     public void setBackgroundResource(int resId) {
         setBackgroundDrawable(getResources().getDrawable(resId));
     }
 }