diff --git a/app/src/main/java/dev/lowrespalmtree/comet/PageFragment.kt b/app/src/main/java/dev/lowrespalmtree/comet/PageFragment.kt
index 9561592..9be03e7 100644
--- a/app/src/main/java/dev/lowrespalmtree/comet/PageFragment.kt
+++ b/app/src/main/java/dev/lowrespalmtree/comet/PageFragment.kt
@@ -138,15 +138,15 @@ class PageFragment : Fragment(), ContentAdapterListener {
                 binding.contentProgressBar.hide()
                 binding.contentSwipeLayout.isRefreshing = false
                 binding.addressBar.setText(vm.currentUrl)
-                binding.addressBar.setTypeface(null, Typeface.NORMAL)
+                binding.addressBar.setTextColor(resources.getColor(R.color.url_bar, null))
             }
             PageViewModel.State.CONNECTING -> {
+                binding.appBarLayout.setExpanded(true, true)
                 binding.contentProgressBar.show()
                 binding.addressBar.setText(vm.loadingUrl?.toString() ?: "")
-                binding.addressBar.setTypeface(null, Typeface.ITALIC)
+                binding.addressBar.setTextColor(resources.getColor(R.color.url_bar_loading, null))
             }
             PageViewModel.State.RECEIVING -> {
-                binding.appBarLayout.setExpanded(true, true)
                 binding.contentSwipeLayout.isRefreshing = false
             }
         }
diff --git a/app/src/main/res/layout/fragment_page_view.xml b/app/src/main/res/layout/fragment_page_view.xml
index e51cbe0..cb545f0 100644
--- a/app/src/main/res/layout/fragment_page_view.xml
+++ b/app/src/main/res/layout/fragment_page_view.xml
@@ -30,6 +30,7 @@
                 android:importantForAutofill="no"
                 android:inputType="textUri"
                 android:text=""
+                android:textColor="@color/url_bar"
                 tools:ignore="TextContrastCheck" />
 
         </Toolbar>
diff --git a/app/src/main/res/layout/gemtext_preformatted.xml b/app/src/main/res/layout/gemtext_preformatted.xml
index 7f1e035..8ff6f6f 100644
--- a/app/src/main/res/layout/gemtext_preformatted.xml
+++ b/app/src/main/res/layout/gemtext_preformatted.xml
@@ -12,8 +12,6 @@
         android:textColor="@color/text"
         android:fontFamily="@font/preformatted"
         android:typeface="monospace"
-        android:paddingStart="16dp"
-        android:paddingEnd="8dp"
-        android:paddingTop="4dp"
-        android:paddingBottom="4dp" />
+        android:padding="4dp"
+        android:background="@color/background_emph" />
 </HorizontalScrollView>
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index ced0691..7c0e63a 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -9,4 +9,6 @@
     <color name="second_accent">#2aa198</color>
     <color name="second_accent_dark">#073642</color>
     <color name="link">#2aa198</color>
+    <color name="url_bar">#fdf6e3</color>
+    <color name="url_bar_loading">#586e75</color>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 8f7297f..fa1ae70 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -11,6 +11,8 @@
     <color name="second_accent">#6c71c4</color>
     <color name="second_accent_dark">#073642</color>
     <color name="link">#268bd2</color>
+    <color name="url_bar">#002b36</color>
+    <color name="url_bar_loading">#fdf6e3</color>
     <!--
     Based on Solarized
     SOLARIZED HEX     16/8 TERMCOL  XTERM/HEX   L*A*B      RGB         HSB