From ce6293b1d396811477df6042575c0668b460858a Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Wed, 18 Jul 2018 09:33:37 -0300
Subject: [PATCH] Dark theme changes based on designer feedback

---
 .../artwork/logo_horizontal_white.svg         |  64 ++-------
 .../artwork/navigation_drawer_header.svg      |  70 ++++++++++
 .../navigation_drawer_header_night.svg        |  70 ++++++++++
 .../android/settings/SettingsFragment.java    |  15 +++
 .../navigation_drawer_header.xml              |  19 +++
 .../navigation_item_background.xml            |   5 +
 .../res/drawable/navigation_drawer_header.xml | 126 ++----------------
 .../drawable/navigation_item_background.xml   |   5 +
 .../src/main/res/layout/navigation_menu.xml   |  39 ++++--
 .../main/res/layout/preferences_category.xml  |   9 +-
 .../main/res/layout/text_input_view_large.xml |   1 +
 .../src/main/res/layout/transports_list.xml   |   1 -
 .../src/main/res/values-night/color.xml       |  15 ++-
 briar-android/src/main/res/values/color.xml   |  14 +-
 briar-android/src/main/res/values/styles.xml  |   6 +
 briar-android/src/main/res/values/themes.xml  |  11 ++
 16 files changed, 270 insertions(+), 200 deletions(-)
 create mode 100644 briar-android/artwork/navigation_drawer_header.svg
 create mode 100644 briar-android/artwork/navigation_drawer_header_night.svg
 create mode 100644 briar-android/src/main/res/drawable-night/navigation_drawer_header.xml
 create mode 100644 briar-android/src/main/res/drawable-night/navigation_item_background.xml
 create mode 100644 briar-android/src/main/res/drawable/navigation_item_background.xml

diff --git a/briar-android/artwork/logo_horizontal_white.svg b/briar-android/artwork/logo_horizontal_white.svg
index 8aa45874c..d3835aae6 100644
--- a/briar-android/artwork/logo_horizontal_white.svg
+++ b/briar-android/artwork/logo_horizontal_white.svg
@@ -14,7 +14,7 @@
    x="0px"
    y="0px"
    xml:space="preserve"
-   inkscape:version="0.91 r13725"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
    sodipodi:docname="logo_horizontal_white.svg"
    width="138"
    height="50"><metadata
@@ -31,18 +31,18 @@
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
      inkscape:window-width="1920"
-     inkscape:window-height="1021"
+     inkscape:window-height="1020"
      id="namedview67"
      showgrid="false"
      fit-margin-top="0"
      fit-margin-left="0"
      fit-margin-right="0"
      fit-margin-bottom="0"
-     inkscape:zoom="1.410079"
-     inkscape:cx="96.786606"
-     inkscape:cy="117.77539"
-     inkscape:window-x="1443"
-     inkscape:window-y="23"
+     inkscape:zoom="5.640316"
+     inkscape:cx="47.227033"
+     inkscape:cy="7.5801079"
+     inkscape:window-x="1440"
+     inkscape:window-y="24"
      inkscape:window-maximized="0"
      inkscape:current-layer="Ebene_1" /><style
      type="text/css"
