diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/views/NavigationURLBar.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/views/NavigationURLBar.java
index 720535bf8..0531f6fc5 100644
--- a/app/src/common/shared/org/mozilla/vrbrowser/ui/views/NavigationURLBar.java
+++ b/app/src/common/shared/org/mozilla/vrbrowser/ui/views/NavigationURLBar.java
@@ -326,8 +326,8 @@ public void setURL(String aURL) {
                 return;
 
             } else if (aURL.startsWith("resource:") || mSession.isHomeUri(aURL)) {
-
                 aURL = "";
+
             } else if (aURL.startsWith("data:") && mSession.isPrivateMode()) {
                 aURL = "";
 
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/NavigationBarWidget.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/NavigationBarWidget.java
index c8d3f5430..9538dba5a 100644
--- a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/NavigationBarWidget.java
+++ b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/NavigationBarWidget.java
@@ -425,9 +425,15 @@ public void attachToWindow(@NonNull WindowWidget aWindow) {
         mAttachedWindow.addWindowListener(this);
         mAttachedWindow.setPopUpDelegate(mPopUpDelegate);
 
+        clearFocus();
+
+        if (getSession() != null) {
+            setUpSession(getSession());
+        }
+        handleWindowResize();
+
         if (mAttachedWindow != null) {
             mURLBar.setIsLibraryVisible(mAttachedWindow.isBookmarksVisible() || mAttachedWindow.isHistoryVisible());
-            mURLBar.setURL("");
             if (mAttachedWindow.isBookmarksVisible()) {
                 mURLBar.setHint(R.string.url_bookmarks_title);
                 mURLBar.setIsLibraryVisible(true);
@@ -443,13 +449,6 @@ public void attachToWindow(@NonNull WindowWidget aWindow) {
             }
             mURLBar.setIsPopUpAvailable(mAttachedWindow.hasPendingPopUps());
         }
-
-        clearFocus();
-
-        if (getSession() != null) {
-            setUpSession(getSession());
-        }
-        handleWindowResize();
     }
 
     private Session getSession() {
diff --git a/app/src/main/res/drawable/url_bar_hint_fading_edge_end.xml b/app/src/main/res/drawable/url_bar_hint_fading_edge_end.xml
deleted file mode 100644
index 2f762af3e..000000000
--- a/app/src/main/res/drawable/url_bar_hint_fading_edge_end.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_enabled="true">
-        <shape>
-            <corners android:bottomRightRadius="20dp" android:topRightRadius="20dp" />
-            <gradient
-                android:type="linear"
-                android:angle="0"
-                android:startColor="#00000000"
-                android:endColor="@color/void_color" />
-        </shape>
-    </item>
-    <item android:state_enabled="false">
-        <shape>
-            <corners android:bottomRightRadius="20dp" android:topRightRadius="20dp" />
-            <gradient
-                android:type="linear"
-                android:angle="0"
-                android:startColor="#00000000"
-                android:endColor="@color/asphalt" />
-        </shape>
-    </item>
-</selector>
-
diff --git a/app/src/main/res/drawable/url_bar_hint_fading_edge_end_private.xml b/app/src/main/res/drawable/url_bar_hint_fading_edge_end_private.xml
deleted file mode 100644
index 311f77563..000000000
--- a/app/src/main/res/drawable/url_bar_hint_fading_edge_end_private.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_enabled="true">
-        <shape>
-            <corners android:bottomRightRadius="20dp" android:topRightRadius="20dp" />
-            <gradient
-                android:type="linear"
-                android:angle="0"
-                android:startColor="#00000000"
-                android:endColor="@color/blackberry" />
-        </shape>
-    </item>
-    <item android:state_enabled="false">
-        <shape>
-            <corners android:bottomRightRadius="20dp" android:topRightRadius="20dp" />
-            <gradient
-                android:type="linear"
-                android:angle="0"
-                android:startColor="#00000000"
-                android:endColor="@color/eggplant" />
-        </shape>
-    </item>
-</selector>
-
diff --git a/app/src/main/res/drawable/url_bar_hint_fading_edge_private.xml b/app/src/main/res/drawable/url_bar_hint_fading_edge_private.xml
index 311f77563..bb4a4d0ff 100644
--- a/app/src/main/res/drawable/url_bar_hint_fading_edge_private.xml
+++ b/app/src/main/res/drawable/url_bar_hint_fading_edge_private.xml
@@ -1,24 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_enabled="true">
-        <shape>
-            <corners android:bottomRightRadius="20dp" android:topRightRadius="20dp" />
-            <gradient
-                android:type="linear"
-                android:angle="0"
-                android:startColor="#00000000"
-                android:endColor="@color/blackberry" />
-        </shape>
-    </item>
-    <item android:state_enabled="false">
-        <shape>
-            <corners android:bottomRightRadius="20dp" android:topRightRadius="20dp" />
-            <gradient
-                android:type="linear"
-                android:angle="0"
-                android:startColor="#00000000"
-                android:endColor="@color/eggplant" />
-        </shape>
-    </item>
+<item android:state_focused="true">
+    <layer-list>
+        <item android:width="120dp">
+            <shape>
+                <gradient
+                    android:startColor="#00000000"
+                    android:endColor="@color/blackberry" />
+                <corners android:topRightRadius="20dp" android:bottomRightRadius="20dp"/>
+            </shape>
+        </item>
+    </layer-list>
+</item>
+<item android:state_focused="false">
+    <layer-list>
+        <item android:width="120dp">
+            <shape>
+                <gradient
+                    android:startColor="@android:color/transparent"
+                    android:endColor="@color/eggplant" />
+                <corners android:topRightRadius="20dp" android:bottomRightRadius="20dp"/>
+            </shape>
+        </item>
+    </layer-list>
+</item>
+<item>
+    <shape>
+        <gradient
+            android:type="linear"
+            android:angle="0"
+            android:startColor="#00000000"
+            android:endColor="@color/eggplant" />
+    </shape>
+</item>
 </selector>
 
diff --git a/app/src/main/res/layout/navigation_url.xml b/app/src/main/res/layout/navigation_url.xml
index 1a11adb73..491a2293c 100644
--- a/app/src/main/res/layout/navigation_url.xml
+++ b/app/src/main/res/layout/navigation_url.xml
@@ -139,7 +139,7 @@
                         app:visibleGone="@{isPopUpAvailable}" />
 
                     <View
-                        android:layout_width="10dp"
+                        android:layout_width="15dp"
                         android:layout_height="match_parent"
                         app:visibleGone="@{!isPopUpAvailable}"/>
                 </LinearLayout>
@@ -154,6 +154,7 @@
                         android:id="@+id/loadingView"
                         android:layout_width="24dp"
                         android:layout_height="24dp"
+                        android:paddingEnd="5dp"
                         android:contentDescription="Loading animation"
                         android:src="@drawable/loading_shape"
                         app:visibleGone="@{isLoading}" />
@@ -163,14 +164,14 @@
                         android:layout_height="24dp"
                         android:contentDescription="SSL icon"
                         android:src="@drawable/ic_icon_security_state_insecure"
-                        app:visibleGone="@{isInsecure}" />
+                        app:visibleGone="@{isInsecure &amp;&amp; (urlEditText.length() != 0)}" />
                 </LinearLayout>
 
             </RelativeLayout>
 
             <View
                 android:id="@+id/padding"
-                android:layout_width="10dp"
+                android:layout_width="15dp"
                 android:layout_height="match_parent"
                 android:layout_toEndOf="@id/iconsLayout"
                 app:visibleGone="@{isLibraryVisible}"/>
@@ -182,7 +183,7 @@
                 android:paddingEnd="10dp"
                 android:layout_toStartOf="@id/endButtonsLayout"
                 android:layout_toEndOf="@id/padding"
-                android:foreground="@{isUrlEmpty ? @drawable/url_bar_hint_fading_edge : null}"
+                android:foreground="@{isUrlEmpty ? (isPrivateMode ? @drawable/url_bar_hint_fading_edge_private : @drawable/url_bar_hint_fading_edge) : null}"
                 android:foregroundGravity="fill_vertical|right"
                 android:ems="10"
                 android:fadingEdgeLength="40dp"