diff --git a/app/src/main/java/com/geeksville/mesh/ui/DragManageAdapter.kt b/app/src/main/java/com/geeksville/mesh/ui/DragManageAdapter.kt
deleted file mode 100644
index 913fa8a51..000000000
--- a/app/src/main/java/com/geeksville/mesh/ui/DragManageAdapter.kt
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.geeksville.mesh.ui
-
-import androidx.recyclerview.widget.ItemTouchHelper
-import androidx.recyclerview.widget.RecyclerView
-
-class DragManageAdapter(var adapter: SwapAdapter, dragDirs: Int, swipeDirs: Int) :
-    ItemTouchHelper.SimpleCallback(dragDirs, swipeDirs) {
-    interface SwapAdapter {
-        fun swapItems(fromPosition: Int, toPosition: Int)
-        fun commitSwaps()
-    }
-
-    override fun onMove(
-        recyclerView: RecyclerView,
-        viewHolder: RecyclerView.ViewHolder,
-        target: RecyclerView.ViewHolder
-    ): Boolean {
-        adapter.swapItems(viewHolder.absoluteAdapterPosition, target.absoluteAdapterPosition)
-        return true
-    }
-
-    override fun onSelectedChanged(viewHolder: RecyclerView.ViewHolder?, actionState: Int) {
-        super.onSelectedChanged(viewHolder, actionState)
-
-        if (actionState == ItemTouchHelper.ACTION_STATE_IDLE) {
-            adapter.commitSwaps()
-        }
-    }
-
-    override fun onSwiped(viewHolder: RecyclerView.ViewHolder, direction: Int) {
-        TODO("Not yet implemented")
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_battery_full_24.xml b/app/src/main/res/drawable/ic_battery_full_24.xml
deleted file mode 100644
index d966141d1..000000000
--- a/app/src/main/res/drawable/ic_battery_full_24.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M16 20H8V6H16M16.67 4H15V2H9V4H7.33C6.6 4 6 4.6 6 5.33V20.67C6 21.4 6.6 22 7.33 22H16.67C17.41 22 18 21.41 18 20.67V5.33C18 4.6 17.4 4 16.67 4M15 16H9V19H15V16M15 7H9V10H15V7M15 11.5H9V14.5H15V11.5Z"
-        android:fillAlpha=".5"/>
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_twotone_share_24.xml b/app/src/main/res/drawable/ic_twotone_share_24.xml
deleted file mode 100644
index 9957047c9..000000000
--- a/app/src/main/res/drawable/ic_twotone_share_24.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0"
-        android:tint="?attr/colorControlNormal">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M18,5m-1,0a1,1 0,1 1,2 0a1,1 0,1 1,-2 0"
-        android:fillAlpha=".3"/>
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M6,12m-1,0a1,1 0,1 1,2 0a1,1 0,1 1,-2 0"
-        android:fillAlpha=".3"/>
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M18,19.02m-1,0a1,1 0,1 1,2 0a1,1 0,1 1,-2 0"
-        android:fillAlpha=".3"/>
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92s2.92,-1.31 2.92,-2.92c0,-1.61 -1.31,-2.92 -2.92,-2.92zM18,4c0.55,0 1,0.45 1,1s-0.45,1 -1,1 -1,-0.45 -1,-1 0.45,-1 1,-1zM6,13c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1 1,0.45 1,1 -0.45,1 -1,1zM18,20.02c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1 1,0.45 1,1 -0.45,1 -1,1z"/>
-</vector>
diff --git a/app/src/main/res/drawable/person.xml b/app/src/main/res/drawable/person.xml
deleted file mode 100644
index f336fc423..000000000
--- a/app/src/main/res/drawable/person.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0"
-        android:tint="?attr/colorControlNormal">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M12,8m-2.1,0a2.1,2.1 0,1 1,4.2 0a2.1,2.1 0,1 1,-4.2 0"
-        android:fillAlpha=".3"/>
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M12,14.9c-2.97,0 -6.1,1.46 -6.1,2.1v1.1h12.2V17c0,-0.64 -3.13,-2.1 -6.1,-2.1z"
-        android:fillAlpha=".3"/>
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M12,13c-2.67,0 -8,1.34 -8,4v3h16v-3c0,-2.66 -5.33,-4 -8,-4zM18.1,18.1L5.9,18.1L5.9,17c0,-0.64 3.13,-2.1 6.1,-2.1s6.1,1.46 6.1,2.1v1.1zM12,12c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4 -4,1.79 -4,4 1.79,4 4,4zM12,5.9c1.16,0 2.1,0.94 2.1,2.1 0,1.16 -0.94,2.1 -2.1,2.1S9.9,9.16 9.9,8c0,-1.16 0.94,-2.1 2.1,-2.1z"/>
-</vector>
diff --git a/app/src/main/res/drawable/sl_lock_24dp.xml b/app/src/main/res/drawable/sl_lock_24dp.xml
deleted file mode 100644
index 49aeeda17..000000000
--- a/app/src/main/res/drawable/sl_lock_24dp.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:drawable="@drawable/ic_twotone_lock_24"
-        android:state_checked="false"
-        />
-    <item
-        android:drawable="@drawable/ic_twotone_lock_open_24"
-        android:state_checked="true"
-        />
-    <item android:drawable="@drawable/ic_twotone_lock_24"  />
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 660a17442..962fe517c 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -6,7 +6,6 @@
     <color name="colorMsg">#F2F2F2</color>
     <color name="colorMyMsg">#EDEAF4</color>
     <color name="colorAdvancedBackground">#FFFFFF</color>
-    <color name="colorIconTint">#000000</color>
     <color name="colorMenuItem">#000000</color>
     <color name="selectedColor">#67EA94</color>
     <color name="unselectedColor">#212121</color>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
deleted file mode 100644
index a8fdb8c56..000000000
--- a/app/src/main/res/values/dimens.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<resources>
-    <dimen name="message_offset">64dp</dimen>
-</resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index fbc800072..23b3ac011 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -31,26 +31,10 @@
         <item name="android:paddingRight">16dp</item>
     </style>
 
-    <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
-
     <style name="menu_item_color">
         <item name="android:textColor">@color/colorMenuItem</item>
     </style>
 
-    <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
-
-    <style name="Widget.App.Button.OutlinedButton.IconOnly" parent="Widget.MaterialComponents.Button.OutlinedButton">
-        <item name="iconPadding">0dp</item>
-        <item name="android:insetTop">0dp</item>
-        <item name="android:insetBottom">0dp</item>
-        <item name="android:paddingLeft">12dp</item>
-        <item name="android:paddingRight">12dp</item>
-        <item name="android:minWidth">48dp</item>
-        <item name="android:minHeight">48dp</item>
-    </style>
-
-    <style name="Widget.App.CardView" parent="Widget.MaterialComponents.CardView"/>
-
     <style name="Meshtastic.Button.Rounded" parent="">
         <item name="cornerFamily">rounded</item>
         <item name="cornerSize">50%</item>