@@ -53,55 +53,7 @@
 	.st3{fill:#95D220;}
 	.st4{display:none;fill:#95D220;}
 	.st5{fill:#FFFFFF;}
-</style><rect
-     style="display:none;fill:#87c214"
-     id="rect11"
-     height="9.279274"
-     width="9.279274"
-     class="st0"
-     y="214.00124"
-     x="230.02246" /><path
-     class="st2"
-     d="m 235.54331,203.97877 c 2.05971,0 3.75843,1.69872 3.75843,3.75842 l 0,42.40437 c 0,2.05971 -1.69872,3.75843 -3.75843,3.75843 l -1.76242,0 c -2.0597,0 -3.75843,-1.69872 -3.75843,-3.75843 l 0,-42.40437 c 0,-2.0597 1.67749,-3.75842 3.73719,-3.75842 l 1.78366,0 m 0,-1.48638 -1.76242,0 c -2.90906,0 -5.24481,2.35697 -5.24481,5.2448 l 0,42.40437 c 0,2.88783 2.35698,5.24481 5.24481,5.24481 l 1.76242,0 c 2.88783,0 5.24481,-2.35698 5.24481,-5.24481 l 0,-42.40437 c -0.0212,-2.88783 -2.35698,-5.2448 -5.24481,-5.2448 l 0,0 z"
-     id="path17"
-     inkscape:connector-curvature="0"
-     style="display:none;fill:#ffffff" /><rect
-     style="display:none;fill:#87c214"
-     id="rect25"
-     height="9.279274"
-     width="9.279274"
-     class="st0"
-     y="234.59825"
-     x="250.61948" /><path
-     class="st2"
-     d="m 256.14033,203.97877 c 2.0597,0 3.75842,1.69872 3.75842,3.75842 l 0,42.40437 c 0,2.05971 -1.67749,3.75843 -3.75842,3.75843 l -1.76243,0 c -2.0597,0 -3.75842,-1.69872 -3.75842,-3.75843 l 0,-42.40437 c 0,-2.0597 1.69872,-3.75842 3.75842,-3.75842 l 1.76243,0 m 0,-1.48638 -1.76243,0 c -2.88783,0 -5.2448,2.35697 -5.2448,5.2448 l 0,42.40437 c 0,2.88783 2.35697,5.24481 5.2448,5.24481 l 1.76243,0 c 2.88783,0 5.24481,-2.35698 5.24481,-5.24481 l 0,-42.40437 c -0.0212,-2.88783 -2.35698,-5.2448 -5.24481,-5.2448 l 0,0 z"
-     id="path29"
-     inkscape:connector-curvature="0"
-     style="display:none;fill:#ffffff" /><rect
-     style="display:none;fill:#95d220"
-     id="rect37"
-     height="9.279274"
-     width="9.279274"
-     class="st4"
-     y="234.59825"
-     x="230.02246" /><path
-     class="st2"
-     d="m 266.14156,234.59825 c 2.0597,0 3.75842,1.67749 3.75842,3.75842 l 0,1.76243 c 0,2.0597 -1.69872,3.75842 -3.75842,3.75842 l -42.38314,0 c -2.0597,0 -3.75842,-1.69872 -3.75842,-3.75842 l 0,-1.76243 c 0,-2.0597 1.67749,-3.75842 3.75842,-3.75842 l 42.38314,0 m 0,-1.48638 -42.38314,0 c -2.88783,0 -5.2448,2.33574 -5.2448,5.22357 l 0,1.76242 c 0,2.88783 2.35697,5.24481 5.2448,5.24481 l 42.40437,0 c 2.88783,0 5.24481,-2.35698 5.24481,-5.24481 l 0,-1.76242 c -0.0212,-2.88783 -2.37821,-5.22357 -5.26604,-5.22357 l 0,0 z"
-     id="path41"
-     inkscape:connector-curvature="0"
-     style="display:none;fill:#ffffff" /><rect
-     style="display:none;fill:#95d220"
-     id="rect47"
-     height="9.279274"
-     width="9.279274"
-     class="st4"
-     y="214.00124"
-     x="250.61948" /><path
-     class="st2"
-     d="m 266.14156,214.00123 c 2.0597,0 3.75842,1.67749 3.75842,3.75843 l 0,1.76242 c 0,2.05971 -1.69872,3.75843 -3.75842,3.75843 l -42.38314,0 C 221.67749,223.25927 220,221.58179 220,219.52208 l 0,-1.76242 c 0,-2.0597 1.67749,-3.75843 3.75842,-3.75843 l 42.38314,0 m 0,-1.48638 -42.38314,0 c -2.88783,0 -5.2448,2.33575 -5.2448,5.22357 l 0,1.76243 c 0,2.88783 2.35697,5.24481 5.2448,5.24481 l 42.40437,0 c 2.88783,0 5.24481,-2.35698 5.24481,-5.24481 l 0,-1.76243 c -0.0212,-2.88782 -2.37821,-5.22357 -5.26604,-5.22357 l 0,0 z"
-     id="path53"
-     inkscape:connector-curvature="0"
-     style="display:none;fill:#ffffff" /><path
+</style><path
      style="fill:#ffffff"
      d="m 57.097656,30.69922 0,19.30078 9.06836,0 c 4.22557,0 6.474893,-2.12355 6.496093,-5.47852 0,-2.14464 -1.017672,-3.78004 -3.013671,-4.67187 l 0,-0.041 c 1.507609,-0.9343 2.166015,-2.10331 2.166015,-3.9082 0,-2.73919 -1.848098,-5.20117 -5.861328,-5.20117 l -8.855469,0 z m 18.75,0 0,19.30078 2.271485,0 0,-7.72852 -0.232422,-0.23437 4.585937,0 c 2.54808,0 4.012966,0.91391 4.947266,2.88867 L 89.820312,50 92.367188,50 89.4375,43.96875 c -0.63702,-1.35898 -1.614284,-2.20763 -2.527344,-2.58984 l 0,-0.043 c 2.1234,-0.55208 3.865235,-2.42042 3.865235,-4.94727 0,-3.80089 -2.951713,-5.68945 -6.476563,-5.68945 l -8.451172,0 z m 18.876953,0 0,19.30078 2.273438,0 0,-19.30078 -2.273438,0 z m 13.419921,0 L 99.650391,50 l 2.484379,0 2.03906,-4.65039 -0.12695,-0.23438 10.57421,0 -0.12695,0.23438 2.03906,4.65039 2.48438,0 -8.47266,-19.30078 -2.40039,0 z m 13.33594,0 0,19.30078 2.27148,0 0,-7.72852 -0.23437,-0.23437 4.58789,0 c 2.54808,0 4.01296,0.91391 4.94726,2.88867 L 135.45117,50 138,50 135.07031,43.96875 c -0.63702,-1.35898 -1.61427,-2.20763 -2.52734,-2.58984 l 0,-0.043 c 2.12341,-0.55208 3.86523,-2.42042 3.86523,-4.94727 0,-3.80089 -2.95171,-5.68945 -6.47656,-5.68945 l -8.45117,0 z m -62.322267,2.14453 6.560547,0 c 2.46315,0 3.759766,0.9967 3.759766,3.03516 0,1.71996 -0.999336,3.10156 -3.759766,3.10156 l -6.560547,0 0.234375,-0.23438 0,-5.66992 -0.234375,-0.23242 z m 18.728516,0 6.433593,0 c 2.378211,0 4.14091,0.97535 4.16211,3.52344 0,2.03846 -1.634356,3.5039 -4.416016,3.5039 l -6.179687,0 0.232422,-0.23242 0,-6.5625 -0.232422,-0.23242 z m 45.652341,0 6.4336,0 c 2.35698,0 4.14062,0.97535 4.14062,3.52344 0,2.03846 -1.61288,3.5039 -4.39453,3.5039 l -6.17969,0 0.23438,-0.23242 0,-6.5625 -0.23438,-0.23242 z m -14.20508,0.21094 0.043,0 0.57227,1.93359 3.39844,7.75 0.23242,0.23242 -8.4707,0 0.23242,-0.23242 3.39843,-7.75 0.59375,-1.93359 z m -50.197261,8.07031 7.007812,0 c 2.84536,0 4.16211,1.3153 4.16211,3.375 0,2.14464 -1.189095,3.33398 -4.140625,3.33398 l -7.029297,0 0.234375,-0.23437 0,-6.24219 -0.234375,-0.23242 z"
      id="path57"
diff --git a/briar-android/artwork/navigation_drawer_header.svg b/briar-android/artwork/navigation_drawer_header.svg
new file mode 100644
index 000000000..c0e0270ab
--- /dev/null
+++ b/briar-android/artwork/navigation_drawer_header.svg
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Ebene_1"
+   x="0px"
+   y="0px"
+   xml:space="preserve"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   sodipodi:docname="navigation_drawer_header.svg"
+   width="146"
+   height="50"><metadata
+     id="metadata71"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs69" /><sodipodi:namedview
+     pagecolor="#000000"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1020"
+     id="namedview67"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="3.9883057"
+     inkscape:cx="55.084459"
+     inkscape:cy="13.664636"
+     inkscape:window-x="1442"
+     inkscape:window-y="24"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="Ebene_1"
+     showguides="true"
+     inkscape:guide-bbox="true" /><style
+     type="text/css"
+     id="style3">
+	.st0{display:none;fill:#87C214;}
+	.st1{fill:#87C214;}
+	.st2{display:none;fill:#FFFFFF;}
+	.st3{fill:#95D220;}
+	.st4{display:none;fill:#95D220;}
+	.st5{fill:#FFFFFF;}
+</style><path
+     style="fill:#ffffff;fill-opacity:1"
+     d="m 65.097656,30.699216 v 19.30078 h 9.06836 c 4.22557,0 6.474893,-2.12355 6.496093,-5.47852 0,-2.14464 -1.017672,-3.78004 -3.013671,-4.67187 v -0.041 c 1.507609,-0.9343 2.166015,-2.10331 2.166015,-3.9082 0,-2.73919 -1.848098,-5.20117 -5.861328,-5.20117 h -8.855469 z m 18.75,0 v 19.30078 h 2.271485 v -7.72852 l -0.232422,-0.23437 h 4.585937 c 2.54808,0 4.012966,0.91391 4.947266,2.88867 l 2.40039,5.07422 h 2.546878 l -2.92969,-6.03125 c -0.63702,-1.35898 -1.614284,-2.20763 -2.527344,-2.58984 v -0.043 c 2.1234,-0.55208 3.865235,-2.42042 3.865235,-4.94727 0,-3.80089 -2.951713,-5.68945 -6.476563,-5.68945 h -8.451172 z m 18.876954,0 v 19.30078 h 2.27344 v -19.30078 z m 13.41992,0 -8.49414,19.30078 h 2.48438 l 2.03906,-4.65039 -0.12695,-0.23438 h 10.57421 l -0.12695,0.23438 2.03906,4.65039 h 2.48438 l -8.47266,-19.30078 z m 13.33594,0 v 19.30078 h 2.27148 v -7.72852 l -0.23437,-0.23437 h 4.58789 c 2.54808,0 4.01296,0.91391 4.94726,2.88867 l 2.39844,5.07422 H 146 l -2.92969,-6.03125 c -0.63702,-1.35898 -1.61427,-2.20763 -2.52734,-2.58984 v -0.043 c 2.12341,-0.55208 3.86523,-2.42042 3.86523,-4.94727 0,-3.80089 -2.95171,-5.68945 -6.47656,-5.68945 h -8.45117 z m -62.322267,2.14453 h 6.560547 c 2.46315,0 3.759766,0.9967 3.759766,3.03516 0,1.71996 -0.999336,3.10156 -3.759766,3.10156 h -6.560547 l 0.234375,-0.23438 v -5.66992 z m 18.728516,0 h 6.433593 c 2.378211,0 4.14091,0.97535 4.16211,3.52344 0,2.03846 -1.634356,3.5039 -4.416016,3.5039 h -6.179687 l 0.232422,-0.23242 v -6.5625 z m 45.652341,0 h 6.4336 c 2.35698,0 4.14062,0.97535 4.14062,3.52344 0,2.03846 -1.61288,3.5039 -4.39453,3.5039 h -6.17969 l 0.23438,-0.23242 v -6.5625 z m -14.20508,0.21094 h 0.043 l 0.57227,1.93359 3.39844,7.75 0.23242,0.23242 h -8.4707 l 0.23242,-0.23242 3.39843,-7.75 0.59375,-1.93359 z m -50.197261,8.07031 h 7.007812 c 2.84536,0 4.16211,1.3153 4.16211,3.375 0,2.14464 -1.189095,3.33398 -4.140625,3.33398 h -7.029297 l 0.234375,-0.23437 v -6.24219 z"
+     id="path57"
+     inkscape:connector-curvature="0" /><path
+     inkscape:connector-curvature="0"
+     style="fill:#87c214;stroke-width:0.21276595"
+     d="m 13.808594,0 c -2.06383,0 -3.766207,1.7019614 -3.766207,3.7657911 V 8.553025 h 9.276928 V 3.7657911 C 19.319315,1.7019614 17.638132,0 15.574302,0 Z m 20.638297,0 c -2.06383,0 -3.766206,1.7019614 -3.766206,3.7657911 V 29.191323 h 9.276927 V 3.7657911 C 39.957612,1.7019614 38.276429,0 36.212599,0 Z M 10.042387,20.808676 v 25.425531 c 0,2.06383 1.681101,3.765791 3.766207,3.765791 h 1.765708 c 2.06383,0 3.766207,-1.701961 3.766207,-3.765791 V 20.808676 Z m 20.638298,20.638297 v 4.787234 c 0,2.06383 1.702376,3.765791 3.766206,3.765791 h 1.765708 c 2.06383,0 3.766206,-1.701961 3.766206,-3.765791 v -4.787234 z"
+     id="path13-3" /><path
+     inkscape:connector-curvature="0"
+     style="fill:#95d220;stroke-width:0.21276595"
+     d="M 3.7657914,10.042387 C 1.7019617,10.042387 0,11.723487 0,13.808594 v 1.765708 c 0,2.063829 1.6806851,3.766206 3.7657914,3.766206 H 29.191323 v -9.298121 z m 37.6811826,0 v 9.298121 h 4.787233 c 2.06383,0 3.765792,-1.6811 3.765792,-3.766206 v -1.765708 c 0,-2.085107 -1.701962,-3.766207 -3.765792,-3.766207 z M 3.7657914,30.680684 C 1.7019617,30.680684 0,32.361784 0,34.44689 v 1.765709 c 0,2.06383 1.6806851,3.766206 3.7657914,3.766206 h 4.7872339 v -9.298121 z m 17.0428856,0 v 9.298121 h 25.42553 c 2.06383,0 3.765792,-1.702376 3.765792,-3.766206 V 34.44689 c 0,-2.085106 -1.701962,-3.766206 -3.765792,-3.766206 z"
+     id="path35" /></svg>
\ No newline at end of file
diff --git a/briar-android/artwork/navigation_drawer_header_night.svg b/briar-android/artwork/navigation_drawer_header_night.svg
new file mode 100644
index 000000000..6627e299e
--- /dev/null
+++ b/briar-android/artwork/navigation_drawer_header_night.svg
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Ebene_1"
+   x="0px"
+   y="0px"
+   xml:space="preserve"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   sodipodi:docname="navigation_drawer_header_night.svg"
+   width="146"
+   height="50"><metadata
+     id="metadata71"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs69" /><sodipodi:namedview
+     pagecolor="#000000"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1020"
+     id="namedview67"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="3.9883057"
+     inkscape:cx="110.49646"
+     inkscape:cy="13.664636"
+     inkscape:window-x="1442"
+     inkscape:window-y="24"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="Ebene_1"
+     showguides="true"
+     inkscape:guide-bbox="true" /><style
+     type="text/css"
+     id="style3">
+	.st0{display:none;fill:#87C214;}
+	.st1{fill:#87C214;}
+	.st2{display:none;fill:#FFFFFF;}
+	.st3{fill:#95D220;}
+	.st4{display:none;fill:#95D220;}
+	.st5{fill:#FFFFFF;}
+</style><path
+     style="fill:#95d220;fill-opacity:1"
+     d="m 65.097656,15.349623 v 19.30078 h 9.06836 c 4.22557,0 6.474893,-2.12355 6.496093,-5.47852 0,-2.14464 -1.017672,-3.78004 -3.013671,-4.67187 v -0.041 c 1.507609,-0.9343 2.166015,-2.10331 2.166015,-3.9082 0,-2.73919 -1.848098,-5.20117 -5.861328,-5.20117 h -8.855469 z m 18.75,0 v 19.30078 h 2.271485 v -7.72852 l -0.232422,-0.23437 h 4.585937 c 2.54808,0 4.012966,0.91391 4.947266,2.88867 l 2.40039,5.07422 h 2.546878 l -2.92969,-6.03125 c -0.63702,-1.35898 -1.614284,-2.20763 -2.527344,-2.58984 v -0.043 c 2.1234,-0.55208 3.865235,-2.42042 3.865235,-4.94727 0,-3.80089 -2.951713,-5.68945 -6.476563,-5.68945 h -8.451172 z m 18.876954,0 v 19.30078 h 2.27344 v -19.30078 z m 13.41992,0 -8.49414,19.30078 h 2.48438 l 2.03906,-4.65039 -0.12695,-0.23438 h 10.57421 l -0.12695,0.23438 2.03906,4.65039 h 2.48438 l -8.47266,-19.30078 z m 13.33594,0 v 19.30078 h 2.27148 v -7.72852 l -0.23437,-0.23437 h 4.58789 c 2.54808,0 4.01296,0.91391 4.94726,2.88867 l 2.39844,5.07422 H 146 l -2.92969,-6.03125 c -0.63702,-1.35898 -1.61427,-2.20763 -2.52734,-2.58984 v -0.043 c 2.12341,-0.55208 3.86523,-2.42042 3.86523,-4.94727 0,-3.80089 -2.95171,-5.68945 -6.47656,-5.68945 h -8.45117 z m -62.322267,2.14453 h 6.560547 c 2.46315,0 3.759766,0.9967 3.759766,3.03516 0,1.71996 -0.999336,3.10156 -3.759766,3.10156 h -6.560547 l 0.234375,-0.23438 v -5.66992 z m 18.728516,0 h 6.433593 c 2.378211,0 4.14091,0.97535 4.16211,3.52344 0,2.03846 -1.634356,3.5039 -4.416016,3.5039 h -6.179687 l 0.232422,-0.23242 v -6.5625 z m 45.652341,0 h 6.4336 c 2.35698,0 4.14062,0.97535 4.14062,3.52344 0,2.03846 -1.61288,3.5039 -4.39453,3.5039 h -6.17969 l 0.23438,-0.23242 v -6.5625 z m -14.20508,0.21094 h 0.043 l 0.57227,1.93359 3.39844,7.75 0.23242,0.23242 h -8.4707 l 0.23242,-0.23242 3.39843,-7.75 0.59375,-1.93359 z m -50.197261,8.07031 h 7.007812 c 2.84536,0 4.16211,1.3153 4.16211,3.375 0,2.14464 -1.189095,3.33398 -4.140625,3.33398 h -7.029297 l 0.234375,-0.23437 v -6.24219 z"
+     id="path57"
+     inkscape:connector-curvature="0" /><path
+     inkscape:connector-curvature="0"
+     style="fill:#87c214;stroke-width:0.21276595"
+     d="m 13.808594,0 c -2.06383,0 -3.766207,1.7019614 -3.766207,3.7657911 V 8.553025 h 9.276928 V 3.7657911 C 19.319315,1.7019614 17.638132,0 15.574302,0 Z m 20.638297,0 c -2.06383,0 -3.766206,1.7019614 -3.766206,3.7657911 V 29.191323 h 9.276927 V 3.7657911 C 39.957612,1.7019614 38.276429,0 36.212599,0 Z M 10.042387,20.808676 v 25.425531 c 0,2.06383 1.681101,3.765791 3.766207,3.765791 h 1.765708 c 2.06383,0 3.766207,-1.701961 3.766207,-3.765791 V 20.808676 Z m 20.638298,20.638297 v 4.787234 c 0,2.06383 1.702376,3.765791 3.766206,3.765791 h 1.765708 c 2.06383,0 3.766206,-1.701961 3.766206,-3.765791 v -4.787234 z"
+     id="path13-3" /><path
+     inkscape:connector-curvature="0"
+     style="fill:#95d220;stroke-width:0.21276595"
+     d="M 3.7657914,10.042387 C 1.7019617,10.042387 0,11.723487 0,13.808594 v 1.765708 c 0,2.063829 1.6806851,3.766206 3.7657914,3.766206 H 29.191323 v -9.298121 z m 37.6811826,0 v 9.298121 h 4.787233 c 2.06383,0 3.765792,-1.6811 3.765792,-3.766206 v -1.765708 c 0,-2.085107 -1.701962,-3.766207 -3.765792,-3.766207 z M 3.7657914,30.680684 C 1.7019617,30.680684 0,32.361784 0,34.44689 v 1.765709 c 0,2.06383 1.6806851,3.766206 3.7657914,3.766206 h 4.7872339 v -9.298121 z m 17.0428856,0 v 9.298121 h 25.42553 c 2.06383,0 3.765792,-1.702376 3.765792,-3.766206 V 34.44689 c 0,-2.085106 -1.701962,-3.766206 -3.765792,-3.766206 z"
+     id="path35" /></svg>
\ No newline at end of file
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsFragment.java
index 955680ff5..f5c38f23c 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsFragment.java
@@ -4,17 +4,22 @@ import android.annotation.TargetApi;
 import android.app.AlertDialog;
 import android.content.Context;
 import android.content.Intent;
+import android.graphics.drawable.ColorDrawable;
 import android.media.Ringtone;
 import android.media.RingtoneManager;
 import android.net.Uri;
 import android.os.Bundle;
 import android.support.annotation.StringRes;
+import android.support.v4.content.ContextCompat;
 import android.support.v4.text.TextUtilsCompat;
 import android.support.v7.preference.CheckBoxPreference;
 import android.support.v7.preference.ListPreference;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceFragmentCompat;
 import android.support.v7.preference.PreferenceGroup;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
 import android.widget.Toast;
 
 import org.acra.ACRA;
@@ -216,6 +221,16 @@ public class SettingsFragment extends PreferenceFragmentCompat
 		loadSettings();
 	}
 
+	@Override
+	public View onCreateView(LayoutInflater inflater, ViewGroup container,
+			Bundle savedInstanceState) {
+		View view = super.onCreateView(inflater, container, savedInstanceState);
+		ColorDrawable divider = new ColorDrawable(
+				ContextCompat.getColor(getContext(), R.color.divider));
+		setDivider(divider);
+		return view;
+	}
+
 	@Override
 	public void onStart() {
 		super.onStart();
diff --git a/briar-android/src/main/res/drawable-night/navigation_drawer_header.xml b/briar-android/src/main/res/drawable-night/navigation_drawer_header.xml
new file mode 100644
index 000000000..4c79711a7
--- /dev/null
+++ b/briar-android/src/main/res/drawable-night/navigation_drawer_header.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="146dp"
+        android:height="50dp"
+        android:viewportHeight="50"
+        android:viewportWidth="146">
+
+	<path
+		android:fillColor="#95d220"
+		android:pathData="M 65.097656,15.349623 v 19.30078 h 9.06836 c 4.22557,0 6.474893,-2.12355 6.496093,-5.47852 0,-2.14464 -1.017672,-3.78004 -3.013671,-4.67187 v -0.041 c 1.507609,-0.9343 2.166015,-2.10331 2.166015,-3.9082 0,-2.73919 -1.848098,-5.20117 -5.861328,-5.20117 h -8.855469 z m 18.75,0 v 19.30078 h 2.271485 v -7.72852 l -0.232422,-0.23437 h 4.585937 c 2.54808,0 4.012966,0.91391 4.947266,2.88867 l 2.40039,5.07422 h 2.546878 l -2.92969,-6.03125 c -0.63702,-1.35898 -1.614284,-2.20763 -2.527344,-2.58984 v -0.043 c 2.1234,-0.55208 3.865235,-2.42042 3.865235,-4.94727 0,-3.80089 -2.951713,-5.68945 -6.476563,-5.68945 h -8.451172 z m 18.876954,0 v 19.30078 h 2.27344 v -19.30078 z m 13.41992,0 -8.49414,19.30078 h 2.48438 l 2.03906,-4.65039 -0.12695,-0.23438 h 10.57421 l -0.12695,0.23438 2.03906,4.65039 h 2.48438 l -8.47266,-19.30078 z m 13.33594,0 v 19.30078 h 2.27148 v -7.72852 l -0.23437,-0.23437 h 4.58789 c 2.54808,0 4.01296,0.91391 4.94726,2.88867 l 2.39844,5.07422 H 146 l -2.92969,-6.03125 c -0.63702,-1.35898 -1.61427,-2.20763 -2.52734,-2.58984 v -0.043 c 2.12341,-0.55208 3.86523,-2.42042 3.86523,-4.94727 0,-3.80089 -2.95171,-5.68945 -6.47656,-5.68945 h -8.45117 z m -62.322267,2.14453 h 6.560547 c 2.46315,0 3.759766,0.9967 3.759766,3.03516 0,1.71996 -0.999336,3.10156 -3.759766,3.10156 h -6.560547 l 0.234375,-0.23438 v -5.66992 z m 18.728516,0 h 6.433593 c 2.378211,0 4.14091,0.97535 4.16211,3.52344 0,2.03846 -1.634356,3.5039 -4.416016,3.5039 h -6.179687 l 0.232422,-0.23242 v -6.5625 z m 45.652341,0 h 6.4336 c 2.35698,0 4.14062,0.97535 4.14062,3.52344 0,2.03846 -1.61288,3.5039 -4.39453,3.5039 h -6.17969 l 0.23438,-0.23242 v -6.5625 z m -14.20508,0.21094 h 0.043 l 0.57227,1.93359 3.39844,7.75 0.23242,0.23242 h -8.4707 l 0.23242,-0.23242 3.39843,-7.75 0.59375,-1.93359 z m -50.197261,8.07031 h 7.007812 c 2.84536,0 4.16211,1.3153 4.16211,3.375 0,2.14464 -1.189095,3.33398 -4.140625,3.33398 h -7.029297 l 0.234375,-0.23437 v -6.24219 z"/>
+	<path
+		android:fillColor="#87c214"
+		android:pathData="M 13.808594,0 c -2.06383,0 -3.766207,1.7019614 -3.766207,3.7657911 V 8.553025 h 9.276928 V 3.7657911 C 19.319315,1.7019614 17.638132,0 15.574302,0 Z m 20.638297,0 c -2.06383,0 -3.766206,1.7019614 -3.766206,3.7657911 V 29.191323 h 9.276927 V 3.7657911 C 39.957612,1.7019614 38.276429,0 36.212599,0 Z M 10.042387,20.808676 v 25.425531 c 0,2.06383 1.681101,3.765791 3.766207,3.765791 h 1.765708 c 2.06383,0 3.766207,-1.701961 3.766207,-3.765791 V 20.808676 Z m 20.638298,20.638297 v 4.787234 c 0,2.06383 1.702376,3.765791 3.766206,3.765791 h 1.765708 c 2.06383,0 3.766206,-1.701961 3.766206,-3.765791 v -4.787234 z"
+		android:strokeWidth="0.21276595"/>
+	<path
+		android:fillColor="#95d220"
+		android:pathData="M 3.7657914,10.042387 C 1.7019617,10.042387 0,11.723487 0,13.808594 v 1.765708 c 0,2.063829 1.6806851,3.766206 3.7657914,3.766206 H 29.191323 v -9.298121 z m 37.6811826,0 v 9.298121 h 4.787233 c 2.06383,0 3.765792,-1.6811 3.765792,-3.766206 v -1.765708 c 0,-2.085107 -1.701962,-3.766207 -3.765792,-3.766207 z M 3.7657914,30.680684 C 1.7019617,30.680684 0,32.361784 0,34.44689 v 1.765709 c 0,2.06383 1.6806851,3.766206 3.7657914,3.766206 h 4.7872339 v -9.298121 z m 17.0428856,0 v 9.298121 h 25.42553 c 2.06383,0 3.765792,-1.702376 3.765792,-3.766206 V 34.44689 c 0,-2.085106 -1.701962,-3.766206 -3.765792,-3.766206 z"
+		android:strokeWidth="0.21276595"/>
+</vector>
\ No newline at end of file
diff --git a/briar-android/src/main/res/drawable-night/navigation_item_background.xml b/briar-android/src/main/res/drawable-night/navigation_item_background.xml
new file mode 100644
index 000000000..deac89913
--- /dev/null
+++ b/briar-android/src/main/res/drawable-night/navigation_item_background.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+	<item android:drawable="@color/item_background_highlight" android:state_checked="true"/>
+	<item android:drawable="@color/window_background" android:state_checked="false"/>
+</selector>
diff --git a/briar-android/src/main/res/drawable/navigation_drawer_header.xml b/briar-android/src/main/res/drawable/navigation_drawer_header.xml
index 9771b2cae..7a735dff0 100644
--- a/briar-android/src/main/res/drawable/navigation_drawer_header.xml
+++ b/briar-android/src/main/res/drawable/navigation_drawer_header.xml
@@ -1,129 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="138dp"
+        android:width="146dp"
         android:height="50dp"
         android:viewportHeight="50"
-        android:viewportWidth="138">
+        android:viewportWidth="146">
 
-	<path
-		android:fillColor="#87c214"
-		android:pathData="M230.022,214.001 L239.302,214.001 L239.302,223.281 L230.022,223.281
-L230.022,214.001 Z"/>
 	<path
 		android:fillColor="#ffffff"
-		android:pathData="M235.543,203.979 C237.603,203.979,239.301,205.678,239.301,207.737
-L239.301,250.141 C239.301,252.201,237.602,253.899,235.543,253.899
-L233.781,253.899 C231.721,253.899,230.023,252.2,230.023,250.141 L230.023,207.737
-C230.023,205.677,231.7,203.979,233.76,203.979 L235.544,203.979 M235.544,202.493
-L233.782,202.493 C230.873,202.493,228.537,204.85,228.537,207.738
-L228.537,250.142 C228.537,253.03,230.894,255.387,233.782,255.387
-L235.544,255.387 C238.432,255.387,240.789,253.03,240.789,250.142
-L240.789,207.738 C240.768,204.85,238.432,202.493,235.544,202.493
-L235.544,202.493 Z"/>
+		android:pathData="M 65.097656,30.699216 v 19.30078 h 9.06836 c 4.22557,0 6.474893,-2.12355 6.496093,-5.47852 0,-2.14464 -1.017672,-3.78004 -3.013671,-4.67187 v -0.041 c 1.507609,-0.9343 2.166015,-2.10331 2.166015,-3.9082 0,-2.73919 -1.848098,-5.20117 -5.861328,-5.20117 h -8.855469 z m 18.75,0 v 19.30078 h 2.271485 v -7.72852 l -0.232422,-0.23437 h 4.585937 c 2.54808,0 4.012966,0.91391 4.947266,2.88867 l 2.40039,5.07422 h 2.546878 l -2.92969,-6.03125 c -0.63702,-1.35898 -1.614284,-2.20763 -2.527344,-2.58984 v -0.043 c 2.1234,-0.55208 3.865235,-2.42042 3.865235,-4.94727 0,-3.80089 -2.951713,-5.68945 -6.476563,-5.68945 h -8.451172 z m 18.876954,0 v 19.30078 h 2.27344 v -19.30078 z m 13.41992,0 -8.49414,19.30078 h 2.48438 l 2.03906,-4.65039 -0.12695,-0.23438 h 10.57421 l -0.12695,0.23438 2.03906,4.65039 h 2.48438 l -8.47266,-19.30078 z m 13.33594,0 v 19.30078 h 2.27148 v -7.72852 l -0.23437,-0.23437 h 4.58789 c 2.54808,0 4.01296,0.91391 4.94726,2.88867 l 2.39844,5.07422 H 146 l -2.92969,-6.03125 c -0.63702,-1.35898 -1.61427,-2.20763 -2.52734,-2.58984 v -0.043 c 2.12341,-0.55208 3.86523,-2.42042 3.86523,-4.94727 0,-3.80089 -2.95171,-5.68945 -6.47656,-5.68945 h -8.45117 z m -62.322267,2.14453 h 6.560547 c 2.46315,0 3.759766,0.9967 3.759766,3.03516 0,1.71996 -0.999336,3.10156 -3.759766,3.10156 h -6.560547 l 0.234375,-0.23438 v -5.66992 z m 18.728516,0 h 6.433593 c 2.378211,0 4.14091,0.97535 4.16211,3.52344 0,2.03846 -1.634356,3.5039 -4.416016,3.5039 h -6.179687 l 0.232422,-0.23242 v -6.5625 z m 45.652341,0 h 6.4336 c 2.35698,0 4.14062,0.97535 4.14062,3.52344 0,2.03846 -1.61288,3.5039 -4.39453,3.5039 h -6.17969 l 0.23438,-0.23242 v -6.5625 z m -14.20508,0.21094 h 0.043 l 0.57227,1.93359 3.39844,7.75 0.23242,0.23242 h -8.4707 l 0.23242,-0.23242 3.39843,-7.75 0.59375,-1.93359 z m -50.197261,8.07031 h 7.007812 c 2.84536,0 4.16211,1.3153 4.16211,3.375 0,2.14464 -1.189095,3.33398 -4.140625,3.33398 h -7.029297 l 0.234375,-0.23437 v -6.24219 z"/>
 	<path
 		android:fillColor="#87c214"
-		android:pathData="M250.619,234.598 L259.899,234.598 L259.899,243.878 L250.619,243.878
-L250.619,234.598 Z"/>
-	<path
-		android:fillColor="#ffffff"
-		android:pathData="M256.14,203.979 C258.2,203.979,259.898,205.678,259.898,207.737 L259.898,250.141
-C259.898,252.201,258.221,253.899,256.14,253.899 L254.378,253.899
-C252.318,253.899,250.62,252.2,250.62,250.141 L250.62,207.737
-C250.62,205.677,252.319,203.979,254.378,203.979 L256.14,203.979 M256.14,202.493
-L254.378,202.493 C251.49,202.493,249.133,204.85,249.133,207.738 L249.133,250.142
-C249.133,253.03,251.49,255.387,254.378,255.387 L256.14,255.387
-C259.028,255.387,261.385,253.03,261.385,250.142 L261.385,207.738
-C261.364,204.85,259.028,202.493,256.14,202.493 L256.14,202.493 Z"/>
+		android:pathData="M 13.808594,0 c -2.06383,0 -3.766207,1.7019614 -3.766207,3.7657911 V 8.553025 h 9.276928 V 3.7657911 C 19.319315,1.7019614 17.638132,0 15.574302,0 Z m 20.638297,0 c -2.06383,0 -3.766206,1.7019614 -3.766206,3.7657911 V 29.191323 h 9.276927 V 3.7657911 C 39.957612,1.7019614 38.276429,0 36.212599,0 Z M 10.042387,20.808676 v 25.425531 c 0,2.06383 1.681101,3.765791 3.766207,3.765791 h 1.765708 c 2.06383,0 3.766207,-1.701961 3.766207,-3.765791 V 20.808676 Z m 20.638298,20.638297 v 4.787234 c 0,2.06383 1.702376,3.765791 3.766206,3.765791 h 1.765708 c 2.06383,0 3.766206,-1.701961 3.766206,-3.765791 v -4.787234 z"
+		android:strokeWidth="0.21276595"/>
 	<path
 		android:fillColor="#95d220"
-		android:pathData="M230.022,234.598 L239.302,234.598 L239.302,243.878 L230.022,243.878
-L230.022,234.598 Z"/>
-	<path
-		android:fillColor="#ffffff"
-		android:pathData="M266.142,234.598 C268.202,234.598,269.9,236.275,269.9,238.356 L269.9,240.118
-C269.9,242.178,268.201,243.876,266.142,243.876 L223.759,243.876
-C221.699,243.876,220.001,242.177,220.001,240.118 L220.001,238.356
-C220.001,236.296,221.678,234.598,223.759,234.598 L266.142,234.598
-M266.142,233.112 L223.759,233.112
-C220.871,233.112,218.514,235.448,218.514,238.336 L218.514,240.098
-C218.514,242.986,220.871,245.343,223.759,245.343 L266.163,245.343
-C269.051,245.343,271.408,242.986,271.408,240.098 L271.408,238.336
-C271.387,235.448,269.03,233.112,266.142,233.112 L266.142,233.112 Z"/>
-	<path
-		android:fillColor="#95d220"
-		android:pathData="M250.619,214.001 L259.899,214.001 L259.899,223.281 L250.619,223.281
-L250.619,214.001 Z"/>
-	<path
-		android:fillColor="#ffffff"
-		android:pathData="M266.142,214.001 C268.202,214.001,269.9,215.678,269.9,217.759 L269.9,219.521
-C269.9,221.581,268.201,223.279,266.142,223.279 L223.759,223.279
-C221.677,223.259,220,221.582,220,219.522 L220,217.76
-C220,215.7,221.677,214.002,223.758,214.002 L266.141,214.002 M266.141,212.516
-L223.758,212.516 C220.87,212.516,218.513,214.852,218.513,217.74 L218.513,219.502
-C218.513,222.39,220.87,224.747,223.758,224.747 L266.162,224.747
-C269.05,224.747,271.407,222.39,271.407,219.502 L271.407,217.74
-C271.386,214.852,269.029,212.516,266.141,212.516 L266.141,212.516 Z"/>
-	<path
-		android:fillColor="#ffffff"
-		android:pathData="M57.0977,30.6992 L57.0977,50 L66.1661,50
-C70.3917,50,72.641,47.8764,72.6622,44.5215
-C72.6622,42.3769,71.6445,40.7415,69.6485,39.8496 L69.6485,39.8086
-C71.1561,38.8743,71.8145,37.7053,71.8145,35.9004
-C71.8145,33.1612,69.9664,30.6992,65.9532,30.6992 L57.0977,30.6992 Z
-M75.8477,30.6992 L75.8477,50 L78.1192,50 L78.1192,42.2715 L77.8868,42.0371
-L82.4727,42.0371 C85.0208,42.0371,86.4857,42.951,87.42,44.9258 L89.8203,50
-L92.3672,50 L89.4375,43.9688 C88.8005,42.6098,87.8232,41.7611,86.9102,41.3789
-L86.9102,41.3359 C89.0336,40.7838,90.7754,38.9155,90.7754,36.3886
-C90.7754,32.5877,87.8237,30.6991,84.2988,30.6991 L75.8476,30.6991 Z
-M94.7247,30.6992 L94.7247,50 L96.9981,50 L96.9981,30.6992 L94.7247,30.6992 Z
-M108.145,30.6992 L99.6504,50 L102.135,50 L104.174,45.3496 L104.047,45.1152
-L114.621,45.1152 L114.494,45.3496 L116.533,50 L119.017,50 L110.544,30.6992
-L108.144,30.6992 Z M121.481,30.6992 L121.481,50 L123.752,50 L123.752,42.2715
-L123.518,42.0371 L128.106,42.0371
-C130.654,42.0371,132.119,42.951,133.053,44.9258 L135.451,50 L138,50
-L135.07,43.9688 C134.433,42.6098,133.456,41.7611,132.543,41.3789
-L132.543,41.3359 C134.666,40.7838,136.408,38.9155,136.408,36.3886
-C136.408,32.5877,133.456,30.6991,129.931,30.6991 L121.48,30.6991 Z
-M59.1587,32.8437 L65.7192,32.8437 C68.1823,32.8437,69.479,33.8404,69.479,35.8789
-C69.479,37.5989,68.4797,38.9805,65.7192,38.9805 L59.1587,38.9805
-L59.3931,38.7461 L59.3931,33.0762 L59.1587,32.8438 Z M77.8872,32.8437
-L84.3208,32.8437 C86.699,32.8437,88.4617,33.819,88.4829,36.3671
-C88.4829,38.4056,86.8485,39.871,84.0669,39.871 L77.8872,39.871 L78.1196,39.6386
-L78.1196,33.0761 L77.8872,32.8437 Z M123.54,32.8437 L129.974,32.8437
-C132.331,32.8437,134.115,33.819,134.115,36.3671
-C134.115,38.4056,132.502,39.871,129.72,39.871 L123.54,39.871 L123.774,39.6386
-L123.774,33.0761 L123.54,32.8437 Z M109.335,33.0546 L109.378,33.0546
-L109.95,34.9882 L113.348,42.7382 L113.58,42.9706 L105.109,42.9706
-L105.341,42.7382 L108.739,34.9882 L109.333,33.0546 Z M59.1377,41.1249
-L66.1455,41.1249 C68.9909,41.1249,70.3076,42.4402,70.3076,44.4999
-C70.3076,46.6445,69.1185,47.8339,66.167,47.8339 L59.1377,47.8339
-L59.3721,47.5995 L59.3721,41.3573 L59.1377,41.1249 Z"/>
-	<path
-		android:fillColor="#87c214"
-		android:pathData="M13.8086,0.00000870181 C11.7448,0.00000870181,10.0425,1.70197,10.0425,3.7658
-L10.0425,8.55303 L19.3194,8.55303 L19.3194,3.7658
-C19.3194,1.70197,17.6382,0.00001,15.5744,0.00001 L13.8087,0.00001 Z
-M34.4469,0.00000870181 C32.3831,0.00000870181,30.6807,1.70197,30.6807,3.7658
-L30.6807,29.1913 L39.9576,29.1913 L39.9576,3.7658
-C39.9576,1.70197,38.2764,0.00001,36.2126,0.00001 L34.4469,0.00001 Z
-M10.0425,20.8087 L10.0425,46.2341
-C10.0425,48.2979,11.7236,49.9999,13.8087,49.9999 L15.5744,49.9999
-C17.6382,49.9999,19.3406,48.2979,19.3406,46.2341 L19.3406,20.8086
-L10.0425,20.8086 Z M30.6808,41.4469 L30.6808,46.2341
-C30.6808,48.2979,32.3832,49.9999,34.447,49.9999 L36.2127,49.9999
-C38.2765,49.9999,39.9789,48.2979,39.9789,46.2341 L39.9789,41.4469
-L30.6808,41.4469 Z"/>
-	<path
-		android:fillColor="#95d220"
-		android:pathData="M3.76588,10.0424 C1.70205,10.0424,0.00014,11.7235,0.00014,13.8086
-L0.00014,15.5743 C0.00014,17.6381,1.68077,19.3405,3.76588,19.3405
-L29.1914,19.3405 L29.1914,10.0424 L3.7659,10.0424 Z M41.4471,10.0424
-L41.4471,19.3405 L46.2343,19.3405
-C48.2981,19.3405,50.0001,17.6594,50.0001,15.5743 L50.0001,13.8086
-C50.0001,11.7235,48.2981,10.0424,46.2343,10.0424 L41.4471,10.0424 Z
-M3.76579,30.6807 C1.70205,30.6807,-0.00008,32.3618,-0.00008,34.4469
-L-0.00008,36.2126 C-0.00008,38.2764,1.68056,39.9788,3.76567,39.9788
-L8.5529,39.9788 L8.5529,30.6807 L3.76567,30.6807 Z M20.8087,30.6807
-L20.8087,39.9788 L46.2342,39.9788 C48.298,39.9788,50,38.2764,50,36.2126
-L50,34.4469 C50,32.3618,48.298,30.6807,46.2342,30.6807 L20.8087,30.6807 Z"/>
-</vector>
+		android:pathData="M 3.7657914,10.042387 C 1.7019617,10.042387 0,11.723487 0,13.808594 v 1.765708 c 0,2.063829 1.6806851,3.766206 3.7657914,3.766206 H 29.191323 v -9.298121 z m 37.6811826,0 v 9.298121 h 4.787233 c 2.06383,0 3.765792,-1.6811 3.765792,-3.766206 v -1.765708 c 0,-2.085107 -1.701962,-3.766207 -3.765792,-3.766207 z M 3.7657914,30.680684 C 1.7019617,30.680684 0,32.361784 0,34.44689 v 1.765709 c 0,2.06383 1.6806851,3.766206 3.7657914,3.766206 h 4.7872339 v -9.298121 z m 17.0428856,0 v 9.298121 h 25.42553 c 2.06383,0 3.765792,-1.702376 3.765792,-3.766206 V 34.44689 c 0,-2.085106 -1.701962,-3.766206 -3.765792,-3.766206 z"
+		android:strokeWidth="0.21276595"/>
+</vector>
\ No newline at end of file
diff --git a/briar-android/src/main/res/drawable/navigation_item_background.xml b/briar-android/src/main/res/drawable/navigation_item_background.xml
new file mode 100644
index 000000000..4067c8829
--- /dev/null
+++ b/briar-android/src/main/res/drawable/navigation_item_background.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+	<item android:drawable="@color/item_background_highlight" android:state_checked="true"/>
+	<item android:drawable="@android:color/transparent" android:state_checked="false"/>
+</selector>
diff --git a/briar-android/src/main/res/layout/navigation_menu.xml b/briar-android/src/main/res/layout/navigation_menu.xml
index 888082260..8a2162914 100644
--- a/briar-android/src/main/res/layout/navigation_menu.xml
+++ b/briar-android/src/main/res/layout/navigation_menu.xml
@@ -2,38 +2,59 @@
 <ScrollView
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="wrap_content"
 	android:layout_height="match_parent"
-	android:background="?android:attr/windowBackground"
+	android:background="@color/window_background"
 	android:fillViewport="true"
 	android:orientation="vertical">
 
-	<LinearLayout
+	<android.support.constraint.ConstraintLayout
 		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:orientation="vertical">
+		android:layout_height="wrap_content">
 
 		<android.support.design.widget.NavigationView
 			android:id="@+id/navigation"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
+			android:background="@color/window_background"
 			app:elevation="0dp"
 			app:headerLayout="@layout/navigation_header"
+			app:itemBackground="@drawable/navigation_item_background"
 			app:itemIconTint="?attr/colorControlNormal"
 			app:itemTextColor="?android:textColorPrimary"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toTopOf="parent"
 			app:menu="@menu/navigation_drawer"/>
 
 		<View
-			android:layout_width="match_parent"
+			android:id="@+id/divider1"
+			style="@style/Divider.Horizontal"
+			android:layout_width="0dp"
+			app:layout_constraintEnd_toEndOf="@+id/navigation"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toBottomOf="@+id/navigation"/>
+
+		<View
+			android:id="@+id/spacer"
+			android:layout_width="0dp"
 			android:layout_height="0dp"
-			android:layout_weight="1"/>
+			app:layout_constraintBottom_toTopOf="@+id/transports"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toBottomOf="@+id/divider1"
+			app:layout_constraintVertical_weight="1"/>
 
 		<include
+			android:id="@+id/transports"
 			layout="@layout/transports_list"
-			android:layout_width="match_parent"
+			android:layout_width="0dp"
 			android:layout_height="wrap_content"
-			android:layout_gravity="bottom"/>
+			app:layout_constraintBottom_toBottomOf="parent"
+			app:layout_constraintEnd_toEndOf="@+id/navigation"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toBottomOf="@+id/spacer"
+			tools:layout_height="75dp"/>
 
-	</LinearLayout>
+	</android.support.constraint.ConstraintLayout>
 
 </ScrollView>
diff --git a/briar-android/src/main/res/layout/preferences_category.xml b/briar-android/src/main/res/layout/preferences_category.xml
index ced92b8ae..c323d8dca 100644
--- a/briar-android/src/main/res/layout/preferences_category.xml
+++ b/briar-android/src/main/res/layout/preferences_category.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TextView
+	android:id="@android:id/title"
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:tools="http://schemas.android.com/tools"
-	android:id="@android:id/title"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
-	android:layout_marginTop="16dp"
-	android:layout_marginLeft="16dp"
-	android:layout_marginStart="16dp"
+	android:background="@color/preference_category_background"
+	android:padding="16dp"
+	android:textColor="@color/briar_accent"
 	android:textSize="14sp"
 	android:textStyle="bold"
-	android:textColor="@color/preference_category"
 	tools:text="This is a category"/>
\ No newline at end of file
diff --git a/briar-android/src/main/res/layout/text_input_view_large.xml b/briar-android/src/main/res/layout/text_input_view_large.xml
index 60155836c..4b01d23c7 100644
--- a/briar-android/src/main/res/layout/text_input_view_large.xml
+++ b/briar-android/src/main/res/layout/text_input_view_large.xml
@@ -18,6 +18,7 @@
 		android:layout_marginTop="@dimen/margin_medium"
 		android:elevation="@dimen/cardview_default_elevation"
 		android:minHeight="@dimen/text_input_height"
+		app:cardBackgroundColor="@color/card_background"
 		app:cardCornerRadius="0dp"
 		app:cardUseCompatPadding="false">
 
diff --git a/briar-android/src/main/res/layout/transports_list.xml b/briar-android/src/main/res/layout/transports_list.xml
index 70ff190c6..17fd52a59 100644
--- a/briar-android/src/main/res/layout/transports_list.xml
+++ b/briar-android/src/main/res/layout/transports_list.xml
@@ -15,7 +15,6 @@
 		android:layout_height="wrap_content"
 		android:listSelector="@android:color/transparent"
 		android:numColumns="3"
-		android:padding="@dimen/margin_medium"
 		tools:listitem="@layout/list_item_transport"/>
 
 </LinearLayout>
diff --git a/briar-android/src/main/res/values-night/color.xml b/briar-android/src/main/res/values-night/color.xml
index ef06c3838..2dba814d1 100644
--- a/briar-android/src/main/res/values-night/color.xml
+++ b/briar-android/src/main/res/values-night/color.xml
@@ -1,15 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-	<color name="briar_accent">@color/briar_blue_light2</color>
-	<color name="preference_category">@color/briar_blue_light2</color>
+	<color name="briar_primary">@color/briar_blue_dark</color>
+	<color name="briar_accent">@color/briar_green</color>
+
+	<color name="preference_category">@color/briar_accent</color>
+	<color name="preference_category_background">@color/divider</color>
 
 	<color name="color_primary">#ffffff</color>
 
-	<color name="window_background">#ff303030</color>
-	<color name="card_background">@color/cardview_dark_background</color>
-	<color name="divider">#666666</color>
+	<color name="window_background">@color/briar_blue_very_dark</color>
+	<color name="card_background">@color/briar_blue_dark</color>
+	<color name="item_background_highlight">@color/briar_blue</color>
+	<color name="divider">#000000</color>
 
+	<color name="briar_button_neutral">@color/briar_link</color>
 	<color name="briar_button_text_disabled">#23cccccc</color>
 
 	<color name="thread_item_background">@color/window_background</color>
diff --git a/briar-android/src/main/res/values/color.xml b/briar-android/src/main/res/values/color.xml
index 5087a5666..ef56fbe47 100644
--- a/briar-android/src/main/res/values/color.xml
+++ b/briar-android/src/main/res/values/color.xml
@@ -1,20 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 	<color name="briar_blue">#2D3E50</color>
-	<color name="briar_blue_dark">#0F1720</color>
+	<color name="briar_blue_dark">#222E3C</color>
+	<color name="briar_blue_very_dark">#0F1720</color>
 	<color name="briar_blue_light">#4F6C8C</color>
-	<color name="briar_blue_light2">#5a7da3</color>
+	<color name="briar_green">#5C940D</color>
 	<color name="briar_green_light">#95D220</color>
-	<color name="briar_link">#06B9FF</color>
+	<color name="briar_link">#2A93C6</color>
 
 	<color name="window_background">#fffafafa</color>
 	<color name="card_background">@color/cardview_light_background</color>
+	<color name="item_background_highlight">#DCDCDC</color>
 	<color name="action_bar_text">#FFFFFF</color>
 	<color name="private_message_date_inverse">#e0e0e0</color>
 	<color name="forum_avatar_shadow">#99000000</color>
 
 	<color name="briar_primary">@color/briar_blue</color>
-	<color name="briar_primary_dark">@color/briar_blue_dark</color>
+	<color name="briar_primary_dark">@color/briar_blue_very_dark</color>
 
 	<color name="briar_accent">@color/briar_blue</color>
 
@@ -27,8 +29,10 @@
 	<color name="briar_text_secondary_inverse">#b4ffffff</color>
 	<color name="briar_text_tertiary_inverse">#80ffffff</color>
 	<color name="preference_category">@color/briar_blue_light</color>
+	<color name="preference_category_background">@color/window_background</color>
 
 	<color name="briar_button_positive">@color/briar_link</color>
+	<color name="briar_button_neutral">@color/briar_blue_light</color>
 	<color name="briar_button_negative">#ff0000</color>
 	<color name="briar_button_text_disabled">#28000000</color>
 	<color name="briar_warning_background">#ff0000</color>
@@ -37,6 +41,4 @@
 	<color name="thread_item_background">#eceff1</color>
 	<color name="thread_item_highlight">#ffffff</color>
 	<color name="divider">#c1c1c1</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 f679d8081..b67979db0 100644
--- a/briar-android/src/main/res/values/styles.xml
+++ b/briar-android/src/main/res/values/styles.xml
@@ -45,6 +45,11 @@
 		<item name="android:textSize">@dimen/text_size_medium</item>
 	</style>
 
+	<style name="BriarButtonFlat.Neutral" parent="Widget.AppCompat.Button.Borderless">
+		<item name="android:textColor">@color/briar_button_neutral</item>
+		<item name="android:textSize">@dimen/text_size_medium</item>
+	</style>
+
 	<style name="BriarButtonFlat.Positive.Tiny" parent="BriarButtonFlat.Positive">
 		<item name="android:textSize">@dimen/text_size_tiny</item>
 		<item name="android:padding">@dimen/margin_medium</item>
@@ -83,6 +88,7 @@
 
 	<style name="BriarCard" parent="CardView">
 		<item name="cardUseCompatPadding">true</item>
+		<item name="cardBackgroundColor">@color/card_background</item>
 		<item name="android:layout_margin">@dimen/margin_small</item>
 	</style>
 
diff --git a/briar-android/src/main/res/values/themes.xml b/briar-android/src/main/res/values/themes.xml
index c4dc47a67..806783e3a 100644
--- a/briar-android/src/main/res/values/themes.xml
+++ b/briar-android/src/main/res/values/themes.xml
@@ -6,7 +6,9 @@
 		<item name="colorPrimaryDark">@color/briar_primary_dark</item>
 		<item name="colorAccent">@color/briar_accent</item>
 		<item name="android:textColorLink">@color/briar_text_link</item>
+		<item name="android:windowBackground">@color/window_background</item>
 		<item name="android:windowAnimationStyle">@style/ActivityAnimation</item>
+		<item name="alertDialogTheme">@style/BriarDialogTheme.Neutral</item>
 		<item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
 	</style>
 
@@ -28,8 +30,10 @@
 		<item name="colorPrimaryDark">@color/briar_primary_dark</item>
 		<item name="colorAccent">@color/briar_accent</item>
 		<item name="buttonBarPositiveButtonStyle">@style/BriarButtonFlat.Positive</item>
+		<item name="buttonBarNeutralButtonStyle">@style/BriarButtonFlat.Neutral</item>
 		<item name="buttonBarNegativeButtonStyle">@style/BriarButtonFlat.Negative</item>
 		<item name="android:textColorLink">@color/briar_text_link</item>
+		<item name="android:windowBackground">@color/window_background</item>
 		<item name="android:windowAnimationStyle">@style/DialogAnimation</item>
 		<item name="android:filterTouchesWhenObscured">true</item>
 	</style>
@@ -39,6 +43,13 @@
 		<item name="android:filterTouchesWhenObscured">false</item>
 	</style>
 
+	<!-- Uses neutral colors for the buttons -->
+	<style name="BriarDialogTheme.Neutral" parent="BriarDialogTheme">
+		<item name="buttonBarPositiveButtonStyle">@style/BriarButtonFlat.Neutral</item>
+		<item name="buttonBarNeutralButtonStyle">@style/BriarButtonFlat.Neutral</item>
+		<item name="buttonBarNegativeButtonStyle">@style/BriarButtonFlat.Neutral</item>
+	</style>
+
 	<style name="DialogAnimation" parent="@android:style/Animation.Dialog">
 		<item name="android:windowEnterAnimation">@anim/fade_in</item>
 		<item name="android:windowExitAnimation">@anim/fade_out</item>