diff --git a/briar-android/src/main/res/drawable/bluetooth.xml b/briar-android/src/main/res/drawable/bluetooth.xml
deleted file mode 100644
index 26f10509b..000000000
--- a/briar-android/src/main/res/drawable/bluetooth.xml
+++ /dev/null
@@ -1,151 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-	android:width="499.24373dp"
-	android:height="175.49413dp"
-	android:viewportWidth="499.24373"
-	android:viewportHeight="175.49413">
-
-	<path
-		android:fillColor="#000000"
-		android:pathData="M459.809,171.16 L455.482,166.826 L448.412,164.399
-C444.524,163.064,439.689,161.403,437.668,160.708 L433.994,159.445
-L437.518,159.272 C445.76,158.868,450.506,155.265,451.854,148.388
-C452.65,144.327,452.983,131.09,452.684,115.347
-C452.531,107.263,452.518,99.9306,452.656,99.0522
-C452.794,98.1738,453.191,96.6321,453.539,95.6262
-C454.761,92.0938,453.879,83.7179,451.681,77.9947
-C451.333,77.0872,449.747,73.7797,448.157,70.6447
-C443.999,62.4444,443.652,61.7028,443.264,60.1606
-C442.805,58.3392,443.052,54.7253,443.726,53.3947
-C444.392,52.0797,445.883,50.4785,446.972,49.9081
-C448.271,49.2279,449.588,50.0301,451.658,52.7632
-C455.08,57.2792,465.659,72.2041,467.39,74.9562
-C471.136,80.9126,473.346,86.1212,475.362,93.7447
-C476.017,96.2197,477.247,100.742,478.097,103.795
-C478.946,106.847,480.811,113.953,482.241,119.585 L484.841,129.825
-L489.491,135.018 C492.048,137.874,495.288,141.482,496.691,143.035
-C498.093,144.588,499.241,146.01,499.241,146.196
-C499.241,146.531,464.741,175.495,464.342,175.495
-C464.227,175.495,462.186,173.545,459.807,171.161 Z M365.944,154.772
-C364.687,154.144,363.739,153.393,363.03,152.465
-C360.941,149.729,361.08,154.834,361.166,83.9825 L361.244,19.9437
-L361.905,18.7088 C362.92,16.8111,363.897,15.7979,365.645,14.8299
-L367.245,13.9437 L405.029,13.8641
-C447.485,13.7747,444.431,13.6158,447.145,16.056
-C448.02,16.8431,448.902,18.0155,449.329,18.9598
-C450.042,20.5368,450.045,20.5982,450.135,33.1639 L450.225,45.7841
-L448.427,45.654 C447.001,45.5509,446.346,45.661,445.261,46.1861
-C443.248,47.1606,441.321,49.0848,440.146,51.2936 L439.109,53.2436
-L439.102,40.4186 L439.095,27.5936 L405.495,27.5936 L371.895,27.5936
-L371.895,78.8936 L371.895,130.194 L405.494,130.194 L439.093,130.194
-L439.169,95.769 C439.242,62.8088,439.267,61.4078,439.76,62.844
-C440.043,63.669,441.566,66.8415,443.143,69.894
-C448.636,80.5202,448.548,79.7541,448.539,117.097
-C448.532,144.718,448.415,147.048,446.877,150.206
-C445.806,152.405,444.166,153.916,441.819,154.866 L440.145,155.543
-L403.977,155.623 L367.809,155.703 L365.945,154.772 Z M408.344,149.734
-C411.215,148.425,412.802,146.056,412.774,143.117
-C412.735,139.001,409.665,135.894,405.638,135.894
-C403.518,135.894,402.071,136.503,400.474,138.066
-C398.229,140.264,397.72,143.505,399.173,146.353
-C399.886,147.751,401.694,149.362,403.135,149.883
-C404.632,150.425,406.975,150.358,408.344,149.734 Z" />
-	<path
-		android:fillColor="#000000"
-		android:pathData="M39.4343,171.16 L43.7609,166.826 L50.8305,164.399
-C54.7188,163.064,59.5534,161.403,61.574,160.708 L65.248,159.445 L61.724,159.272
-C53.4822,158.868,48.7362,155.265,47.3877,148.388
-C46.5914,144.327,46.2588,131.09,46.5575,115.347
-C46.7109,107.263,46.7237,99.9306,46.5859,99.0522
-C46.4482,98.1738,46.0506,96.6321,45.7025,95.6262
-C44.48,92.0938,45.3625,83.7179,47.5602,77.9947
-C47.9087,77.0872,49.4945,73.7797,51.0844,70.6447
-C55.2429,62.4444,55.589,61.7028,55.9773,60.1606
-C56.4359,58.3392,56.1889,54.7253,55.5148,53.3947
-C54.8486,52.0797,53.3578,50.4785,52.2686,49.9081
-C50.9697,49.2279,49.6529,50.0301,47.5822,52.7632
-C44.1607,57.2792,33.5808,72.2041,31.8503,74.9562
-C28.1048,80.9126,25.8947,86.1212,23.8781,93.7447
-C23.2234,96.2197,21.9929,100.742,21.1435,103.795
-C20.2942,106.847,18.4295,113.953,16.9996,119.585 L14.4,129.824 L9.75,135.017
-C7.1925,137.873,3.9525,141.481,2.55,143.034 C1.1475,144.587,0,146.009,0,146.195
-C0,146.53,34.4996,175.494,34.8991,175.494
-C35.0138,175.494,37.0547,173.544,39.4343,171.16 Z M133.299,154.772
-C134.557,154.144,135.505,153.393,136.213,152.465
-C138.302,149.729,138.163,154.834,138.077,83.9825 L137.999,19.9437
-L137.338,18.7088 C136.323,16.8111,135.346,15.7979,133.598,14.8299
-L131.998,13.9437 L94.2141,13.8641
-C51.7582,13.7747,54.8117,13.6158,52.0976,16.056
-C51.2222,16.8431,50.3404,18.0155,49.9137,18.9598
-C49.2011,20.5368,49.1976,20.5982,49.1081,33.1639 L49.0182,45.7841
-L50.8164,45.654 C52.2422,45.5509,52.8978,45.661,53.9824,46.1861
-C55.9953,47.1606,57.9223,49.0848,59.0972,51.2936 L60.1344,53.2436
-L60.1414,40.4186 L60.1484,27.5936 L93.7484,27.5936 L127.348,27.5936
-L127.348,78.8936 L127.348,130.194 L93.7493,130.194 L60.1506,130.194
-L60.0743,95.769 C60.0013,62.8088,59.9761,61.4078,59.4833,62.844
-C59.2002,63.669,57.6777,66.8415,56.0999,69.894
-C50.6074,80.5202,50.695,79.7541,50.7039,117.097
-C50.7109,144.718,50.8275,147.048,52.3659,150.206
-C53.4373,152.405,55.0773,153.916,57.4241,154.866 L59.0979,155.543
-L95.2656,155.623 L131.433,155.703 L133.297,154.772 Z M90.8996,149.734
-C88.0284,148.425,86.4419,146.056,86.4696,143.117
-C86.5084,139.001,89.5784,135.894,93.606,135.894
-C95.7256,135.894,97.1733,136.503,98.7696,138.066
-C101.015,140.264,101.524,143.505,100.071,146.353
-C99.3579,147.751,97.5496,149.362,96.1089,149.883
-C94.6118,150.425,92.2689,150.358,90.9,149.734 Z" />
-	<path
-		android:fillColor="#0a3d91"
-		android:pathData="M247.254,75.9792 L251.99,75.9792
-C265.155,75.9792,275.753,86.5777,275.753,99.7427 L275.753,131.917
-C275.753,145.082,265.154,155.68,251.99,155.68 L247.254,155.68
-C234.089,155.68,223.491,145.081,223.491,131.917 L223.491,99.7424
-C223.491,86.5774,234.09,75.9789,247.254,75.9789 Z" />
-	<path
-		android:strokeColor="#ffffff"
-		android:strokeWidth="4.32805729"
-		android:pathData="M236.311,102.927 L261.218,127.997 L249.214,142.533 L249.214,90.5963
-L261.218,104.479 L236.311,128.896" />
-	<path
-		android:fillColor="#0a3d91"
-		android:strokeWidth="7.55000019"
-		android:strokeLineJoin="round"
-		android:strokeLineCap="round"
-		android:pathData="M143.679,27.5571 C142.089,30.1809,143.861,33.1318,146.464,34.1998
-C149.159,35.7722,152.635,39.187,155.612,36.432
-C157.845,34.3925,156.213,30.7041,153.571,29.7617
-C150.507,28.085,147.019,24.2469,143.68,27.5572 Z M351.705,27.1294
-C348.937,29.09,344.636,29.8244,343.327,33.1721
-C342.685,35.9031,345.263,38.1647,347.911,37.5986
-C351.113,35.9607,354.968,34.7562,357.089,31.6509
-C357.658,29.0465,355.596,26.3002,352.821,26.9052
-C352.405,26.7975,352.061,26.9402,351.704,27.1294 Z M324.943,40.3012
-C322.009,42.0092,317.623,42.224,316.012,45.4542
-C315.104,48.1085,317.444,50.6134,320.136,50.3152
-C323.492,49.0109,327.456,48.2025,329.873,45.3129
-C330.687,42.7752,328.896,39.8433,326.077,40.184
-C325.673,40.0383,325.317,40.1458,324.944,40.3011 Z M169.707,42.7641
-C168.488,45.476,170.464,48.2246,173.151,48.9095
-C176.009,49.9903,179.82,53.0273,182.463,50.1434
-C184.778,48.1069,182.802,44.308,180.053,43.7252
-C176.725,42.5494,172.668,39.0116,169.707,42.7641 Z M296.98,50.3813
-C293.857,51.6905,289.488,51.352,287.488,54.3514
-C286.256,56.8701,288.261,59.6497,290.968,59.6911
-C294.455,58.7838,298.535,58.5783,301.271,55.952
-C302.385,53.5298,300.959,50.4059,298.119,50.401
-C297.736,50.2053,297.369,50.274,296.98,50.3813 Z M199.49,51.9262
-C197.261,53.388,196.81,56.7921,199.214,58.3031
-C201.801,59.7737,205.129,60.258,208.054,60.7984
-C210.839,61.1306,212.8,58.3192,211.945,55.7497
-C209.902,52.47,205.473,53.0161,202.228,51.6605
-C201.315,51.749,200.402,51.8376,199.49,51.9261 Z M268.004,56.434
-C264.728,57.2229,260.543,56.2461,258.068,58.816
-C256.418,61.0841,257.911,64.1697,260.572,64.6779
-C264.184,64.3855,268.29,64.7686,271.412,62.5839
-C272.874,60.3563,271.935,57.0522,269.127,56.6245
-C268.778,56.3753,268.405,56.3852,268.004,56.434 Z M228.555,57.852
-C226.622,59.6879,226.79,63.1186,229.426,64.1735
-C232.235,65.1623,235.597,65.0202,238.57,65.0349
-C241.369,64.8621,242.796,61.7451,241.494,59.3702
-C238.89,56.5186,234.647,57.8284,231.201,57.1003
-C230.319,57.3509,229.437,57.6015,228.555,57.8521 Z" />
-</vector>
\ No newline at end of file
diff --git a/briar-android/src/main/res/drawable/border_spinner.xml b/briar-android/src/main/res/drawable/border_spinner.xml
deleted file mode 100644
index 9720073e4..000000000
--- a/briar-android/src/main/res/drawable/border_spinner.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:shape="rectangle">
-
-	<solid
-		android:color="@android:color/transparent"/>
-
-	<stroke
-		android:width="1dp"
-		android:color="@color/spinner_border"/>
-
-	<corners
-		android:radius="2dp"/>
-
-</shape>
\ No newline at end of file
diff --git a/briar-android/src/main/res/values-night/color.xml b/briar-android/src/main/res/values-night/color.xml
index 24ed1f6cd..e15fb0256 100644
--- a/briar-android/src/main/res/values-night/color.xml
+++ b/briar-android/src/main/res/values-night/color.xml
@@ -5,8 +5,6 @@
 	<color name="preference_category">@color/briar_blue_light2</color>
 
 	<color name="color_primary">#ffffff</color>
