diff --git a/src/com/android/browser/BaseUi.java b/src/com/android/browser/BaseUi.java
index c00e6fc..2a03893 100644
--- a/src/com/android/browser/BaseUi.java
+++ b/src/com/android/browser/BaseUi.java
@@ -481,8 +481,9 @@
         FrameLayout wrapper =
             (FrameLayout) mContentView.findViewById(R.id.webview_wrapper);
         wrapper.setVisibility(View.GONE);
-        hideTitleBar();
+        getTitleBar().stopEditingUrl();
         dismissIME();
+        hideTitleBar();
         if (mActiveTab != null) {
             WebView web = mActiveTab.getWebView();
             mActiveTab.putInBackground();
diff --git a/src/com/android/browser/PhoneUi.java b/src/com/android/browser/PhoneUi.java
index 9cc5a2f..42e2aff 100644
--- a/src/com/android/browser/PhoneUi.java
+++ b/src/com/android/browser/PhoneUi.java
@@ -104,16 +104,22 @@
 
     @Override
     public void onProgressChanged(Tab tab) {
-        if (mUseQuickControls) return;
         if (tab.inForeground()) {
             int progress = tab.getLoadProgress();
             mTitleBar.setProgress(progress);
             if (progress == 100) {
                 if (!mOptionsMenuOpen || !mExtendedMenuOpen) {
                     hideTitleBar();
+                    if (mUseQuickControls) {
+                        mTitleBar.setShowProgressOnly(false);
+                    }
                 }
             } else {
                 if (!mOptionsMenuOpen || mExtendedMenuOpen) {
+                    if (mUseQuickControls && !mTitleBar.isEditingUrl()) {
+                        mTitleBar.setShowProgressOnly(true);
+                        setTitleGravity(Gravity.TOP);
+                    }
                     showTitleBar();
                 }
             }
@@ -272,13 +278,13 @@
 
     @Override
     public void onActionModeFinished(boolean inLoad) {
-        // TODO: Remove once b/4136071 is fixed
-        new Handler().post(new Runnable() {
-            @Override
-            public void run() {
-                mActivity.getActionBar().hide();
+        if (inLoad) {
+            if (mUseQuickControls) {
+                mTitleBar.setShowProgressOnly(true);
             }
-        });
+            showTitleBar();
+        }
+        mActivity.getActionBar().hide();
     }
 
     @Override
@@ -331,7 +337,6 @@
         mUseQuickControls = useQuickControls;
         getTitleBar().setUseQuickControls(mUseQuickControls);
         if (useQuickControls) {
-//            checkTabCount();
             mPieControl = new PieControl(mActivity, mUiController, this);
             mPieControl.attachToContainer(mContentView);
             Tab tab = getActiveTab();
@@ -373,4 +378,11 @@
                             .getDimension(R.dimen.tab_view_thumbnail_height));
         }
     }
+
+    @Override
+    void showTitleBarAndEdit() {
+        mTitleBar.setShowProgressOnly(false);
+        super.showTitleBarAndEdit();
+    }
+
 }
diff --git a/src/com/android/browser/PieControl.java b/src/com/android/browser/PieControl.java
index 82e26c4..846811d 100644
--- a/src/com/android/browser/PieControl.java
+++ b/src/com/android/browser/PieControl.java
@@ -128,10 +128,10 @@
             // level 2
             mPie.addItem(mForward);
             mPie.addItem(mRefresh);
+            mPie.addItem(mOptions);
             mPie.addItem(mShowTabs);
             mPie.addItem(mNewTab);
             mPie.addItem(mClose);
-            mPie.addItem(mOptions);
             mPie.setController(this);
         }
         container.addView(mPie);
diff --git a/src/com/android/browser/TitleBarPhone.java b/src/com/android/browser/TitleBarPhone.java
index d6b5f4d..3edd831 100644
--- a/src/com/android/browser/TitleBarPhone.java
+++ b/src/com/android/browser/TitleBarPhone.java
@@ -42,7 +42,8 @@
         OnClickListener, TextChangeWatcher {
 
     private Activity mActivity;
-    private StopProgressView mStopButton;
+    private ImageView mStopButton;
+    private PageProgressView mProgress;
     private ImageView mVoiceButton;
     private boolean mInLoad;
     private View mContainer;
@@ -60,8 +61,9 @@
         mContainer = findViewById(R.id.taburlbar);
         mLockIcon = (ImageView) findViewById(R.id.lock);
         mFavicon = (ImageView) findViewById(R.id.favicon);
-        mStopButton = (StopProgressView) findViewById(R.id.stop);
+        mStopButton = (ImageView) findViewById(R.id.stop);
         mStopButton.setOnClickListener(this);
+        mProgress = (PageProgressView) findViewById(R.id.progress);
         mVoiceButton = (ImageView) findViewById(R.id.voice);
         mVoiceButton.setOnClickListener(this);
         setFocusState(false);
@@ -119,14 +121,24 @@
      */
     @Override
     void setProgress(int newProgress) {
+        boolean blockvisuals = mUseQuickControls && isEditingUrl();
         if (newProgress >= PROGRESS_MAX) {
             mInLoad = false;
+            if (!blockvisuals) {
+                mProgress.setProgress(PageProgressView.MAX_PROGRESS);
+                mProgress.setVisibility(View.GONE);
+            }
             setFocusState(mUrlInput.hasFocus());
         } else {
             if (!mInLoad) {
                 mInLoad = true;
+                if (!blockvisuals) {
+                    mProgress.setVisibility(View.VISIBLE);
+                }
                 setFocusState(mUrlInput.hasFocus());
             }
+            mProgress.setProgress(newProgress * PageProgressView.MAX_PROGRESS
+                    / PROGRESS_MAX);
         }
     }
 
@@ -200,6 +212,14 @@
         setLayoutParams(makeLayoutParams());
     }
 
+    void setShowProgressOnly(boolean progress) {
+        if (progress && !inAutoLogin()) {
+            mContainer.setVisibility(View.GONE);
+        } else {
+            mContainer.setVisibility(View.VISIBLE);
+        }
+    }
+
     private ViewGroup.LayoutParams makeLayoutParams() {
         if (mUseQuickControls) {
             return new FrameLayout.LayoutParams(LayoutParams.MATCH_PARENT,
diff --git a/src/com/android/browser/TitleBarXLarge.java b/src/com/android/browser/TitleBarXLarge.java
index 7a8d984..4254046 100644
--- a/src/com/android/browser/TitleBarXLarge.java
+++ b/src/com/android/browser/TitleBarXLarge.java
@@ -211,6 +211,7 @@
      * called from the Ui when the user wants to edit
      * @param clearInput clear the input field
      */
+    @Override
     void startEditingUrl(boolean clearInput) {
         // editing takes preference of progress
         mContainer.setVisibility(View.VISIBLE);
diff --git a/src/com/android/browser/XLargeUi.java b/src/com/android/browser/XLargeUi.java
index 7e78f0d..e19515e 100644
--- a/src/com/android/browser/XLargeUi.java
+++ b/src/com/android/browser/XLargeUi.java
@@ -291,10 +291,10 @@
         mTitleBar.startEditingUrl(clearInput);
     }
 
+    @Override
     void showTitleBarAndEdit() {
         mTitleBar.setShowProgressOnly(false);
-        showTitleBar();
-        mTitleBar.startEditingUrl(false);
+        super.showTitleBarAndEdit();
     }
 
     void stopEditingUrl() {