diff --git a/apps/reader/tasks.py b/apps/reader/tasks.py
index 522c26211..ac3fd0a56 100644
--- a/apps/reader/tasks.py
+++ b/apps/reader/tasks.py
@@ -29,7 +29,7 @@ def FreshenHomepage():
         sub.save()
         sub.calculate_feed_scores(silent=True)
 
-@app.task(name='clean_analytics', time_limit=720*10)
+@app.task(name='clean-analytics', time_limit=720*10)
 def CleanAnalytics():
     logging.debug(" ---> Cleaning analytics... %s feed fetches" % (
         settings.MONGOANALYTICSDB.nbanalytics.feed_fetches.count(),
diff --git a/apps/social/models.py b/apps/social/models.py
index 466ad8e63..63d161ad0 100644
--- a/apps/social/models.py
+++ b/apps/social/models.py
@@ -1599,6 +1599,14 @@ class MSharedStory(mongo.DynamicDocument):
             socialsub.save()
 
         self.delete()
+
+    def publish_to_subscribers(self):
+        try:
+            r = redis.Redis(connection_pool=settings.REDIS_PUBSUB_POOL)
+            r.publish("social:%s:story" % (self.user_id), '%s,%s' % (self.story_hash, self.shared_date.strftime('%s')))
+            logging.debug("   ***> [%-30s] ~BMPublishing to Redis for real-time." % (Feed.get_by_id(self.story_feed_id).title[:30],))
+        except redis.ConnectionError:
+            logging.debug("   ***> [%-30s] ~BMRedis is unavailable for real-time." % (Feed.get_by_id(self.story_feed_id).title[:30],))
     
     @classmethod
     def feed_quota(cls, user_id, story_hash, feed_id=None, days=1, quota=1):
@@ -2763,7 +2771,7 @@ class MSocialServices(mongo.Document):
             return
             
         return True
-        
+    
 
 class MInteraction(mongo.Document):
     user_id      = mongo.IntField()
diff --git a/apps/social/views.py b/apps/social/views.py
index f31140171..63f416a5d 100644
--- a/apps/social/views.py
+++ b/apps/social/views.py
@@ -611,6 +611,7 @@ def mark_story_as_shared(request):
         }
         try:
             shared_story = MSharedStory.objects.create(**story_db)
+            shared_story.publish_to_subscribers()
         except NotUniqueError:
             shared_story = MSharedStory.objects.get(story_guid=story_db['story_guid'],
                                                     user_id=story_db['user_id'])
@@ -667,6 +668,7 @@ def mark_story_as_shared(request):
     
     EmailFirstShare.apply_async(kwargs=dict(user_id=request.user.pk))
     
+
     if format == 'html':
         stories = MSharedStory.attach_users_to_stories(stories, profiles)
         return render(request, 'social/social_story.xhtml', {
diff --git a/clients/android/NewsBlur/AndroidManifest.xml b/clients/android/NewsBlur/AndroidManifest.xml
index fc63f0059..269e37a96 100644
--- a/clients/android/NewsBlur/AndroidManifest.xml
+++ b/clients/android/NewsBlur/AndroidManifest.xml
@@ -126,15 +126,13 @@
         <activity
             android:name=".activity.FolderReading"/>
 
-        <activity
-            android:name=".activity.InAppBrowser" />
-
         <activity
             android:name=".activity.Premium" />
 
         <activity
             android:name=".activity.MuteConfig"
-            android:launchMode="singleTask"/>
+            android:launchMode="singleTask"
+            android:label="@string/mute_sites"/>
         
         <activity 
             android:name=".activity.SearchForFeeds" android:launchMode="singleTop" >
diff --git a/clients/android/NewsBlur/assets/black_reading.css b/clients/android/NewsBlur/assets/black_reading.css
index 8cbafed10..bec227edc 100644
--- a/clients/android/NewsBlur/assets/black_reading.css
+++ b/clients/android/NewsBlur/assets/black_reading.css
@@ -28,3 +28,20 @@ blockquote a, blockquote a span {
 .NB-story > table {
     background-color: #1A1A1A !important;
 }
+
+ins {
+    background-color: #069000;
+    text-decoration: none;
+}
+
+del {
+    background-color: #920000;
+}
+.NB-story ins {
+    background-color: #069000;
+    text-decoration: none;
+}
+
+.NB-story del {
+    background-color: #920000;
+}
\ No newline at end of file
diff --git a/clients/android/NewsBlur/assets/dark_reading.css b/clients/android/NewsBlur/assets/dark_reading.css
index 1c382d1d2..a79f0f021 100644
--- a/clients/android/NewsBlur/assets/dark_reading.css
+++ b/clients/android/NewsBlur/assets/dark_reading.css
@@ -27,4 +27,21 @@ blockquote a, blockquote a span {
 
 .NB-story > table {
     background-color: #4C4C4C !important;
+}
+
+ins {
+    background-color: #069000;
+    text-decoration: none;
+}
+
+del {
+    background-color: #920000;
+}
+.NB-story ins {
+    background-color: #069000;
+    text-decoration: none;
+}
+
+.NB-story del {
+    background-color: #920000;
 }
\ No newline at end of file
diff --git a/clients/android/NewsBlur/assets/light_reading.css b/clients/android/NewsBlur/assets/light_reading.css
index 19c151b46..fa47bc620 100644
--- a/clients/android/NewsBlur/assets/light_reading.css
+++ b/clients/android/NewsBlur/assets/light_reading.css
@@ -23,4 +23,21 @@ pre, blockquote {
     body, html {
         background-color: #FFF;
     }
+}
+
+ins {
+    background-color: #BEE8BC;
+    text-decoration: none;
+}
+
+del {
+    background-color: #f5c3c3
+}
+.NB-story ins {
+    background-color: #BEE8BC;
+    text-decoration: none
+}
+
+.NB-story del {
+    background-color: #f5c3c3;
 }
\ No newline at end of file
diff --git a/clients/android/NewsBlur/assets/reading.css b/clients/android/NewsBlur/assets/reading.css
index dd4f63d9e..8177f8771 100644
--- a/clients/android/NewsBlur/assets/reading.css
+++ b/clients/android/NewsBlur/assets/reading.css
@@ -63,13 +63,4 @@ pre, blockquote {
     margin: 0.6em;
     word-wrap: break-word !important;
     white-space: pre-wrap !important;
-}
-
-/* these are the diff blocks produced by NewsBlur */
-ins { 
-	text-decoration: none;
-}
-
-del {
-    display: none;
-}
+}
\ No newline at end of file
diff --git a/clients/android/NewsBlur/build.gradle b/clients/android/NewsBlur/build.gradle
index b48d5402c..e82c3d6eb 100644
--- a/clients/android/NewsBlur/build.gradle
+++ b/clients/android/NewsBlur/build.gradle
@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.4.10'
+    ext.kotlin_version = '1.4.20'
     repositories {
         mavenCentral()
         maven {
@@ -9,7 +9,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.0'
+        classpath 'com.android.tools.build:gradle:4.1.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
@@ -34,10 +34,13 @@ dependencies {
     implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
     implementation 'com.squareup.okhttp3:okhttp:4.9.0'
     implementation 'com.google.code.gson:gson:2.8.6'
-    implementation 'com.android.billingclient:billing:3.0.1'
+    implementation 'com.android.billingclient:billing:3.0.2'
     implementation 'nl.dionsegijn:konfetti:1.2.2'
     implementation 'com.github.jinatonic.confetti:confetti:1.1.2'
-    implementation 'com.google.android.play:core:1.8.3'
+    implementation 'com.google.android.play:core:1.9.0'
+    implementation "com.google.android.material:material:1.2.1"
+    implementation "androidx.preference:preference-ktx:1.1.1"
+    implementation "androidx.browser:browser:1.3.0"
 }
 
 android {
@@ -46,14 +49,15 @@ android {
         applicationId "com.newsblur"
         minSdkVersion 21
         targetSdkVersion 29
-        versionCode 177
-        versionName "10.1.1"
+        versionCode 180
+        versionName "10.2.1b1"
     }
     compileOptions.with {
         sourceCompatibility = JavaVersion.VERSION_1_8
         targetCompatibility = JavaVersion.VERSION_1_8
     }
     android.buildFeatures.viewBinding = true
+    android.buildFeatures.dataBinding = true
 
     sourceSets {
         main {
diff --git a/clients/android/NewsBlur/res/drawable/ic_bookmark.xml b/clients/android/NewsBlur/res/drawable/ic_bookmark.xml
index 2e1dfadc7..a9d4765ff 100644
--- a/clients/android/NewsBlur/res/drawable/ic_bookmark.xml
+++ b/clients/android/NewsBlur/res/drawable/ic_bookmark.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="#A6A6A6"
+        android:fillColor="@color/gray55"
         android:pathData="M19,18l2,1V3c0,-1.1 -0.9,-2 -2,-2H8.99C7.89,1 7,1.9 7,3h10c1.1,0 2,0.9 2,2v13zM15,5H5c-1.1,0 -2,0.9 -2,2v16l7,-3 7,3V7c0,-1.1 -0.9,-2 -2,-2z" />
 </vector>
diff --git a/clients/android/NewsBlur/res/drawable/ic_dining.xml b/clients/android/NewsBlur/res/drawable/ic_dining.xml
index 6793ae0f9..6e8e470ca 100644
--- a/clients/android/NewsBlur/res/drawable/ic_dining.xml
+++ b/clients/android/NewsBlur/res/drawable/ic_dining.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="#A6A6A6"
+        android:fillColor="@color/gray55"
         android:pathData="M8.1,13.34l2.83,-2.83L3.91,3.5c-1.56,1.56 -1.56,4.09 0,5.66l4.19,4.18zM14.88,11.53c1.53,0.71 3.68,0.21 5.27,-1.38 1.91,-1.91 2.28,-4.65 0.81,-6.12 -1.46,-1.46 -4.2,-1.1 -6.12,0.81 -1.59,1.59 -2.09,3.74 -1.38,5.27L3.7,19.87l1.41,1.41L12,14.41l6.88,6.88 1.41,-1.41L13.41,13l1.47,-1.47z" />
 </vector>
diff --git a/clients/android/NewsBlur/res/drawable/ic_file_edit.png b/clients/android/NewsBlur/res/drawable/ic_file_edit.png
new file mode 100644
index 000000000..5132c000d
Binary files /dev/null and b/clients/android/NewsBlur/res/drawable/ic_file_edit.png differ
diff --git a/clients/android/NewsBlur/res/drawable/ic_folder.xml b/clients/android/NewsBlur/res/drawable/ic_folder.xml
index 721dec314..82bdfd668 100644
--- a/clients/android/NewsBlur/res/drawable/ic_folder.xml
+++ b/clients/android/NewsBlur/res/drawable/ic_folder.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="#A6A6A6"
+        android:fillColor="@color/gray55"
         android:pathData="M10,4H4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2V8c0,-1.1 -0.9,-2 -2,-2h-8l-2,-2z" />
 </vector>
diff --git a/clients/android/NewsBlur/res/drawable/ic_hand_pointing_right.xml b/clients/android/NewsBlur/res/drawable/ic_hand_pointing_right.xml
index 3463f37a2..dcb910746 100644
--- a/clients/android/NewsBlur/res/drawable/ic_hand_pointing_right.xml
+++ b/clients/android/NewsBlur/res/drawable/ic_hand_pointing_right.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="#A6A6A6"
+        android:fillColor="@color/gray55"
         android:pathData="M21,9A1,1 0,0 1,22 10A1,1 0,0 1,21 11H16.53L16.4,12.21L14.2,17.15C14,17.65 13.47,18 12.86,18H8.5C7.7,18 7,17.27 7,16.5V10C7,9.61 7.16,9.26 7.43,9L11.63,4.1L12.4,4.84C12.6,5.03 12.72,5.29 12.72,5.58L12.69,5.8L11,9H21M2,18V10H5V18H2Z" />
 </vector>
diff --git a/clients/android/NewsBlur/res/drawable/ic_lock.xml b/clients/android/NewsBlur/res/drawable/ic_lock.xml
index 6c3cc5598..658e34b2d 100644
--- a/clients/android/NewsBlur/res/drawable/ic_lock.xml
+++ b/clients/android/NewsBlur/res/drawable/ic_lock.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="#A6A6A6"
+        android:fillColor="@color/gray55"
         android:pathData="M18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM12,17c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2zM15.1,8L8.9,8L8.9,6c0,-1.71 1.39,-3.1 3.1,-3.1 1.71,0 3.1,1.39 3.1,3.1v2z" />
 </vector>
diff --git a/clients/android/NewsBlur/res/drawable/ic_menu_fullscreen_gray55.png b/clients/android/NewsBlur/res/drawable/ic_menu_fullscreen_gray55.png
deleted file mode 100755
index 15f91e4aa..000000000
Binary files a/clients/android/NewsBlur/res/drawable/ic_menu_fullscreen_gray55.png and /dev/null differ
diff --git a/clients/android/NewsBlur/res/drawable/ic_rss_feed.xml b/clients/android/NewsBlur/res/drawable/ic_rss_feed.xml
index 88af5ee32..c5813bda8 100644
--- a/clients/android/NewsBlur/res/drawable/ic_rss_feed.xml
+++ b/clients/android/NewsBlur/res/drawable/ic_rss_feed.xml
@@ -4,9 +4,9 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="#A6A6A6"
+        android:fillColor="@color/gray55"
         android:pathData="M6.18,17.82m-2.18,0a2.18,2.18 0,1 1,4.36 0a2.18,2.18 0,1 1,-4.36 0" />
     <path
-        android:fillColor="#A6A6A6"
+        android:fillColor="@color/gray55"
         android:pathData="M4,4.44v2.83c7.03,0 12.73,5.7 12.73,12.73h2.83c0,-8.59 -6.97,-15.56 -15.56,-15.56zM4,10.1v2.83c3.9,0 7.07,3.17 7.07,7.07h2.83c0,-5.47 -4.43,-9.9 -9.9,-9.9z" />
 </vector>
diff --git a/clients/android/NewsBlur/res/drawable/ic_search.xml b/clients/android/NewsBlur/res/drawable/ic_search.xml
index 4e02b363a..f98ddb005 100644
--- a/clients/android/NewsBlur/res/drawable/ic_search.xml
+++ b/clients/android/NewsBlur/res/drawable/ic_search.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="#A6A6A6"
+        android:fillColor="@color/gray55"
         android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z" />
 </vector>
diff --git a/clients/android/NewsBlur/res/drawable/ic_sync.xml b/clients/android/NewsBlur/res/drawable/ic_sync.xml
index e16b8024f..a1e783529 100644
--- a/clients/android/NewsBlur/res/drawable/ic_sync.xml
+++ b/clients/android/NewsBlur/res/drawable/ic_sync.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="#A6A6A6"
+        android:fillColor="@color/gray55"
         android:pathData="M12,4L12,1L8,5l4,4L12,6c3.31,0 6,2.69 6,6 0,1.01 -0.25,1.97 -0.7,2.8l1.46,1.46C19.54,15.03 20,13.57 20,12c0,-4.42 -3.58,-8 -8,-8zM12,18c-3.31,0 -6,-2.69 -6,-6 0,-1.01 0.25,-1.97 0.7,-2.8L5.24,7.74C4.46,8.97 4,10.43 4,12c0,4.42 3.58,8 8,8v3l4,-4 -4,-4v3z" />
 </vector>
diff --git a/clients/android/NewsBlur/res/drawable/ic_text.xml b/clients/android/NewsBlur/res/drawable/ic_text.xml
index a8ae5a005..fcaac987a 100644
--- a/clients/android/NewsBlur/res/drawable/ic_text.xml
+++ b/clients/android/NewsBlur/res/drawable/ic_text.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="#A6A6A6"
+        android:fillColor="@color/gray55"
         android:pathData="M14,17L4,17v2h10v-2zM20,9L4,9v2h16L20,9zM4,15h16v-2L4,13v2zM4,5v2h16L20,5L4,5z" />
 </vector>
diff --git a/clients/android/NewsBlur/res/layout/actionbar_custom_icon.xml b/clients/android/NewsBlur/res/layout/actionbar_custom_icon.xml
deleted file mode 100644
index bf777969e..000000000
--- a/clients/android/NewsBlur/res/layout/actionbar_custom_icon.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent" >
-
-    <ImageView
-        android:id="@+id/actionbar_icon"
-        android:layout_width="24dp"
-        android:layout_height="24dp"
-        android:layout_alignParentLeft="true"
-        android:layout_centerVertical="true"
-        android:layout_marginLeft="10dp"
-        android:layout_marginRight="4dp"
-        android:src="@drawable/world" />
-
-    <TextView
-        android:id="@+id/actionbar_text"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerVertical="true"
-        android:layout_toRightOf="@id/actionbar_icon"
-        android:ellipsize="end"
-        android:maxLines="1"
-        android:textSize="18sp" />
-
-</RelativeLayout>
diff --git a/clients/android/NewsBlur/res/layout/activity_addfeedexternal.xml b/clients/android/NewsBlur/res/layout/activity_addfeedexternal.xml
index 2e9d1b4ba..897b7a58e 100644
--- a/clients/android/NewsBlur/res/layout/activity_addfeedexternal.xml
+++ b/clients/android/NewsBlur/res/layout/activity_addfeedexternal.xml
@@ -1,25 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:animateLayoutChanges="true"
-    style="?itemBackground" >
+    android:layout_height="match_parent">
 
-    <com.newsblur.view.ProgressThrobber
-        android:id="@+id/loading_throb"
-        android:layout_width="fill_parent"
-        android:layout_alignParentTop="true"
-        android:layout_height="6dp" />
+    <include layout="@layout/toolbar_newsblur" />
 
-    <TextView
-        android:id="@+id/progress_text"
+    <RelativeLayout
+        style="?layoutBackground"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentTop="true"
-        android:layout_marginTop="25dp"
-        android:gravity="center_horizontal"
-        style="?explainerText"
-        android:visibility="invisible"
-        android:textSize="16sp" />
-    
-</RelativeLayout>
+        android:layout_height="match_parent"
+        android:animateLayoutChanges="true"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
+        <com.newsblur.view.ProgressThrobber
+            android:id="@+id/loading_throb"
+            android:layout_width="fill_parent"
+            android:layout_height="6dp"
+            android:layout_alignParentTop="true" />
+
+        <TextView
+            android:id="@+id/progress_text"
+            style="?explainerText"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_alignParentTop="true"
+            android:layout_marginTop="25dp"
+            android:gravity="center_horizontal"
+            android:textSize="16sp"
+            android:visibility="invisible" />
+
+    </RelativeLayout>
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/clients/android/NewsBlur/res/layout/activity_addsocial.xml b/clients/android/NewsBlur/res/layout/activity_addsocial.xml
index 1fb2bdb49..829a555ec 100644
--- a/clients/android/NewsBlur/res/layout/activity_addsocial.xml
+++ b/clients/android/NewsBlur/res/layout/activity_addsocial.xml
@@ -1,32 +1,42 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/item_background" >
+    android:layout_height="match_parent">
 
-    <FrameLayout
-        android:id="@+id/addsocial_container"
+    <include layout="@layout/toolbar_newsblur" />
+
+    <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginTop="10dp"
-        android:gravity="center"
-        android:padding="20dp" />
-    
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:gravity="right"
-        android:padding="10dp" >
+        android:background="@color/item_background"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-        <Button
-            android:id="@+id/login_addsocial_nextstep"
-            android:layout_width="wrap_content"
+        <FrameLayout
+            android:id="@+id/addsocial_container"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginTop="10dp"
+            android:gravity="center"
+            android:padding="20dp" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginRight="10dp"
-            android:text="Start Reading"
-            android:textSize="14sp" />
-        
-    </LinearLayout>
+            android:layout_alignParentBottom="true"
+            android:gravity="right"
+            android:padding="10dp">
 
-</RelativeLayout>
+            <Button
+                android:id="@+id/login_addsocial_nextstep"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginRight="10dp"
+                android:text="Start Reading"
+                android:textSize="14sp" />
+
+        </LinearLayout>
+
+    </RelativeLayout>
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/clients/android/NewsBlur/res/layout/activity_feed_search.xml b/clients/android/NewsBlur/res/layout/activity_feed_search.xml
index 827c7f365..31fbdf06a 100644
--- a/clients/android/NewsBlur/res/layout/activity_feed_search.xml
+++ b/clients/android/NewsBlur/res/layout/activity_feed_search.xml
@@ -1,25 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    style="?listBackground" >
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
 
-    
-    <TextView
-        android:id="@+id/empty_view"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_centerInParent="true"
-        android:gravity="center"
-        android:text="@string/empty_search_notice"
-        android:textColor="@color/text"
-        android:textSize="13sp"
-        android:textStyle="italic" />
-    
-    <ListView
-        android:id="@+id/feed_result_list"
-        android:name="com.newsblur.fragment.FolderListFragment"
+    <include layout="@layout/toolbar_newsblur" />
+
+    <RelativeLayout
+        style="?listBackground"
         android:layout_width="fill_parent"
-        android:layout_height="fill_parent" />
+        android:layout_height="fill_parent"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-</RelativeLayout>
+        <TextView
+            android:id="@+id/empty_view"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_centerInParent="true"
+            android:gravity="center"
+            android:text="@string/empty_search_notice"
+            android:textColor="@color/text"
+            android:textSize="13sp"
+            android:textStyle="italic" />
+
+        <ListView
+            android:id="@+id/feed_result_list"
+            android:name="com.newsblur.fragment.FolderListFragment"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent" />
+
+    </RelativeLayout>
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/clients/android/NewsBlur/res/layout/activity_in_app_browser.xml b/clients/android/NewsBlur/res/layout/activity_in_app_browser.xml
deleted file mode 100644
index b6ed584f5..000000000
--- a/clients/android/NewsBlur/res/layout/activity_in_app_browser.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <WebView
-        android:id="@+id/web_view"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-
-    <ProgressBar
-        android:id="@+id/progress_bar"
-        style="?android:attr/progressBarStyleHorizontal"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="-6dp"
-        android:max="100"
-        android:visibility="gone"/>
-
-</FrameLayout>
\ No newline at end of file
diff --git a/clients/android/NewsBlur/res/layout/activity_itemslist.xml b/clients/android/NewsBlur/res/layout/activity_itemslist.xml
index 251b7c3f7..5b76c08f9 100644
--- a/clients/android/NewsBlur/res/layout/activity_itemslist.xml
+++ b/clients/android/NewsBlur/res/layout/activity_itemslist.xml
@@ -1,50 +1,57 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:animateLayoutChanges="true"
-    style="?itemBackground" >
-    
-    <EditText
-        android:id="@+id/itemlist_search_query"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentTop="true" 
-        android:textSize="16sp"
-        android:hint="@string/story_search_hint"
-        android:drawableLeft="@android:drawable/ic_menu_search"
-        android:inputType="textNoSuggestions"
-        android:imeOptions="actionSearch"
-        android:visibility="gone"
-        android:animateLayoutChanges="true"
-    />
+    android:layout_height="match_parent">
 
-    <LinearLayout
-        android:id="@+id/activity_itemlist_container"
+    <include layout="@layout/toolbar_newsblur" />
+
+    <RelativeLayout
+        style="?layoutBackground"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:orientation="horizontal"
-        android:layout_below="@id/itemlist_search_query"
-    />
+        android:animateLayoutChanges="true"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-    <include layout="@layout/row_fleuron"
-        android:id="@+id/footer_fleuron"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/itemlist_search_query"
-        android:visibility="gone"/>
+        <EditText
+            android:id="@+id/itemlist_search_query"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_alignParentTop="true"
+            android:animateLayoutChanges="true"
+            android:drawableLeft="@android:drawable/ic_menu_search"
+            android:hint="@string/story_search_hint"
+            android:imeOptions="actionSearch"
+            android:inputType="textNoSuggestions"
+            android:textSize="16sp"
+            android:visibility="gone" />
 
-    <TextView
-        android:id="@+id/itemlist_sync_status"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:padding="2dp"
-        android:textSize="14sp"
-        android:gravity="center"
-        android:textColor="@color/status_overlay_text"
-        android:background="@color/status_overlay_background"
-        android:text="SYNC STATUS" 
-    />
+        <LinearLayout
+            android:id="@+id/activity_itemlist_container"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_below="@id/itemlist_search_query"
+            android:orientation="horizontal" />
 
-</RelativeLayout>
+        <include
+            android:id="@+id/footer_fleuron"
+            layout="@layout/row_fleuron"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/itemlist_search_query"
+            android:visibility="gone" />
+
+        <TextView
+            android:id="@+id/itemlist_sync_status"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:background="@color/status_overlay_background"
+            android:gravity="center"
+            android:padding="2dp"
+            android:text="SYNC STATUS"
+            android:textColor="@color/status_overlay_text"
+            android:textSize="14sp" />
+
+    </RelativeLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/clients/android/NewsBlur/res/layout/activity_main.xml b/clients/android/NewsBlur/res/layout/activity_main.xml
index d8b2d1a67..f98bd3fa2 100644
--- a/clients/android/NewsBlur/res/layout/activity_main.xml
+++ b/clients/android/NewsBlur/res/layout/activity_main.xml
@@ -9,9 +9,9 @@
     <RelativeLayout
         android:id="@+id/main_top_bar"
         android:layout_width="match_parent"
-        android:layout_height="50dp"
+        android:layout_height="?attr/actionBarSize"
         android:layout_alignParentTop="true"
-        style="?actionbarBackground" >
+        android:background="?colorPrimary" >
 
         <ImageView
             android:id="@+id/main_user_image"
@@ -75,7 +75,19 @@
             android:layout_marginLeft="3dp"
             android:textSize="14sp" />
 
-        <Button
+        <ImageButton
+            android:id="@+id/main_search_feeds_button"
+            android:layout_width="30dp"
+            android:layout_height="30dp"
+            android:padding="2dp"
+            android:layout_alignParentTop="true"
+            android:layout_margin="8dp"
+            android:layout_toStartOf="@+id/main_profile_button"
+            android:layout_toLeftOf="@+id/main_profile_button"
+            android:background="@drawable/ic_search"
+            android:contentDescription="@string/menu_search_feeds" />
+
+        <ImageButton
             android:id="@+id/main_profile_button"
             android:layout_width="34dp"
             android:layout_height="34dp"
@@ -98,7 +110,7 @@
         android:layout_alignParentBottom="true"
         android:tag="feedIntelligenceSelector" />
 
-    <Button
+    <ImageButton
         android:id="@+id/main_menu_button"
         android:layout_width="34dp"
         android:layout_height="34dp"
@@ -108,7 +120,7 @@
         android:layout_alignParentBottom="true"
         android:layout_alignParentRight="true" />
 
-    <Button
+    <ImageButton
         android:id="@+id/main_add_button"
         android:layout_width="36dp"
         android:layout_height="36dp"
diff --git a/clients/android/NewsBlur/res/layout/activity_mute_config.xml b/clients/android/NewsBlur/res/layout/activity_mute_config.xml
index b597a3fb9..49cd67a5d 100644
--- a/clients/android/NewsBlur/res/layout/activity_mute_config.xml
+++ b/clients/android/NewsBlur/res/layout/activity_mute_config.xml
@@ -1,60 +1,68 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:animateLayoutChanges="true">
+    android:layout_height="match_parent">
+
+    <include layout="@layout/toolbar_newsblur" />
 
     <FrameLayout
-        android:id="@+id/container_sites_count"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingStart="4dp"
-        android:paddingTop="16dp"
-        android:paddingEnd="8dp"
-        android:paddingBottom="16dp"
-        android:visibility="gone">
+        android:layout_height="match_parent"
+        android:animateLayoutChanges="true"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
+        <FrameLayout
+            android:id="@+id/container_sites_count"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingStart="4dp"
+            android:paddingTop="16dp"
+            android:paddingEnd="8dp"
+            android:paddingBottom="16dp"
+            android:visibility="gone">
+
+            <TextView
+                android:id="@+id/text_reset_sites"
+                style="?linkText"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="start"
+                android:padding="4dp"
+                android:text="@string/mute_config_reset_button"
+                android:textSize="12sp"
+                android:textStyle="bold" />
+
+            <TextView
+                android:id="@+id/text_sites"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="end|center_vertical"
+                android:text="@string/mute_config_sites"
+                android:textColor="@color/positive"
+                android:textSize="12sp"
+                android:textStyle="bold" />
+
+        </FrameLayout>
+
+        <ExpandableListView
+            android:id="@+id/list_view"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:groupIndicator="@null" />
 
         <TextView
-            android:id="@+id/text_reset_sites"
-            style="?linkText"
-            android:layout_width="wrap_content"
+            android:id="@+id/text_sync_status"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="start"
-            android:padding="4dp"
-            android:text="@string/mute_config_reset_button"
-            android:textSize="12sp"
-            android:textStyle="bold" />
-
-        <TextView
-            android:id="@+id/text_sites"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="end|center_vertical"
-            android:text="@string/mute_config_sites"
-            android:textColor="@color/positive"
-            android:textSize="12sp"
-            android:textStyle="bold" />
+            android:layout_gravity="bottom"
+            android:background="@color/status_overlay_background"
+            android:gravity="center"
+            android:padding="2dp"
+            android:textColor="@color/status_overlay_text"
+            android:textSize="14sp"
+            android:visibility="gone" />
 
     </FrameLayout>
 
-    <ExpandableListView
-        android:id="@+id/list_view"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:groupIndicator="@null" />
-
-    <TextView
-        android:id="@+id/text_sync_status"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom"
-        android:background="@color/status_overlay_background"
-        android:gravity="center"
-        android:padding="2dp"
-        android:textColor="@color/status_overlay_text"
-        android:textSize="14sp"
-        android:visibility="gone" />
-
-</FrameLayout>
-
-
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/clients/android/NewsBlur/res/layout/activity_premium.xml b/clients/android/NewsBlur/res/layout/activity_premium.xml
index 02eca7922..49065b6f9 100644
--- a/clients/android/NewsBlur/res/layout/activity_premium.xml
+++ b/clients/android/NewsBlur/res/layout/activity_premium.xml
@@ -1,293 +1,303 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/container"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <FrameLayout
+    <include layout="@layout/toolbar_newsblur" />
+
+    <androidx.core.widget.NestedScrollView
+        android:id="@+id/container"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:animateLayoutChanges="true">
-
-        <LinearLayout
-            android:id="@+id/container_going_premium"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:padding="16dp">
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:gravity="center_horizontal"
-                android:text="@string/premium_title_going_premium"
-                android:textSize="18sp"
-                android:textStyle="bold" />
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
-                android:gravity="center_horizontal"
-                android:lineSpacingExtra="@dimen/extra_line_spacing"
-                android:text="@string/premium_subtitle"
-                android:textSize="14sp"
-                android:textStyle="bold" />
-
-            <TextView
-                android:id="@+id/text_policies"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
-                android:gravity="center_horizontal"
-                android:lineSpacingExtra="@dimen/extra_line_spacing"
-                android:text="@string/premium_policies"
-                android:textSize="12sp" />
-
-            <FrameLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="40dp">
-
-                <ImageView
-                    android:layout_width="24dp"
-                    android:layout_height="24dp"
-                    android:layout_gravity="center_vertical"
-                    android:src="@drawable/ic_hand_pointing_right" />
-
-                <LinearLayout
-                    android:id="@+id/container_sub"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="40dp"
-                    android:orientation="vertical"
-                    android:visibility="gone">
-
-                    <TextView
-                        android:id="@+id/text_sub_title"
-                        style="?linkText"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_vertical"
-                        android:text="@string/premium_subscription_title"
-                        android:textSize="14sp" />
-
-                    <TextView
-                        android:id="@+id/text_sub_price"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_vertical"
-                        android:layout_marginTop="4dp"
-                        android:text="@string/premium_subscription_price"
-                        android:textSize="20sp"
-                        android:textStyle="bold" />
-
-                </LinearLayout>
-
-                <TextView
-                    android:id="@+id/text_loading"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:text="@string/loading"
-                    android:textSize="18sp" />
-
-            </FrameLayout>
-
-            <FrameLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="40dp">
-
-                <ImageView
-                    android:layout_width="24dp"
-                    android:layout_height="24dp"
-                    android:src="@drawable/ic_sync" />
-
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:layout_marginStart="40dp"
-                    android:text="@string/premium_sync" />
-
-            </FrameLayout>
-
-            <FrameLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="16dp">
-
-                <ImageView
-                    android:layout_width="24dp"
-                    android:layout_height="24dp"
-                    android:src="@drawable/ic_folder" />
-
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:layout_marginStart="40dp"
-                    android:text="@string/premium_read_by_folder" />
-
-            </FrameLayout>
-
-            <FrameLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="16dp">
-
-                <ImageView
-                    android:layout_width="24dp"
-                    android:layout_height="24dp"
-                    android:src="@drawable/ic_search" />
-
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:layout_marginStart="40dp"
-                    android:text="@string/premium_search" />
-
-            </FrameLayout>
-
-            <FrameLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="16dp">
-
-                <ImageView
-                    android:layout_width="24dp"
-                    android:layout_height="24dp"
-                    android:src="@drawable/ic_bookmark" />
-
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:layout_marginStart="40dp"
-                    android:text="@string/premium_searchable_tags" />
-
-            </FrameLayout>
-
-            <FrameLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="16dp">
-
-                <ImageView
-                    android:layout_width="24dp"
-                    android:layout_height="24dp"
-                    android:src="@drawable/ic_lock" />
-
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:layout_marginStart="40dp"
-                    android:text="@string/premium_privacy_options" />
-
-            </FrameLayout>
-
-            <FrameLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="16dp">
-
-                <ImageView
-                    android:layout_width="24dp"
-                    android:layout_height="24dp"
-                    android:src="@drawable/ic_rss_feed" />
-
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:layout_marginStart="40dp"
-                    android:text="@string/premium_custom_rss" />
-
-            </FrameLayout>
-
-            <FrameLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="16dp">
-
-                <ImageView
-                    android:layout_width="24dp"
-                    android:layout_height="24dp"
-                    android:src="@drawable/ic_text" />
-
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:layout_marginStart="40dp"
-                    android:text="@string/premium_text_view" />
-
-            </FrameLayout>
-
-            <FrameLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="16dp">
-
-                <ImageView
-                    android:layout_width="24dp"
-                    android:layout_height="24dp"
-                    android:src="@drawable/ic_dining" />
-
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:layout_marginStart="40dp"
-                    android:text="@string/premium_shiloh" />
-
-            </FrameLayout>
-
-            <ImageView
-                android:id="@+id/img_shiloh"
-                android:layout_width="104dp"
-                android:layout_height="104dp"
-                android:layout_gravity="center_horizontal"
-                android:layout_marginTop="16dp"
-                android:scaleType="centerCrop" />
-
-        </LinearLayout>
+        android:layout_height="match_parent"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
         <FrameLayout
-            android:id="@+id/container_gone_premium"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:visibility="gone">
+            android:animateLayoutChanges="true">
 
-            <TextView
+            <LinearLayout
+                android:id="@+id/container_going_premium"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="120dp"
-                android:gravity="center_horizontal"
-                android:text="@string/premium_title_gone_premium"
-                android:textSize="40sp"
-                android:textStyle="bold" />
+                android:orientation="vertical"
+                android:padding="16dp">
 
-            <TextView
-                android:id="@+id/text_subscription_renewal"
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="center_horizontal"
+                    android:text="@string/premium_title_going_premium"
+                    android:textSize="18sp"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="16dp"
+                    android:gravity="center_horizontal"
+                    android:lineSpacingExtra="@dimen/extra_line_spacing"
+                    android:text="@string/premium_subtitle"
+                    android:textSize="14sp"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:id="@+id/text_policies"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="16dp"
+                    android:gravity="center_horizontal"
+                    android:lineSpacingExtra="@dimen/extra_line_spacing"
+                    android:text="@string/premium_policies"
+                    android:textSize="12sp" />
+
+                <FrameLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="40dp">
+
+                    <ImageView
+                        android:layout_width="24dp"
+                        android:layout_height="24dp"
+                        android:layout_gravity="center_vertical"
+                        android:src="@drawable/ic_hand_pointing_right" />
+
+                    <LinearLayout
+                        android:id="@+id/container_sub"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="40dp"
+                        android:orientation="vertical"
+                        android:visibility="gone">
+
+                        <TextView
+                            android:id="@+id/text_sub_title"
+                            style="?linkText"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_vertical"
+                            android:text="@string/premium_subscription_title"
+                            android:textSize="14sp" />
+
+                        <TextView
+                            android:id="@+id/text_sub_price"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_vertical"
+                            android:layout_marginTop="4dp"
+                            android:text="@string/premium_subscription_price"
+                            android:textSize="20sp"
+                            android:textStyle="bold" />
+
+                    </LinearLayout>
+
+                    <TextView
+                        android:id="@+id/text_loading"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:text="@string/loading"
+                        android:textSize="18sp" />
+
+                </FrameLayout>
+
+                <FrameLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="40dp">
+
+                    <ImageView
+                        android:layout_width="24dp"
+                        android:layout_height="24dp"
+                        android:src="@drawable/ic_sync" />
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:layout_marginStart="40dp"
+                        android:text="@string/premium_sync" />
+
+                </FrameLayout>
+
+                <FrameLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="16dp">
+
+                    <ImageView
+                        android:layout_width="24dp"
+                        android:layout_height="24dp"
+                        android:src="@drawable/ic_folder" />
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:layout_marginStart="40dp"
+                        android:text="@string/premium_read_by_folder" />
+
+                </FrameLayout>
+
+                <FrameLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="16dp">
+
+                    <ImageView
+                        android:layout_width="24dp"
+                        android:layout_height="24dp"
+                        android:src="@drawable/ic_search" />
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:layout_marginStart="40dp"
+                        android:text="@string/premium_search" />
+
+                </FrameLayout>
+
+                <FrameLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="16dp">
+
+                    <ImageView
+                        android:layout_width="24dp"
+                        android:layout_height="24dp"
+                        android:src="@drawable/ic_bookmark" />
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:layout_marginStart="40dp"
+                        android:text="@string/premium_searchable_tags" />
+
+                </FrameLayout>
+
+                <FrameLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="16dp">
+
+                    <ImageView
+                        android:layout_width="24dp"
+                        android:layout_height="24dp"
+                        android:src="@drawable/ic_lock" />
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:layout_marginStart="40dp"
+                        android:text="@string/premium_privacy_options" />
+
+                </FrameLayout>
+
+                <FrameLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="16dp">
+
+                    <ImageView
+                        android:layout_width="24dp"
+                        android:layout_height="24dp"
+                        android:src="@drawable/ic_rss_feed" />
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:layout_marginStart="40dp"
+                        android:text="@string/premium_custom_rss" />
+
+                </FrameLayout>
+
+                <FrameLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="16dp">
+
+                    <ImageView
+                        android:layout_width="24dp"
+                        android:layout_height="24dp"
+                        android:src="@drawable/ic_text" />
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:layout_marginStart="40dp"
+                        android:text="@string/premium_text_view" />
+
+                </FrameLayout>
+
+                <FrameLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="16dp">
+
+                    <ImageView
+                        android:layout_width="24dp"
+                        android:layout_height="24dp"
+                        android:src="@drawable/ic_dining" />
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:layout_marginStart="40dp"
+                        android:text="@string/premium_shiloh" />
+
+                </FrameLayout>
+
+                <ImageView
+                    android:id="@+id/img_shiloh"
+                    android:layout_width="104dp"
+                    android:layout_height="104dp"
+                    android:layout_gravity="center_horizontal"
+                    android:layout_marginTop="16dp"
+                    android:scaleType="centerCrop" />
+
+            </LinearLayout>
+
+            <FrameLayout
+                android:id="@+id/container_gone_premium"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="320dp"
-                android:gravity="center_horizontal"
-                android:lineSpacingExtra="@dimen/extra_line_spacing"
-                android:textSize="18sp"
-                android:visibility="gone" />
+                android:visibility="gone">
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="120dp"
+                    android:gravity="center_horizontal"
+                    android:text="@string/premium_title_gone_premium"
+                    android:textSize="40sp"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:id="@+id/text_subscription_renewal"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="320dp"
+                    android:gravity="center_horizontal"
+                    android:lineSpacingExtra="@dimen/extra_line_spacing"
+                    android:textSize="18sp"
+                    android:visibility="gone" />
+
+            </FrameLayout>
+
+            <nl.dionsegijn.konfetti.KonfettiView
+                android:id="@+id/konfetti"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
 
         </FrameLayout>
 
-        <nl.dionsegijn.konfetti.KonfettiView
-            android:id="@+id/konfetti"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" />
+    </androidx.core.widget.NestedScrollView>
 
-    </FrameLayout>
-
-</ScrollView>
\ No newline at end of file
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/clients/android/NewsBlur/res/layout/activity_profile.xml b/clients/android/NewsBlur/res/layout/activity_profile.xml
index 7a0089efa..af4f2d7b3 100644
--- a/clients/android/NewsBlur/res/layout/activity_profile.xml
+++ b/clients/android/NewsBlur/res/layout/activity_profile.xml
@@ -1,29 +1,39 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    style="?itemBackground"
-    android:orientation="vertical" >
+    android:layout_height="match_parent">
 
-    <FrameLayout
-        android:id="@+id/profile_details"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
+    <include layout="@layout/toolbar_newsblur" />
 
-    <androidx.viewpager.widget.ViewPager
-        android:id="@+id/activity_details_pager"
+    <RelativeLayout
+        style="?layoutBackground"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_below="@id/profile_details">
+        android:orientation="vertical"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-        <androidx.viewpager.widget.PagerTitleStrip
+        <FrameLayout
+            android:id="@+id/profile_details"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="top"
-            style="?activityDetailsPager"
-            android:paddingTop="4dp"
-            android:paddingBottom="4dp" />
+            android:layout_height="wrap_content" />
 
-    </androidx.viewpager.widget.ViewPager>
+        <androidx.viewpager.widget.ViewPager
+            android:id="@+id/activity_details_pager"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_below="@id/profile_details">
 
-</RelativeLayout>
+            <androidx.viewpager.widget.PagerTitleStrip
+                style="?activityDetailsPager"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="top"
+                android:paddingTop="4dp"
+                android:paddingBottom="4dp" />
+
+        </androidx.viewpager.widget.ViewPager>
+
+    </RelativeLayout>
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/clients/android/NewsBlur/res/layout/activity_reading.xml b/clients/android/NewsBlur/res/layout/activity_reading.xml
index 54bae14b1..9ed2741c4 100644
--- a/clients/android/NewsBlur/res/layout/activity_reading.xml
+++ b/clients/android/NewsBlur/res/layout/activity_reading.xml
@@ -1,114 +1,118 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="match_parent" >
+    android:layout_height="match_parent">
 
-    <TextView
-        android:id="@+id/reading_empty_view_text"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentTop="true"
-        android:layout_marginTop="40dp"
-        android:gravity="center_horizontal"
-        android:text="@string/loading"
-        style="?explainerText"
-        android:textSize="16sp" />
+    <include layout="@layout/toolbar_newsblur" />
 
     <FrameLayout
-        android:id="@+id/activity_reading_container"
         android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+        android:layout_height="match_parent"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-    <Button
-        android:id="@+id/reading_overlay_text"
-        android:layout_width="110dp"
-        android:layout_height="40dp"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentLeft="true" 
-        android:layout_marginLeft="8dp"
-        android:layout_marginBottom="4dp"
-        android:text="@string/overlay_text"
-        android:textSize="14sp"
-        android:paddingLeft="10dp"
-        style="?selectorOverlayBackgroundText"
-        android:onClick="overlayText" />
+        <TextView
+            android:id="@+id/reading_empty_view_text"
+            style="?explainerText"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="40dp"
+            android:gravity="center_horizontal"
+            android:text="@string/loading"
+            android:textSize="16sp" />
 
-    <Button
-        android:id="@+id/reading_overlay_send"
-        android:layout_width="50dp"
-        android:layout_height="40dp"
-        android:layout_alignParentBottom="true"
-        android:layout_toRightOf="@id/reading_overlay_text"
-        android:layout_marginLeft="2dp"
-        android:layout_marginBottom="4dp"
-        style="?selectorOverlayBackgroundSend"
-        android:onClick="overlaySend" />
+        <FrameLayout
+            android:id="@+id/activity_reading_container"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
 
-    <Button
-        android:id="@+id/reading_overlay_right"
-        android:layout_width="120dp"
-        android:layout_height="40dp"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentRight="true" 
-        android:layout_marginRight="8dp"
-        android:layout_marginBottom="4dp"
-        android:text="@string/overlay_next"
-        android:textSize="14sp"
-        style="?selectorOverlayBackgroundRight"
-        android:onClick="overlayRight" />
+    </FrameLayout>
 
-    <Button
-        android:id="@+id/reading_overlay_left"
-        android:layout_width="50dp"
-        android:layout_height="40dp"
-        android:layout_alignParentBottom="true"
-        android:layout_toLeftOf="@id/reading_overlay_right"
-        android:layout_marginRight="2dp"
-        android:layout_marginBottom="4dp"
-        style="?selectorOverlayBackgroundLeft"
-        android:onClick="overlayLeft" />
-
-    <com.newsblur.view.ProgressCircle
-        android:id="@+id/reading_overlay_progress"
-        style="@android:style/Widget.ProgressBar.Horizontal"
-        android:layout_width="24dp"
-        android:layout_height="24dp"
-        android:layout_marginRight="98dp"
-        android:layout_marginBottom="12dp"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentRight="true"
-        android:onClick="overlayCount" />
-
-    <ProgressBar
-        android:id="@+id/reading_overlay_progress_right"
-        android:layout_width="24dp"
-        android:layout_height="24dp"
-        android:layout_marginRight="98dp"
-        android:layout_marginBottom="12dp"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentRight="true"
-        android:indeterminate="true" />
-
-    <ProgressBar
-        android:id="@+id/reading_overlay_progress_left"
-        android:layout_width="24dp"
-        android:layout_height="24dp"
-        android:layout_marginLeft="90dp"
-        android:layout_marginBottom="12dp"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentLeft="true"
-        android:indeterminate="true" />
-
-    <TextView
-        android:id="@+id/reading_sync_status"
-        android:layout_width="fill_parent"
+    <FrameLayout
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:padding="1dp"
-        android:textSize="13sp"
-        android:gravity="center"
-        android:textColor="@color/status_overlay_text"
-        android:background="@color/status_overlay_background"
-        android:visibility="gone" />
+        android:layout_gravity="bottom"
+        android:layout_marginBottom="8dp">
 
-</RelativeLayout>
+        <TextView
+            android:id="@+id/reading_overlay_text"
+            style="?selectorOverlayBackgroundText"
+            android:layout_width="110dp"
+            android:layout_height="40dp"
+            android:layout_gravity="start"
+            android:layout_marginStart="8dp"
+            android:gravity="center"
+            android:onClick="overlayText"
+            android:paddingStart="8dp"
+            android:text="@string/overlay_text"
+            android:textSize="14sp" />
+
+        <ImageButton
+            android:id="@+id/reading_overlay_send"
+            style="?selectorOverlayBackgroundSend"
+            android:layout_width="50dp"
+            android:layout_height="40dp"
+            android:layout_gravity="start"
+            android:layout_marginStart="120dp"
+            android:onClick="overlaySend" />
+
+        <TextView
+            android:id="@+id/reading_overlay_right"
+            style="?selectorOverlayBackgroundRight"
+            android:layout_width="120dp"
+            android:layout_height="40dp"
+            android:layout_gravity="end"
+            android:layout_marginRight="8dp"
+            android:gravity="center"
+            android:onClick="overlayRight"
+            android:text="@string/overlay_next"
+            android:textSize="14sp" />
+
+        <ImageButton
+            android:id="@+id/reading_overlay_left"
+            style="?selectorOverlayBackgroundLeft"
+            android:layout_width="50dp"
+            android:layout_height="40dp"
+            android:layout_gravity="end"
+            android:layout_marginEnd="130dp"
+            android:onClick="overlayLeft" />
+
+        <com.newsblur.view.ProgressCircle
+            android:id="@+id/reading_overlay_progress"
+            style="@android:style/Widget.ProgressBar.Horizontal"
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:layout_gravity="end|center_vertical"
+            android:layout_marginRight="100dp"
+            android:onClick="overlayCount" />
+
+        <ProgressBar
+            android:id="@+id/reading_overlay_progress_right"
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:layout_gravity="end|center_vertical"
+            android:layout_marginRight="100dp"
+            android:indeterminate="true" />
+
+        <ProgressBar
+            android:id="@+id/reading_overlay_progress_left"
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:layout_gravity="start|center_vertical"
+            android:layout_marginStart="90dp"
+            android:indeterminate="true" />
+
+        <TextView
+            android:id="@+id/reading_sync_status"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal|bottom"
+            android:background="@color/status_overlay_background"
+            android:gravity="center"
+            android:padding="1dp"
+            android:textColor="@color/status_overlay_text"
+            android:textSize="13sp"
+            android:visibility="gone" />
+
+    </FrameLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/clients/android/NewsBlur/res/layout/activity_settings.xml b/clients/android/NewsBlur/res/layout/activity_settings.xml
new file mode 100644
index 000000000..60b1e6ee7
--- /dev/null
+++ b/clients/android/NewsBlur/res/layout/activity_settings.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <include layout="@layout/toolbar_newsblur" />
+
+    <FrameLayout
+        android:id="@+id/container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior" />
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/clients/android/NewsBlur/res/layout/activity_webcontainer.xml b/clients/android/NewsBlur/res/layout/activity_webcontainer.xml
index e79fd42d0..7d847026d 100644
--- a/clients/android/NewsBlur/res/layout/activity_webcontainer.xml
+++ b/clients/android/NewsBlur/res/layout/activity_webcontainer.xml
@@ -1,12 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/item_background" >
+    android:layout_height="match_parent">
 
-    <WebView
-        android:id="@+id/webcontainer"
+    <include layout="@layout/toolbar_newsblur" />
+
+    <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-    
-</RelativeLayout>
+        android:layout_height="match_parent"
+        android:background="@color/item_background"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
+        <WebView
+            android:id="@+id/webcontainer"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+
+    </RelativeLayout>
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/clients/android/NewsBlur/res/layout/activity_widget_config.xml b/clients/android/NewsBlur/res/layout/activity_widget_config.xml
index a80bb88b8..7eb958c9e 100644
--- a/clients/android/NewsBlur/res/layout/activity_widget_config.xml
+++ b/clients/android/NewsBlur/res/layout/activity_widget_config.xml
@@ -1,21 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <ExpandableListView
-        android:id="@+id/list_view"
+    <include layout="@layout/toolbar_newsblur" />
+
+    <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:groupIndicator="@null" />
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-    <TextView
-        android:id="@+id/text_no_subscriptions"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="center"
-        android:padding="32dp"
-        android:text="@string/title_no_subscriptions"
-        android:visibility="gone" />
+        <ExpandableListView
+            android:id="@+id/list_view"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:groupIndicator="@null" />
 
-</FrameLayout>
\ No newline at end of file
+        <TextView
+            android:id="@+id/text_no_subscriptions"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:gravity="center"
+            android:padding="32dp"
+            android:text="@string/title_no_subscriptions"
+            android:visibility="gone" />
+
+    </FrameLayout>
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/clients/android/NewsBlur/res/layout/dialog_trainstory.xml b/clients/android/NewsBlur/res/layout/dialog_trainstory.xml
index 30c2d8c28..a9106b17a 100644
--- a/clients/android/NewsBlur/res/layout/dialog_trainstory.xml
+++ b/clients/android/NewsBlur/res/layout/dialog_trainstory.xml
@@ -19,7 +19,7 @@
         android:text="@string/intel_title_header"
     />
 
-    <Button
+    <ImageButton
         android:id="@+id/intel_title_clear"
         android:layout_below="@id/intel_title_header"
         android:layout_alignParentRight="true"
@@ -29,7 +29,7 @@
         android:background="@drawable/ic_clear_gray55"
     />
 
-    <Button
+    <ImageButton
         android:id="@+id/intel_title_dislike"
         android:layout_below="@id/intel_title_header"
         android:layout_toLeftOf="@id/intel_title_clear"
@@ -42,7 +42,7 @@
         android:background="@drawable/ic_dislike_gray55"
     />
 
-    <Button
+    <ImageButton
         android:id="@+id/intel_title_like"
         android:layout_below="@id/intel_title_header"
         android:layout_toLeftOf="@id/intel_title_dislike"
diff --git a/clients/android/NewsBlur/res/layout/fragment_itemgrid.xml b/clients/android/NewsBlur/res/layout/fragment_itemgrid.xml
index 7e59340b8..0afbb7758 100644
--- a/clients/android/NewsBlur/res/layout/fragment_itemgrid.xml
+++ b/clients/android/NewsBlur/res/layout/fragment_itemgrid.xml
@@ -2,7 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    style="?itemBackground"
+    style="?layoutBackground"
     android:orientation="vertical" >
 
     <RelativeLayout
diff --git a/clients/android/NewsBlur/res/layout/fragment_profileactivity.xml b/clients/android/NewsBlur/res/layout/fragment_profileactivity.xml
index 6d0cd0399..207708f0c 100644
--- a/clients/android/NewsBlur/res/layout/fragment_profileactivity.xml
+++ b/clients/android/NewsBlur/res/layout/fragment_profileactivity.xml
@@ -3,7 +3,7 @@
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:orientation="vertical"
-    style="?itemBackground" >
+    style="?layoutBackground" >
 
     <RelativeLayout
         android:id="@+id/empty_view"
diff --git a/clients/android/NewsBlur/res/layout/fragment_profiledetails.xml b/clients/android/NewsBlur/res/layout/fragment_profiledetails.xml
index ea8313840..04c0b1f6a 100644
--- a/clients/android/NewsBlur/res/layout/fragment_profiledetails.xml
+++ b/clients/android/NewsBlur/res/layout/fragment_profiledetails.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    style="?itemBackground"
+    style="?layoutBackground"
     android:orientation="vertical" >
 
     <LinearLayout
diff --git a/clients/android/NewsBlur/res/layout/fragment_readingitem.xml b/clients/android/NewsBlur/res/layout/fragment_readingitem.xml
index f08176df3..ca2077ec8 100644
--- a/clients/android/NewsBlur/res/layout/fragment_readingitem.xml
+++ b/clients/android/NewsBlur/res/layout/fragment_readingitem.xml
@@ -63,12 +63,12 @@
                     android:layout_below="@id/row_item_feed_header"
                     android:background="@color/gray55"/>
 
-                <Button
+                <ImageButton
                     android:id="@+id/story_context_menu_button"
                     android:layout_width="34dp"
                     android:layout_height="34dp"
                     android:layout_margin="5dp"
-                    android:background="@drawable/ic_menu_moreoverflow"
+                    style="?android:attr/actionOverflowButtonStyle"
                     android:contentDescription="@string/description_menu"
                     android:layout_below="@id/item_feed_border"
                     android:layout_alignParentRight="true" />
@@ -107,12 +107,28 @@
                     android:textSize="12sp"
                     android:textStyle="bold"/>
 
+                <TextView
+                    android:id="@+id/reading_story_changes"
+                    style="?readingItemMetadata"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/reading_item_date"
+                    android:layout_alignLeft="@id/reading_item_title"
+                    android:paddingTop="8dp"
+                    android:gravity="center_vertical"
+                    android:paddingBottom="4dp"
+                    android:drawablePadding="6dp"
+                    android:drawableStart="@drawable/ic_file_edit"
+                    android:text="@string/story_show_changes"
+                    android:textSize="12sp"
+                    android:visibility="gone" />
+
                 <com.newsblur.view.FlowLayout
                     android:id="@+id/reading_item_tags"
                     android:layout_width="match_parent"
                     android:layout_height="17dp"
                     android:layout_alignLeft="@id/reading_item_title"
-                    android:layout_below="@id/reading_item_date"
+                    android:layout_below="@id/reading_story_changes"
                     android:layout_marginBottom="8dp"
                     android:layout_marginTop="8dp" />
 
diff --git a/clients/android/NewsBlur/res/layout/include_intel_row.xml b/clients/android/NewsBlur/res/layout/include_intel_row.xml
index 156d81181..3f57eb269 100644
--- a/clients/android/NewsBlur/res/layout/include_intel_row.xml
+++ b/clients/android/NewsBlur/res/layout/include_intel_row.xml
@@ -4,7 +4,7 @@
     android:layout_height="wrap_content"
     >
 
-    <Button
+    <ImageButton
         android:id="@+id/intel_row_clear"
         android:layout_alignParentTop="true"
         android:layout_alignParentRight="true"
@@ -14,7 +14,7 @@
         android:background="@drawable/ic_clear_gray55"
     />
 
-    <Button
+    <ImageButton
         android:id="@+id/intel_row_dislike"
         android:layout_alignParentTop="true"
         android:layout_toLeftOf="@id/intel_row_clear"
@@ -27,7 +27,7 @@
         android:background="@drawable/ic_dislike_gray55"
     />
 
-    <Button
+    <ImageButton
         android:id="@+id/intel_row_like"
         android:layout_alignParentTop="true"
         android:layout_toLeftOf="@id/intel_row_dislike"
diff --git a/clients/android/NewsBlur/res/layout/include_reading_item_comment.xml b/clients/android/NewsBlur/res/layout/include_reading_item_comment.xml
index 5c60fd2db..9f4b887be 100644
--- a/clients/android/NewsBlur/res/layout/include_reading_item_comment.xml
+++ b/clients/android/NewsBlur/res/layout/include_reading_item_comment.xml
@@ -10,14 +10,14 @@
         android:layout_marginBottom="15dp"
         android:baselineAligned="false" >
 
-        <Button
+        <TextView
             android:id="@+id/share_story_button"
             android:layout_width="170dp"
             android:layout_height="36dp"
             style="?storyButtons"
             android:text="@string/share_this" />
         
-        <Button
+        <TextView
             android:id="@+id/save_story_button"
             android:layout_width="170dp"
             android:layout_height="36dp"
diff --git a/clients/android/NewsBlur/res/layout/infrequent_cutoff_dialog.xml b/clients/android/NewsBlur/res/layout/infrequent_cutoff_dialog.xml
index 1d156c61d..b9ad58649 100644
--- a/clients/android/NewsBlur/res/layout/infrequent_cutoff_dialog.xml
+++ b/clients/android/NewsBlur/res/layout/infrequent_cutoff_dialog.xml
@@ -1,35 +1,58 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RadioGroup xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:layout_gravity="bottom|center_horizontal"
-    android:orientation="vertical"
-    android:layout_marginTop="10dp"
-    android:paddingLeft="25dip"
-    android:paddingRight="25dip"
-    android:paddingBottom="10dip"
-    android:paddingTop="10dip"
-    >
-    
-    <RadioButton android:id="@+id/radio_5"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/infrequent_5"/>
-    <RadioButton android:id="@+id/radio_15"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/infrequent_15"/>
-    <RadioButton android:id="@+id/radio_30"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/infrequent_30"/>
-    <RadioButton android:id="@+id/radio_60"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/infrequent_60"/>
-    <RadioButton android:id="@+id/radio_90"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/infrequent_90"/>
+    android:orientation="vertical">
 
-</RadioGroup>
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="16dp"
+        android:text="@string/infrequent_choice_title"
+        android:textSize="18sp"
+        android:textStyle="bold" />
+
+    <RadioGroup
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom|center_horizontal"
+        android:layout_marginTop="8dp"
+        android:orientation="vertical"
+        android:paddingLeft="25dip"
+        android:paddingTop="10dip"
+        android:paddingRight="25dip"
+        android:paddingBottom="10dip">
+
+        <RadioButton
+            android:id="@+id/radio_5"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/infrequent_5" />
+
+        <RadioButton
+            android:id="@+id/radio_15"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/infrequent_15" />
+
+        <RadioButton
+            android:id="@+id/radio_30"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/infrequent_30" />
+
+        <RadioButton
+            android:id="@+id/radio_60"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/infrequent_60" />
+
+        <RadioButton
+            android:id="@+id/radio_90"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/infrequent_90" />
+
+    </RadioGroup>
+</LinearLayout>
diff --git a/clients/android/NewsBlur/res/layout/row_activity.xml b/clients/android/NewsBlur/res/layout/row_activity.xml
index cea50a0a2..cb31face1 100644
--- a/clients/android/NewsBlur/res/layout/row_activity.xml
+++ b/clients/android/NewsBlur/res/layout/row_activity.xml
@@ -2,7 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-    style="?itemBackground"
+    style="?layoutBackground"
     android:paddingBottom="10dp"
     android:paddingTop="10dp" >
 
diff --git a/clients/android/NewsBlur/res/layout/row_feedresult.xml b/clients/android/NewsBlur/res/layout/row_feedresult.xml
index 5a73a952d..e05228b2a 100644
--- a/clients/android/NewsBlur/res/layout/row_feedresult.xml
+++ b/clients/android/NewsBlur/res/layout/row_feedresult.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    style="?itemBackground"
+    style="?layoutBackground"
     android:focusable="false">
 
     <RelativeLayout
diff --git a/clients/android/NewsBlur/res/layout/row_widget_config_feed.xml b/clients/android/NewsBlur/res/layout/row_widget_config_feed.xml
index db01d688e..354693fbe 100644
--- a/clients/android/NewsBlur/res/layout/row_widget_config_feed.xml
+++ b/clients/android/NewsBlur/res/layout/row_widget_config_feed.xml
@@ -14,7 +14,9 @@
         android:layout_height="wrap_content"
         android:layout_marginEnd="4dp"
         android:clickable="false"
-        android:focusable="false" />
+        android:focusable="false"
+        android:minWidth="0dp"
+        android:minHeight="0dp" />
 
     <ImageView
         android:id="@+id/img"
diff --git a/clients/android/NewsBlur/res/layout/toolbar_newsblur.xml b/clients/android/NewsBlur/res/layout/toolbar_newsblur.xml
new file mode 100644
index 000000000..6edc251c5
--- /dev/null
+++ b/clients/android/NewsBlur/res/layout/toolbar_newsblur.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.material.appbar.AppBarLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <com.google.android.material.appbar.MaterialToolbar
+        android:id="@+id/toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="horizontal">
+
+            <ImageView
+                android:id="@+id/toolbar_arrow"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:src="?attr/homeAsUpIndicator"
+                android:visibility="gone" />
+
+            <ImageView
+                android:id="@+id/toolbar_icon"
+                android:layout_width="24dp"
+                android:layout_height="24dp"
+                android:layout_gravity="center_vertical"
+                android:layout_marginStart="4dp"
+                android:layout_marginEnd="4dp"
+                android:src="@drawable/world" />
+
+            <TextView
+                android:id="@+id/toolbar_text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:ellipsize="end"
+                android:maxLines="1"
+                android:textSize="18sp" />
+
+        </LinearLayout>
+    </com.google.android.material.appbar.MaterialToolbar>
+</com.google.android.material.appbar.AppBarLayout>
diff --git a/clients/android/NewsBlur/res/menu/itemslist.xml b/clients/android/NewsBlur/res/menu/itemslist.xml
index 02b39053b..6fccba3ad 100644
--- a/clients/android/NewsBlur/res/menu/itemslist.xml
+++ b/clients/android/NewsBlur/res/menu/itemslist.xml
@@ -1,17 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
     <item android:id="@+id/menu_mark_all_as_read"
           android:title="@string/menu_mark_all_as_read"
-          android:showAsAction="ifRoom" android:icon="@drawable/ic_menu_markread_gray55" />
+          app:showAsAction="ifRoom" android:icon="@drawable/ic_menu_markread_gray55" />
     <item android:id="@+id/menu_search_stories"
           android:title="@string/menu_search_stories"
-          android:showAsAction="ifRoom" android:icon="@drawable/ic_menu_search_gray55" />
+          app:showAsAction="ifRoom" android:icon="@drawable/ic_menu_search_gray55" />
     <item android:id="@+id/menu_story_order"
           android:title="@string/menu_story_order"
-          android:showAsAction="never" />
+          app:showAsAction="never" />
     <item android:id="@+id/menu_read_filter"
           android:title="@string/menu_read_filter"
-          android:showAsAction="never" />
+          app:showAsAction="never" />
     <item android:id="@+id/menu_story_list_style"
           android:title="@string/menu_story_list_style_choose" >
         <menu>
@@ -28,7 +29,7 @@
         </menu>
     </item>
     <item android:id="@+id/menu_textsize"
-          android:showAsAction="never"
+          app:showAsAction="never"
           android:title="@string/menu_textsize"/>
     <item android:id="@+id/menu_theme"
           android:title="@string/menu_theme_choose" >
@@ -65,20 +66,20 @@
     </item>
     <item android:id="@+id/menu_statistics"
         android:title="@string/menu_statistics"
-        android:showAsAction="never" />
+        app:showAsAction="never" />
     <item android:id="@+id/menu_delete_feed"
           android:title="@string/menu_delete_feed"
-          android:showAsAction="never" />
+          app:showAsAction="never" />
     <item android:id="@+id/menu_rename_feed"
           android:title="@string/menu_rename_feed"
-          android:showAsAction="never" />
+          app:showAsAction="never" />
     <item android:id="@+id/menu_instafetch_feed"
           android:title="@string/menu_instafetch_feed" />
     <item android:id="@+id/menu_infrequent_cutoff"
           android:title="@string/menu_infrequent_cutoff"
-          android:showAsAction="never" />
+          app:showAsAction="never" />
     <item android:id="@+id/menu_save_search"
         android:title="Save Search"
-        android:showAsAction="never"
+        app:showAsAction="never"
         android:visible="false"/>
 </menu>
diff --git a/clients/android/NewsBlur/res/menu/main.xml b/clients/android/NewsBlur/res/menu/main.xml
index 0754c2644..3d4efe7bf 100644
--- a/clients/android/NewsBlur/res/menu/main.xml
+++ b/clients/android/NewsBlur/res/menu/main.xml
@@ -1,60 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <item android:id="@+id/menu_refresh"
-          android:title="@string/menu_refresh"
-          android:showAsAction="never" />
-
-    <item android:id="@+id/menu_search_feeds"
-          android:title="@string/menu_search_feeds"
-          android:showAsAction="never" />
-    
-    <item android:id="@+id/menu_add_feed"
-          android:title="@string/menu_add_feed"
-          android:showAsAction="never" />
-    
-    <item android:id="@+id/menu_textsize"
-          android:showAsAction="never"
-          android:title="@string/menu_textsize"/>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <item android:id="@+id/menu_settings"
           android:title="@string/settings"
-          android:showAsAction="never" />
+          app:showAsAction="never" />
 
     <item android:id="@+id/menu_mute_sites"
         android:title="@string/mute_sites"
-        android:showAsAction="never" />
+        app:showAsAction="never" />
 
     <item android:id="@+id/menu_widget"
         android:title="@string/widget"
-        android:showAsAction="never" />
-
-    <item android:id="@+id/menu_feedback"
-          android:title="@string/menu_feedback"
-          android:showAsAction="never" >
-        <menu>
-            <item android:id="@+id/menu_feedback_post"
-                  android:title="@string/menu_feedback_post"
-                  android:showAsAction="never" />
-            <item android:id="@+id/menu_feedback_email"
-                  android:title="@string/menu_feedback_email"
-                  android:showAsAction="never" />
-
-        </menu>
-    </item>
-
-    <item android:id="@+id/menu_loginas"
-          android:title="@string/menu_loginas"
-          android:showAsAction="never"
-          android:visible="false"/>
+        app:showAsAction="never" />
 
     <item android:id="@+id/menu_premium_account"
         android:title="@string/menu_premium_account"
-        android:showAsAction="never" />
-    
-    <item android:id="@+id/menu_logout"
-          android:title="@string/menu_logout"
-          android:showAsAction="never" />
+        app:showAsAction="never" />
+
+    <item android:id="@+id/menu_textsize"
+        app:showAsAction="never"
+        android:title="@string/menu_textsize"/>
 
     <item android:id="@+id/menu_theme"
           android:title="@string/menu_theme_choose" >
@@ -72,4 +38,27 @@
         </menu>
     </item>
 
+    <item android:id="@+id/menu_feedback"
+        android:title="@string/menu_feedback"
+        app:showAsAction="never" >
+        <menu>
+            <item android:id="@+id/menu_feedback_post"
+                android:title="@string/menu_feedback_post"
+                app:showAsAction="never" />
+            <item android:id="@+id/menu_feedback_email"
+                android:title="@string/menu_feedback_email"
+                app:showAsAction="never" />
+
+        </menu>
+    </item>
+
+    <item android:id="@+id/menu_loginas"
+        android:title="@string/menu_loginas"
+        app:showAsAction="never"
+        android:visible="false"/>
+
+    <item android:id="@+id/menu_logout"
+        android:title="@string/menu_logout"
+        app:showAsAction="never" />
+
 </menu>
diff --git a/clients/android/NewsBlur/res/menu/menu_feed_chooser.xml b/clients/android/NewsBlur/res/menu/menu_feed_chooser.xml
index baff24d1a..7a37e22c8 100644
--- a/clients/android/NewsBlur/res/menu/menu_feed_chooser.xml
+++ b/clients/android/NewsBlur/res/menu/menu_feed_chooser.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/menu_sort_by"
-        android:showAsAction="never"
+        app:showAsAction="never"
         android:title="@string/menu_sort_by">
         <menu>
             <group android:checkableBehavior="single">
@@ -26,7 +27,7 @@
     </item>
     <item
         android:id="@+id/menu_sort_order"
-        android:showAsAction="never"
+        app:showAsAction="never"
         android:title="@string/menu_sort_order">
         <menu>
             <group android:checkableBehavior="single">
@@ -41,7 +42,7 @@
     </item>
     <item
         android:id="@+id/menu_folder_view"
-        android:showAsAction="never"
+        app:showAsAction="never"
         android:title="@string/menu_folder_view">
         <menu>
             <group android:checkableBehavior="single">
@@ -68,7 +69,7 @@
         android:title="@string/menu_select_none" />
     <item
         android:id="@+id/menu_widget_background"
-        android:showAsAction="never"
+        app:showAsAction="never"
         android:title="@string/menu_widget_background">
         <menu>
             <group android:checkableBehavior="single">
diff --git a/clients/android/NewsBlur/res/menu/reading.xml b/clients/android/NewsBlur/res/menu/reading.xml
deleted file mode 100644
index 8a0620e3c..000000000
--- a/clients/android/NewsBlur/res/menu/reading.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <item
-        android:id="@+id/menu_reading_fullscreen"
-        android:icon="@drawable/ic_menu_fullscreen_gray55"
-        android:showAsAction="always"
-        android:title="@string/menu_fullscreen"/>
-
-</menu>
diff --git a/clients/android/NewsBlur/res/menu/search.xml b/clients/android/NewsBlur/res/menu/search.xml
index e69a9bf3c..bbe5300b0 100644
--- a/clients/android/NewsBlur/res/menu/search.xml
+++ b/clients/android/NewsBlur/res/menu/search.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <item android:id="@+id/menu_search"
           android:icon="@drawable/ic_menu_search_gray55"
           android:title="@string/menu_search"
-          android:showAsAction="always" />
+          app:showAsAction="always" />
 
 </menu>
diff --git a/clients/android/NewsBlur/res/menu/story_context.xml b/clients/android/NewsBlur/res/menu/story_context.xml
index 01fb36515..8aa707740 100644
--- a/clients/android/NewsBlur/res/menu/story_context.xml
+++ b/clients/android/NewsBlur/res/menu/story_context.xml
@@ -1,51 +1,52 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <item
         android:id="@+id/menu_reading_sharenewsblur"
-        android:showAsAction="never"
+        app:showAsAction="never"
         android:title="@string/menu_sharenewsblur"/>
 
     <item
         android:id="@+id/menu_reading_original"
-        android:showAsAction="never"
+        app:showAsAction="never"
         android:title="@string/menu_original"/>
 
     <item
         android:id="@+id/menu_send_story"
-        android:showAsAction="never"
+        app:showAsAction="never"
         android:title="@string/menu_send_story"/>
 
     <item
         android:id="@+id/menu_send_story_full"
-        android:showAsAction="never"
+        app:showAsAction="never"
         android:title="@string/menu_send_story_full"/>
 
     <item
         android:id="@+id/menu_textsize"
-        android:showAsAction="never"
+        app:showAsAction="never"
         android:title="@string/menu_textsize"/>
 
     <item
         android:id="@+id/menu_font"
-        android:showAsAction="never"
+        app:showAsAction="never"
         android:title="@string/menu_font"/>
-        
+
     <item
         android:id="@+id/menu_reading_save"
-        android:showAsAction="never"
+        app:showAsAction="never"
         android:title="@string/menu_save_story"/>
 
     <item
         android:id="@+id/menu_reading_markunread"
-        android:showAsAction="never"
+        app:showAsAction="never"
         android:title="@string/menu_mark_unread"/>
 
     <item android:id="@+id/menu_go_to_feed"
         android:title="@string/go_to_feed"/>
     <item
         android:id="@+id/menu_intel"
-        android:showAsAction="never"
+        app:showAsAction="never"
         android:title="@string/menu_intel"/>
 
     <item android:id="@+id/menu_theme"
diff --git a/clients/android/NewsBlur/res/values/attrs.xml b/clients/android/NewsBlur/res/values/attrs.xml
index 635c10d98..3ef1843a2 100644
--- a/clients/android/NewsBlur/res/values/attrs.xml
+++ b/clients/android/NewsBlur/res/values/attrs.xml
@@ -5,7 +5,7 @@
     <attr name="feedRowNeutCountText" format="string" />
     <attr name="actionbarBackground" format="string" />
     <attr name="listBackground" format="string" />
-    <attr name="itemBackground" format="string" />
+    <attr name="layoutBackground" format="string" />
     <attr name="readingBackground" format="string" />
     <attr name="defaultText" format="string" />
     <attr name="linkText" format="string" />
diff --git a/clients/android/NewsBlur/res/values/colors.xml b/clients/android/NewsBlur/res/values/colors.xml
index ae2eb19cf..571ecfdc7 100644
--- a/clients/android/NewsBlur/res/values/colors.xml
+++ b/clients/android/NewsBlur/res/values/colors.xml
@@ -1,6 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
+    <color name="primary">@color/nb_green_gray91</color>
+    <color name="primaryDark">@color/black</color>
+    <color name="secondary">@color/newsblur_blue</color>
+
+    <color name="primary.dark">@color/gray13</color>
+    <color name="primaryDark.dark">@color/black</color>
+    <color name="secondary.dark">@color/newsblur_blue</color>
+
+    <color name="primary.black">@color/black</color>
+    <color name="primaryDark.black">@color/black</color>
+    <color name="secondary.black">@color/newsblur_blue</color>
+
     <color name="black">#000000</color>
     <color name="gray07">#121212</color>
     <color name="gray10">#1A1A1A</color>
@@ -123,7 +135,7 @@
     <color name="tag_gray_shadow">#C9C9C8</color>
     <color name="tag_bg_dark">#757575</color>
 
-    <color name="newsblur_blue">#0b445a</color>
+    <color name="newsblur_blue">#319DC5</color>
 
     <color name="progress_circle_complete">@color/gray46</color>
     <color name="progress_circle_remaining">@color/gray75</color>
diff --git a/clients/android/NewsBlur/res/values/strings.xml b/clients/android/NewsBlur/res/values/strings.xml
index e3eccc599..4d174c6a4 100644
--- a/clients/android/NewsBlur/res/values/strings.xml
+++ b/clients/android/NewsBlur/res/values/strings.xml
@@ -128,7 +128,6 @@
     <string name="profile_no_interactions">No interactions</string>
     
     <string name="menu_profile">Profile</string>
-    <string name="menu_refresh">Refresh</string>
     <string name="menu_search_feeds">Search your feeds</string>
     <string name="menu_original">View original</string>
     <string name="menu_send_story">Send link to…</string>
@@ -155,7 +154,6 @@
     <string name="menu_oldest_mark_newer_stories_as_read">\u21E3 Mark newer as read</string>
     <string name="menu_mark_story_as_read">Mark as read</string>
     <string name="menu_mark_unread">Mark as unread</string>
-    <string name="menu_fullscreen">Full screen</string>
     <string name="menu_search_stories">Search…</string>
     <string name="menu_mute_feed">Mute feed</string>
     <string name="menu_unmute_feed">Unmute feed</string>
@@ -197,7 +195,10 @@
 
     <string name="logout_warning">Are you sure you want to log out?</string>
     <string name="search_mark_read_warning">Look out! All stories in feed/folder would be marked read, not just search results.  If you really want to mark all stories read, please clear your search query to confirm.</string>
-    
+
+    <string name="story_show_changes">Show Story Changes</string>
+    <string name="story_hide_changes">Hide Story Changes</string>
+    <string name="story_changes_loading">Story Changes Loading ...</string>
     <string name="your_feeds_search_hint">Search your feeds</string>
     <string name="feed_search_hint">Search term or feed URL</string>
     <string name="story_search_hint">Search for stories</string>
@@ -319,6 +320,11 @@
     </string-array>
     <string name="default_network_select_value">NOMONONME</string>
 
+    <string name="menu_delete_offline_stories">Delete offline stories …</string>
+    <string name="menu_delete_offline_stories_key">delete_offline_stories</string>
+    <string name="menu_delete_offline_stories_sum">Clear all offline stories and images</string>
+    <string name="menu_delete_offline_stories_confirmation">Cleared all stories and images!</string>
+
     <string name="menu_cache_age_select">Maximum Cache Age</string>
     <string name="menu_cache_age_select_sum">Clean up cached story content after…</string>
     <string name="menu_cache_age_select_opt_2d">2 days (reduce storage use)</string>
@@ -396,7 +402,6 @@
     <string name="settings_social">Social</string>
     <string name="settings_show_public_comments">Show Public Comments</string>
     <string name="settings_reading">Reading</string>
-    <string name="settings_immersive_enter_single_tap">Immersive Mode Via Single Tap</string>
     <string name="settings_show_content_preview">Show Content Preview Text</string>
     <string name="settings_thumbnails_style">Image Preview Thumbnails</string>
     <string name="settings_notifications">Notifications</string>
diff --git a/clients/android/NewsBlur/res/values/styles.xml b/clients/android/NewsBlur/res/values/styles.xml
index 7c3ae4133..14a529d78 100644
--- a/clients/android/NewsBlur/res/values/styles.xml
+++ b/clients/android/NewsBlur/res/values/styles.xml
@@ -1,25 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
 
+    <style name="dialogButton" parent="Widget.MaterialComponents.Button.TextButton">
+        <item name="android:textColor">@color/black</item>
+        <item name="android:letterSpacing">0</item>
+    </style>
+
+    <style name="dialogButton.dark" parent="Widget.MaterialComponents.Button.TextButton">
+        <item name="android:textColor">@color/white</item>
+        <item name="android:letterSpacing">0</item>
+    </style>
+
     <style name="initStyle" parent="@android:style/Theme.DeviceDefault.NoActionBar">
         <item name="android:windowBackground">@color/transparent</item>
     </style>
 
-    <style name="actionbar" parent="@android:style/Widget.Holo.Light.ActionBar">
-        <item name="android:background">@color/bar_background</item>
+    <style name="actionbar" parent="ThemeOverlay.MaterialComponents.Light">
+        <item name="colorControlNormal">@color/gray55</item>
     </style>
-    <style name="actionbar.dark" parent="@android:style/Widget.Holo.ActionBar">
+    <style name="actionbar.dark" parent="ThemeOverlay.MaterialComponents">
         <item name="android:background">@color/dark_bar_background</item>
+        <item name="colorControlNormal">@color/gray55</item>
     </style>
-    <style name="actionbar.black" parent="@android:style/Widget.Holo.ActionBar">
+    <style name="actionbar.black" parent="ThemeOverlay.MaterialComponents">
         <item name="android:background">@color/black</item>
-    </style>
-
-    <style name="expandableListView" parent="@android:style/Widget.Holo.Light.ExpandableListView">
-        <item name="android:background">@drawable/list_background</item>
-    </style>
-    <style name="expandableListView.dark" parent="@android:style/Widget.Holo.ExpandableListView">
-        <item name="android:background">@drawable/dark_list_background</item>
+        <item name="colorControlNormal">@color/gray55</item>
     </style>
 
     <style name="selectorFolderBackground">
@@ -63,13 +68,13 @@
         <item name="android:background">@drawable/dark_list_background</item>
     </style>
 
-    <style name="itemBackground">
+    <style name="layoutBackground">
         <item name="android:background">@color/item_background</item>
     </style>
-    <style name="itemBackground.dark">
+    <style name="layoutBackground.dark">
         <item name="android:background">@color/dark_item_background</item>
     </style>
-    <style name="itemBackground.black">
+    <style name="layoutBackground.black">
         <item name="android:background">@color/black</item>
     </style>
 
@@ -176,6 +181,7 @@
         <item name="android:textColor">@color/button_text</item>
         <item name="android:background">@drawable/button_background</item>
         <item name="android:gravity">center</item>
+        <item name="android:letterSpacing">0</item>
     </style>
     <style name="storyButtons.dark">
         <item name="android:textSize">14sp</item>
@@ -184,6 +190,7 @@
         <item name="android:textColor">@color/button_text_dark</item>
         <item name="android:background">@drawable/button_background_dark</item>
         <item name="android:gravity">center</item>
+        <item name="android:letterSpacing">0</item>
     </style>
 
     <style name="shareBarBackground">
@@ -377,21 +384,33 @@
         <item name="android:src">@drawable/mute_black</item>
     </style>
 
-    <!-- these fix the Android framework bug that causes context menus to get badly
-         truncated when the Holo theme is used on a v7+ device:
-         https://issuetracker.google.com/issues/37118658  -->
-    <style name="contextPopupStyle" parent="@android:style/Widget.Holo.Light.PopupMenu">
-        <item name="android:overlapAnchor">true</item>
-    </style>
-    <style name="contextPopupStyle.dark" parent="@android:style/Widget.Holo.PopupMenu">
-        <item name="android:overlapAnchor">true</item>
+    <style name="actionBarPopup" parent="Widget.MaterialComponents.PopupMenu">
+        <item name="android:background">@color/transparent</item>
+        <item name="popupMenuBackground">@color/primary</item>
     </style>
 
-    <!-- Fixes menu text being too dark on Moto devices -->
-    <style name="itemTextAppearance">
-        <item name="android:textColor">@color/black</item>
+    <style name="actionBarPopup.dark" parent="Widget.MaterialComponents.PopupMenu">
+        <item name="android:background">@color/transparent</item>
+        <item name="popupMenuBackground">@color/gray13</item>
     </style>
-    <style name="itemTextAppearance.dark">
-        <item name="android:textColor">@color/white</item>
+
+    <style name="preferenceTheme" parent="@style/PreferenceThemeOverlay">
+        <item name="preferenceCategoryStyle">@style/preferenceCategory</item>
+        <item name="checkBoxPreferenceStyle">@style/checkBoxPreference</item>
+        <item name="dialogPreferenceStyle">@style/dialogPreference</item>
+        <item name="preferenceStyle">@style/dialogPreference</item>
     </style>
+
+    <style name="preferenceCategory" parent="Preference.Category.Material">
+        <item name="iconSpaceReserved">false</item>
+    </style>
+
+    <style name="checkBoxPreference" parent="Preference.CheckBoxPreference.Material">
+        <item name="iconSpaceReserved">false</item>
+    </style>
+
+    <style name="dialogPreference" parent="Preference.DialogPreference.Material">
+        <item name="iconSpaceReserved">false</item>
+    </style>
+
 </resources>
diff --git a/clients/android/NewsBlur/res/values/theme.xml b/clients/android/NewsBlur/res/values/theme.xml
index da1bfafa8..a449be3d6 100644
--- a/clients/android/NewsBlur/res/values/theme.xml
+++ b/clients/android/NewsBlur/res/values/theme.xml
@@ -1,14 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
-	<style name="NewsBlurTheme" parent="@android:style/Theme.Holo.Light" >
-    	<item name="android:actionBarStyle">@style/actionbar</item>
-        <item name="android:expandableListViewStyle">@style/expandableListView</item>
+	<style name="NewsBlurTheme" parent="Theme.MaterialComponents.Light.NoActionBar">
+        <item name="colorPrimary">@color/primary</item>
+        <item name="colorPrimaryDark">@color/primaryDark</item>
+        <item name="colorSecondary">@color/secondary</item>
+        <item name="actionBarTheme">@style/actionbar</item>
+        <item name="actionBarPopupTheme">@style/actionBarPopup</item>
+        <item name="popupMenuBackground">@color/primary</item>
+        <item name="buttonBarPositiveButtonStyle">@style/dialogButton</item>
+        <item name="buttonBarNegativeButtonStyle">@style/dialogButton</item>
+        <item name="buttonBarNeutralButtonStyle">@style/dialogButton</item>
         <item name="selectorFolderBackground">@style/selectorFolderBackground</item>
         <item name="selectorFeedBackground">@style/selectorFeedBackground</item>
         <item name="feedRowNeutCountText">@style/feedRowNeutCountText</item>
         <item name="actionbarBackground">@style/actionbarBackground</item>
         <item name="listBackground">@style/listBackground</item>
-        <item name="itemBackground">@style/itemBackground</item>
+        <item name="layoutBackground">@style/layoutBackground</item>
         <item name="readingBackground">@style/readingBackground</item>
         <item name="defaultText">@style/defaultText</item>
         <item name="linkText">@style/linkText</item>
@@ -40,19 +47,26 @@
         <item name="selectorOverlayBackgroundStory">@style/selectorOverlayBackgroundStory</item>
         <item name="selectorOverlayBackgroundText">@style/selectorOverlayBackgroundText</item>
         <item name="muteicon">@style/muteicon</item>
-        <item name="android:contextPopupMenuStyle">@style/contextPopupStyle</item>
-        <item name="android:textColorPrimary">@color/black</item>
+        <item name="android:textColor">@color/black</item>
+        <item name="preferenceTheme">@style/preferenceTheme</item>
 	</style>
 
-    <style name="NewsBlurDarkTheme" parent="@android:style/Theme.Holo" >
-        <item name="android:actionBarStyle">@style/actionbar.dark</item>
-        <item name="android:expandableListViewStyle">@style/expandableListView.dark</item>
+    <style name="NewsBlurDarkTheme" parent="Theme.MaterialComponents.NoActionBar">
+        <item name="colorPrimary">@color/primary.dark</item>
+        <item name="colorPrimaryDark">@color/primaryDark.dark</item>
+        <item name="colorSecondary">@color/secondary.dark</item>
+        <item name="actionBarTheme">@style/actionbar.dark</item>
+        <item name="actionBarPopupTheme">@style/actionBarPopup.dark</item>
+        <item name="popupMenuBackground">@color/gray13</item>
+        <item name="buttonBarPositiveButtonStyle">@style/dialogButton.dark</item>
+        <item name="buttonBarNegativeButtonStyle">@style/dialogButton.dark</item>
+        <item name="buttonBarNeutralButtonStyle">@style/dialogButton.dark</item>
         <item name="selectorFolderBackground">@style/selectorFolderBackground.dark</item>
         <item name="selectorFeedBackground">@style/selectorFeedBackground.dark</item>
         <item name="feedRowNeutCountText">@style/feedRowNeutCountText.dark</item>
         <item name="actionbarBackground">@style/actionbarBackground.dark</item>
         <item name="listBackground">@style/listBackground.dark</item>
-        <item name="itemBackground">@style/itemBackground.dark</item>
+        <item name="layoutBackground">@style/layoutBackground.dark</item>
         <item name="readingBackground">@style/readingBackground.dark</item>
         <item name="defaultText">@style/defaultText.dark</item>
         <item name="linkText">@style/linkText.dark</item>
@@ -84,22 +98,27 @@
         <item name="selectorOverlayBackgroundStory">@style/selectorOverlayBackgroundStory.dark</item>
         <item name="selectorOverlayBackgroundText">@style/selectorOverlayBackgroundText.dark</item>
         <item name="muteicon">@style/muteicon.dark</item>
-
-        <!--requires API 24-->
-        <item name="android:contextPopupMenuStyle">@style/contextPopupStyle.dark</item>
-        <item name="android:textColorPrimary">@color/white</item>
-        <item name="android:itemTextAppearance">@style/itemTextAppearance.dark</item>
+        <item name="android:textColor">@color/white</item>
+        <item name="preferenceTheme">@style/preferenceTheme</item>
+        <item name="android:navigationBarColor">@android:color/black</item>
     </style>
 
-    <style name="NewsBlurBlackTheme" parent="@android:style/Theme.Holo" >
-        <item name="android:actionBarStyle">@style/actionbar.black</item>
-        <item name="android:expandableListViewStyle">@style/expandableListView.dark</item>
+    <style name="NewsBlurBlackTheme" parent="Theme.MaterialComponents.NoActionBar" >
+        <item name="colorPrimary">@color/primary.black</item>
+        <item name="colorPrimaryDark">@color/primaryDark.black</item>
+        <item name="colorSecondary">@color/secondary.black</item>
+        <item name="actionBarTheme">@style/actionbar.black</item>
+        <item name="actionBarPopupTheme">@style/actionBarPopup.dark</item>
+        <item name="popupMenuBackground">@color/gray13</item>
+        <item name="buttonBarPositiveButtonStyle">@style/dialogButton.dark</item>
+        <item name="buttonBarNegativeButtonStyle">@style/dialogButton.dark</item>
+        <item name="buttonBarNeutralButtonStyle">@style/dialogButton.dark</item>
         <item name="selectorFolderBackground">@style/selectorFolderBackground.black</item>
         <item name="selectorFeedBackground">@style/selectorFeedBackground.dark</item>
         <item name="feedRowNeutCountText">@style/feedRowNeutCountText.dark</item>
         <item name="actionbarBackground">@style/actionbarBackground.black</item>
         <item name="listBackground">@style/listBackground.dark</item>
-        <item name="itemBackground">@style/itemBackground.black</item>
+        <item name="layoutBackground">@style/layoutBackground.black</item>
         <item name="readingBackground">@style/readingBackground.black</item>
         <item name="defaultText">@style/defaultText.dark</item>
         <item name="linkText">@style/linkText.dark</item>
@@ -131,8 +150,8 @@
         <item name="selectorOverlayBackgroundStory">@style/selectorOverlayBackgroundStory.dark</item>
         <item name="selectorOverlayBackgroundText">@style/selectorOverlayBackgroundText.dark</item>
         <item name="muteicon">@style/muteicon.dark</item>
-        <item name="android:contextPopupMenuStyle">@style/contextPopupStyle.dark</item>
-        <item name="android:textColorPrimary">@color/white</item>
-        <item name="android:itemTextAppearance">@style/itemTextAppearance.dark</item>
+        <item name="android:textColor">@color/white</item>
+        <item name="preferenceTheme">@style/preferenceTheme</item>
+        <item name="android:navigationBarColor">@android:color/black</item>
     </style>
 </resources>
diff --git a/clients/android/NewsBlur/res/xml/activity_settings.xml b/clients/android/NewsBlur/res/xml/activity_settings.xml
index 50cc7225c..3687e9962 100644
--- a/clients/android/NewsBlur/res/xml/activity_settings.xml
+++ b/clients/android/NewsBlur/res/xml/activity_settings.xml
@@ -34,6 +34,10 @@
             android:entries="@array/cache_age_select_entries"
             android:entryValues="@array/cache_age_select_values"
             android:defaultValue="@string/default_cache_age_select_value" />
+        <Preference
+            android:title="@string/menu_delete_offline_stories"
+            android:key="@string/menu_delete_offline_stories_key"
+            android:summary="@string/menu_delete_offline_stories_sum" />
     </PreferenceCategory>
 
     <PreferenceCategory
@@ -119,11 +123,6 @@
             android:entries="@array/default_font_entries"
             android:entryValues="@array/default_font_values"
             android:defaultValue="@string/default_font_value" />
-        <CheckBoxPreference
-            android:defaultValue="false"
-            android:key="immersive_enter_single_tap"
-            android:title="@string/settings_immersive_enter_single_tap" >
-        </CheckBoxPreference>
         <ListPreference
             android:key="volume_key_navigation"
             android:title="@string/volume_key_navigation"
diff --git a/clients/android/NewsBlur/src/com/newsblur/activity/AddFacebook.java b/clients/android/NewsBlur/src/com/newsblur/activity/AddFacebook.java
index faa2c40d0..e020c5ec4 100644
--- a/clients/android/NewsBlur/src/com/newsblur/activity/AddFacebook.java
+++ b/clients/android/NewsBlur/src/com/newsblur/activity/AddFacebook.java
@@ -7,6 +7,7 @@ import android.webkit.WebViewClient;
 
 import com.newsblur.R;
 import com.newsblur.network.APIConstants;
+import com.newsblur.util.UIUtils;
 
 public class AddFacebook extends NbActivity {
 
@@ -17,10 +18,12 @@ public class AddFacebook extends NbActivity {
 	protected void onCreate(Bundle bundle) {
 		super.onCreate(bundle);
 		setContentView(R.layout.activity_webcontainer);
-		
+
+		UIUtils.setupToolbar(this, R.drawable.logo, getString(R.string.add_facebook), true);
+
 		webview = (WebView) findViewById(R.id.webcontainer);
 		webview.getSettings().setJavaScriptEnabled(true);
-		
+
 		webview.setWebViewClient(new WebViewClient() {
             // this was deprecated in API 24 but the replacement only added in the same release.
             // the suppression can be removed when we move past 24
diff --git a/clients/android/NewsBlur/src/com/newsblur/activity/AddFeedExternal.java b/clients/android/NewsBlur/src/com/newsblur/activity/AddFeedExternal.java
index bc044410c..0c4e820d7 100644
--- a/clients/android/NewsBlur/src/com/newsblur/activity/AddFeedExternal.java
+++ b/clients/android/NewsBlur/src/com/newsblur/activity/AddFeedExternal.java
@@ -20,10 +20,10 @@ public class AddFeedExternal extends NbActivity implements AddFeedFragment.AddFe
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         binding = ActivityAddfeedexternalBinding.inflate(getLayoutInflater());
-        getActionBar().setDisplayHomeAsUpEnabled(true);
-
         setContentView(binding.getRoot());
 
+        UIUtils.setupToolbar(this, R.drawable.logo, "Add Feed", true);
+
         binding.loadingThrob.setEnabled(!ViewUtils.isPowerSaveMode(this));
         binding.loadingThrob.setColors(UIUtils.getColor(this, R.color.refresh_1),
                                UIUtils.getColor(this, R.color.refresh_2),
diff --git a/clients/android/NewsBlur/src/com/newsblur/activity/AddSocial.java b/clients/android/NewsBlur/src/com/newsblur/activity/AddSocial.java
index 47c8e176f..a4e1ba97d 100644
--- a/clients/android/NewsBlur/src/com/newsblur/activity/AddSocial.java
+++ b/clients/android/NewsBlur/src/com/newsblur/activity/AddSocial.java
@@ -10,6 +10,7 @@ import android.widget.Button;
 
 import com.newsblur.R;
 import com.newsblur.fragment.AddSocialFragment;
+import com.newsblur.util.UIUtils;
 
 public class AddSocial extends NbActivity {
 
@@ -21,6 +22,8 @@ public class AddSocial extends NbActivity {
 	protected void onCreate(Bundle bundle) {
 		super.onCreate(bundle);
 		setContentView(R.layout.activity_addsocial);
+
+		UIUtils.setupToolbar(this, R.drawable.logo, getString(R.string.add_friends), false);
 		
 		fragmentManager = getSupportFragmentManager();
 
diff --git a/clients/android/NewsBlur/src/com/newsblur/activity/AddTwitter.java b/clients/android/NewsBlur/src/com/newsblur/activity/AddTwitter.java
index 7ec9e5d44..5a22c425d 100644
--- a/clients/android/NewsBlur/src/com/newsblur/activity/AddTwitter.java
+++ b/clients/android/NewsBlur/src/com/newsblur/activity/AddTwitter.java
@@ -7,6 +7,7 @@ import android.webkit.WebViewClient;
 
 import com.newsblur.R;
 import com.newsblur.network.APIConstants;
+import com.newsblur.util.UIUtils;
 
 public class AddTwitter extends NbActivity {
 
@@ -17,6 +18,8 @@ public class AddTwitter extends NbActivity {
 	protected void onCreate(Bundle bundle) {
 		super.onCreate(bundle);
 		setContentView(R.layout.activity_webcontainer);
+
+		UIUtils.setupToolbar(this, R.drawable.logo, getString(R.string.add_twitter), true);
 		
 		webview = (WebView) findViewById(R.id.webcontainer);
 		webview.getSettings().setJavaScriptEnabled(true);
diff --git a/clients/android/NewsBlur/src/com/newsblur/activity/AllSharedStoriesItemsList.java b/clients/android/NewsBlur/src/com/newsblur/activity/AllSharedStoriesItemsList.java
index a96dc7588..ca7ed5907 100644
--- a/clients/android/NewsBlur/src/com/newsblur/activity/AllSharedStoriesItemsList.java
+++ b/clients/android/NewsBlur/src/com/newsblur/activity/AllSharedStoriesItemsList.java
@@ -11,7 +11,7 @@ public class AllSharedStoriesItemsList extends ItemsList {
 	protected void onCreate(Bundle bundle) {
 		super.onCreate(bundle);
 
-        UIUtils.setCustomActionBar(this, R.drawable.ak_icon_blurblogs, getResources().getString(R.string.all_shared_stories_title));
+        UIUtils.setupToolbar(this, R.drawable.ak_icon_blurblogs, getResources().getString(R.string.all_shared_stories_title), false);
 	}
 
 	@Override
diff --git a/clients/android/NewsBlur/src/com/newsblur/activity/AllSharedStoriesReading.java b/clients/android/NewsBlur/src/com/newsblur/activity/AllSharedStoriesReading.java
index e9c5dff61..0428af7f5 100644
--- a/clients/android/NewsBlur/src/com/newsblur/activity/AllSharedStoriesReading.java
+++ b/clients/android/NewsBlur/src/com/newsblur/activity/AllSharedStoriesReading.java
@@ -11,7 +11,7 @@ public class AllSharedStoriesReading extends Reading {
     protected void onCreate(Bundle savedInstanceBundle) {
         super.onCreate(savedInstanceBundle);
 
-        UIUtils.setCustomActionBar(this, R.drawable.ak_icon_blurblogs, getResources().getString(R.string.all_shared_stories_title));
+        UIUtils.setupToolbar(this, R.drawable.ak_icon_blurblogs, getResources().getString(R.string.all_shared_stories_title), false);
     }
 
 }
diff --git a/clients/android/NewsBlur/src/com/newsblur/activity/AllStoriesItemsList.java b/clients/android/NewsBlur/src/com/newsblur/activity/AllStoriesItemsList.java
index 46486b2ce..17a9f88bb 100644
--- a/clients/android/NewsBlur/src/com/newsblur/activity/AllStoriesItemsList.java
+++ b/clients/android/NewsBlur/src/com/newsblur/activity/AllStoriesItemsList.java
@@ -12,7 +12,7 @@ public class AllStoriesItemsList extends ItemsList {
 	protected void onCreate(Bundle bundle) {
 		super.onCreate(bundle);
 
-        UIUtils.setCustomActionBar(this, R.drawable.ak_icon_allstories, getResources().getString(R.string.all_stories_title));
+        UIUtils.setupToolbar(this, R.drawable.ak_icon_allstories, getResources().getString(R.string.all_stories_title), false);
 	}
 
 	@Override
diff --git a/clients/android/NewsBlur/src/com/newsblur/activity/AllStoriesReading.java b/clients/android/NewsBlur/src/com/newsblur/activity/AllStoriesReading.java
index e41107d70..f4ef6a3f1 100644
--- a/clients/android/NewsBlur/src/com/newsblur/activity/AllStoriesReading.java
+++ b/clients/android/NewsBlur/src/com/newsblur/activity/AllStoriesReading.java
@@ -11,8 +11,7 @@ public class AllStoriesReading extends Reading {
     protected void onCreate(Bundle savedInstanceBundle) {
         super.onCreate(savedInstanceBundle);
 
-        UIUtils.setCustomActionBar(this, R.drawable.ak_icon_allstories, getResources().getString(R.string.all_stories_title));
-        setTitle(getResources().getString(R.string.all_stories_row_title));
+        UIUtils.setupToolbar(this, R.drawable.ak_icon_allstories, getResources().getString(R.string.all_stories_title), false);
     }
 
 }
diff --git a/clients/android/NewsBlur/src/com/newsblur/activity/FeedChooser.java b/clients/android/NewsBlur/src/com/newsblur/activity/FeedChooser.java
index 9698fc645..9d3e874c6 100644
--- a/clients/android/NewsBlur/src/com/newsblur/activity/FeedChooser.java
+++ b/clients/android/NewsBlur/src/com/newsblur/activity/FeedChooser.java
@@ -46,7 +46,6 @@ abstract public class FeedChooser extends NbActivity {
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         bindLayout();
-        getActionBar().setDisplayHomeAsUpEnabled(true);
         setupList();
         loadFeeds();
         loadFolders();
diff --git a/clients/android/NewsBlur/src/com/newsblur/activity/FeedItemsList.java b/clients/android/NewsBlur/src/com/newsblur/activity/FeedItemsList.java
index 59c4c4b41..53d58b4f1 100644
--- a/clients/android/NewsBlur/src/com/newsblur/activity/FeedItemsList.java
+++ b/clients/android/NewsBlur/src/com/newsblur/activity/FeedItemsList.java
@@ -46,7 +46,7 @@ public class FeedItemsList extends ItemsList {
 
 		super.onCreate(bundle);
 
-        UIUtils.setCustomActionBar(this, feed.faviconUrl, feed.title);
+        UIUtils.setupToolbar(this, feed.faviconUrl, feed.title, false);
         checkInAppReview();
     }
 
diff --git a/clients/android/NewsBlur/src/com/newsblur/activity/FeedReading.java b/clients/android/NewsBlur/src/com/newsblur/activity/FeedReading.java
index 1260f861e..6b13cadcb 100644
--- a/clients/android/NewsBlur/src/com/newsblur/activity/FeedReading.java
+++ b/clients/android/NewsBlur/src/com/newsblur/activity/FeedReading.java
@@ -23,7 +23,7 @@ public class FeedReading extends Reading {
             return;
         }
 
-        UIUtils.setCustomActionBar(this, feed.faviconUrl, feed.title);
+        UIUtils.setupToolbar(this, feed.faviconUrl, feed.title, false);
     }
 
 }
diff --git a/clients/android/NewsBlur/src/com/newsblur/activity/FolderItemsList.java b/clients/android/NewsBlur/src/com/newsblur/activity/FolderItemsList.java
index 78c925af3..61880245a 100644
--- a/clients/android/NewsBlur/src/com/newsblur/activity/FolderItemsList.java
+++ b/clients/android/NewsBlur/src/com/newsblur/activity/FolderItemsList.java
@@ -16,7 +16,7 @@ public class FolderItemsList extends ItemsList {
 
 		super.onCreate(bundle);
 
-        UIUtils.setCustomActionBar(this, R.drawable.g_icn_folder_rss, folderName);
+        UIUtils.setupToolbar(this, R.drawable.g_icn_folder_rss, folderName, false);
 	}
 
 	@Override
diff --git a/clients/android/NewsBlur/src/com/newsblur/activity/FolderReading.java b/clients/android/NewsBlur/src/com/newsblur/activity/FolderReading.java
index 436556314..019d394dc 100644
--- a/clients/android/NewsBlur/src/com/newsblur/activity/FolderReading.java
+++ b/clients/android/NewsBlur/src/com/newsblur/activity/FolderReading.java
@@ -11,7 +11,7 @@ public class FolderReading extends Reading {
     protected void onCreate(Bundle savedInstanceBundle) {
         super.onCreate(savedInstanceBundle);
 
-        UIUtils.setCustomActionBar(this, R.drawable.g_icn_folder_rss, fs.getFolderName());
+        UIUtils.setupToolbar(this, R.drawable.g_icn_folder_rss, fs.getFolderName(), false);
     }
 
 }
diff --git a/clients/android/NewsBlur/src/com/newsblur/activity/GlobalSharedStoriesItemsList.java b/clients/android/NewsBlur/src/com/newsblur/activity/GlobalSharedStoriesItemsList.java
index 4d8eb089a..2234a641b 100644
--- a/clients/android/NewsBlur/src/com/newsblur/activity/GlobalSharedStoriesItemsList.java
+++ b/clients/android/NewsBlur/src/com/newsblur/activity/GlobalSharedStoriesItemsList.java
@@ -11,7 +11,7 @@ public class GlobalSharedStoriesItemsList extends ItemsList {
 	protected void onCreate(Bundle bundle) {
 		super.onCreate(bundle);
 
-        UIUtils.setCustomActionBar(this, R.drawable.ak_icon_global, getResources().getString(R.string.global_shared_stories_title));
+        UIUtils.setupToolbar(this, R.drawable.ak_icon_global, getResources().getString(R.string.global_shared_stories_title), false);
 	}
 
 	@Override
diff --git a/clients/android/NewsBlur/src/com/newsblur/activity/GlobalSharedStoriesReading.java b/clients/android/NewsBlur/src/com/newsblur/activity/GlobalSharedStoriesReading.java
index e33a02871..ef23ebd57 100644
--- a/clients/android/NewsBlur/src/com/newsblur/activity/GlobalSharedStoriesReading.java
+++ b/clients/android/NewsBlur/src/com/newsblur/activity/GlobalSharedStoriesReading.java
@@ -12,7 +12,7 @@ public class GlobalSharedStoriesReading extends Reading {
     protected void onCreate(Bundle savedInstanceBundle) {
         super.onCreate(savedInstanceBundle);
 
-        UIUtils.setCustomActionBar(this, R.drawable.ak_icon_global, getResources().getString(R.string.global_shared_stories_title));
+        UIUtils.setupToolbar(this, R.drawable.ak_icon_global, getResources().getString(R.string.global_shared_stories_title), false);
     }
 
     @Override
diff --git a/clients/android/NewsBlur/src/com/newsblur/activity/InAppBrowser.java b/clients/android/NewsBlur/src/com/newsblur/activity/InAppBrowser.java
deleted file mode 100644
index a5b28eea0..000000000
--- a/clients/android/NewsBlur/src/com/newsblur/activity/InAppBrowser.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package com.newsblur.activity;
-
-import android.graphics.Bitmap;
-import android.os.Bundle;
-import android.view.View;
-import android.webkit.WebChromeClient;
-import android.webkit.WebView;
-import android.webkit.WebViewClient;
-
-import androidx.fragment.app.FragmentActivity;
-
-import com.newsblur.databinding.ActivityInAppBrowserBinding;
-import com.newsblur.util.PrefsUtils;
-
-public class InAppBrowser extends FragmentActivity {
-
-    public static final String URI = "uri";
-
-    private ActivityInAppBrowserBinding binding;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        PrefsUtils.applyThemePreference(this);
-        binding = ActivityInAppBrowserBinding.inflate(getLayoutInflater());
-        setContentView(binding.getRoot());
-
-        String url = getIntent().getParcelableExtra(URI).toString();
-
-        binding.webView.getSettings().setJavaScriptEnabled(true);
-        binding.webView.getSettings().setLoadWithOverviewMode(true);
-        binding.webView.getSettings().setSupportZoom(true);
-
-        binding.webView.setWebViewClient(new WebViewClient() {
-            @Override
-            public void onPageStarted(WebView view, String url, Bitmap favicon) {
-                super.onPageStarted(view, url, favicon);
-                binding.progressBar.setVisibility(View.VISIBLE);
-            }
-
-            @Override
-            public void onPageFinished(WebView view, String url) {
-                super.onPageFinished(view, url);
-                binding.progressBar.setVisibility(View.GONE);
-            }
-        });
-        binding.webView.setWebChromeClient(new WebChromeClient() {
-            @Override
-            public void onProgressChanged(WebView view, int newProgress) {
-                super.onProgressChanged(view, newProgress);
-                binding.progressBar.setProgress(newProgress);
-            }
-        });
-
-        binding.webView.loadUrl(url);
-    }
-}
\ No newline at end of file
diff --git a/clients/android/NewsBlur/src/com/newsblur/activity/InfrequentItemsList.java b/clients/android/NewsBlur/src/com/newsblur/activity/InfrequentItemsList.java
index 712802c38..5c54e3598 100644
--- a/clients/android/NewsBlur/src/com/newsblur/activity/InfrequentItemsList.java
+++ b/clients/android/NewsBlur/src/com/newsblur/activity/InfrequentItemsList.java
@@ -16,7 +16,7 @@ public class InfrequentItemsList extends ItemsList implements InfrequentCutoffCh
 	protected void onCreate(Bundle bundle) {
 		super.onCreate(bundle);
 
-        UIUtils.setCustomActionBar(this, R.drawable.ak_icon_allstories, getResources().getString(R.string.infrequent_title));
+        UIUtils.setupToolbar(this, R.drawable.ak_icon_allstories, getResources().getString(R.string.infrequent_title), false);
 	}
 
     @Override
diff --git a/clients/android/NewsBlur/src/com/newsblur/activity/InfrequentReading.java b/clients/android/NewsBlur/src/com/newsblur/activity/InfrequentReading.java
index 865872ffd..9a9de97db 100644
--- a/clients/android/NewsBlur/src/com/newsblur/activity/InfrequentReading.java
+++ b/clients/android/NewsBlur/src/com/newsblur/activity/InfrequentReading.java
@@ -11,7 +11,7 @@ public class InfrequentReading extends Reading {
     protected void onCreate(Bundle savedInstanceBundle) {
         super.onCreate(savedInstanceBundle);
 
-        UIUtils.setCustomActionBar(this, R.drawable.ak_icon_allstories, getResources().getString(R.string.infrequent_title));
+        UIUtils.setupToolbar(this, R.drawable.ak_icon_allstories, getResources().getString(R.string.infrequent_title), false);
     }
 
 }
diff --git a/clients/android/NewsBlur/src/com/newsblur/activity/Main.java b/clients/android/NewsBlur/src/com/newsblur/activity/Main.java
index a48d479fb..121ae942b 100644
--- a/clients/android/NewsBlur/src/com/newsblur/activity/Main.java
+++ b/clients/android/NewsBlur/src/com/newsblur/activity/Main.java
@@ -5,6 +5,8 @@ import android.graphics.Bitmap;
 import android.net.Uri;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
+
+import androidx.appcompat.widget.PopupMenu;
 import androidx.fragment.app.DialogFragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
@@ -17,7 +19,6 @@ import android.view.MenuItem;
 import android.view.View;
 import android.view.View.OnKeyListener;
 import android.widget.AbsListView;
-import android.widget.PopupMenu;
 import android.widget.SeekBar;
 import android.widget.SeekBar.OnSeekBarChangeListener;
 
@@ -58,8 +59,6 @@ public class Main extends NbActivity implements StateChangedListener, SwipeRefre
         binding = ActivityMainBinding.inflate(getLayoutInflater());
 		setContentView(binding.getRoot());
 
-		getActionBar().hide();
-
         // set the status bar to an generic loading message when the activity is first created so
         // that something is displayed while the service warms up
         binding.mainSyncStatus.setText(R.string.loading);
@@ -108,30 +107,11 @@ public class Main extends NbActivity implements StateChangedListener, SwipeRefre
 
         FeedUtils.currentFolderName = null;
 
-        binding.mainMenuButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                onClickMenuButton();
-            }
-        });
-        binding.mainAddButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                onClickAddButton();
-            }
-        });
-        binding.mainProfileButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                onClickProfileButton();
-            }
-        });
-        binding.mainUserImage.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                onClickUserButton();
-            }
-        });
+        binding.mainMenuButton.setOnClickListener(v -> onClickMenuButton());
+        binding.mainAddButton.setOnClickListener(v -> onClickAddButton());
+        binding.mainProfileButton.setOnClickListener(v -> onClickProfileButton());
+        binding.mainUserImage.setOnClickListener(v -> onClickUserButton());
+        binding.mainSearchFeedsButton.setOnClickListener(v -> onClickSearchFeedsButton());
 	}
 
     @Override
@@ -280,21 +260,6 @@ public class Main extends NbActivity implements StateChangedListener, SwipeRefre
             loginAsItem.setVisible(false);
         }
 
-        MenuItem feedbackItem = menu.findItem(R.id.menu_feedback);
-        if (AppConstants.ENABLE_FEEDBACK) {
-            feedbackItem.setTitle(feedbackItem.getTitle() + " (v" + PrefsUtils.getVersion(this) + ")");
-        } else {
-            feedbackItem.setVisible(false);
-        }
-
-        if ( (folderFeedList.currentState == StateFilter.ALL) ||
-             (folderFeedList.currentState == StateFilter.SOME) ||
-             (folderFeedList.currentState == StateFilter.BEST) ) {
-            menu.findItem(R.id.menu_search_feeds).setVisible(true);
-        } else {
-            menu.findItem(R.id.menu_search_feeds).setVisible(false);
-        }
-
         ThemeValue themeValue = PrefsUtils.getSelectedTheme(this);
         if (themeValue == ThemeValue.LIGHT) {
             menu.findItem(R.id.menu_theme_light).setChecked(true);
@@ -314,23 +279,7 @@ public class Main extends NbActivity implements StateChangedListener, SwipeRefre
 
     @Override
     public boolean onMenuItemClick(MenuItem item) {
-		if (item.getItemId() == R.id.menu_refresh) {
-            onRefresh();
-			return true;
-        } else if (item.getItemId() == R.id.menu_search_feeds) {
-            if (binding.feedlistSearchQuery.getVisibility() != View.VISIBLE) {
-                binding.feedlistSearchQuery.setVisibility(View.VISIBLE);
-                binding.feedlistSearchQuery.requestFocus();
-            } else {
-                binding.feedlistSearchQuery.setText("");
-                binding.feedlistSearchQuery.setVisibility(View.GONE);
-                checkSearchQuery();
-            }
-		} else if (item.getItemId() == R.id.menu_add_feed) {
-			Intent i = new Intent(this, SearchForFeeds.class);
-            startActivity(i);
-			return true;
-		} else if (item.getItemId() == R.id.menu_logout) {
+		if (item.getItemId() == R.id.menu_logout) {
 			DialogFragment newFragment = new LogoutDialogFragment();
 			newFragment.show(getSupportFragmentManager(), "dialog");
 		} else if (item.getItemId() == R.id.menu_settings) {
@@ -400,6 +349,17 @@ public class Main extends NbActivity implements StateChangedListener, SwipeRefre
         startActivity(i);
     }
 
+    private void onClickSearchFeedsButton() {
+        if (binding.feedlistSearchQuery.getVisibility() != View.VISIBLE) {
+            binding.feedlistSearchQuery.setVisibility(View.VISIBLE);
+            binding.feedlistSearchQuery.requestFocus();
+        } else {
+            binding.feedlistSearchQuery.setText("");
+            binding.feedlistSearchQuery.setVisibility(View.GONE);
+            checkSearchQuery();
+        }
+    }
+
     @Override
     public void onScrollStateChanged(AbsListView absListView, int i) {
         // not required
diff --git a/clients/android/NewsBlur/src/com/newsblur/activity/MuteConfig.java b/clients/android/NewsBlur/src/com/newsblur/activity/MuteConfig.java
index 9c767a531..1ea301e83 100644
--- a/clients/android/NewsBlur/src/com/newsblur/activity/MuteConfig.java
+++ b/clients/android/NewsBlur/src/com/newsblur/activity/MuteConfig.java
@@ -1,6 +1,5 @@
 package com.newsblur.activity;
 
-import android.app.AlertDialog;
 import android.content.Intent;
 import android.database.Cursor;
 import android.text.TextUtils;
@@ -10,6 +9,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
 
+import androidx.appcompat.app.AlertDialog;
 import androidx.core.content.ContextCompat;
 
 import com.newsblur.R;
@@ -59,6 +59,7 @@ public class MuteConfig extends FeedChooser implements MuteConfigAdapter.FeedSta
     void bindLayout() {
         binding = ActivityMuteConfigBinding.inflate(getLayoutInflater());
         setContentView(binding.getRoot());
+        UIUtils.setupToolbar(this, R.drawable.logo, getString(R.string.mute_sites), true);
     }
 
     @Override
diff --git a/clients/android/NewsBlur/src/com/newsblur/activity/NbActivity.java b/clients/android/NewsBlur/src/com/newsblur/activity/NbActivity.java
index 42da9b5ba..7cf4c09fe 100644
--- a/clients/android/NewsBlur/src/com/newsblur/activity/NbActivity.java
+++ b/clients/android/NewsBlur/src/com/newsblur/activity/NbActivity.java
@@ -1,6 +1,8 @@
 package com.newsblur.activity;
 
 import android.os.Bundle;
+
+import androidx.appcompat.app.AppCompatActivity;
 import androidx.fragment.app.FragmentActivity;
 import android.widget.Toast;
 
@@ -15,7 +17,7 @@ import java.util.ArrayList;
  * The base class for all Activities in the NewsBlur app.  Handles enforcement of
  * login state and tracking of sync/update broadcasts.
  */
-public class NbActivity extends FragmentActivity {
+public class NbActivity extends AppCompatActivity {
 
     public static final int UPDATE_DB_READY = (1<<0);
     public static final int UPDATE_METADATA = (1<<1);
diff --git a/clients/android/NewsBlur/src/com/newsblur/activity/Premium.java b/clients/android/NewsBlur/src/com/newsblur/activity/Premium.java
index 58f87ec58..100a62921 100644
--- a/clients/android/NewsBlur/src/com/newsblur/activity/Premium.java
+++ b/clients/android/NewsBlur/src/com/newsblur/activity/Premium.java
@@ -1,6 +1,5 @@
 package com.newsblur.activity;
 
-import android.content.res.Resources;
 import android.graphics.Color;
 import android.graphics.Paint;
 import android.net.Uri;
@@ -8,13 +7,10 @@ import android.os.AsyncTask;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.text.util.Linkify;
-import android.util.DisplayMetrics;
 import android.view.View;
-import android.widget.FrameLayout;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.core.content.res.ResourcesCompat;
 
 import com.android.billingclient.api.AcknowledgePurchaseParams;
 import com.android.billingclient.api.AcknowledgePurchaseResponseListener;
@@ -41,6 +37,7 @@ import com.newsblur.util.UIUtils;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Currency;
 import java.util.Date;
 import java.util.List;
 import java.util.Locale;
@@ -127,7 +124,7 @@ public class Premium extends NbActivity {
     }
 
     private void setupUI() {
-        UIUtils.setCustomActionBar(this, R.drawable.logo, getString(R.string.premium_toolbar_title));
+        UIUtils.setupToolbar(this, R.drawable.logo, getString(R.string.premium_toolbar_title), true);
 
         // linkify before setting the string resource
         BetterLinkMovementMethod.linkify(Linkify.WEB_URLS, binding.textPolicies)
@@ -230,10 +227,9 @@ public class Premium extends NbActivity {
     }
 
     private void showSubscriptionDetails() {
-        // handling dynamic currency and pricing for 1Y subscriptions
-        String currencySymbol = subscriptionDetails.getPrice().substring(0, 1);
-        String priceString = subscriptionDetails.getPrice().substring(1);
-        double price = Double.parseDouble(priceString);
+        double price = subscriptionDetails.getPriceAmountMicros() / 1000f / 1000f;
+        Currency currency = Currency.getInstance(subscriptionDetails.getPriceCurrencyCode());
+        String currencySymbol = currency.getSymbol(Locale.getDefault());
         StringBuilder pricingText = new StringBuilder();
         pricingText.append(subscriptionDetails.getPrice());
         pricingText.append(" per year (");
diff --git a/clients/android/NewsBlur/src/com/newsblur/activity/Profile.java b/clients/android/NewsBlur/src/com/newsblur/activity/Profile.java
index 9684aa983..e31ba8393 100644
--- a/clients/android/NewsBlur/src/com/newsblur/activity/Profile.java
+++ b/clients/android/NewsBlur/src/com/newsblur/activity/Profile.java
@@ -13,6 +13,7 @@ import com.newsblur.domain.UserDetails;
 import com.newsblur.fragment.ProfileDetailsFragment;
 import com.newsblur.network.APIManager;
 import com.newsblur.util.PrefsUtils;
+import com.newsblur.util.UIUtils;
 
 public class Profile extends NbActivity {
 
@@ -28,7 +29,7 @@ public class Profile extends NbActivity {
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		setContentView(R.layout.activity_profile);
-		getActionBar().setDisplayHomeAsUpEnabled(true);
+		UIUtils.setupToolbar(this, R.drawable.logo, getString(R.string.profile), true);
 		apiManager = new APIManager(this);
         if (savedInstanceState == null) {
             userId = getIntent().getStringExtra(USER_ID);
diff --git a/clients/android/NewsBlur/src/com/newsblur/activity/ReadStoriesItemsList.java b/clients/android/NewsBlur/src/com/newsblur/activity/ReadStoriesItemsList.java
index c6f07f663..24a102c73 100644
--- a/clients/android/NewsBlur/src/com/newsblur/activity/ReadStoriesItemsList.java
+++ b/clients/android/NewsBlur/src/com/newsblur/activity/ReadStoriesItemsList.java
@@ -11,7 +11,7 @@ public class ReadStoriesItemsList extends ItemsList {
 	protected void onCreate(Bundle bundle) {
 		super.onCreate(bundle);
 
-        UIUtils.setCustomActionBar(this, R.drawable.g_icn_unread_double, getResources().getString(R.string.read_stories_title));
+        UIUtils.setupToolbar(this, R.drawable.g_icn_unread_double, getResources().getString(R.string.read_stories_title), false);
 	}
 
 	@Override
diff --git a/clients/android/NewsBlur/src/com/newsblur/activity/ReadStoriesReading.java b/clients/android/NewsBlur/src/com/newsblur/activity/ReadStoriesReading.java
index 744425ed4..c9fbbcb60 100644
--- a/clients/android/NewsBlur/src/com/newsblur/activity/ReadStoriesReading.java
+++ b/clients/android/NewsBlur/src/com/newsblur/activity/ReadStoriesReading.java
@@ -11,7 +11,7 @@ public class ReadStoriesReading extends Reading {
     protected void onCreate(Bundle savedInstanceBundle) {
         super.onCreate(savedInstanceBundle);
 
-        UIUtils.setCustomActionBar(this, R.drawable.g_icn_unread, getResources().getString(R.string.read_stories_title));
+        UIUtils.setupToolbar(this, R.drawable.g_icn_unread, getResources().getString(R.string.read_stories_title), false);
     }
 
 }
diff --git a/clients/android/NewsBlur/src/com/newsblur/activity/Reading.java b/clients/android/NewsBlur/src/com/newsblur/activity/Reading.java
index db4ceb9bb..9fbeb71ec 100644
--- a/clients/android/NewsBlur/src/com/newsblur/activity/Reading.java
+++ b/clients/android/NewsBlur/src/com/newsblur/activity/Reading.java
@@ -53,7 +53,6 @@ public abstract class Reading extends NbActivity implements OnPageChangeListener
     private static final String BUNDLE_POSITION = "position";
     private static final String BUNDLE_STARTING_UNREAD = "starting_unread";
     private static final String BUNDLE_SELECTED_FEED_VIEW = "selectedFeedView";
-    private static final String BUNDLE_IS_FULLSCREEN = "is_fullscreen";
 
     /** special value for starting story hash that jumps to the first unread. */
     public static final String FIND_FIRST_UNREAD = "FIND_FIRST_UNREAD";
@@ -143,14 +142,6 @@ public abstract class Reading extends NbActivity implements OnPageChangeListener
 		intelState = PrefsUtils.getStateFilter(this);
         volumeKeyNavigation = PrefsUtils.getVolumeKeyNavigation(this);
 
-        // were we fullscreen before rotation?
-        if ((savedInstanceBundle != null) && savedInstanceBundle.containsKey(BUNDLE_IS_FULLSCREEN)) {
-            boolean isFullscreen = savedInstanceBundle.getBoolean(BUNDLE_IS_FULLSCREEN, false);
-            if (isFullscreen) {
-                ViewUtils.hideSystemUI(getWindow().getDecorView());
-            }
-        }
-
         // this value is expensive to compute but doesn't change during a single runtime
         this.overlayRangeTopPx = (float) UIUtils.dp2px(this, OVERLAY_RANGE_TOP_DP);
         this.overlayRangeBotPx = (float) UIUtils.dp2px(this, OVERLAY_RANGE_BOT_DP);
@@ -199,10 +190,6 @@ public abstract class Reading extends NbActivity implements OnPageChangeListener
         if (startingUnreadCount != 0) {
             outState.putInt(BUNDLE_STARTING_UNREAD, startingUnreadCount);
         }
-
-        if (ViewUtils.isSystemUIHidden(getWindow().getDecorView())) {
-            outState.putBoolean(BUNDLE_IS_FULLSCREEN, true);
-        }
     }
 
     @Override
@@ -375,29 +362,12 @@ public abstract class Reading extends NbActivity implements OnPageChangeListener
         return result;
     }
 
-	@Override
-	public boolean onCreateOptionsMenu(Menu menu) {
-		super.onCreateOptionsMenu(menu);
-		MenuInflater inflater = getMenuInflater();
-		inflater.inflate(R.menu.reading, menu);
-		return true;
-	}
-
-    @Override
-    public boolean onPrepareOptionsMenu(Menu menu) {
-        super.onPrepareOptionsMenu(menu);
-        return true;
-    }
-
 	@Override
 	public boolean onOptionsItemSelected(MenuItem item) {
 		if (item.getItemId() == android.R.id.home) {
 			finish();
 			return true;
-		} else if (item.getItemId() == R.id.menu_reading_fullscreen) {
-            ViewUtils.hideSystemUI(getWindow().getDecorView());
-            return true;
-        } else {
+		} else {
 			return super.onOptionsItemSelected(item);
 		}
 	}
diff --git a/clients/android/NewsBlur/src/com/newsblur/activity/SavedStoriesItemsList.java b/clients/android/NewsBlur/src/com/newsblur/activity/SavedStoriesItemsList.java
index 1748bab80..33b0e0e5d 100644
--- a/clients/android/NewsBlur/src/com/newsblur/activity/SavedStoriesItemsList.java
+++ b/clients/android/NewsBlur/src/com/newsblur/activity/SavedStoriesItemsList.java
@@ -15,7 +15,7 @@ public class SavedStoriesItemsList extends ItemsList {
         if (fs.getSingleSavedTag() != null) {
             title = title + " - " + fs.getSingleSavedTag();
         }
-        UIUtils.setCustomActionBar(this, R.drawable.clock, title);
+        UIUtils.setupToolbar(this, R.drawable.clock, title, false);
 	}
 
     @Override
diff --git a/clients/android/NewsBlur/src/com/newsblur/activity/SavedStoriesReading.java b/clients/android/NewsBlur/src/com/newsblur/activity/SavedStoriesReading.java
index ad9271a53..624966426 100644
--- a/clients/android/NewsBlur/src/com/newsblur/activity/SavedStoriesReading.java
+++ b/clients/android/NewsBlur/src/com/newsblur/activity/SavedStoriesReading.java
@@ -15,7 +15,7 @@ public class SavedStoriesReading extends Reading {
         if (fs.getSingleSavedTag() != null) {
             title = title + " - " + fs.getSingleSavedTag();
         }
-        UIUtils.setCustomActionBar(this, R.drawable.clock, title);
+        UIUtils.setupToolbar(this, R.drawable.clock, title, false);
     }
 
 }
diff --git a/clients/android/NewsBlur/src/com/newsblur/activity/SearchForFeeds.java b/clients/android/NewsBlur/src/com/newsblur/activity/SearchForFeeds.java
index bd484072b..b78229573 100644
--- a/clients/android/NewsBlur/src/com/newsblur/activity/SearchForFeeds.java
+++ b/clients/android/NewsBlur/src/com/newsblur/activity/SearchForFeeds.java
@@ -27,6 +27,7 @@ import com.newsblur.domain.FeedResult;
 import com.newsblur.fragment.AddFeedFragment;
 import com.newsblur.network.SearchAsyncTaskLoader;
 import com.newsblur.network.SearchLoaderResponse;
+import com.newsblur.util.UIUtils;
 
 // TODO: this activity's use of the inbuilt activity search facility as well as an improper use of a loader to
 //       make network requests makes it easily lose state, lack non-legacy progress indication, and generally
@@ -46,11 +47,10 @@ public class SearchForFeeds extends NbActivity implements LoaderCallbacks<Search
 	@Override
 	protected void onCreate(Bundle arg0) {
 		super.onCreate(arg0);
-		getActionBar().setDisplayHomeAsUpEnabled(true);
-		
-		setTitle(R.string.title_feed_search);
+
 		setContentView(R.layout.activity_feed_search);
-		
+		UIUtils.setupToolbar(this, R.drawable.logo, getString(R.string.title_feed_search), true);
+
 		TextView emptyView = (TextView) findViewById(R.id.empty_view);
 		resultsList = (ListView) findViewById(R.id.feed_result_list);
 		resultsList.setEmptyView(emptyView);
diff --git a/clients/android/NewsBlur/src/com/newsblur/activity/Settings.java b/clients/android/NewsBlur/src/com/newsblur/activity/Settings.java
index 0fd95aff2..9fb92de9a 100644
--- a/clients/android/NewsBlur/src/com/newsblur/activity/Settings.java
+++ b/clients/android/NewsBlur/src/com/newsblur/activity/Settings.java
@@ -1,27 +1,31 @@
 package com.newsblur.activity;
 
-import androidx.fragment.app.FragmentActivity;
 import android.content.SharedPreferences;
 import android.os.Bundle;
-import android.view.MenuItem;
 
+import androidx.appcompat.app.AppCompatActivity;
+
+import com.newsblur.R;
+import com.newsblur.databinding.ActivitySettingsBinding;
 import com.newsblur.fragment.SettingsFragment;
 import com.newsblur.util.PrefConstants;
 import com.newsblur.util.PrefsUtils;
 import com.newsblur.util.UIUtils;
 
-public class Settings extends FragmentActivity implements SharedPreferences.OnSharedPreferenceChangeListener {
+public class Settings extends AppCompatActivity implements SharedPreferences.OnSharedPreferenceChangeListener {
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
         PrefsUtils.applyThemePreference(this);
-
         super.onCreate(savedInstanceState);
+        ActivitySettingsBinding binding = ActivitySettingsBinding.inflate(getLayoutInflater());
+        setContentView(binding.getRoot());
+        UIUtils.setupToolbar(this, R.drawable.logo, getString(R.string.settings), true);
 
-        getActionBar().setDisplayHomeAsUpEnabled(true);
-
-        SettingsFragment fragment = new SettingsFragment();
-        getFragmentManager().beginTransaction().replace(android.R.id.content, fragment).commit();
+        getSupportFragmentManager()
+                .beginTransaction()
+                .replace(binding.container.getId(), new SettingsFragment())
+                .commit();
 
         SharedPreferences prefs = getSharedPreferences(PrefConstants.PREFERENCES, 0);
         prefs.registerOnSharedPreferenceChangeListener(this);
@@ -29,21 +33,10 @@ public class Settings extends FragmentActivity implements SharedPreferences.OnSh
 
     @Override
     protected void onDestroy() {
-        super.onDestroy();
-
         SharedPreferences prefs = getSharedPreferences(PrefConstants.PREFERENCES, 0);
         prefs.unregisterOnSharedPreferenceChangeListener(this);
-    }
+        super.onDestroy();
 
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-        case android.R.id.home:
-            finish();
-            return true;
-        default:
-            return super.onOptionsItemSelected(item);   
-        }
     }
 
     @Override
diff --git a/clients/android/NewsBlur/src/com/newsblur/activity/SocialFeedItemsList.java b/clients/android/NewsBlur/src/com/newsblur/activity/SocialFeedItemsList.java
index ff1211f12..a2daf50de 100644
--- a/clients/android/NewsBlur/src/com/newsblur/activity/SocialFeedItemsList.java
+++ b/clients/android/NewsBlur/src/com/newsblur/activity/SocialFeedItemsList.java
@@ -16,7 +16,7 @@ public class SocialFeedItemsList extends ItemsList {
 	    socialFeed = (SocialFeed) getIntent().getSerializableExtra(EXTRA_SOCIAL_FEED);
 		super.onCreate(bundle);
 				
-        UIUtils.setCustomActionBar(this, socialFeed.photoUrl, socialFeed.feedTitle);
+        UIUtils.setupToolbar(this, socialFeed.photoUrl, socialFeed.feedTitle, false);
 	}
 
 	@Override
diff --git a/clients/android/NewsBlur/src/com/newsblur/activity/SocialFeedReading.java b/clients/android/NewsBlur/src/com/newsblur/activity/SocialFeedReading.java
index ba00c3503..cd42511c5 100644
--- a/clients/android/NewsBlur/src/com/newsblur/activity/SocialFeedReading.java
+++ b/clients/android/NewsBlur/src/com/newsblur/activity/SocialFeedReading.java
@@ -13,7 +13,7 @@ public class SocialFeedReading extends Reading {
         super.onCreate(savedInstanceBundle);
         SocialFeed socialFeed = FeedUtils.dbHelper.getSocialFeed(fs.getSingleSocialFeed().getKey());
         if (socialFeed == null) finish(); // don't open fatally stale intents
-        UIUtils.setCustomActionBar(this, socialFeed.photoUrl, socialFeed.feedTitle);
+        UIUtils.setupToolbar(this, socialFeed.photoUrl, socialFeed.feedTitle, false);
     }
 
 }
diff --git a/clients/android/NewsBlur/src/com/newsblur/activity/WidgetConfig.java b/clients/android/NewsBlur/src/com/newsblur/activity/WidgetConfig.java
index 87c887bcf..98d44bbbc 100644
--- a/clients/android/NewsBlur/src/com/newsblur/activity/WidgetConfig.java
+++ b/clients/android/NewsBlur/src/com/newsblur/activity/WidgetConfig.java
@@ -11,6 +11,7 @@ import com.newsblur.databinding.ActivityWidgetConfigBinding;
 import com.newsblur.domain.Feed;
 import com.newsblur.domain.Folder;
 import com.newsblur.util.PrefsUtils;
+import com.newsblur.util.UIUtils;
 import com.newsblur.widget.WidgetUtils;
 
 import java.util.ArrayList;
@@ -62,6 +63,7 @@ public class WidgetConfig extends FeedChooser {
     void bindLayout() {
         binding = ActivityWidgetConfigBinding.inflate(getLayoutInflater());
         setContentView(binding.getRoot());
+        UIUtils.setupToolbar(this, R.drawable.logo, getString(R.string.widget), true);
     }
 
     @Override
diff --git a/clients/android/NewsBlur/src/com/newsblur/database/BlurDatabaseHelper.java b/clients/android/NewsBlur/src/com/newsblur/database/BlurDatabaseHelper.java
index 487e42ba7..5063f6eb3 100644
--- a/clients/android/NewsBlur/src/com/newsblur/database/BlurDatabaseHelper.java
+++ b/clients/android/NewsBlur/src/com/newsblur/database/BlurDatabaseHelper.java
@@ -202,6 +202,12 @@ public class BlurDatabaseHelper {
         synchronized (RW_MUTEX) {dbRW.execSQL(q);}
     }
 
+    public void deleteStories() {
+        vacuum();
+        synchronized (RW_MUTEX) {dbRW.delete(DatabaseConstants.STORY_TABLE, null, null);}
+        synchronized (RW_MUTEX) {dbRW.delete(DatabaseConstants.STORY_TEXT_TABLE, null, null);}
+    }
+
     public Feed getFeed(String feedId) {
         Cursor c = dbRO.query(DatabaseConstants.FEED_TABLE, null,  DatabaseConstants.FEED_ID + " = ?", new String[] {feedId}, null, null, null);
         Feed result = null;
diff --git a/clients/android/NewsBlur/src/com/newsblur/database/DatabaseConstants.java b/clients/android/NewsBlur/src/com/newsblur/database/DatabaseConstants.java
index 517ffda2a..6fe1901fd 100644
--- a/clients/android/NewsBlur/src/com/newsblur/database/DatabaseConstants.java
+++ b/clients/android/NewsBlur/src/com/newsblur/database/DatabaseConstants.java
@@ -107,6 +107,7 @@ public class DatabaseConstants {
     public static final String STORY_SEARCH_HIT = "search_hit";
     public static final String STORY_THUMBNAIL_URL = "thumbnail_url";
     public static final String STORY_INFREQUENT = "infrequent";
+    public static final String STORY_HAS_MODIFICATIONS = "has_modifications";
 
     public static final String READING_SESSION_TABLE = "reading_session";
     public static final String READING_SESSION_STORY_HASH = "session_story_hash";
@@ -272,7 +273,8 @@ public class DatabaseConstants {
         STORY_IMAGE_URLS + TEXT + ", " +
         STORY_LAST_READ_DATE + INTEGER + ", " +
         STORY_SEARCH_HIT + TEXT + ", " +
-        STORY_THUMBNAIL_URL + TEXT +
+        STORY_THUMBNAIL_URL + TEXT + ", " +
+        STORY_HAS_MODIFICATIONS + INTEGER +
         ")";
 
     static final String READING_SESSION_SQL = "CREATE TABLE " + READING_SESSION_TABLE + " (" +
@@ -344,7 +346,7 @@ public class DatabaseConstants {
         STORY_INTELLIGENCE_AUTHORS, STORY_INTELLIGENCE_FEED, STORY_INTELLIGENCE_TAGS, STORY_INTELLIGENCE_TOTAL,
         STORY_INTELLIGENCE_TITLE, STORY_PERMALINK, STORY_READ, STORY_STARRED, STORY_STARRED_DATE, STORY_TAGS, STORY_USER_TAGS, STORY_TITLE,
         STORY_SOCIAL_USER_ID, STORY_SOURCE_USER_ID, STORY_SHARED_USER_IDS, STORY_FRIEND_USER_IDS, STORY_HASH,
-        STORY_LAST_READ_DATE, STORY_THUMBNAIL_URL,
+        STORY_LAST_READ_DATE, STORY_THUMBNAIL_URL, STORY_HAS_MODIFICATIONS,
 	};
 
     private static final String STORY_COLUMNS = 
diff --git a/clients/android/NewsBlur/src/com/newsblur/domain/Story.java b/clients/android/NewsBlur/src/com/newsblur/domain/Story.java
index d62d876a3..f25804746 100644
--- a/clients/android/NewsBlur/src/com/newsblur/domain/Story.java
+++ b/clients/android/NewsBlur/src/com/newsblur/domain/Story.java
@@ -89,6 +89,9 @@ public class Story implements Serializable {
     @SerializedName("secure_image_thumbnails")
     public Map<String, String> secureImageThumbnails;
 
+    @SerializedName("has_modifications")
+    public boolean hasModifications;
+
     // NOTE: this is parsed and saved to the DB, but is *not* generally un-thawed when stories are fetched back from the DB
     @SerializedName("image_urls")
     public String[] imageUrls;
@@ -149,6 +152,7 @@ public class Story implements Serializable {
 		values.put(DatabaseConstants.STORY_SEARCH_HIT, searchHit);
         values.put(DatabaseConstants.STORY_THUMBNAIL_URL, thumbnailUrl);
         values.put(DatabaseConstants.STORY_INFREQUENT, infrequent);
+        values.put(DatabaseConstants.STORY_HAS_MODIFICATIONS, hasModifications);
 		return values;
 	}
 
@@ -180,6 +184,7 @@ public class Story implements Serializable {
         story.lastReadTimestamp = cursor.getLong(cursor.getColumnIndex(DatabaseConstants.STORY_LAST_READ_DATE));
         story.sharedTimestamp = cursor.getLong(cursor.getColumnIndex(DatabaseConstants.STORY_SHARED_DATE));
 		story.thumbnailUrl = cursor.getString(cursor.getColumnIndex(DatabaseConstants.STORY_THUMBNAIL_URL));
+		story.hasModifications = cursor.getInt(cursor.getColumnIndex(DatabaseConstants.STORY_HAS_MODIFICATIONS)) > 0;
 		return story;
 	}
 
diff --git a/clients/android/NewsBlur/src/com/newsblur/fragment/AddFeedFragment.java b/clients/android/NewsBlur/src/com/newsblur/fragment/AddFeedFragment.java
index 6c5c37db3..0583aedef 100644
--- a/clients/android/NewsBlur/src/com/newsblur/fragment/AddFeedFragment.java
+++ b/clients/android/NewsBlur/src/com/newsblur/fragment/AddFeedFragment.java
@@ -1,13 +1,13 @@
 package com.newsblur.fragment;
 
 import android.app.Activity;
-import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.Intent;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.DialogFragment;
 import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.LinearLayoutManager;
diff --git a/clients/android/NewsBlur/src/com/newsblur/fragment/AlertDialogFragment.java b/clients/android/NewsBlur/src/com/newsblur/fragment/AlertDialogFragment.java
index 6ee846b65..119a3260d 100644
--- a/clients/android/NewsBlur/src/com/newsblur/fragment/AlertDialogFragment.java
+++ b/clients/android/NewsBlur/src/com/newsblur/fragment/AlertDialogFragment.java
@@ -1,9 +1,10 @@
 package com.newsblur.fragment;
 
-import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
+
+import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.DialogFragment;
 
 import com.newsblur.R;
diff --git a/clients/android/NewsBlur/src/com/newsblur/fragment/ChooseFoldersFragment.java b/clients/android/NewsBlur/src/com/newsblur/fragment/ChooseFoldersFragment.java
index 62f25c837..a4fee31bc 100644
--- a/clients/android/NewsBlur/src/com/newsblur/fragment/ChooseFoldersFragment.java
+++ b/clients/android/NewsBlur/src/com/newsblur/fragment/ChooseFoldersFragment.java
@@ -6,10 +6,11 @@ import java.util.List;
 import java.util.Set;
 
 import android.app.Activity;
-import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
+
+import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.DialogFragment;
 import android.view.Gravity;
 import android.view.LayoutInflater;
diff --git a/clients/android/NewsBlur/src/com/newsblur/fragment/DeleteFeedFragment.java b/clients/android/NewsBlur/src/com/newsblur/fragment/DeleteFeedFragment.java
index 301228e59..20dcec549 100644
--- a/clients/android/NewsBlur/src/com/newsblur/fragment/DeleteFeedFragment.java
+++ b/clients/android/NewsBlur/src/com/newsblur/fragment/DeleteFeedFragment.java
@@ -11,10 +11,11 @@ import com.newsblur.util.FeedUtils;
 import com.newsblur.util.UIUtils;
 
 import android.app.Activity;
-import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
+
+import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.DialogFragment;
 
 public class DeleteFeedFragment extends DialogFragment {
diff --git a/clients/android/NewsBlur/src/com/newsblur/fragment/DeleteFolderFragment.java b/clients/android/NewsBlur/src/com/newsblur/fragment/DeleteFolderFragment.java
index 708be7ab1..4642836ec 100644
--- a/clients/android/NewsBlur/src/com/newsblur/fragment/DeleteFolderFragment.java
+++ b/clients/android/NewsBlur/src/com/newsblur/fragment/DeleteFolderFragment.java
@@ -1,11 +1,11 @@
 package com.newsblur.fragment;
 
-import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.DialogFragment;
 import android.text.TextUtils;
 
diff --git a/clients/android/NewsBlur/src/com/newsblur/fragment/EditReplyDialogFragment.java b/clients/android/NewsBlur/src/com/newsblur/fragment/EditReplyDialogFragment.java
index 6283e5dd2..ae43f965a 100644
--- a/clients/android/NewsBlur/src/com/newsblur/fragment/EditReplyDialogFragment.java
+++ b/clients/android/NewsBlur/src/com/newsblur/fragment/EditReplyDialogFragment.java
@@ -1,10 +1,11 @@
 package com.newsblur.fragment;
 
 import android.app.Activity;
-import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
+
+import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.DialogFragment;
 import android.view.LayoutInflater;
 import android.view.View;
diff --git a/clients/android/NewsBlur/src/com/newsblur/fragment/FeedIntelTrainerFragment.java b/clients/android/NewsBlur/src/com/newsblur/fragment/FeedIntelTrainerFragment.java
index bdcc862b5..c440fdc92 100644
--- a/clients/android/NewsBlur/src/com/newsblur/fragment/FeedIntelTrainerFragment.java
+++ b/clients/android/NewsBlur/src/com/newsblur/fragment/FeedIntelTrainerFragment.java
@@ -4,10 +4,11 @@ import java.util.List;
 import java.util.Map;
 
 import android.app.Activity;
-import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
+
+import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.DialogFragment;
 import android.view.Gravity;
 import android.view.LayoutInflater;
diff --git a/clients/android/NewsBlur/src/com/newsblur/fragment/InfrequentCutoffDialogFragment.java b/clients/android/NewsBlur/src/com/newsblur/fragment/InfrequentCutoffDialogFragment.java
index 448bcbfd6..8f14a5458 100644
--- a/clients/android/NewsBlur/src/com/newsblur/fragment/InfrequentCutoffDialogFragment.java
+++ b/clients/android/NewsBlur/src/com/newsblur/fragment/InfrequentCutoffDialogFragment.java
@@ -43,8 +43,7 @@ public class InfrequentCutoffDialogFragment extends DialogFragment {
 		binding.radio30.setChecked(currentValue == 30);
 		binding.radio60.setChecked(currentValue == 60);
 		binding.radio90.setChecked(currentValue == 90);
-		
-		getDialog().setTitle(R.string.infrequent_choice_title);
+
 		getDialog().getWindow().getAttributes().gravity = Gravity.BOTTOM;
 		
 		return v;
diff --git a/clients/android/NewsBlur/src/com/newsblur/fragment/LoginAsDialogFragment.java b/clients/android/NewsBlur/src/com/newsblur/fragment/LoginAsDialogFragment.java
index 4c4a1a5cb..ced1e801d 100644
--- a/clients/android/NewsBlur/src/com/newsblur/fragment/LoginAsDialogFragment.java
+++ b/clients/android/NewsBlur/src/com/newsblur/fragment/LoginAsDialogFragment.java
@@ -1,12 +1,13 @@
 package com.newsblur.fragment;
 
 import android.app.Activity;
-import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.AsyncTask;
 import android.os.Bundle;
+
+import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.DialogFragment;
 import android.view.LayoutInflater;
 import android.view.View;
diff --git a/clients/android/NewsBlur/src/com/newsblur/fragment/LogoutDialogFragment.java b/clients/android/NewsBlur/src/com/newsblur/fragment/LogoutDialogFragment.java
index ed2819ceb..47699b739 100644
--- a/clients/android/NewsBlur/src/com/newsblur/fragment/LogoutDialogFragment.java
+++ b/clients/android/NewsBlur/src/com/newsblur/fragment/LogoutDialogFragment.java
@@ -1,9 +1,10 @@
 package com.newsblur.fragment;
 
-import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
+
+import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.DialogFragment;
 
 import com.newsblur.R;
@@ -14,7 +15,7 @@ public class LogoutDialogFragment extends DialogFragment {
     @Override
     public Dialog onCreateDialog(Bundle savedInstanceState) {
         AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
-        builder.setMessage(getResources().getString(R.string.logout_warning));
+        builder.setTitle(getResources().getString(R.string.logout_warning));
         builder.setPositiveButton(R.string.alert_dialog_ok, new DialogInterface.OnClickListener() {
             @Override
             public void onClick(DialogInterface dialogInterface, int i) {
diff --git a/clients/android/NewsBlur/src/com/newsblur/fragment/ReadingActionConfirmationFragment.java b/clients/android/NewsBlur/src/com/newsblur/fragment/ReadingActionConfirmationFragment.java
index 3632d826b..1c67ba775 100644
--- a/clients/android/NewsBlur/src/com/newsblur/fragment/ReadingActionConfirmationFragment.java
+++ b/clients/android/NewsBlur/src/com/newsblur/fragment/ReadingActionConfirmationFragment.java
@@ -3,10 +3,11 @@ package com.newsblur.fragment;
 import com.newsblur.util.FeedUtils;
 import com.newsblur.util.ReadingAction;
 
-import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
+
+import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.DialogFragment;
 
 public class ReadingActionConfirmationFragment extends DialogFragment {
diff --git a/clients/android/NewsBlur/src/com/newsblur/fragment/ReadingItemFragment.java b/clients/android/NewsBlur/src/com/newsblur/fragment/ReadingItemFragment.java
index 8edf8a7a2..06bb87e57 100644
--- a/clients/android/NewsBlur/src/com/newsblur/fragment/ReadingItemFragment.java
+++ b/clients/android/NewsBlur/src/com/newsblur/fragment/ReadingItemFragment.java
@@ -1,7 +1,6 @@
 package com.newsblur.fragment;
 
 import android.app.Activity;
-import android.app.AlertDialog;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -16,21 +15,20 @@ import android.os.AsyncTask;
 import android.os.Bundle;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.widget.PopupMenu;
 import androidx.fragment.app.DialogFragment;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.ContextMenu;
-import android.view.GestureDetector;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
-import android.view.MotionEvent;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 import android.webkit.WebView.HitTestResult;
 import android.widget.ImageView;
-import android.widget.PopupMenu;
 import android.widget.TextView;
 
 import com.newsblur.R;
@@ -42,6 +40,8 @@ import com.newsblur.databinding.IncludeReadingItemCommentBinding;
 import com.newsblur.domain.Classifier;
 import com.newsblur.domain.Story;
 import com.newsblur.domain.UserDetails;
+import com.newsblur.network.APIManager;
+import com.newsblur.network.domain.StoryChangesResponse;
 import com.newsblur.service.OriginalTextService;
 import com.newsblur.util.DefaultFeedView;
 import com.newsblur.util.FeedSet;
@@ -49,9 +49,9 @@ import com.newsblur.util.FeedUtils;
 import com.newsblur.util.Font;
 import com.newsblur.util.PrefConstants.ThemeValue;
 import com.newsblur.util.PrefsUtils;
+import com.newsblur.util.StoryChangesState;
 import com.newsblur.util.StoryUtils;
 import com.newsblur.util.UIUtils;
-import com.newsblur.util.ViewUtils;
 import com.newsblur.view.ReadingScrollView;
 
 import java.util.HashMap;
@@ -75,6 +75,7 @@ public class ReadingItemFragment extends NbFragment implements PopupMenu.OnMenuI
 	private UserDetails user;
     private DefaultFeedView selectedFeedView;
     private boolean textViewUnavailable;
+    private StoryChangesState storyChangesState = StoryChangesState.SHOW_CHANGES;
 
     /** The story HTML, as provided by the 'content' element of the stories API. */
     private String storyContent;
@@ -208,8 +209,6 @@ public class ReadingItemFragment extends NbFragment implements PopupMenu.OnMenuI
         ReadingScrollView scrollView = (ReadingScrollView) view.findViewById(R.id.reading_scrollview);
         scrollView.registerScrollChangeListener(activity);
 
-        setupImmersiveViewGestureDetector();
-
 		return view;
 	}
 
@@ -234,25 +233,13 @@ public class ReadingItemFragment extends NbFragment implements PopupMenu.OnMenuI
                 clickShare();
             }
         });
+
+        if (selectedFeedView == DefaultFeedView.STORY && story.hasModifications) {
+            binding.readingStoryChanges.setVisibility(View.VISIBLE);
+            binding.readingStoryChanges.setOnClickListener(v -> loadStoryChanges());
+        }
 	}
 
-    private void setupImmersiveViewGestureDetector() {
-        // Change the system visibility on the decorview from the activity so that the state is maintained as we page through
-        // fragments
-        ImmersiveViewHandler immersiveViewHandler = new ImmersiveViewHandler(getActivity().getWindow().getDecorView());
-        final GestureDetector gestureDetector = new GestureDetector(getActivity(), immersiveViewHandler);
-        View.OnTouchListener touchListener = new View.OnTouchListener() {
-            @Override
-            public boolean onTouch(View view, MotionEvent motionEvent) {
-                return gestureDetector.onTouchEvent(motionEvent);
-            }
-        };
-        binding.readingWebview.setOnTouchListener(touchListener);
-        view.setOnTouchListener(touchListener);
-
-        getActivity().getWindow().getDecorView().setOnSystemUiVisibilityChangeListener(immersiveViewHandler);
-    }
-
     @Override
     public void onCreateContextMenu(ContextMenu menu, View v, ContextMenu.ContextMenuInfo menuInfo) {
         HitTestResult result = binding.readingWebview.getHitTestResult();
@@ -630,9 +617,11 @@ public class ReadingItemFragment extends NbFragment implements PopupMenu.OnMenuI
         enableProgress(false);
 
         boolean needStoryContent = false;
+        boolean enableStoryChanges = false;
 
         if (selectedFeedView == DefaultFeedView.STORY) {
             needStoryContent = true;
+            enableStoryChanges = story != null && story.hasModifications;
         } else {
             if (textViewUnavailable) {
                 binding.readingTextmodefailed.setVisibility(View.VISIBLE);
@@ -657,6 +646,8 @@ public class ReadingItemFragment extends NbFragment implements PopupMenu.OnMenuI
                 onContentLoadFinished();
             }
         }
+
+        binding.readingStoryChanges.setVisibility(enableStoryChanges ? View.VISIBLE : View.GONE);
     }
 
     private void enableProgress(boolean loading) {
@@ -748,6 +739,37 @@ public class ReadingItemFragment extends NbFragment implements PopupMenu.OnMenuI
         }.execute();
     }
 
+    private void loadStoryChanges() {
+        boolean showChanges = storyChangesState == null || storyChangesState == StoryChangesState.SHOW_CHANGES;
+        if (story == null) return;
+        new AsyncTask<Void, Void, StoryChangesResponse>() {
+
+            @Override
+            protected void onPreExecute() {
+                super.onPreExecute();
+                binding.readingStoryChanges.setText(R.string.story_changes_loading);
+            }
+
+            @Override
+            protected StoryChangesResponse doInBackground(Void... voids) {
+                APIManager apiManager = new APIManager(requireContext());
+                return apiManager.getStoryChanges(story.storyHash, showChanges);
+            }
+
+            @Override
+            protected void onPostExecute(StoryChangesResponse response) {
+                if (!response.isError() && response.getStory() != null) {
+                    ReadingItemFragment.this.storyContent = response.getStory().content;
+                    reloadStoryContent();
+                    binding.readingStoryChanges.setText(showChanges ? R.string.story_hide_changes : R.string.story_show_changes);
+                    storyChangesState = showChanges ? StoryChangesState.HIDE_CHANGES : StoryChangesState.SHOW_CHANGES;
+                } else {
+                    binding.readingStoryChanges.setText(showChanges ? R.string.story_show_changes : R.string.story_hide_changes);
+                }
+            }
+        }.execute();
+    }
+
 	private void setupWebview(final String storyText) {
         if (getActivity() == null) {
             // sometimes we get called before the activity is ready. abort, since we will get a refresh when
@@ -935,37 +957,4 @@ public class ReadingItemFragment extends NbFragment implements PopupMenu.OnMenuI
             reloadStoryContent();
         }
     }
-
-    private class ImmersiveViewHandler extends GestureDetector.SimpleOnGestureListener implements View.OnSystemUiVisibilityChangeListener {
-        private View view;
-
-        public ImmersiveViewHandler(View view) {
-            this.view = view;
-        }
-
-        @Override
-        public boolean onSingleTapUp(MotionEvent e) {
-            if (binding.readingWebview.wasLinkClicked()) {
-                // Clicked a link so ignore immersive view
-                return super.onSingleTapUp(e);
-            }
-
-            if (ViewUtils.isSystemUIHidden(view)) {
-                ViewUtils.showSystemUI(view);
-            } else if (PrefsUtils.enterImmersiveReadingModeOnSingleTap(getActivity())) {
-                ViewUtils.hideSystemUI(view);
-            }
-
-            return super.onSingleTapUp(e);
-        }
-
-        @Override
-        public void onSystemUiVisibilityChange(int i) {
-            // If immersive view has been exited via a system gesture we want to ensure that it gets resized
-            // in the same way as using tap to exit.
-            if (ViewUtils.immersiveViewExitedViaSystemGesture(view)) {
-                ViewUtils.showSystemUI(view);
-            }
-        }
-    }
-}
+}
\ No newline at end of file
diff --git a/clients/android/NewsBlur/src/com/newsblur/fragment/RenameDialogFragment.java b/clients/android/NewsBlur/src/com/newsblur/fragment/RenameDialogFragment.java
index 380010873..3173b57e9 100644
--- a/clients/android/NewsBlur/src/com/newsblur/fragment/RenameDialogFragment.java
+++ b/clients/android/NewsBlur/src/com/newsblur/fragment/RenameDialogFragment.java
@@ -1,11 +1,11 @@
 package com.newsblur.fragment;
 
 import android.app.Activity;
-import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
 import androidx.annotation.NonNull;
+import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.DialogFragment;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
diff --git a/clients/android/NewsBlur/src/com/newsblur/fragment/ReplyDialogFragment.java b/clients/android/NewsBlur/src/com/newsblur/fragment/ReplyDialogFragment.java
index df4093c31..b9e275f17 100644
--- a/clients/android/NewsBlur/src/com/newsblur/fragment/ReplyDialogFragment.java
+++ b/clients/android/NewsBlur/src/com/newsblur/fragment/ReplyDialogFragment.java
@@ -1,10 +1,11 @@
 package com.newsblur.fragment;
 
 import android.app.Activity;
-import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
+
+import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.DialogFragment;
 import android.view.LayoutInflater;
 import android.view.View;
diff --git a/clients/android/NewsBlur/src/com/newsblur/fragment/SaveSearchFragment.java b/clients/android/NewsBlur/src/com/newsblur/fragment/SaveSearchFragment.java
index 930bdbb7d..3255a4dd9 100644
--- a/clients/android/NewsBlur/src/com/newsblur/fragment/SaveSearchFragment.java
+++ b/clients/android/NewsBlur/src/com/newsblur/fragment/SaveSearchFragment.java
@@ -1,10 +1,10 @@
 package com.newsblur.fragment;
 
-import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
 import androidx.annotation.NonNull;
+import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.DialogFragment;
 
 import com.newsblur.R;
diff --git a/clients/android/NewsBlur/src/com/newsblur/fragment/SettingsFragment.java b/clients/android/NewsBlur/src/com/newsblur/fragment/SettingsFragment.java
index 0e676aa1f..64e3ac0aa 100644
--- a/clients/android/NewsBlur/src/com/newsblur/fragment/SettingsFragment.java
+++ b/clients/android/NewsBlur/src/com/newsblur/fragment/SettingsFragment.java
@@ -1,20 +1,40 @@
 package com.newsblur.fragment;
 
 import android.os.Bundle;
-import android.preference.PreferenceFragment;
-import android.preference.PreferenceManager;
+
+import androidx.preference.Preference;
+import androidx.preference.PreferenceFragmentCompat;
+import androidx.preference.PreferenceManager;
 
 import com.newsblur.R;
+import com.newsblur.util.FeedUtils;
 import com.newsblur.util.PrefConstants;
 
-public class SettingsFragment extends PreferenceFragment {
+public class SettingsFragment extends PreferenceFragmentCompat {
+
+    private Preference deleteOfflineStoriesPref;
 
     @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
+    public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
         PreferenceManager preferenceManager = getPreferenceManager();
         preferenceManager.setSharedPreferencesName(PrefConstants.PREFERENCES);
-        addPreferencesFromResource(R.xml.activity_settings);
+        setPreferencesFromResource(R.xml.activity_settings, rootKey);
+
+        deleteOfflineStoriesPref = findPreference(getString(R.string.menu_delete_offline_stories_key));
+        if (deleteOfflineStoriesPref != null) {
+            deleteOfflineStoriesPref.setOnPreferenceClickListener(preference -> {
+                deleteOfflineStories();
+                return true;
+            });
+        }
     }
 
-}
+    private void deleteOfflineStories() {
+        if (deleteOfflineStoriesPref != null) {
+            deleteOfflineStoriesPref.setOnPreferenceClickListener(null);
+            FeedUtils.syncOfflineStories(requireContext());
+            deleteOfflineStoriesPref.setSummary("");
+            deleteOfflineStoriesPref.setTitle(R.string.menu_delete_offline_stories_confirmation);
+        }
+    }
+}
\ No newline at end of file
diff --git a/clients/android/NewsBlur/src/com/newsblur/fragment/ShareDialogFragment.java b/clients/android/NewsBlur/src/com/newsblur/fragment/ShareDialogFragment.java
index d99e461ba..dcdd6d333 100644
--- a/clients/android/NewsBlur/src/com/newsblur/fragment/ShareDialogFragment.java
+++ b/clients/android/NewsBlur/src/com/newsblur/fragment/ShareDialogFragment.java
@@ -1,10 +1,11 @@
 package com.newsblur.fragment;
 
 import android.app.Activity;
-import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
+
+import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.DialogFragment;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
diff --git a/clients/android/NewsBlur/src/com/newsblur/fragment/StoryIntelTrainerFragment.java b/clients/android/NewsBlur/src/com/newsblur/fragment/StoryIntelTrainerFragment.java
index 7675e9e0b..dc96639f7 100644
--- a/clients/android/NewsBlur/src/com/newsblur/fragment/StoryIntelTrainerFragment.java
+++ b/clients/android/NewsBlur/src/com/newsblur/fragment/StoryIntelTrainerFragment.java
@@ -3,10 +3,11 @@ package com.newsblur.fragment;
 import java.util.Map;
 
 import android.app.Activity;
-import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
+
+import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.DialogFragment;
 import android.text.InputType;
 import android.text.TextUtils;
diff --git a/clients/android/NewsBlur/src/com/newsblur/network/APIConstants.java b/clients/android/NewsBlur/src/com/newsblur/network/APIConstants.java
index a958d10f5..c796c3c01 100644
--- a/clients/android/NewsBlur/src/com/newsblur/network/APIConstants.java
+++ b/clients/android/NewsBlur/src/com/newsblur/network/APIConstants.java
@@ -63,6 +63,7 @@ public class APIConstants {
 	public static final String PATH_DELETE_FEED = "/reader/delete_feed";
 	public static final String PATH_CLASSIFIER_SAVE = "/classifier/save";
 	public static final String PATH_STORY_TEXT = "/rss_feeds/original_text";
+	public static final String PATH_STORY_CHANGES = "/rss_feeds/story_changes";
 	public static final String PATH_UNREAD_HASHES = "/reader/unread_story_hashes";
     public static final String PATH_READ_STORIES = "/reader/read_stories";
     public static final String PATH_MOVE_FEED_TO_FOLDERS = "/reader/move_feed_to_folders";
@@ -134,6 +135,7 @@ public class APIConstants {
     public static final String PARAMETER_NEW_FOLDER_NAME = "new_folder_name";
     public static final String PARAMETER_ORDER_ID = "order_id";
     public static final String PARAMETER_PRODUCT_ID = "product_id";
+    public static final String PARAMETER_SHOW_CHANGES = "show_changes";
 
     public static final String VALUE_PREFIX_SOCIAL = "social:";
     public static final String VALUE_ALLSOCIAL = "river:blurblogs"; // the magic value passed to the mark-read API for all social feeds
diff --git a/clients/android/NewsBlur/src/com/newsblur/network/APIManager.java b/clients/android/NewsBlur/src/com/newsblur/network/APIManager.java
index cb92b9f3e..d3aa19781 100644
--- a/clients/android/NewsBlur/src/com/newsblur/network/APIManager.java
+++ b/clients/android/NewsBlur/src/com/newsblur/network/APIManager.java
@@ -39,6 +39,7 @@ import com.newsblur.network.domain.ProfileResponse;
 import com.newsblur.network.domain.RegisterResponse;
 import com.newsblur.network.domain.StarredStoryHashesResponse;
 import com.newsblur.network.domain.StoriesResponse;
+import com.newsblur.network.domain.StoryChangesResponse;
 import com.newsblur.network.domain.StoryTextResponse;
 import com.newsblur.network.domain.UnreadCountResponse;
 import com.newsblur.network.domain.UnreadStoryHashesResponse;
@@ -505,6 +506,14 @@ public class APIManager {
 		}
 	}
 
+	public StoryChangesResponse getStoryChanges(String storyHash, boolean showChanges) {
+        final ContentValues values = new ContentValues();
+        values.put(APIConstants.PARAMETER_STORY_HASH, storyHash);
+        values.put(APIConstants.PARAMETER_SHOW_CHANGES, showChanges ? "true" : "false");
+        final APIResponse response = get(buildUrl(APIConstants.PATH_STORY_CHANGES), values);
+        return response.getResponse(gson, StoryChangesResponse.class);
+    }
+
 	public NewsBlurResponse favouriteComment(String storyId, String commentUserId, String feedId) {
 		ContentValues values = new ContentValues();
 		values.put(APIConstants.PARAMETER_STORYID, storyId);
diff --git a/clients/android/NewsBlur/src/com/newsblur/network/domain/StoryChangesResponse.kt b/clients/android/NewsBlur/src/com/newsblur/network/domain/StoryChangesResponse.kt
new file mode 100644
index 000000000..589dcc67d
--- /dev/null
+++ b/clients/android/NewsBlur/src/com/newsblur/network/domain/StoryChangesResponse.kt
@@ -0,0 +1,8 @@
+package com.newsblur.network.domain
+
+import com.google.gson.annotations.SerializedName
+import com.newsblur.domain.Story
+
+data class StoryChangesResponse(
+        @SerializedName("story")
+        val story: Story? = null) : NewsBlurResponse()
diff --git a/clients/android/NewsBlur/src/com/newsblur/util/AppConstants.java b/clients/android/NewsBlur/src/com/newsblur/util/AppConstants.java
index 132426f4e..987d0380e 100644
--- a/clients/android/NewsBlur/src/com/newsblur/util/AppConstants.java
+++ b/clients/android/NewsBlur/src/com/newsblur/util/AppConstants.java
@@ -71,9 +71,6 @@ public class AppConstants {
     // how many images to prefetch before updating the countdown UI
     public static final int IMAGE_PREFETCH_BATCH_SIZE = 6;
 
-    // should the feedback link be enabled (read: is this a beta?)
-    public static final boolean ENABLE_FEEDBACK = true;
-
     // link to app feedback page
     public static final String FEEDBACK_URL = "https://forum.newsblur.com/new-topic?title=Android%3A+&body=";
 
diff --git a/clients/android/NewsBlur/src/com/newsblur/util/FeedUtils.java b/clients/android/NewsBlur/src/com/newsblur/util/FeedUtils.java
index 5ebdbef4b..b4f464a4b 100644
--- a/clients/android/NewsBlur/src/com/newsblur/util/FeedUtils.java
+++ b/clients/android/NewsBlur/src/com/newsblur/util/FeedUtils.java
@@ -196,6 +196,12 @@ public class FeedUtils {
         }.execute();
     }
 
+    public static void syncOfflineStories(Context context) {
+        dbHelper.deleteStories();
+        NBSyncService.forceFeedsFolders();
+        triggerSync(context);
+    }
+
     public static void renameFolder(final String folderName, final String newFolderName, final String inFolder, final Context context, final APIManager apiManager) {
         new AsyncTask<Void, Void, NewsBlurResponse>() {
             @Override
diff --git a/clients/android/NewsBlur/src/com/newsblur/util/PrefConstants.java b/clients/android/NewsBlur/src/com/newsblur/util/PrefConstants.java
index 7b6204b5a..28aec150e 100644
--- a/clients/android/NewsBlur/src/com/newsblur/util/PrefConstants.java
+++ b/clients/android/NewsBlur/src/com/newsblur/util/PrefConstants.java
@@ -58,7 +58,6 @@ public class PrefConstants {
 
     public static final String READ_STORIES_FOLDER_NAME = "read_stories";
     public static final String SAVED_STORIES_FOLDER_NAME = "saved_stories";
-    public static final String READING_ENTER_IMMERSIVE_SINGLE_TAP = "immersive_enter_single_tap";
 
     public static final String STORIES_AUTO_OPEN_FIRST = "pref_auto_open_first_unread";
     public static final String STORIES_MARK_READ_ON_SCROLL = "pref_mark_read_on_scroll";
diff --git a/clients/android/NewsBlur/src/com/newsblur/util/PrefsUtils.java b/clients/android/NewsBlur/src/com/newsblur/util/PrefsUtils.java
index 5aa221045..23e78c185 100644
--- a/clients/android/NewsBlur/src/com/newsblur/util/PrefsUtils.java
+++ b/clients/android/NewsBlur/src/com/newsblur/util/PrefsUtils.java
@@ -681,11 +681,6 @@ public class PrefsUtils {
         return DefaultFeedView.STORY;
     }
 
-    public static boolean enterImmersiveReadingModeOnSingleTap(Context context) {
-        SharedPreferences prefs = context.getSharedPreferences(PrefConstants.PREFERENCES, 0);
-        return prefs.getBoolean(PrefConstants.READING_ENTER_IMMERSIVE_SINGLE_TAP, false);
-    }
-
     public static boolean isShowContentPreviews(Context context) {
         SharedPreferences prefs = context.getSharedPreferences(PrefConstants.PREFERENCES, 0);
         return prefs.getBoolean(PrefConstants.STORIES_SHOW_PREVIEWS, true);
diff --git a/clients/android/NewsBlur/src/com/newsblur/util/StoryChangesState.kt b/clients/android/NewsBlur/src/com/newsblur/util/StoryChangesState.kt
new file mode 100644
index 000000000..e16cff61f
--- /dev/null
+++ b/clients/android/NewsBlur/src/com/newsblur/util/StoryChangesState.kt
@@ -0,0 +1,6 @@
+package com.newsblur.util
+
+enum class StoryChangesState {
+    SHOW_CHANGES,
+    HIDE_CHANGES
+}
\ No newline at end of file
diff --git a/clients/android/NewsBlur/src/com/newsblur/util/UIUtils.java b/clients/android/NewsBlur/src/com/newsblur/util/UIUtils.java
index 4e72e9439..d4ddf68cc 100644
--- a/clients/android/NewsBlur/src/com/newsblur/util/UIUtils.java
+++ b/clients/android/NewsBlur/src/com/newsblur/util/UIUtils.java
@@ -4,9 +4,11 @@ import java.io.File;
 import java.util.Map;
 
 import static android.graphics.Bitmap.Config.ARGB_8888;
+import static com.google.android.material.appbar.AppBarLayout.LayoutParams.SCROLL_FLAG_ENTER_ALWAYS;
+import static com.google.android.material.appbar.AppBarLayout.LayoutParams.SCROLL_FLAG_SCROLL;
+import static com.google.android.material.appbar.AppBarLayout.LayoutParams.SCROLL_FLAG_SNAP;
 
 import android.app.Activity;
-import android.app.ActionBar;
 import android.content.Context;
 import android.content.Intent;
 import android.content.res.TypedArray;
@@ -26,16 +28,22 @@ import android.util.TypedValue;
 import android.text.Html;
 import android.text.Spanned;
 import android.text.TextUtils;
-import android.view.LayoutInflater;
 import android.view.ContextMenu;
 import android.view.MenuInflater;
 import android.view.View;
 import android.view.View.OnClickListener;
-import android.view.ViewGroup.LayoutParams;
 import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.browser.customtabs.CustomTabColorSchemeParams;
+import androidx.browser.customtabs.CustomTabsIntent;
+import androidx.core.content.ContextCompat;
+
+import com.google.android.material.appbar.AppBarLayout;
+import com.google.android.material.appbar.MaterialToolbar;
+import com.google.android.material.color.MaterialColors;
 import com.newsblur.R;
 import com.newsblur.activity.*;
 import com.newsblur.domain.Classifier;
@@ -191,40 +199,43 @@ public class UIUtils {
      * Set up our customised ActionBar view that features the specified icon and title, sized
      * away from system standard to meet the NewsBlur visual style.
      */
-    public static void setCustomActionBar(Activity activity, String imageUrl, String title) { 
-        ImageView iconView = setupCustomActionbar(activity, title);
+    public static void setupToolbar(AppCompatActivity activity, String imageUrl, String title, boolean showHomeEnabled) {
+        ImageView iconView = setupCustomToolbar(activity, title, showHomeEnabled);
         FeedUtils.iconLoader.displayImage(imageUrl, iconView, 0, false);
     }
 
-    public static void setCustomActionBar(Activity activity, int imageId, String title) { 
-        ImageView iconView = setupCustomActionbar(activity, title);
+    public static void setupToolbar(AppCompatActivity activity, int imageId, String title, boolean showHomeEnabled) {
+        ImageView iconView = setupCustomToolbar(activity, title, showHomeEnabled);
         iconView.setImageResource(imageId);
     }
 
-    private static ImageView setupCustomActionbar(final Activity activity, String title) {
-        // we completely replace the existing title and 'home' icon with a custom view
-        activity.getActionBar().setDisplayShowCustomEnabled(true);
-        activity.getActionBar().setDisplayShowTitleEnabled(false);
-        activity.getActionBar().setDisplayShowHomeEnabled(false);
-        View v = LayoutInflater.from(activity).inflate(R.layout.actionbar_custom_icon, null);
-        TextView titleView = ((TextView) v.findViewById(R.id.actionbar_text));
+    private static ImageView setupCustomToolbar(final AppCompatActivity activity, String title, boolean showHomeEnabled) {
+        MaterialToolbar toolbar = activity.findViewById(R.id.toolbar);
+        if (toolbar == null) {
+            return new ImageView(activity);
+        }
+
+        // enabled scrolling app bar only for reading
+        if (activity instanceof Reading) {
+            AppBarLayout.LayoutParams p = (AppBarLayout.LayoutParams) toolbar.getLayoutParams();
+            p.setScrollFlags(SCROLL_FLAG_SCROLL | SCROLL_FLAG_ENTER_ALWAYS | SCROLL_FLAG_SNAP);
+            toolbar.setLayoutParams(p);
+        }
+
+        activity.setSupportActionBar(toolbar);
+        activity.getSupportActionBar().setDisplayShowTitleEnabled(false);
+        activity.getSupportActionBar().setDisplayShowHomeEnabled(false);
+
+        ImageView arrowView = activity.findViewById(R.id.toolbar_arrow);
+        arrowView.setVisibility(showHomeEnabled ? View.VISIBLE : View.GONE);
+        TextView titleView = activity.findViewById(R.id.toolbar_text);
         titleView.setText(title);
-        ImageView iconView = ((ImageView) v.findViewById(R.id.actionbar_icon));
+        ImageView iconView = activity.findViewById(R.id.toolbar_icon);
         // using a custom view breaks the system-standard ability to tap the icon or title to return
         // to the previous activity. Re-implement that here.
-        titleView.setOnClickListener(new OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                activity.finish();
-            }
-        });
-        iconView.setOnClickListener(new OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                activity.finish();
-            }
-        });
-        activity.getActionBar().setCustomView(v, new ActionBar.LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.MATCH_PARENT));
+        arrowView.setOnClickListener(v0 -> activity.finish());
+        titleView.setOnClickListener(v1 -> activity.finish());
+        iconView.setOnClickListener(v12 -> activity.finish());
         return iconView;
     }
 
@@ -542,14 +553,12 @@ public class UIUtils {
         return result;
     }
 
-    public static void  handleUri(Context context, Uri uri) {
+    public static void handleUri(Context context, Uri uri) {
         DefaultBrowser defaultBrowser = PrefsUtils.getDefaultBrowser(context);
         if (defaultBrowser == DefaultBrowser.SYSTEM_DEFAULT) {
             openSystemDefaultBrowser(context, uri);
         } else if (defaultBrowser == DefaultBrowser.IN_APP_BROWSER) {
-            Intent intent = new Intent(context, InAppBrowser.class);
-            intent.putExtra(InAppBrowser.URI, uri);
-            context.startActivity(intent);
+            openInAppBrowser(context, uri);
         } else if (defaultBrowser == DefaultBrowser.CHROME) {
             openExternalBrowserApp(context, uri, "com.android.chrome");
         } else if (defaultBrowser == DefaultBrowser.FIREFOX) {
@@ -559,6 +568,21 @@ public class UIUtils {
         }
     }
 
+    private static void openInAppBrowser(Context context, Uri uri) {
+        int colorPrimary = MaterialColors.getColor(context, R.attr.colorPrimary, ContextCompat.getColor(context, R.color.primary_dark));
+        CustomTabColorSchemeParams schemeParams = new CustomTabColorSchemeParams.Builder()
+                .setToolbarColor(colorPrimary)
+                .build();
+        CustomTabsIntent customTabsIntent = new CustomTabsIntent.Builder()
+                .setColorScheme(getCustomTabsColorScheme(context))
+                .setDefaultColorSchemeParams(schemeParams)
+                .setShareState(CustomTabsIntent.SHARE_STATE_ON)
+                .setUrlBarHidingEnabled(false)
+                .setShowTitle(true)
+                .build();
+        customTabsIntent.launchUrl(context, uri);
+    }
+
     public static void openSystemDefaultBrowser(Context context, Uri uri) {
         try {
             Intent intent = new Intent(Intent.ACTION_VIEW);
@@ -593,4 +617,15 @@ public class UIUtils {
         Intent intent = new Intent(context, Premium.class);
         context.startActivity(intent);
     }
+
+    private static int getCustomTabsColorScheme(Context context) {
+        PrefConstants.ThemeValue value = PrefsUtils.getSelectedTheme(context);
+        if (value == PrefConstants.ThemeValue.DARK || value == PrefConstants.ThemeValue.BLACK) {
+            return CustomTabsIntent.COLOR_SCHEME_DARK;
+        } else if (value == PrefConstants.ThemeValue.LIGHT) {
+            return CustomTabsIntent.COLOR_SCHEME_LIGHT;
+        } else {
+            return CustomTabsIntent.COLOR_SCHEME_SYSTEM;
+        }
+    }
 }
diff --git a/clients/android/NewsBlur/src/com/newsblur/util/ViewUtils.java b/clients/android/NewsBlur/src/com/newsblur/util/ViewUtils.java
index 23afb40ca..7beed6474 100644
--- a/clients/android/NewsBlur/src/com/newsblur/util/ViewUtils.java
+++ b/clients/android/NewsBlur/src/com/newsblur/util/ViewUtils.java
@@ -41,31 +41,6 @@ public class ViewUtils {
 		return image;
 	}
 
-    public static void showSystemUI(View view) {
-        view.setSystemUiVisibility(View.SYSTEM_UI_FLAG_VISIBLE);
-    }
-
-    public static void hideSystemUI(View view) {
-        view.setSystemUiVisibility(
-                View.SYSTEM_UI_FLAG_LAYOUT_STABLE
-                        | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
-                        | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
-                        | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
-                        | View.SYSTEM_UI_FLAG_FULLSCREEN
-                        | View.SYSTEM_UI_FLAG_IMMERSIVE);
-    }
-
-    public static boolean isSystemUIHidden(View view) {
-        return (view.getSystemUiVisibility() & View.SYSTEM_UI_FLAG_IMMERSIVE) != 0;
-    }
-
-    public static boolean immersiveViewExitedViaSystemGesture(View view) {
-        return view.getSystemUiVisibility() == (View.SYSTEM_UI_FLAG_LAYOUT_STABLE
-                | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
-                | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
-                | View.SYSTEM_UI_FLAG_IMMERSIVE);
-    }
-
     /**
      * see if Power Save mode is enabled on the device and the UI should disable animations
      * or other extra features.
diff --git a/clients/android/NewsBlur/src/com/newsblur/view/ReadingScrollView.java b/clients/android/NewsBlur/src/com/newsblur/view/ReadingScrollView.java
index d47f532e4..abbbfaf4d 100644
--- a/clients/android/NewsBlur/src/com/newsblur/view/ReadingScrollView.java
+++ b/clients/android/NewsBlur/src/com/newsblur/view/ReadingScrollView.java
@@ -8,13 +8,14 @@ import android.util.AttributeSet;
 import android.view.View;
 import android.webkit.WebView;
 import android.widget.LinearLayout;
-import android.widget.ScrollView;
+
+import androidx.core.widget.NestedScrollView;
 
 /**
  * Custom scrollview to handle the many quirks of the scroller in which we place
  * the WebView that shows stories.
  */
-public class ReadingScrollView extends ScrollView {
+public class ReadingScrollView extends NestedScrollView {
 
     // the fragments/activity that show stories need to know their scroll state. give
     // them a way to subscribe to scroll changes
diff --git a/media/js/newsblur/reader/reader.js b/media/js/newsblur/reader/reader.js
index 37d84012d..b65faab9e 100644
--- a/media/js/newsblur/reader/reader.js
+++ b/media/js/newsblur/reader/reader.js
@@ -4995,7 +4995,7 @@
                 this.socket.on('feed:story:new', _.bind(function(feed_id, message) {
                     var story_hash = message.split(',')[0];
                     var timestamp = message.split(',')[1];
-                    // NEWSBLUR.log(['Real-time new story', feed_id, story_hash, timestamp]);
+                    NEWSBLUR.log(['Real-time new story', feed_id, story_hash, timestamp]);
                     NEWSBLUR.app.dashboard_river.new_story(story_hash, timestamp);
                 }, this));
 
diff --git a/media/js/vendor/jquery.newsblur.js b/media/js/vendor/jquery.newsblur.js
index 995f972d0..1c7066131 100644
--- a/media/js/vendor/jquery.newsblur.js
+++ b/media/js/vendor/jquery.newsblur.js
@@ -248,7 +248,10 @@ NEWSBLUR.log = function(msg) {
             }
         },
         
-        favicon: function(feed, empty_on_missing) {
+        favicon: function (feed, empty_on_missing) {
+            var empty_icon = NEWSBLUR.Globals.MEDIA_URL + '/img/icons/circular/world.png';
+            if (!feed) return empty_icon;
+            
             if (_.isNumber(feed)) return NEWSBLUR.URLs.favicon.replace('{id}', feed);
             else if (feed.get('favicon') && feed.get('favicon').length && feed.get('favicon').indexOf('data:image/png;base64,') != -1) return feed.get('favicon');
             else if (feed.get('favicon') && feed.get('favicon').length) return 'data:image/png;base64,' + feed.get('favicon');
@@ -259,7 +262,8 @@ NEWSBLUR.log = function(msg) {
             else if (_.isNumber(feed.id)) return NEWSBLUR.URLs.favicon.replace('{id}', feed.id);
             else if (feed.get('favicon_url')) return feed.get('favicon_url');
             else if (feed.is_starred()) return NEWSBLUR.Globals.MEDIA_URL + '/img/reader/tag.png';
-            return NEWSBLUR.Globals.MEDIA_URL + '/img/icons/circular/world.png';
+
+            return empty_icon;
         },
         
         deepCopy: function(obj) {
@@ -506,4 +510,4 @@ NEWSBLUR.log = function(msg) {
             }));
         }
     });
-})(jQuery);
\ No newline at end of file
+})(jQuery);
diff --git a/node/favicons.js b/node/favicons.js
index 62b895054..46237f55c 100644
--- a/node/favicons.js
+++ b/node/favicons.js
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.8.0
+// Generated by CoffeeScript 2.5.1
 (function() {
   var DEV, MONGODB_PORT, MONGODB_SERVER, app, log, mongo, server, url;
 
@@ -28,48 +28,44 @@
   }
 
   if (DEV) {
-    url = "mongodb://" + MONGODB_SERVER + ":" + MONGODB_PORT + "/newsblur";
+    url = `mongodb://${MONGODB_SERVER}:${MONGODB_PORT}/newsblur`;
   } else {
-    url = "mongodb://" + MONGODB_SERVER + ":" + MONGODB_PORT + "/newsblur?replicaSet=nbset&readPreference=secondaryPreferred";
+    url = `mongodb://${MONGODB_SERVER}:${MONGODB_PORT}/newsblur?replicaSet=nbset&readPreference=secondaryPreferred`;
   }
 
-  mongo.MongoClient.connect(url, (function(_this) {
-    return function(err, db) {
-      log.debug("Connected to " + (db != null ? db.serverConfig.s.host : void 0) + ":" + (db != null ? db.serverConfig.s.port : void 0) + " / " + err);
-      return _this.collection = db != null ? db.collection("feed_icons") : void 0;
-    };
-  })(this));
+  mongo.MongoClient.connect(url, (err, db) => {
+    log.debug(`Connected to ${db != null ? db.serverConfig.s.host : void 0}:${db != null ? db.serverConfig.s.port : void 0} / ${err}`);
+    return this.collection = db != null ? db.collection("feed_icons") : void 0;
+  });
 
-  app.get(/\/rss_feeds\/icon\/(\d+)\/?/, (function(_this) {
-    return function(req, res) {
-      var etag, feed_id;
-      feed_id = parseInt(req.params[0], 10);
-      etag = req.header('If-None-Match');
-      log.debug(("Feed: " + feed_id + " ") + (etag ? " / " + etag : ""));
-      return _this.collection.findOne({
-        _id: feed_id
-      }, function(err, docs) {
-        var body;
-        if (!err && etag && docs && (docs != null ? docs.color : void 0) === etag) {
-          log.debug(("Cached: " + feed_id + ", etag: " + etag + "/" + (docs != null ? docs.color : void 0) + " ") + (err ? "(err: " + err + ")" : ""));
-          return res.sendStatus(304);
-        } else if (!err && docs && docs.data) {
-          log.debug(("Req: " + feed_id + ", etag: " + etag + "/" + (docs != null ? docs.color : void 0) + " ") + (err ? "(err: " + err + ")" : ""));
-          res.header('etag', docs.color);
-          body = new Buffer(docs.data, 'base64');
-          res.set("Content-Type", "image/png");
-          return res.status(200).send(body);
+  app.get(/\/rss_feeds\/icon\/(\d+)\/?/, (req, res) => {
+    var etag, feed_id;
+    feed_id = parseInt(req.params[0], 10);
+    etag = req.header('If-None-Match');
+    log.debug(`Feed: ${feed_id} ` + (etag ? ` / ${etag}` : ""));
+    return this.collection.findOne({
+      _id: feed_id
+    }, function(err, docs) {
+      var body;
+      if (!err && etag && docs && (docs != null ? docs.color : void 0) === etag) {
+        log.debug(`Cached: ${feed_id}, etag: ${etag}/${docs != null ? docs.color : void 0} ` + (err ? `(err: ${err})` : ""));
+        return res.sendStatus(304);
+      } else if (!err && docs && docs.data) {
+        log.debug(`Req: ${feed_id}, etag: ${etag}/${docs != null ? docs.color : void 0} ` + (err ? `(err: ${err})` : ""));
+        res.header('etag', docs.color);
+        body = new Buffer(docs.data, 'base64');
+        res.set("Content-Type", "image/png");
+        return res.status(200).send(body);
+      } else {
+        log.debug(`Redirect: ${feed_id}, etag: ${etag}/${docs != null ? docs.color : void 0} ` + (err ? `(err: ${err})` : ""));
+        if (DEV) {
+          return res.redirect('/media/img/icons/circular/world.png');
         } else {
-          log.debug(("Redirect: " + feed_id + ", etag: " + etag + "/" + (docs != null ? docs.color : void 0) + " ") + (err ? "(err: " + err + ")" : ""));
-          if (DEV) {
-            return res.redirect('/media/img/icons/circular/world.png');
-          } else {
-            return res.redirect('https://www.newsblur.com/media/img/icons/circular/world.png');
-          }
+          return res.redirect('https://www.newsblur.com/media/img/icons/circular/world.png');
         }
-      });
-    };
-  })(this));
+      }
+    });
+  });
 
   app.listen(3030);
 
diff --git a/node/log.js b/node/log.js
index d9dca7e05..885921c48 100644
--- a/node/log.js
+++ b/node/log.js
@@ -1,17 +1,17 @@
-// Generated by CoffeeScript 1.8.0
+// Generated by CoffeeScript 2.5.1
 (function() {
   var debug, info;
 
   info = function(username, message) {
     var timestamp;
     timestamp = new Date().toISOString().replace(/T/, ' ').replace(/\..+/, '');
-    return console.log("[" + timestamp + "]  ---> [" + username + "] " + message);
+    return console.log(`[${timestamp}]  ---> [${username}] ${message}`);
   };
 
   debug = function(message) {
     var timestamp;
     timestamp = new Date().toISOString().replace(/T/, ' ').replace(/\..+/, '');
-    return console.log("[" + timestamp + "]  ---> " + message);
+    return console.log(`[${timestamp}]  ---> ${message}`);
   };
 
   exports.info = info;
diff --git a/node/original_page.js b/node/original_page.js
index c4cdfb87e..7ed3138ef 100644
--- a/node/original_page.js
+++ b/node/original_page.js
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.8.0
+// Generated by CoffeeScript 2.5.1
 (function() {
   var DB_PATH, DEV, app, busboy, fs, mkdirp, path, server, splitFeedId;
 
@@ -22,69 +22,67 @@
 
   app.use(busboy());
 
-  app.get(/^\/original_page\/(\d+)\/?/, (function(_this) {
-    return function(req, res) {
-      var etag, feedId, feedIdDir, filePath, lastModified;
-      feedId = parseInt(req.params[0], 10);
-      etag = req.header('If-None-Match');
-      lastModified = req.header('If-Modified-Since');
-      feedIdDir = splitFeedId(feedId);
-      filePath = "" + DB_PATH + "/" + feedIdDir + ".zhtml";
-      return fs.exists(filePath, function(exists, err) {
-        console.log((" ---> Loading: " + feedId + " (" + filePath + "). ") + ("" + (exists ? "" : "NOT FOUND")));
-        if (!exists) {
-          return res.send(404);
+  app.get(/^\/original_page\/(\d+)\/?/, (req, res) => {
+    var etag, feedId, feedIdDir, filePath, lastModified;
+    feedId = parseInt(req.params[0], 10);
+    etag = req.header('If-None-Match');
+    lastModified = req.header('If-Modified-Since');
+    feedIdDir = splitFeedId(feedId);
+    filePath = `${DB_PATH}/${feedIdDir}.zhtml`;
+    return fs.exists(filePath, function(exists, err) {
+      console.log(` ---> Loading: ${feedId} (${filePath}). ` + `${exists ? "" : "NOT FOUND"}`);
+      if (!exists) {
+        return res.send(404);
+      }
+      return fs.stat(filePath, function(err, stats) {
+        if (!err && etag && stats.mtime === etag) {
+          return res.send(304);
         }
-        return fs.stat(filePath, function(err, stats) {
-          if (!err && etag && stats.mtime === etag) {
-            return res.send(304);
-          }
-          if (!err && lastModified && stats.mtime === lastModified) {
-            return res.send(304);
-          }
-          return fs.readFile(filePath, function(err, content) {
-            res.header('Etag', Date.parse(stats.mtime));
-            return res.send(content);
-          });
+        if (!err && lastModified && stats.mtime === lastModified) {
+          return res.send(304);
+        }
+        return fs.readFile(filePath, function(err, content) {
+          res.header('Etag', Date.parse(stats.mtime));
+          return res.send(content);
         });
       });
-    };
-  })(this));
+    });
+  });
 
-  app.post(/^\/original_page\/(\d+)\/?/, (function(_this) {
-    return function(req, res) {
-      var feedId, feedIdDir;
-      feedId = parseInt(req.params[0], 10);
-      feedIdDir = splitFeedId(feedId);
-      req.pipe(req.busboy);
-      return req.busboy.on('file', function(fieldname, file, filename) {
-        var filePath, filePathDir;
-        filePath = "" + DB_PATH + "/" + feedIdDir + ".zhtml";
-        filePathDir = path.dirname(filePath);
-        return mkdirp(filePathDir, function(err) {
-          var fstream;
-          if (err) {
-            console.log(err);
-          }
-          fstream = fs.createWriteStream(filePath);
-          file.pipe(fstream);
-          return fstream.on('close', function() {
-            return fs.stat(filePath, function(err, stats) {
-              if (err) {
-                console.log(err);
-              }
-              console.log(" ---> Saving: " + feedId + " (" + filePath + ") " + stats.size + " bytes");
-              return res.send("OK");
-            });
+  app.post(/^\/original_page\/(\d+)\/?/, (req, res) => {
+    var feedId, feedIdDir;
+    feedId = parseInt(req.params[0], 10);
+    feedIdDir = splitFeedId(feedId);
+    req.pipe(req.busboy);
+    return req.busboy.on('file', function(fieldname, file, filename) {
+      var filePath, filePathDir;
+      // console.log "Uploading #{fieldname} / #{file} / #{filename}"
+      filePath = `${DB_PATH}/${feedIdDir}.zhtml`;
+      filePathDir = path.dirname(filePath);
+      return mkdirp(filePathDir, function(err) {
+        var fstream;
+        if (err) {
+          console.log(err);
+        }
+        fstream = fs.createWriteStream(filePath);
+        file.pipe(fstream);
+        return fstream.on('close', function() {
+          return fs.stat(filePath, function(err, stats) {
+            if (err) {
+              console.log(err);
+            }
+            console.log(` ---> Saving: ${feedId} (${filePath}) ${stats.size} bytes`);
+            return res.send("OK");
           });
         });
       });
-    };
-  })(this));
+    });
+  });
 
   splitFeedId = function(feedId) {
     var rgx;
     feedId += '';
+    // x2 = if feedId.length > 1 then '.' + feedId[1] else ''
     rgx = /(\d+)(\d{3})/;
     while (rgx.test(feedId)) {
       feedId = feedId.replace(rgx, '$1' + '/' + '$2');
@@ -92,6 +90,6 @@
     return feedId;
   };
 
-  console.log(" ---> Starting Original Page server " + (DEV ? "on DEV" : "in production"));
+  console.log(` ---> Starting Original Page server ${DEV ? "on DEV" : "in production"}`);
 
 }).call(this);
diff --git a/node/original_text.js b/node/original_text.js
index 715f82ffb..68dc29a01 100644
--- a/node/original_text.js
+++ b/node/original_text.js
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.8.0
+// Generated by CoffeeScript 2.5.1
 (function() {
   var DEV, Mercury, app, log, server;
 
@@ -23,33 +23,31 @@
     log.debug("Running as production server");
   }
 
-  app.get(/\/rss_feeds\/original_text_fetcher\/?/, (function(_this) {
-    return function(req, res) {
-      var api_key, url;
-      res.setHeader('Content-Type', 'application/json');
-      if (req.query.test) {
-        return res.end("OK");
-      }
-      url = req.query.url;
-      if (!url) {
-        log.debug("Missing url");
-        return res.end(JSON.stringify({
-          error: "Missing `url` query parameter."
-        }));
-      }
-      api_key = req.header('x-api-key') || req.query.apikey;
-      if (!DEV && (!api_key || api_key.indexOf("djtXZrSIEfDa3Dex9FQ9AR") === -1)) {
-        log.debug("Mismatched API key: " + url + " / " + api_key);
-        return res.end(JSON.stringify({
-          error: "Invalid API key. You need to set up your own Original Text server."
-        }));
-      }
-      return Mercury.parse(url).then(function(result) {
-        log.debug("Fetched: " + url);
-        return res.end(JSON.stringify(result));
-      });
-    };
-  })(this));
+  app.get(/\/rss_feeds\/original_text_fetcher\/?/, (req, res) => {
+    var api_key, url;
+    res.setHeader('Content-Type', 'application/json');
+    if (req.query.test) {
+      return res.end("OK");
+    }
+    url = req.query.url;
+    if (!url) {
+      log.debug("Missing url");
+      return res.end(JSON.stringify({
+        error: "Missing `url` query parameter."
+      }));
+    }
+    api_key = req.header('x-api-key') || req.query.apikey;
+    if (!DEV && (!api_key || api_key.indexOf("djtXZrSIEfDa3Dex9FQ9AR") === -1)) {
+      log.debug(`Mismatched API key: ${url} / ${api_key}`);
+      return res.end(JSON.stringify({
+        error: "Invalid API key. You need to set up your own Original Text server."
+      }));
+    }
+    return Mercury.parse(url).then((result) => {
+      log.debug(`Fetched: ${url}`);
+      return res.end(JSON.stringify(result));
+    });
+  });
 
   app.listen(4040);
 
diff --git a/node/unread_counts.coffee b/node/unread_counts.coffee
index 2ea9dd230..64e83939c 100644
--- a/node/unread_counts.coffee
+++ b/node/unread_counts.coffee
@@ -53,8 +53,8 @@ else
 io.on 'connection', (socket) ->
     ip = socket.handshake.headers['X-Forwarded-For'] || socket.handshake.address
 
-    socket.on 'subscribe:feeds', (@feeds, @username) ->
-        log.info @username, "Connecting (#{feeds.length} feeds, #{ip})," +
+    socket.on 'subscribe:feeds', (@feeds, @username) =>
+        log.info @username, "Connecting (#{@feeds.length} feeds, #{ip})," +
                  " (#{io.engine.clientsCount} connected) " +
                  " #{if SECURE then "(SSL)" else "(non-SSL)"}"
         
@@ -86,7 +86,7 @@ io.on 'connection', (socket) ->
             else
                 socket.emit 'feed:update', channel, message
 
-    socket.on 'disconnect', () ->
+    socket.on 'disconnect', () =>
         socket.subscribe?.quit()
         log.info @username, "Disconnect (#{@feeds?.length} feeds, #{ip})," +
                     " there are now #{io.engine.clientsCount} users. " +
diff --git a/node/unread_counts.js b/node/unread_counts.js
index cc4df3614..d5201c88e 100644
--- a/node/unread_counts.js
+++ b/node/unread_counts.js
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.8.0
+// Generated by CoffeeScript 2.5.1
 (function() {
   var DEV, REDIS_SERVER, SECURE, app, certificate, fs, io, log, options, privateKey, redis;
 
@@ -14,6 +14,12 @@
 
   SECURE = !!process.env.NODE_SSL;
 
+  // client = redis.createClient 6379, REDIS_SERVER
+
+  // RedisStore  = require 'socket.io/lib/stores/redis'
+  // rpub        = redis.createClient 6379, REDIS_SERVER
+  // rsub        = redis.createClient 6379, REDIS_SERVER
+  // rclient     = redis.createClient 6379, REDIS_SERVER
   log.debug("Starting NewsBlur unread count server...");
 
   if (!DEV && !process.env.NODE_ENV) {
@@ -28,6 +34,7 @@
   if (SECURE) {
     privateKey = fs.readFileSync('/srv/newsblur/config/certificates/newsblur.com.key').toString();
     certificate = fs.readFileSync('/srv/newsblur/config/certificates/newsblur.com.crt').toString();
+    // ca = fs.readFileSync('./config/certificates/intermediate.crt').toString()
     options = {
       port: 8889,
       key: privateKey,
@@ -38,7 +45,7 @@
       path: "/v2/socket.io"
     });
     app.listen(options.port);
-    log.debug("Listening securely on port " + options.port);
+    log.debug(`Listening securely on port ${options.port}`);
   } else {
     options = {
       port: 8888
@@ -48,70 +55,70 @@
       path: "/v2/socket.io"
     });
     app.listen(options.port);
-    log.debug("Listening on port " + options.port);
+    log.debug(`Listening on port ${options.port}`);
   }
 
+  // io.set('transports', ['websocket'])
+
+  // io.set 'store', new RedisStore
+  //     redisPub    : rpub
+  //     redisSub    : rsub
+  //     redisClient : rclient
   io.on('connection', function(socket) {
     var ip;
     ip = socket.handshake.headers['X-Forwarded-For'] || socket.handshake.address;
-    socket.on('subscribe:feeds', function(feeds, username) {
-      var _ref;
+    socket.on('subscribe:feeds', (feeds, username) => {
+      var ref;
       this.feeds = feeds;
       this.username = username;
-      log.info(this.username, ("Connecting (" + feeds.length + " feeds, " + ip + "),") + (" (" + io.engine.clientsCount + " connected) ") + (" " + (SECURE ? "(SSL)" : "(non-SSL)")));
+      log.info(this.username, `Connecting (${this.feeds.length} feeds, ${ip}),` + ` (${io.engine.clientsCount} connected) ` + ` ${SECURE ? "(SSL)" : "(non-SSL)"}`);
       if (!this.username) {
         return;
       }
       socket.on("error", function(err) {
-        return log.debug("Error (socket): " + err);
+        return log.debug(`Error (socket): ${err}`);
       });
-      if ((_ref = socket.subscribe) != null) {
-        _ref.quit();
+      if ((ref = socket.subscribe) != null) {
+        ref.quit();
       }
       socket.subscribe = redis.createClient(6379, REDIS_SERVER);
-      socket.subscribe.on("error", (function(_this) {
-        return function(err) {
-          var _ref1;
-          log.info(_this.username, "Error: " + err + " (" + _this.feeds.length + " feeds)");
-          return (_ref1 = socket.subscribe) != null ? _ref1.quit() : void 0;
-        };
-      })(this));
-      socket.subscribe.on("connect", (function(_this) {
-        return function() {
-          var feeds_story;
-          log.info(_this.username, ("Connected (" + _this.feeds.length + " feeds, " + ip + "),") + (" (" + io.engine.clientsCount + " connected) ") + (" " + (SECURE ? "(SSL)" : "(non-SSL)")));
-          socket.subscribe.subscribe(_this.feeds);
-          feeds_story = _this.feeds.map(function(f) {
-            return "" + f + ":story";
-          });
-          socket.subscribe.subscribe(feeds_story);
-          return socket.subscribe.subscribe(_this.username);
-        };
-      })(this));
-      return socket.subscribe.on('message', (function(_this) {
-        return function(channel, message) {
-          log.info(_this.username, "Update on " + channel + ": " + message);
-          if (channel === _this.username) {
-            return socket.emit('user:update', channel, message);
-          } else if (channel.indexOf(':story') >= 0) {
-            return socket.emit('feed:story:new', channel, message);
-          } else {
-            return socket.emit('feed:update', channel, message);
-          }
-        };
-      })(this));
+      socket.subscribe.on("error", (err) => {
+        var ref1;
+        log.info(this.username, `Error: ${err} (${this.feeds.length} feeds)`);
+        return (ref1 = socket.subscribe) != null ? ref1.quit() : void 0;
+      });
+      socket.subscribe.on("connect", () => {
+        var feeds_story;
+        log.info(this.username, `Connected (${this.feeds.length} feeds, ${ip}),` + ` (${io.engine.clientsCount} connected) ` + ` ${SECURE ? "(SSL)" : "(non-SSL)"}`);
+        socket.subscribe.subscribe(this.feeds);
+        feeds_story = this.feeds.map(function(f) {
+          return `${f}:story`;
+        });
+        socket.subscribe.subscribe(feeds_story);
+        return socket.subscribe.subscribe(this.username);
+      });
+      return socket.subscribe.on('message', (channel, message) => {
+        log.info(this.username, `Update on ${channel}: ${message}`);
+        if (channel === this.username) {
+          return socket.emit('user:update', channel, message);
+        } else if (channel.indexOf(':story') >= 0) {
+          return socket.emit('feed:story:new', channel, message);
+        } else {
+          return socket.emit('feed:update', channel, message);
+        }
+      });
     });
-    return socket.on('disconnect', function() {
-      var _ref, _ref1;
-      if ((_ref = socket.subscribe) != null) {
-        _ref.quit();
+    return socket.on('disconnect', () => {
+      var ref, ref1;
+      if ((ref = socket.subscribe) != null) {
+        ref.quit();
       }
-      return log.info(this.username, ("Disconnect (" + ((_ref1 = this.feeds) != null ? _ref1.length : void 0) + " feeds, " + ip + "),") + (" there are now " + io.engine.clientsCount + " users. ") + (" " + (SECURE ? "(SSL)" : "(non-SSL)")));
+      return log.info(this.username, `Disconnect (${(ref1 = this.feeds) != null ? ref1.length : void 0} feeds, ${ip}),` + ` there are now ${io.engine.clientsCount} users. ` + ` ${SECURE ? "(SSL)" : "(non-SSL)"}`);
     });
   });
 
   io.sockets.on('error', function(err) {
-    return log.debug("Error (sockets): " + err);
+    return log.debug(`Error (sockets): ${err}`);
   });
 
 }).call(this);
diff --git a/utils/munin/newsblur_app_servers.py b/utils/munin/newsblur_app_servers.py
index de6ec75c2..8e3a32b7a 100755
--- a/utils/munin/newsblur_app_servers.py
+++ b/utils/munin/newsblur_app_servers.py
@@ -1,6 +1,8 @@
 #!/srv/newsblur/venv/newsblur/bin/python
 from utils.munin.base import MuninGraph
 import datetime
+import os
+os.environ["DJANGO_SETTINGS_MODULE"] = "newsblur.settings"
 from django.conf import settings
 
 
diff --git a/utils/munin/newsblur_app_times.py b/utils/munin/newsblur_app_times.py
index 86c092c36..3c6d24e3a 100755
--- a/utils/munin/newsblur_app_times.py
+++ b/utils/munin/newsblur_app_times.py
@@ -27,6 +27,8 @@ class NBMuninGraph(MuninGraph):
     @property
     def stats(self):
         import datetime
+        import os
+        os.environ["DJANGO_SETTINGS_MODULE"] = "newsblur.settings"
         from django.conf import settings
         
         stats = settings.MONGOANALYTICSDB.nbanalytics.page_loads.aggregate([{
diff --git a/utils/munin/newsblur_classifiers.py b/utils/munin/newsblur_classifiers.py
index 8b54535f2..866fa3ba9 100755
--- a/utils/munin/newsblur_classifiers.py
+++ b/utils/munin/newsblur_classifiers.py
@@ -1,6 +1,10 @@
 #!/srv/newsblur/venv/newsblur/bin/python
 
 from utils.munin.base import MuninGraph
+import os
+os.environ["DJANGO_SETTINGS_MODULE"] = "newsblur.settings"
+import django
+django.setup()
 
 class NBMuninGraph(MuninGraph):
 
diff --git a/utils/munin/newsblur_dbtimes.py b/utils/munin/newsblur_dbtimes.py
index ec3c47305..559479234 100755
--- a/utils/munin/newsblur_dbtimes.py
+++ b/utils/munin/newsblur_dbtimes.py
@@ -1,5 +1,9 @@
 #!/srv/newsblur/venv/newsblur/bin/python
 from utils.munin.base import MuninGraph
+import os
+os.environ["DJANGO_SETTINGS_MODULE"] = "newsblur.settings"
+import django
+django.setup()
 
 class NBMuninGraph(MuninGraph):
 
diff --git a/utils/munin/newsblur_errors.py b/utils/munin/newsblur_errors.py
index efd469cf4..7d4421b60 100755
--- a/utils/munin/newsblur_errors.py
+++ b/utils/munin/newsblur_errors.py
@@ -1,6 +1,10 @@
 #!/srv/newsblur/venv/newsblur/bin/python
 
 from utils.munin.base import MuninGraph
+import os
+os.environ["DJANGO_SETTINGS_MODULE"] = "newsblur.settings"
+import django
+django.setup()
 
 class NBMuninGraph(MuninGraph):
 
diff --git a/utils/munin/newsblur_feed_counts.py b/utils/munin/newsblur_feed_counts.py
index ce62d5042..63a8fe111 100755
--- a/utils/munin/newsblur_feed_counts.py
+++ b/utils/munin/newsblur_feed_counts.py
@@ -1,6 +1,10 @@
 #!/srv/newsblur/venv/newsblur/bin/python
 from utils.munin.base import MuninGraph
 import redis
+import os
+os.environ["DJANGO_SETTINGS_MODULE"] = "newsblur.settings"
+import django
+django.setup()
 
 class NBMuninGraph(MuninGraph):
 
diff --git a/utils/munin/newsblur_feeds.py b/utils/munin/newsblur_feeds.py
index 7acb7ad59..ef5ec09a9 100755
--- a/utils/munin/newsblur_feeds.py
+++ b/utils/munin/newsblur_feeds.py
@@ -1,5 +1,9 @@
 #!/srv/newsblur/venv/newsblur/bin/python
 from utils.munin.base import MuninGraph
+import os
+os.environ["DJANGO_SETTINGS_MODULE"] = "newsblur.settings"
+import django
+django.setup()
 
 class NBMuninGraph(MuninGraph):
 
diff --git a/utils/munin/newsblur_loadtimes.py b/utils/munin/newsblur_loadtimes.py
index 16071bb9a..d3f7cd8ad 100755
--- a/utils/munin/newsblur_loadtimes.py
+++ b/utils/munin/newsblur_loadtimes.py
@@ -1,5 +1,9 @@
 #!/srv/newsblur/venv/newsblur/bin/python
 from utils.munin.base import MuninGraph
+import os
+os.environ["DJANGO_SETTINGS_MODULE"] = "newsblur.settings"
+import django
+django.setup()
 
 class NBMuninGraph(MuninGraph):
 
diff --git a/utils/munin/newsblur_stories.py b/utils/munin/newsblur_stories.py
index 45e4555e3..43081f790 100755
--- a/utils/munin/newsblur_stories.py
+++ b/utils/munin/newsblur_stories.py
@@ -1,5 +1,9 @@
 #!/srv/newsblur/venv/newsblur/bin/python
 from utils.munin.base import MuninGraph
+import os
+os.environ["DJANGO_SETTINGS_MODULE"] = "newsblur.settings"
+import django
+django.setup()
 
 
 class NBMuninGraph(MuninGraph):
diff --git a/utils/munin/newsblur_tasks_codes.py b/utils/munin/newsblur_tasks_codes.py
index 8210f64f0..215f73db5 100755
--- a/utils/munin/newsblur_tasks_codes.py
+++ b/utils/munin/newsblur_tasks_codes.py
@@ -1,5 +1,7 @@
 #!/srv/newsblur/venv/newsblur/bin/python
 from utils.munin.base import MuninGraph
+import os
+os.environ["DJANGO_SETTINGS_MODULE"] = "newsblur.settings"
 
 class NBMuninGraph(MuninGraph):
 
diff --git a/utils/munin/newsblur_tasks_pipeline.py b/utils/munin/newsblur_tasks_pipeline.py
index 96f3ab257..1588ff390 100755
--- a/utils/munin/newsblur_tasks_pipeline.py
+++ b/utils/munin/newsblur_tasks_pipeline.py
@@ -1,5 +1,9 @@
 #!/srv/newsblur/venv/newsblur/bin/python
 from utils.munin.base import MuninGraph
+import os
+os.environ["DJANGO_SETTINGS_MODULE"] = "newsblur.settings"
+import django
+django.setup()
 
 class NBMuninGraph(MuninGraph):
 
diff --git a/utils/munin/newsblur_tasks_servers.py b/utils/munin/newsblur_tasks_servers.py
index c14067769..fa1248e8f 100755
--- a/utils/munin/newsblur_tasks_servers.py
+++ b/utils/munin/newsblur_tasks_servers.py
@@ -1,6 +1,8 @@
 #!/srv/newsblur/venv/newsblur/bin/python
 from utils.munin.base import MuninGraph
 import datetime
+import os
+os.environ["DJANGO_SETTINGS_MODULE"] = "newsblur.settings"
 from django.conf import settings
 
 
diff --git a/utils/munin/newsblur_tasks_times.py b/utils/munin/newsblur_tasks_times.py
index 8a7a6ebcb..984cd47a9 100755
--- a/utils/munin/newsblur_tasks_times.py
+++ b/utils/munin/newsblur_tasks_times.py
@@ -1,5 +1,9 @@
 #!/srv/newsblur/venv/newsblur/bin/python
 from utils.munin.base import MuninGraph
+import os
+os.environ["DJANGO_SETTINGS_MODULE"] = "newsblur.settings"
+import django
+django.setup()
 
 class NBMuninGraph(MuninGraph):
 
diff --git a/utils/munin/newsblur_updates.py b/utils/munin/newsblur_updates.py
index 9a0b76b0a..4f1bb9aca 100755
--- a/utils/munin/newsblur_updates.py
+++ b/utils/munin/newsblur_updates.py
@@ -1,6 +1,10 @@
 #!/srv/newsblur/venv/newsblur/bin/python
 import redis
 from utils.munin.base import MuninGraph
+import os
+os.environ["DJANGO_SETTINGS_MODULE"] = "newsblur.settings"
+import django
+django.setup()
 
 class NBMuninGraph(MuninGraph):
 
diff --git a/utils/munin/newsblur_users.py b/utils/munin/newsblur_users.py
index 0c2eb3055..a53263d38 100755
--- a/utils/munin/newsblur_users.py
+++ b/utils/munin/newsblur_users.py
@@ -1,6 +1,9 @@
 #!/srv/newsblur/venv/newsblur/bin/python
 from utils.munin.base import MuninGraph
-
+import os
+os.environ["DJANGO_SETTINGS_MODULE"] = "newsblur.settings"
+import django
+django.setup()
 
 class NBMuninGraph(MuninGraph):
 
diff --git a/utils/templatetags/bookmarklet_includes.py b/utils/templatetags/bookmarklet_includes.py
index 671c29715..14d295b60 100644
--- a/utils/templatetags/bookmarklet_includes.py
+++ b/utils/templatetags/bookmarklet_includes.py
@@ -1,12 +1,13 @@
 from django.conf import settings
 from django import template
+from django.utils.safestring import mark_safe
 
 register = template.Library()
 
 @register.simple_tag
 def include_bookmarklet_js():
-    return settings.JAMMIT.render_code('javascripts', 'bookmarklet')
+    return mark_safe(settings.JAMMIT.render_code('javascripts', 'bookmarklet'))
     
 @register.simple_tag
 def include_bookmarklet_css():
-    return settings.JAMMIT.render_code('stylesheets', 'bookmarklet')
+    return mark_safe(settings.JAMMIT.render_code('stylesheets', 'bookmarklet'))