-	<color name="color_primary_inverse">#dd000000</color>
-	<color name="color_secondary">#b2ffffff</color>
 
 	<color name="window_background">#ff303030</color>
 	<color name="card_background">@color/cardview_dark_background</color>
diff --git a/briar-android/src/main/res/values/color.xml b/briar-android/src/main/res/values/color.xml
index ad806a0b3..7fedb0cbf 100644
--- a/briar-android/src/main/res/values/color.xml
+++ b/briar-android/src/main/res/values/color.xml
@@ -10,8 +10,6 @@
 	<color name="window_background">#fffafafa</color>
 	<color name="card_background">@color/cardview_light_background</color>
 	<color name="action_bar_text">#FFFFFF</color>
-	<color name="button_bar_background">#FFFFFF</color>
-	<color name="private_message_date">#AAAAAA</color>
 	<color name="private_message_date_inverse">#e0e0e0</color>
 	<color name="forum_avatar_shadow">#99000000</color>
 
@@ -19,19 +17,14 @@
 	<color name="briar_primary_dark">@color/briar_blue_dark</color>
 
 	<color name="briar_accent">@color/briar_blue</color>
-	<color name="control_normal_light">#757575</color>
 
 	<color name="color_primary">#dd000000</color>
-	<color name="color_primary_inverse">#ffffff</color>
-	<color name="color_secondary">#89000000</color>
 
 	<!-- text colors -->
 	<color name="briar_text_link">@color/briar_link</color>
 	<color name="briar_text_primary">#df000000</color>
 	<color name="briar_text_primary_inverse">#ffffff</color>
