--- a/mobile/android/app/src/australis/res/values/colors.xml
+++ b/mobile/android/app/src/australis/res/values/colors.xml
@@ -95,17 +95,18 @@
   <color name="text_color_link">#22629E</color>
 
   <!-- Divider colors -->
   <color name="toolbar_divider_grey">#D7D9DB</color>
 
   <color name="doorhanger_link">#FF2AA1FE</color>
 
   <color name="validation_message_text">#ffffff</color>
-  <color name="url_bar_text_highlight_pb">#FFD06BFF</color>
+  <color name="url_bar_text_highlight">@color/fennec_ui_orange</color>
+  <color name="url_bar_text_highlight_private">#FFD06BFF</color>
   <color name="tab_row_pressed">#4D000000</color>
 
   <color name="url_bar_urltext">#AFB1B3</color>
   <color name="url_bar_urltext_private">#777777</color>
   <color name="url_bar_domaintext">#363B40</color>
   <color name="url_bar_domaintext_private">#FFFFFF</color>
   <color name="url_bar_blockedtext">#b14646</color>
   <color name="url_bar_blockedtext_private">@color/url_bar_blockedtext</color>

--- a/mobile/android/base/java/org/mozilla/gecko/CustomEditText.java
+++ b/mobile/android/base/java/org/mozilla/gecko/CustomEditText.java
@@ -77,13 +77,14 @@ public class CustomEditText extends Them
         return mHighlightColor;
     }
 
     @Override
     public void setPrivateMode(boolean isPrivate) {
         super.setPrivateMode(isPrivate);
 
         mHighlightColor = ContextCompat.getColor(getContext(), isPrivate
-                ? R.color.url_bar_text_highlight_pb : R.color.fennec_ui_orange);
+                ? R.color.url_bar_text_highlight_private : R.color.url_bar_text_highlight);
+
         // android:textColorHighlight cannot support a ColorStateList.
         setHighlightColor(mHighlightColor);
     }
 }

--- a/mobile/android/base/java/org/mozilla/gecko/toolbar/BrowserToolbarPhoneBase.java
+++ b/mobile/android/base/java/org/mozilla/gecko/toolbar/BrowserToolbarPhoneBase.java
@@ -134,18 +134,21 @@ abstract class BrowserToolbarPhoneBase e
     protected void updateNavigationButtons(final Tab tab) {
         // We have no navigation buttons so do nothing.
     }
 
     @Override
     public void draw(final Canvas canvas) {
         super.draw(canvas);
 
-        if (uiMode == UIMode.DISPLAY) {
-            canvas.drawPath(roundCornerShape, roundCornerPaint);
+        // bug 1375351: Only draw curve in Australis flavor
+        if (SkinConfig.isAustralis()) {
+            if (uiMode == UIMode.DISPLAY) {
+                canvas.drawPath(roundCornerShape, roundCornerPaint);
+            }
         }
     }
 
     @Override
     public void triggerTabsPanelTransition(final PropertyAnimator animator, final boolean areTabsShown) {
         if (areTabsShown) {
             ViewHelper.setAlpha(tabsCounter, 0.0f);