-	<color name="briar_text_secondary">#8a000000</color>
 	<color name="briar_text_secondary_inverse">#b4ffffff</color>
-	<color name="briar_text_tertiary">#61000000</color>
 	<color name="briar_text_tertiary_inverse">#80ffffff</color>
 	<color name="preference_category">@color/briar_blue_light</color>
 
@@ -39,13 +32,10 @@
 	<color name="briar_button_negative">#ff0000</color>
 	<color name="briar_warning_background">#ff0000</color>
 
-	<color name="emoji_pager_background">@color/window_background</color>
-
 	<color name="thread_indicator">#9e9e9e</color>
 	<color name="thread_item_background">#eceff1</color>
 	<color name="thread_item_highlight">#ffffff</color>
 	<color name="divider">#c1c1c1</color>
-	<color name="menu_background">#FFFFFF</color>
 
 	<color name="spinner_border">#61000000</color> <!-- 38% Black -->
 </resources>
\ No newline at end of file
diff --git a/briar-android/src/main/res/values/styles.xml b/briar-android/src/main/res/values/styles.xml
index 83ef28883..f679d8081 100644
--- a/briar-android/src/main/res/values/styles.xml
+++ b/briar-android/src/main/res/values/styles.xml
@@ -76,40 +76,14 @@
 		<item name="civ_border_color">?android:attr/textColorSecondary</item>
 	</style>
 
-	<style name="NavMenuButton" parent="Widget.AppCompat.Button.Borderless.Colored">
-		<item name="android:textSize">@dimen/text_size_medium</item>
-		<item name="android:textColor">@android:color/tertiary_text_light</item>
-		<item name="android:paddingTop">@dimen/margin_large</item>
-		<item name="android:paddingBottom">@dimen/margin_large</item>
-		<item name="android:drawablePadding">@dimen/margin_xlarge</item>
-		<item name="android:gravity">left|center_vertical</item>
-		<item name="android:layout_margin">0dp</item>
-		<item name="android:paddingLeft">@dimen/margin_large</item>
-	</style>
-
 	<style name="DiscussionLevelIndicator">
 		<item name="android:layout_marginLeft">4dp</item>
 		<item name="android:background">@color/thread_indicator</item>
 	</style>
 
-	<style name="BriarTabLayout" parent="Widget.Design.TabLayout">
-		<item name="android:background">@color/briar_primary</item>
-		<item name="tabMode">scrollable</item>
-		<item name="tabMaxWidth">100dp</item>
-		<item name="tabIndicatorColor">@color/briar_text_primary_inverse</item>
-		<item name="tabIndicatorHeight">3dp</item>
-		<item name="tabSelectedTextColor">@color/briar_text_primary_inverse</item>
-		<item name="tabTextColor">@color/briar_text_primary_inverse</item>
-	</style>
-
 	<style name="BriarCard" parent="CardView">
 		<item name="cardUseCompatPadding">true</item>
 		<item name="android:layout_margin">@dimen/margin_small</item>
 	</style>
 
-	<!-- This fixes the missing TextAppearance.Design.Counter.Overflow style -->
-	<style name="BriarTextCounter.Overflow" parent="TextAppearance.Design.Counter">
-		<item name="android:textColor">@color/briar_button_negative</item>
-	</style>
-
 </resources>
\ No newline at end of file