From e986d4b214d6c74f4b147f898b16b4b9749a879e Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Tue, 18 Oct 2022 17:23:06 -0300
Subject: [PATCH] Replace empty state images with new illustrations

---
 briar-android/artwork/empty_state_blog.svg    | 91 -------------------
 .../artwork/empty_state_contact_list.svg      | 56 ------------
 .../artwork/empty_state_forum_list.svg        | 81 -----------------
 .../artwork/empty_state_group_list.svg        | 86 ------------------
 .../artwork/il_empty_state_blogs_dark.svg     | 17 ++++
 .../artwork/il_empty_state_blogs_light.svg    | 17 ++++
 .../il_empty_state_contact_list_dark.svg      |  7 ++
 .../il_empty_state_contact_list_light.svg     |  7 ++
 .../il_empty_state_forum_list_dark.svg        | 11 +++
 .../il_empty_state_forum_list_light.svg       | 11 +++
 .../il_empty_state_group_list_dark.svg        | 13 +++
 .../il_empty_state_group_list_light.svg       | 13 +++
 .../briar/android/blog/FeedFragment.java      |  2 +-
 .../android/contact/ContactListFragment.java  |  2 +-
 .../BaseContactSelectorFragment.java          |  2 +-
 .../privategroup/list/GroupListFragment.java  |  2 +-
 .../main/res/drawable/ic_empty_state_blog.xml | 21 -----
 .../drawable/ic_empty_state_contact_list.xml  |  9 --
 .../drawable/ic_empty_state_forum_list.xml    | 15 ---
 .../drawable/ic_empty_state_group_list.xml    | 18 ----
 .../res/drawable/il_empty_state_blogs.xml     | 37 ++++++++
 .../drawable/il_empty_state_contact_list.xml  | 26 ++++++
 .../drawable/il_empty_state_forum_list.xml    | 14 +++
 .../drawable/il_empty_state_group_list.xml    | 21 +++++
 .../main/res/layout/briar_recycler_view.xml   |  2 +-
 .../main/res/layout/fragment_forum_list.xml   |  2 +-
 .../src/main/res/values-night/color.xml       |  3 +
 briar-android/src/main/res/values/color.xml   |  3 +
 28 files changed, 206 insertions(+), 383 deletions(-)
 delete mode 100644 briar-android/artwork/empty_state_blog.svg
 delete mode 100644 briar-android/artwork/empty_state_contact_list.svg
 delete mode 100644 briar-android/artwork/empty_state_forum_list.svg
 delete mode 100644 briar-android/artwork/empty_state_group_list.svg
 create mode 100644 briar-android/artwork/il_empty_state_blogs_dark.svg
 create mode 100644 briar-android/artwork/il_empty_state_blogs_light.svg
 create mode 100644 briar-android/artwork/il_empty_state_contact_list_dark.svg
 create mode 100644 briar-android/artwork/il_empty_state_contact_list_light.svg
 create mode 100644 briar-android/artwork/il_empty_state_forum_list_dark.svg
 create mode 100644 briar-android/artwork/il_empty_state_forum_list_light.svg
 create mode 100644 briar-android/artwork/il_empty_state_group_list_dark.svg
 create mode 100644 briar-android/artwork/il_empty_state_group_list_light.svg
 delete mode 100644 briar-android/src/main/res/drawable/ic_empty_state_blog.xml
 delete mode 100644 briar-android/src/main/res/drawable/ic_empty_state_contact_list.xml
 delete mode 100644 briar-android/src/main/res/drawable/ic_empty_state_forum_list.xml
 delete mode 100644 briar-android/src/main/res/drawable/ic_empty_state_group_list.xml
 create mode 100644 briar-android/src/main/res/drawable/il_empty_state_blogs.xml
 create mode 100644 briar-android/src/main/res/drawable/il_empty_state_contact_list.xml
 create mode 100644 briar-android/src/main/res/drawable/il_empty_state_forum_list.xml
 create mode 100644 briar-android/src/main/res/drawable/il_empty_state_group_list.xml

diff --git a/briar-android/artwork/empty_state_blog.svg b/briar-android/artwork/empty_state_blog.svg
deleted file mode 100644
index eb1cd25c7..000000000
--- a/briar-android/artwork/empty_state_blog.svg
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<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"
-   width="162"
-   height="156"
-   viewBox="0 0 162 156"
-   fill="none"
-   version="1.1"
-   id="svg16"
-   sodipodi:docname="No-Posts.svg"
-   inkscape:version="0.92.3 (2405546, 2018-03-11)">
-  <metadata
-     id="metadata22">
-    <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="defs20" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="754"
-     inkscape:window-height="480"
-     id="namedview18"
-     showgrid="false"
-     inkscape:zoom="1.5128205"
-     inkscape:cx="81"
-     inkscape:cy="78"
-     inkscape:window-x="0"
-     inkscape:window-y="20"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg16" />
-  <rect
-     width="80.9997"
-     height="78"
-     fill="black"
-     fill-opacity="0"
-     transform="scale(2)"
-     id="rect2" />
-  <rect
-     width="80.9997"
-     height="78"
-     fill="black"
-     fill-opacity="0"
-     transform="scale(2)"
-     id="rect4" />
-  <path
-     d="M140.87 53.647H91.5654V64.2352H140.87V53.647Z"
-     fill="white"
-     fill-opacity="0.6"
-     id="path6" />
-  <path
-     d="M140.869 99.5292V88.9409H115.512L126.077 99.5292H140.869Z"
-     fill="white"
-     fill-opacity="0.6"
-     id="path8" />
-  <path
-     d="M140.869 71.2939H97.9038L108.469 81.8822H140.869V71.2939Z"
-     fill="white"
-     fill-opacity="0.6"
-     id="path10" />
-  <path
-     d="M147.912 14.8232H41.5557L84.5209 57.8821V28.9409H147.912V120.706H147.208L157.773 131.294C160.59 128.47 161.999 124.941 161.999 120.706V28.9409C161.999 21.1762 155.66 14.8232 147.912 14.8232Z"
-     fill="white"
-     fill-opacity="0.6"
-     id="path12" />
-  <path
-     d="M129.6 120.706L84.5217 75.5294L23.9478 14.8235L9.15652 0L0 9.17647L10.5652 19.7647C8.45217 21.8824 7.04348 25.4118 7.04348 28.9412V120.706C7.04348 128.471 13.3826 134.824 21.1304 134.824H125.374L146.504 156L155.661 146.824L143.687 134.824L129.6 120.706ZM84.5217 120.706V93.8824L111.287 120.706H84.5217Z"
-     fill="white"
-     fill-opacity="0.6"
-     id="path14" />
-</svg>
diff --git a/briar-android/artwork/empty_state_contact_list.svg b/briar-android/artwork/empty_state_contact_list.svg
deleted file mode 100644
index efc3f10ba..000000000
--- a/briar-android/artwork/empty_state_contact_list.svg
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<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"
-   width="164"
-   height="164"
-   viewBox="0 0 164 164"
-   fill="none"
-   version="1.1"
-   id="svg12"
-   sodipodi:docname="empty_state_contact_list.svg"
-   inkscape:version="0.92.3 (2405546, 2018-03-11)">
-  <metadata
-     id="metadata18">
-    <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="defs16" />
-  <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="namedview14"
-     showgrid="false"
-     inkscape:zoom="1.4390244"
-     inkscape:cx="81.305085"
-     inkscape:cy="109.79661"
-     inkscape:window-x="1440"
-     inkscape:window-y="24"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg12" />
-  <path
-     style="clip-rule:evenodd;display:inline;fill:#ffffff;fill-rule:evenodd"
-     d="M 27.333984 0 L 27.333984 13.666016 L 136.66797 13.666016 L 136.66797 0 L 27.333984 0 z M 27.333984 27.333984 C 19.817284 27.333984 13.666016 33.4834 13.666016 41 L 13.666016 123 C 13.666016 130.517 19.817284 136.66797 27.333984 136.66797 L 136.66797 136.66797 C 144.18397 136.66797 150.33203 130.517 150.33203 123 L 150.33203 41 C 150.33203 33.4834 144.18397 27.333984 136.66797 27.333984 L 27.333984 27.333984 z M 82.150391 44.757812 C 89.592295 44.757812 95.348492 46.476807 99.419922 49.914062 C 103.52467 53.351338 105.57617 58.23949 105.57617 64.580078 C 105.57617 67.349967 105.0272 69.869409 103.92578 72.138672 C 102.82458 74.407935 101.05521 76.728225 98.619141 79.097656 L 92.863281 84.453125 C 91.227921 86.021639 90.093094 87.640125 89.458984 89.308594 C 88.824874 90.943745 88.475053 93.030171 88.408203 95.566406 L 74.091797 95.566406 C 74.091797 90.694273 74.640917 86.855942 75.742188 84.052734 C 76.843435 81.216209 78.63001 78.762286 81.099609 76.693359 C 83.568995 74.624218 85.436853 72.739109 86.705078 71.037109 C 88.006403 69.30179 88.658203 67.400958 88.658203 65.332031 C 88.658203 60.292857 86.488795 57.771484 82.150391 57.771484 C 80.1481 57.771484 78.529614 58.506262 77.294922 59.974609 C 76.060186 61.442955 75.40854 63.42881 75.341797 65.931641 L 58.423828 65.931641 C 58.490468 59.25736 60.592402 54.067509 64.730469 50.363281 C 68.868538 46.625672 74.675257 44.757813 82.150391 44.757812 z M 81.398438 102.32422 C 84.068159 102.32422 86.287795 103.12473 88.056641 104.72656 C 89.858601 106.29508 90.759766 108.31381 90.759766 110.7832 C 90.759766 113.2528 89.858601 115.28879 88.056641 116.89062 C 86.287795 118.45914 84.068159 119.24219 81.398438 119.24219 C 78.728717 119.24219 76.493467 118.45914 74.691406 116.89062 C 72.922705 115.28879 72.039062 113.2528 72.039062 110.7832 C 72.039062 108.31381 72.922705 106.29508 74.691406 104.72656 C 76.493467 103.12473 78.728716 102.32422 81.398438 102.32422 z M 27.333984 150.33203 L 27.333984 164 L 136.66797 164 L 136.66797 150.33203 L 27.333984 150.33203 z "
-     id="path8" />
-</svg>
diff --git a/briar-android/artwork/empty_state_forum_list.svg b/briar-android/artwork/empty_state_forum_list.svg
deleted file mode 100644
index 101eca192..000000000
--- a/briar-android/artwork/empty_state_forum_list.svg
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<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"
-   width="148"
-   height="148"
-   viewBox="0 0 148 148"
-   fill="none"
-   version="1.1"
-   id="svg12"
-   sodipodi:docname="No-Forums.svg"
-   inkscape:version="0.92.3 (2405546, 2018-03-11)">
-  <metadata
-     id="metadata18">
-    <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="defs16" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="720"
-     id="namedview14"
-     showgrid="false"
-     inkscape:zoom="1.5945946"
-     inkscape:cx="74"
-     inkscape:cy="74"
-     inkscape:window-x="0"
-     inkscape:window-y="20"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg12" />
-  <rect
-     width="74"
-     height="74"
-     fill="black"
-     fill-opacity="0"
-     transform="scale(2)"
-     id="rect2" />
-  <rect
-     width="74"
-     height="74"
-     fill="black"
-     fill-opacity="0"
-     transform="scale(2)"
-     id="rect4" />
-  <path
-     d="M107.266 74.6791C111.34 74.6791 114.055 71.9635 114.055 67.8901V6.78901C114.055 2.7156 111.34 0 107.266 0H24.4404L99.1194 74.6791H107.266Z"
-     fill="white"
-     fill-opacity="0.6"
-     id="path6" />
-  <path
-     d="M141.211 27.156H127.633V88.2571H112.697L148 123.56V33.945C148 29.8716 144.606 27.156 141.211 27.156Z"
-     fill="white"
-     fill-opacity="0.6"
-     id="path8" />
-  <path
-     d="M8.8257 1.35742L0 10.1831L12.2202 22.4033V101.835L39.3762 74.6787H64.4955L78.0735 88.2567H39.3762V101.835C39.3762 105.908 42.0918 108.624 46.1652 108.624H98.4405L137.817 148L146.642 139.174L8.8257 1.35742Z"
-     fill="white"
-     fill-opacity="0.6"
-     id="path10" />
-</svg>
diff --git a/briar-android/artwork/empty_state_group_list.svg b/briar-android/artwork/empty_state_group_list.svg
deleted file mode 100644
index 58e0218d7..000000000
--- a/briar-android/artwork/empty_state_group_list.svg
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<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"
-   width="172"
-   height="140"
-   viewBox="0 0 172 140"
-   fill="none"
-   version="1.1"
-   id="svg14"
-   sodipodi:docname="No-Groups.svg"
-   inkscape:version="0.92.3 (2405546, 2018-03-11)">
-  <metadata
-     id="metadata20">
-    <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="defs18" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="754"
-     inkscape:window-height="480"
-     id="namedview16"
-     showgrid="false"
-     inkscape:zoom="1.6857143"
-     inkscape:cx="86"
-     inkscape:cy="70"
-     inkscape:window-x="0"
-     inkscape:window-y="20"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg14" />
-  <rect
-     width="85.9999"
-     height="70"
-     fill="black"
-     fill-opacity="0"
-     transform="scale(2)"
-     id="rect2" />
-  <rect
-     width="85.9999"
-     height="70"
-     fill="black"
-     fill-opacity="0"
-     transform="scale(2)"
-     id="rect4" />
-  <path
-     d="M125.091 103.444L71.9274 50.5556L38.3092 17.1111L21.1091 0L10.9455 10.1111L31.2728 30.3333C31.2728 31.8889 31.2728 32.6667 31.2728 34.2222C31.2728 47.4444 41.4365 57.5556 54.7274 57.5556C56.291 57.5556 57.0729 57.5556 58.6365 56.7778L78.182 76.2222C69.582 74.6667 60.982 73.1111 54.7274 73.1111C36.7455 73.1111 0 82.4444 0 100.333V119.778H109.455V107.333L142.291 140L152.455 129.889L142.291 119.778L125.091 103.444Z"
-     fill="white"
-     fill-opacity="0.6"
-     id="path6" />
-  <path
-     d="M117.273 57.5549C130.227 57.5549 140.728 47.1082 140.728 34.2215C140.728 21.3349 130.227 10.8882 117.273 10.8882C104.319 10.8882 93.8184 21.3349 93.8184 34.2215C93.8184 47.1082 104.319 57.5549 117.273 57.5549Z"
-     fill="white"
-     fill-opacity="0.6"
-     id="path8" />
-  <path
-     d="M78.1819 34.2215C78.1819 20.9993 68.0182 10.8882 54.7273 10.8882C53.9455 10.8882 53.1637 10.8882 52.3818 10.8882L78.1819 36.5548C78.1819 35.7771 78.1819 34.9993 78.1819 34.2215Z"
-     fill="white"
-     fill-opacity="0.6"
-     id="path10" />
-  <path
-     d="M117.272 73.1104C116.49 73.1104 115.709 73.1104 114.927 73.1104L161.836 119.777H172V100.333C172 82.4437 135.254 73.1104 117.272 73.1104Z"
-     fill="white"
-     fill-opacity="0.6"
-     id="path12" />
-</svg>
diff --git a/briar-android/artwork/il_empty_state_blogs_dark.svg b/briar-android/artwork/il_empty_state_blogs_dark.svg
new file mode 100644
index 000000000..9813dc9f7
--- /dev/null
+++ b/briar-android/artwork/il_empty_state_blogs_dark.svg
@@ -0,0 +1,17 @@
+<svg width="81" height="81" viewBox="0 0 81 81" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_142_9184)">
+<path d="M14.4937 62.0026C13.3891 62.0026 12.4937 61.1071 12.4937 60.0026L12.4937 30.003C12.4936 28.8984 13.3891 28.003 14.4937 28.003L34.4936 28.003C35.5982 28.003 36.4936 28.8984 36.4936 30.003L36.4936 60.0029C36.4936 61.1075 35.5982 62.0029 34.4936 62.0029L14.4937 62.0026Z" fill="#334155"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M34.4936 29.503L14.4937 29.503C14.2175 29.503 13.9937 29.7268 13.9937 30.003L13.9937 60.0026C13.9937 60.2787 14.2176 60.5026 14.4937 60.5026L34.4936 60.5029C34.7698 60.5029 34.9936 60.2791 34.9936 60.0029L34.9936 30.003C34.9936 29.7268 34.7698 29.503 34.4936 29.503ZM12.4937 60.0026C12.4937 61.1071 13.3891 62.0026 14.4937 62.0026L34.4936 62.0029C35.5982 62.0029 36.4936 61.1075 36.4936 60.0029L36.4936 30.003C36.4936 28.8984 35.5982 28.003 34.4936 28.003L14.4937 28.003C13.3891 28.003 12.4936 28.8984 12.4937 30.003L12.4937 60.0026Z" fill="#64748B"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M45.1289 40.6699C45.1289 40.2557 45.4647 39.9199 45.8789 39.9199L67.8786 39.9199C68.2928 39.9199 68.6286 40.2557 68.6286 40.6699C68.6286 41.0841 68.2928 41.4199 67.8786 41.4199L45.8789 41.4199C45.4647 41.4199 45.1289 41.0841 45.1289 40.6699Z" fill="#64748B"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M45.1289 32.0039C45.1289 31.5897 45.4647 31.2539 45.8789 31.2539L67.8786 31.2539C68.2928 31.2539 68.6286 31.5897 68.6286 32.0039C68.6286 32.4181 68.2928 32.7539 67.8786 32.7539L45.8789 32.7539C45.4647 32.7539 45.1289 32.4181 45.1289 32.0039Z" fill="#64748B"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M45.1289 49.3369C45.1289 48.9227 45.4647 48.5869 45.8789 48.5869L67.8789 48.5869C68.2931 48.5869 68.6289 48.9227 68.6289 49.3369C68.6289 49.7511 68.2931 50.0869 67.8789 50.0869L45.8789 50.0869C45.4647 50.0869 45.1289 49.7511 45.1289 49.3369Z" fill="#64748B"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M45.1289 58.0029C45.1289 57.5887 45.4647 57.2529 45.8789 57.2529L56.879 57.2529C57.2932 57.2529 57.629 57.5887 57.629 58.0029C57.629 58.4171 57.2932 58.7529 56.879 58.7529L45.8789 58.7529C45.4647 58.7529 45.1289 58.4171 45.1289 58.0029Z" fill="#64748B"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M79.4013 24.9019C79.3854 20.4972 75.8098 16.9314 71.4014 16.9314L9.40142 16.9314C4.98314 16.9314 1.40142 20.5131 1.40142 24.9314L1.40137 16.874C1.40137 12.4557 4.98309 8.87403 9.40137 8.87403L71.4013 8.87402C75.8196 8.87402 79.4013 12.4557 79.4013 16.874V24.9019Z" fill="#334155"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M0.651422 16.874C0.651429 12.0415 4.56894 8.12403 9.40142 8.12403L71.4014 8.12402C76.2339 8.12402 80.1514 12.0415 80.1514 16.874V64.874C80.1514 69.7065 76.2338 73.6241 71.4013 73.624L9.40129 73.6235C4.56882 73.6234 0.651361 69.7059 0.651367 64.8735L0.651378 56.8491L0.651367 56.8435L0.651422 16.874ZM9.40142 9.62403L71.4014 9.62402C75.4054 9.62402 78.6514 12.87 78.6514 16.874V19.954C77.0782 17.6312 74.4181 16.1046 71.4014 16.1046L9.40142 16.1046C6.38472 16.1046 3.72458 17.6312 2.15142 19.954L2.15142 16.874C2.15143 12.87 5.39736 9.62403 9.40142 9.62403ZM2.15137 64.8735C2.15136 68.8775 5.39726 72.1234 9.4013 72.1235L71.4013 72.124C75.4054 72.1241 78.6514 68.8781 78.6514 64.874L78.6514 24.9046L78.6514 24.9026C78.6358 20.9118 75.3959 17.6814 71.4014 17.6814L9.40147 17.6814C5.39741 17.6814 2.15148 20.9273 2.15147 24.9314L2.15137 64.8735Z" fill="#64748B"/>
+</g>
+<defs>
+<clipPath id="clip0_142_9184">
+<rect width="80" height="80" fill="white" transform="translate(0.401367 0.78125)"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/briar-android/artwork/il_empty_state_blogs_light.svg b/briar-android/artwork/il_empty_state_blogs_light.svg
new file mode 100644
index 000000000..882a66a33
--- /dev/null
+++ b/briar-android/artwork/il_empty_state_blogs_light.svg
@@ -0,0 +1,17 @@
+<svg width="81" height="81" viewBox="0 0 81 81" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_142_9186)">
+<path d="M14.9605 62.0026C13.8559 62.0026 12.9605 61.1071 12.9605 60.0026L12.9604 30.003C12.9604 28.8984 13.8559 28.003 14.9604 28.003L34.9604 28.003C36.065 28.003 36.9604 28.8984 36.9604 30.003L36.9604 60.0029C36.9604 61.1075 36.065 62.0029 34.9604 62.0029L14.9605 62.0026Z" fill="#E5E7EB"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M34.9604 29.503L14.9604 29.503C14.6843 29.503 14.4604 29.7268 14.4604 30.003L14.4605 60.0026C14.4605 60.2787 14.6844 60.5026 14.9605 60.5026L34.9604 60.5029C35.2366 60.5029 35.4604 60.2791 35.4604 60.0029L35.4604 30.003C35.4604 29.7268 35.2366 29.503 34.9604 29.503ZM12.9605 60.0026C12.9605 61.1071 13.8559 62.0026 14.9605 62.0026L34.9604 62.0029C36.065 62.0029 36.9604 61.1075 36.9604 60.0029L36.9604 30.003C36.9604 28.8984 36.065 28.003 34.9604 28.003L14.9604 28.003C13.8559 28.003 12.9604 28.8984 12.9604 30.003L12.9605 60.0026Z" fill="#9CA3AF"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M45.5957 40.6699C45.5957 40.2557 45.9315 39.9199 46.3457 39.9199L68.3454 39.9199C68.7596 39.9199 69.0954 40.2557 69.0954 40.6699C69.0954 41.0841 68.7596 41.4199 68.3454 41.4199L46.3457 41.4199C45.9315 41.4199 45.5957 41.0841 45.5957 40.6699Z" fill="#9CA3AF"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M45.5957 32.0039C45.5957 31.5897 45.9315 31.2539 46.3457 31.2539L68.3454 31.2539C68.7596 31.2539 69.0954 31.5897 69.0954 32.0039C69.0954 32.4181 68.7596 32.7539 68.3454 32.7539L46.3457 32.7539C45.9315 32.7539 45.5957 32.4181 45.5957 32.0039Z" fill="#9CA3AF"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M45.5957 49.3369C45.5957 48.9227 45.9315 48.5869 46.3457 48.5869L68.3457 48.5869C68.7599 48.5869 69.0957 48.9227 69.0957 49.3369C69.0957 49.7511 68.7599 50.0869 68.3457 50.0869L46.3457 50.0869C45.9315 50.0869 45.5957 49.7511 45.5957 49.3369Z" fill="#9CA3AF"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M45.5957 58.0029C45.5957 57.5887 45.9315 57.2529 46.3457 57.2529L57.3458 57.2529C57.76 57.2529 58.0958 57.5887 58.0958 58.0029C58.0958 58.4171 57.76 58.7529 57.3458 58.7529L46.3457 58.7529C45.9315 58.7529 45.5957 58.4171 45.5957 58.0029Z" fill="#9CA3AF"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M79.8681 24.9019C79.8522 20.4972 76.2766 16.9314 71.8682 16.9314L9.86821 16.9314C5.44994 16.9314 1.86822 20.5131 1.86822 24.9314L1.86816 16.874C1.86817 12.4557 5.44989 8.87403 9.86816 8.87403L71.8681 8.87402C76.2864 8.87402 79.8681 12.4557 79.8681 16.874V24.9019Z" fill="#E5E7EB"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M1.11822 16.874C1.11823 12.0415 5.03573 8.12403 9.86822 8.12403L71.8682 8.12402C76.7007 8.12402 80.6182 12.0415 80.6182 16.874V64.874C80.6182 69.7065 76.7006 73.6241 71.8681 73.624L9.86809 73.6235C5.03562 73.6234 1.11816 69.7059 1.11816 64.8735L1.11818 56.8491L1.11816 56.8435L1.11822 16.874ZM9.86822 9.62403L71.8682 9.62402C75.8722 9.62402 79.1182 12.87 79.1182 16.874V19.954C77.545 17.6312 74.8849 16.1046 71.8682 16.1046L9.86822 16.1046C6.85152 16.1046 4.19138 17.6312 2.61822 19.954L2.61822 16.874C2.61822 12.87 5.86416 9.62403 9.86822 9.62403ZM2.61816 64.8735C2.61816 68.8775 5.86406 72.1234 9.8681 72.1235L71.8681 72.124C75.8722 72.1241 79.1182 68.8781 79.1182 64.874L79.1182 24.9046L79.1182 24.9026C79.1026 20.9118 75.8627 17.6814 71.8682 17.6814L9.86827 17.6814C5.86421 17.6814 2.61828 20.9273 2.61827 24.9314L2.61816 64.8735Z" fill="#9CA3AF"/>
+</g>
+<defs>
+<clipPath id="clip0_142_9186">
+<rect width="80" height="80" fill="white" transform="translate(0.868164 0.78125)"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/briar-android/artwork/il_empty_state_contact_list_dark.svg b/briar-android/artwork/il_empty_state_contact_list_dark.svg
new file mode 100644
index 000000000..a0c70d4e0
--- /dev/null
+++ b/briar-android/artwork/il_empty_state_contact_list_dark.svg
@@ -0,0 +1,7 @@
+<svg width="81" height="80" viewBox="0 0 81 80" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M55.8771 3.19912L71.2942 5.82176C76.4078 6.69164 79.8553 11.4996 79.0387 16.6225L70.73 68.746C69.7481 74.9062 63.0013 78.3146 57.4761 75.4418L58.1751 74.1118C62.7908 76.5117 68.4271 73.6643 69.2474 68.5181L77.5561 16.3946C78.2438 12.0806 75.3406 8.03176 71.0344 7.29922L57.3985 4.9796L58.1751 74.1118L56.6739 74.1365L55.8771 3.19912Z" fill="#64748B"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M10.6021 74.9992L10.6021 4H58.6021C63.0203 4 66.6021 7.58172 66.6021 12V67C66.6021 71.4183 63.0202 75.0001 58.6019 75L10.6021 74.9992ZM22.8896 49.1657V53.0394C22.8896 57.4577 26.4714 61.0394 30.8896 61.0394H46.8472C51.2655 61.0394 54.8472 57.4577 54.8472 53.0394V49.1657C54.8472 44.7474 51.2655 41.1657 46.8472 41.1657H30.8896C26.4714 41.1657 22.8896 44.7474 22.8896 49.1657ZM38.8685 34.8533C43.5566 34.8533 47.3572 31.0717 47.3572 26.4069C47.3572 21.7421 43.5566 17.9606 38.8685 17.9606C34.1803 17.9606 30.3797 21.7421 30.3797 26.4069C30.3797 31.0717 34.1803 34.8533 38.8685 34.8533Z" fill="#334155"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M22.8896 49.1657V53.0394C22.8896 57.4577 26.4714 61.0394 30.8896 61.0394H46.8472C51.2655 61.0394 54.8472 57.4577 54.8472 53.0394V49.1657C54.8472 44.7474 51.2655 41.1657 46.8472 41.1657H30.8896C26.4714 41.1657 22.8896 44.7474 22.8896 49.1657ZM24.3896 53.0394V49.1657C24.3896 45.5758 27.2998 42.6657 30.8896 42.6657H46.8472C50.437 42.6657 53.3472 45.5758 53.3472 49.1657V53.0394C53.3472 56.6293 50.437 59.5394 46.8472 59.5394H30.8896C27.2998 59.5394 24.3896 56.6293 24.3896 53.0394Z" fill="#64748B"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M38.8685 34.8532C43.5566 34.8532 47.3572 31.0717 47.3572 26.4069C47.3572 21.7421 43.5566 17.9606 38.8685 17.9606C34.1803 17.9606 30.3797 21.7421 30.3797 26.4069C30.3797 31.0717 34.1803 34.8532 38.8685 34.8532ZM45.8572 26.4069C45.8572 30.2362 42.7353 33.3533 38.8685 33.3533C35.0016 33.3533 31.8797 30.2362 31.8797 26.4069C31.8797 22.5776 35.0016 19.4606 38.8685 19.4606C42.7353 19.4606 45.8572 22.5776 45.8572 26.4069Z" fill="#64748B"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M58.6021 2.5H9.10205L9.10205 17.7334H3.85059C3.43637 17.7334 3.10059 18.0692 3.10059 18.4834C3.10059 18.8976 3.43637 19.2334 3.85059 19.2334H9.10205L9.10205 38.8779H3.85059C3.43637 38.8779 3.10059 39.2137 3.10059 39.6279C3.10059 40.0421 3.43637 40.3779 3.85059 40.3779H9.10205L9.10205 60.752H3.85059C3.43637 60.752 3.10059 61.0877 3.10059 61.502C3.10059 61.9162 3.43637 62.252 3.85059 62.252H9.10205L9.10205 76.4992L58.6019 76.5C63.8487 76.5001 68.1021 72.2468 68.1021 67V12C68.1021 6.75329 63.8488 2.5 58.6021 2.5ZM10.6021 62.252L10.6021 74.9992L58.6019 75C63.0202 75.0001 66.6021 71.4183 66.6021 67V12C66.6021 7.58172 63.0203 4 58.6021 4H10.6021L10.6021 17.7334H15.6148C16.029 17.7334 16.3648 18.0692 16.3648 18.4834C16.3648 18.8976 16.029 19.2334 15.6148 19.2334H10.6021L10.6021 38.8779H15.6148C16.029 38.8779 16.3648 39.2137 16.3648 39.6279C16.3648 40.0421 16.029 40.3779 15.6148 40.3779H10.6021L10.6021 60.752H15.6148C16.029 60.752 16.3648 61.0877 16.3648 61.502C16.3648 61.9162 16.029 62.252 15.6148 62.252H10.6021Z" fill="#64748B"/>
+</svg>
diff --git a/briar-android/artwork/il_empty_state_contact_list_light.svg b/briar-android/artwork/il_empty_state_contact_list_light.svg
new file mode 100644
index 000000000..cac7f4550
--- /dev/null
+++ b/briar-android/artwork/il_empty_state_contact_list_light.svg
@@ -0,0 +1,7 @@
+<svg width="81" height="80" viewBox="0 0 81 80" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M54.8771 3.19912L70.2942 5.82176C75.4078 6.69164 78.8553 11.4996 78.0387 16.6225L69.73 68.746C68.7481 74.9062 62.0013 78.3146 56.4761 75.4418L57.1751 74.1118C61.7908 76.5117 67.4271 73.6643 68.2474 68.5181L76.5561 16.3946C77.2438 12.0806 74.3406 8.03176 70.0344 7.29922L56.3985 4.9796L57.1751 74.1118L55.6739 74.1365L54.8771 3.19912Z" fill="#9CA3AF"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M9.60205 74.9992L9.60205 4H57.6021C62.0203 4 65.6021 7.58172 65.6021 12V67C65.6021 71.4183 62.0202 75.0001 57.6019 75L9.60205 74.9992ZM21.8896 49.1657V53.0394C21.8896 57.4577 25.4714 61.0394 29.8896 61.0394H45.8472C50.2655 61.0394 53.8472 57.4577 53.8472 53.0394V49.1657C53.8472 44.7474 50.2655 41.1657 45.8472 41.1657H29.8896C25.4714 41.1657 21.8896 44.7474 21.8896 49.1657ZM37.8685 34.8533C42.5566 34.8533 46.3572 31.0717 46.3572 26.4069C46.3572 21.7421 42.5566 17.9606 37.8685 17.9606C33.1803 17.9606 29.3797 21.7421 29.3797 26.4069C29.3797 31.0717 33.1803 34.8533 37.8685 34.8533Z" fill="#E5E7EB"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M21.8896 49.1657V53.0394C21.8896 57.4577 25.4714 61.0394 29.8896 61.0394H45.8472C50.2655 61.0394 53.8472 57.4577 53.8472 53.0394V49.1657C53.8472 44.7474 50.2655 41.1657 45.8472 41.1657H29.8896C25.4714 41.1657 21.8896 44.7474 21.8896 49.1657ZM23.3896 53.0394V49.1657C23.3896 45.5758 26.2998 42.6657 29.8896 42.6657H45.8472C49.437 42.6657 52.3472 45.5758 52.3472 49.1657V53.0394C52.3472 56.6293 49.437 59.5394 45.8472 59.5394H29.8896C26.2998 59.5394 23.3896 56.6293 23.3896 53.0394Z" fill="#9CA3AF"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M37.8685 34.8532C42.5566 34.8532 46.3572 31.0717 46.3572 26.4069C46.3572 21.7421 42.5566 17.9606 37.8685 17.9606C33.1803 17.9606 29.3797 21.7421 29.3797 26.4069C29.3797 31.0717 33.1803 34.8532 37.8685 34.8532ZM44.8572 26.4069C44.8572 30.2362 41.7353 33.3533 37.8685 33.3533C34.0016 33.3533 30.8797 30.2362 30.8797 26.4069C30.8797 22.5776 34.0016 19.4606 37.8685 19.4606C41.7353 19.4606 44.8572 22.5776 44.8572 26.4069Z" fill="#9CA3AF"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M57.6021 2.5H8.10205L8.10205 17.7334H2.85059C2.43637 17.7334 2.10059 18.0692 2.10059 18.4834C2.10059 18.8976 2.43637 19.2334 2.85059 19.2334H8.10205L8.10205 38.8779H2.85059C2.43637 38.8779 2.10059 39.2137 2.10059 39.6279C2.10059 40.0421 2.43637 40.3779 2.85059 40.3779H8.10205L8.10205 60.752H2.85059C2.43637 60.752 2.10059 61.0877 2.10059 61.502C2.10059 61.9162 2.43637 62.252 2.85059 62.252H8.10205L8.10205 76.4992L57.6019 76.5C62.8487 76.5001 67.1021 72.2468 67.1021 67V12C67.1021 6.75329 62.8488 2.5 57.6021 2.5ZM9.60205 62.252L9.60205 74.9992L57.6019 75C62.0202 75.0001 65.6021 71.4183 65.6021 67V12C65.6021 7.58172 62.0203 4 57.6021 4H9.60205L9.60205 17.7334H14.6148C15.029 17.7334 15.3648 18.0692 15.3648 18.4834C15.3648 18.8976 15.029 19.2334 14.6148 19.2334H9.60205L9.60205 38.8779H14.6148C15.029 38.8779 15.3648 39.2137 15.3648 39.6279C15.3648 40.0421 15.029 40.3779 14.6148 40.3779H9.60205L9.60205 60.752H14.6148C15.029 60.752 15.3648 61.0877 15.3648 61.502C15.3648 61.9162 15.029 62.252 14.6148 62.252H9.60205Z" fill="#9CA3AF"/>
+</svg>
diff --git a/briar-android/artwork/il_empty_state_forum_list_dark.svg b/briar-android/artwork/il_empty_state_forum_list_dark.svg
new file mode 100644
index 000000000..0e821f497
--- /dev/null
+++ b/briar-android/artwork/il_empty_state_forum_list_dark.svg
@@ -0,0 +1,11 @@
+<svg width="81" height="81" viewBox="0 0 81 81" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_142_9249)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M20.3936 48.6422V58.2131C20.3936 62.6314 23.9753 66.2131 28.3936 66.2131H63.0813L79.4015 75.3286V30.9092C79.4015 26.4909 75.8198 22.9092 71.4015 22.9092H60.4067V40.6422C60.4067 45.0605 56.825 48.6422 52.4067 48.6422H20.3936Z" fill="#334155"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M9.40137 4.5791C4.56888 4.5791 0.651367 8.4966 0.651367 13.3291V59.0201L17.9148 49.3778H19.6436V58.2131C19.6436 63.0456 23.5611 66.9631 28.3936 66.9631H62.8861L80.1515 76.6065V30.9092C80.1515 26.0767 76.234 22.1592 71.4015 22.1592H61.1522V13.3291C61.1522 8.49661 57.2347 4.5791 52.4022 4.5791H9.40137ZM2.15137 13.3291C2.15137 9.32503 5.3973 6.0791 9.40137 6.0791H52.4022C56.4062 6.0791 59.6522 9.32504 59.6522 13.3291V40.6278C59.6522 44.6319 56.4062 47.8778 52.4022 47.8778H17.5243L2.15137 56.4642V13.3291ZM61.1567 40.6422V23.6592H71.4015C75.4055 23.6592 78.6515 26.9051 78.6515 30.9092V74.0506L63.2766 65.4631H28.3936C24.3895 65.4631 21.1436 62.2172 21.1436 58.2131V49.3922H52.4067C57.2392 49.3922 61.1567 45.4747 61.1567 40.6422Z" fill="#64748B"/>
+</g>
+<defs>
+<clipPath id="clip0_142_9249">
+<rect width="80" height="80" fill="white" transform="translate(0.401367 0.0859375)"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/briar-android/artwork/il_empty_state_forum_list_light.svg b/briar-android/artwork/il_empty_state_forum_list_light.svg
new file mode 100644
index 000000000..3747cdd1c
--- /dev/null
+++ b/briar-android/artwork/il_empty_state_forum_list_light.svg
@@ -0,0 +1,11 @@
+<svg width="81" height="81" viewBox="0 0 81 81" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_142_9251)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M20.3936 48.6422V58.2131C20.3936 62.6314 23.9753 66.2131 28.3936 66.2131H63.0813L79.4015 75.3286V30.9092C79.4015 26.4909 75.8198 22.9092 71.4015 22.9092H60.4067V40.6422C60.4067 45.0605 56.825 48.6422 52.4067 48.6422H20.3936Z" fill="#E5E7EB"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M9.40137 4.5791C4.56888 4.5791 0.651367 8.4966 0.651367 13.3291V59.0201L17.9148 49.3778H19.6436V58.2131C19.6436 63.0456 23.5611 66.9631 28.3936 66.9631H62.8861L80.1515 76.6065V30.9092C80.1515 26.0767 76.234 22.1592 71.4015 22.1592H61.1522V13.3291C61.1522 8.49661 57.2347 4.5791 52.4022 4.5791H9.40137ZM2.15137 13.3291C2.15137 9.32503 5.3973 6.0791 9.40137 6.0791H52.4022C56.4062 6.0791 59.6522 9.32504 59.6522 13.3291V40.6278C59.6522 44.6319 56.4062 47.8778 52.4022 47.8778H17.5243L2.15137 56.4642V13.3291ZM61.1567 40.6422V23.6592H71.4015C75.4055 23.6592 78.6515 26.9051 78.6515 30.9092V74.0506L63.2766 65.4631H28.3936C24.3895 65.4631 21.1436 62.2172 21.1436 58.2131V49.3922H52.4067C57.2392 49.3922 61.1567 45.4747 61.1567 40.6422Z" fill="#9CA3AF"/>
+</g>
+<defs>
+<clipPath id="clip0_142_9251">
+<rect width="80" height="80" fill="white" transform="translate(0.868164 0.0859375)"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/briar-android/artwork/il_empty_state_group_list_dark.svg b/briar-android/artwork/il_empty_state_group_list_dark.svg
new file mode 100644
index 000000000..3d0f91c7b
--- /dev/null
+++ b/briar-android/artwork/il_empty_state_group_list_dark.svg
@@ -0,0 +1,13 @@
+<svg width="81" height="81" viewBox="0 0 81 81" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_142_9298)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M48.6662 16.6539C48.6662 21.2186 44.9657 24.9191 40.401 24.9191C35.8362 24.9191 32.1357 21.2186 32.1357 16.6539C32.1357 12.0891 35.8362 8.38867 40.401 8.38867C44.9657 8.38867 48.6662 12.0891 48.6662 16.6539ZM47.1662 16.6539C47.1662 20.3902 44.1373 23.4191 40.401 23.4191C36.6646 23.4191 33.6357 20.3902 33.6357 16.6539C33.6357 12.9176 36.6646 9.88867 40.401 9.88867C44.1373 9.88867 47.1662 12.9176 47.1662 16.6539Z" fill="#64748B"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M25.2785 25.9195C25.2785 30.4843 21.578 34.1847 17.0133 34.1847C12.4485 34.1847 8.74805 30.4843 8.74805 25.9195C8.74805 21.3548 12.4485 17.6543 17.0133 17.6543C21.578 17.6543 25.2785 21.3548 25.2785 25.9195ZM23.7785 25.9195C23.7785 29.6558 20.7496 32.6847 17.0133 32.6847C13.2769 32.6847 10.248 29.6558 10.248 25.9195C10.248 22.1832 13.2769 19.1543 17.0133 19.1543C20.7496 19.1543 23.7785 22.1832 23.7785 25.9195Z" fill="#64748B"/>
+<path d="M2.15137 49.1689C2.15137 45.1649 5.3973 41.9189 9.40137 41.9189H24.0391V61.1648C24.0391 61.579 24.3748 61.9148 24.7891 61.9148C25.2033 61.9148 25.5391 61.579 25.5391 61.1648V41.976C29.1119 42.4252 31.8755 45.4743 31.8755 49.1689V72.3931C31.8755 72.8073 32.2113 73.1431 32.6255 73.1431C33.0397 73.1431 33.3755 72.8073 33.3755 72.3931V49.1689C33.3755 44.645 29.9422 40.9229 25.5391 40.4661V39.7774C25.5391 35.7733 28.785 32.5273 32.7891 32.5273H48.0132C52.0173 32.5273 55.2632 35.7733 55.2632 39.7773V40.4661C50.8603 40.9231 47.4272 44.6451 47.4272 49.169V70.5564C47.4272 70.9706 47.763 71.3064 48.1772 71.3064C48.5915 71.3064 48.9272 70.9706 48.9272 70.5564V49.169C48.9272 45.4745 51.6906 42.4254 55.2632 41.976V61.1648C55.2632 61.579 55.599 61.9148 56.0132 61.9148C56.4274 61.9148 56.7632 61.579 56.7632 61.1648V41.9189H71.4014C75.4054 41.9189 78.6514 45.1649 78.6514 49.1689V70.5564C78.6514 70.9706 78.9872 71.3064 79.4014 71.3064C79.8156 71.3064 80.1514 70.9706 80.1514 70.5564V49.1689C80.1514 44.3365 76.2339 40.4189 71.4014 40.4189H56.7632V39.7773C56.7632 34.9449 52.8457 31.0273 48.0132 31.0273H32.7891C27.9566 31.0273 24.0391 34.9449 24.0391 39.7774V40.4189H9.40137C4.56888 40.4189 0.651367 44.3365 0.651367 49.1689V72.3931C0.651367 72.8073 0.987154 73.1431 1.40137 73.1431C1.81558 73.1431 2.15137 72.8073 2.15137 72.3931V49.1689Z" fill="#64748B"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M72.0543 25.9195C72.0543 30.4843 68.3539 34.1847 63.7891 34.1847C59.2244 34.1847 55.5239 30.4843 55.5239 25.9195C55.5239 21.3548 59.2244 17.6543 63.7891 17.6543C68.3539 17.6543 72.0543 21.3548 72.0543 25.9195ZM70.5543 25.9195C70.5543 29.6558 67.5255 32.6847 63.7891 32.6847C60.0528 32.6847 57.0239 29.6558 57.0239 25.9195C57.0239 22.1832 60.0528 19.1543 63.7891 19.1543C67.5255 19.1543 70.5543 22.1832 70.5543 25.9195Z" fill="#64748B"/>
+</g>
+<defs>
+<clipPath id="clip0_142_9298">
+<rect width="80" height="80" fill="white" transform="translate(0.401367 0.390625)"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/briar-android/artwork/il_empty_state_group_list_light.svg b/briar-android/artwork/il_empty_state_group_list_light.svg
new file mode 100644
index 000000000..ac8c311e8
--- /dev/null
+++ b/briar-android/artwork/il_empty_state_group_list_light.svg
@@ -0,0 +1,13 @@
+<svg width="81" height="81" viewBox="0 0 81 81" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_142_9300)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M49.1334 16.6539C49.1334 21.2186 45.4329 24.919 40.8682 24.919C36.3035 24.919 32.603 21.2186 32.603 16.6539C32.603 12.0891 36.3035 8.38867 40.8682 8.38867C45.4329 8.38867 49.1334 12.0891 49.1334 16.6539ZM47.6334 16.6539C47.6334 20.3902 44.6045 23.419 40.8682 23.419C37.1319 23.419 34.103 20.3902 34.103 16.6539C34.103 12.9175 37.1319 9.88867 40.8682 9.88867C44.6045 9.88867 47.6334 12.9175 47.6334 16.6539Z" fill="#9CA3AF"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M25.7452 25.9195C25.7452 30.4842 22.0448 34.1847 17.48 34.1847C12.9153 34.1847 9.21484 30.4842 9.21484 25.9195C9.21484 21.3547 12.9153 17.6543 17.48 17.6543C22.0448 17.6543 25.7452 21.3547 25.7452 25.9195ZM24.2452 25.9195C24.2452 29.6558 21.2163 32.6847 17.48 32.6847C13.7437 32.6847 10.7148 29.6558 10.7148 25.9195C10.7148 22.1832 13.7437 19.1543 17.48 19.1543C21.2163 19.1543 24.2452 22.1832 24.2452 25.9195Z" fill="#9CA3AF"/>
+<path d="M2.61816 49.168C2.61816 45.1639 5.8641 41.918 9.86816 41.918H24.5063V61.1647C24.5063 61.5789 24.8421 61.9147 25.2563 61.9147C25.6706 61.9147 26.0063 61.5789 26.0063 61.1647V41.975C29.5789 42.4245 32.3422 45.4735 32.3422 49.168V72.392C32.3422 72.8062 32.678 73.142 33.0922 73.142C33.5064 73.142 33.8422 72.8062 33.8422 72.392V49.168C33.8422 44.6442 30.4092 40.9222 26.0063 40.4651V39.7773C26.0063 35.7733 29.2523 32.5273 33.2563 32.5273H48.4804C52.4845 32.5273 55.7304 35.7733 55.7304 39.7773V40.4651C51.3273 40.9219 47.894 44.644 47.894 49.168V70.5553C47.894 70.9695 48.2298 71.3053 48.644 71.3053C49.0583 71.3053 49.394 70.9695 49.394 70.5553V49.168C49.394 45.4734 52.1576 42.4242 55.7304 41.975V61.1647C55.7304 61.5789 56.0662 61.9147 56.4804 61.9147C56.8946 61.9147 57.2304 61.5789 57.2304 61.1647V41.918H71.8681C75.8721 41.918 79.1181 45.1639 79.1181 49.168V70.5553C79.1181 70.9695 79.4539 71.3053 79.8681 71.3053C80.2823 71.3053 80.6181 70.9695 80.6181 70.5553V49.168C80.6181 44.3355 76.7006 40.418 71.8681 40.418H57.2304V39.7773C57.2304 34.9449 53.3129 31.0273 48.4804 31.0273H33.2563C28.4239 31.0273 24.5063 34.9449 24.5063 39.7773V40.418H9.86816C5.03567 40.418 1.11816 44.3355 1.11816 49.168V72.392C1.11816 72.8062 1.45395 73.142 1.86816 73.142C2.28238 73.142 2.61816 72.8062 2.61816 72.392V49.168Z" fill="#9CA3AF"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M72.5216 25.9195C72.5216 30.4842 68.8211 34.1847 64.2564 34.1847C59.6917 34.1847 55.9912 30.4842 55.9912 25.9195C55.9912 21.3547 59.6917 17.6543 64.2564 17.6543C68.8211 17.6543 72.5216 21.3547 72.5216 25.9195ZM71.0216 25.9195C71.0216 29.6558 67.9927 32.6847 64.2564 32.6847C60.5201 32.6847 57.4912 29.6558 57.4912 25.9195C57.4912 22.1832 60.5201 19.1543 64.2564 19.1543C67.9927 19.1543 71.0216 22.1832 71.0216 25.9195Z" fill="#9CA3AF"/>
+</g>
+<defs>
+<clipPath id="clip0_142_9300">
+<rect width="80" height="80" fill="white" transform="translate(0.868164 0.390625)"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/blog/FeedFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/blog/FeedFragment.java
index 85f8c7974..eef893e7b 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/blog/FeedFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/blog/FeedFragment.java
@@ -76,7 +76,7 @@ public class FeedFragment extends BaseFragment
 		list = v.findViewById(R.id.postList);
 		list.setLayoutManager(layoutManager);
 		list.setAdapter(adapter);
-		list.setEmptyImage(R.drawable.ic_empty_state_blog);
+		list.setEmptyImage(R.drawable.il_empty_state_blogs);
 		list.setEmptyText(R.string.blogs_feed_empty_state);
 		list.setEmptyAction(R.string.blogs_feed_empty_state_action);
 
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contact/ContactListFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/contact/ContactListFragment.java
index 7ee423ab0..836cf0ca6 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/contact/ContactListFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/contact/ContactListFragment.java
@@ -93,7 +93,7 @@ public class ContactListFragment extends BaseFragment
 		list = contentView.findViewById(R.id.list);
 		list.setLayoutManager(new LinearLayoutManager(requireContext()));
 		list.setAdapter(adapter);
-		list.setEmptyImage(R.drawable.ic_empty_state_contact_list);
+		list.setEmptyImage(R.drawable.il_empty_state_contact_list);
 		list.setEmptyText(getString(R.string.no_contacts));
 		list.setEmptyAction(getString(R.string.no_contacts_action));
 
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contactselection/BaseContactSelectorFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/contactselection/BaseContactSelectorFragment.java
index 858e0154a..dcfb52c19 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/contactselection/BaseContactSelectorFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/contactselection/BaseContactSelectorFragment.java
@@ -70,7 +70,7 @@ public abstract class BaseContactSelectorFragment<I extends SelectableContactIte
 
 		list = contentView.findViewById(R.id.list);
 		list.setLayoutManager(new LinearLayoutManager(getActivity()));
-		list.setEmptyImage(R.drawable.ic_empty_state_contact_list);
+		list.setEmptyImage(R.drawable.il_empty_state_contact_list);
 		list.setEmptyText(getString(R.string.no_contacts_selector));
 		list.setEmptyAction(getString(R.string.no_contacts_selector_action));
 		adapter = getAdapter(requireContext(), this);
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/list/GroupListFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/list/GroupListFragment.java
index 0ed8a25b3..347ce6d9e 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/list/GroupListFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/list/GroupListFragment.java
@@ -70,7 +70,7 @@ public class GroupListFragment extends BaseFragment implements
 
 		adapter = new GroupListAdapter(this);
 		list = v.findViewById(R.id.list);
-		list.setEmptyImage(R.drawable.ic_empty_state_group_list);
+		list.setEmptyImage(R.drawable.il_empty_state_group_list);
 		list.setEmptyText(R.string.groups_list_empty);
 		list.setEmptyAction(R.string.groups_list_empty_action);
 		list.setLayoutManager(new LinearLayoutManager(getContext()));
diff --git a/briar-android/src/main/res/drawable/ic_empty_state_blog.xml b/briar-android/src/main/res/drawable/ic_empty_state_blog.xml
deleted file mode 100644
index a93f3eb1a..000000000
--- a/briar-android/src/main/res/drawable/ic_empty_state_blog.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="100dp"
-        android:height="96dp"
-        android:viewportHeight="156"
-        android:viewportWidth="162">
-	<path
-		android:fillColor="#ffffff"
-		android:pathData="M140.87,53.647H91.565V64.235H140.87V53.647Z"/>
-	<path
-		android:fillColor="#ffffff"
-		android:pathData="M140.869,99.529V88.941H115.512L126.077,99.529H140.869Z"/>
-	<path
-		android:fillColor="#ffffff"
-		android:pathData="M140.869,71.294H97.904L108.469,81.882H140.869V71.294Z"/>
-	<path
-		android:fillColor="#ffffff"
-		android:pathData="M147.912,14.823H41.556L84.521,57.882V28.941H147.912V120.706H147.208L157.773,131.294C160.59,128.47 161.999,124.941 161.999,120.706V28.941C161.999,21.176 155.66,14.823 147.912,14.823Z"/>
-	<path
-		android:fillColor="#ffffff"
-		android:pathData="M129.6,120.706L84.522,75.529L23.948,14.823L9.157,0L0,9.176L10.565,19.765C8.452,21.882 7.043,25.412 7.043,28.941V120.706C7.043,128.471 13.383,134.824 21.13,134.824H125.374L146.504,156L155.661,146.824L143.687,134.824L129.6,120.706ZM84.522,120.706V93.882L111.287,120.706H84.522Z"/>
-</vector>
diff --git a/briar-android/src/main/res/drawable/ic_empty_state_contact_list.xml b/briar-android/src/main/res/drawable/ic_empty_state_contact_list.xml
deleted file mode 100644
index 560b137c5..000000000
--- a/briar-android/src/main/res/drawable/ic_empty_state_contact_list.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="100dp"
-        android:height="100dp"
-        android:viewportHeight="164"
-        android:viewportWidth="164">
-	<path
-		android:fillColor="#ffffff"
-		android:pathData="M27.334,0L27.334,13.666L136.668,13.666L136.668,0L27.334,0zM27.334,27.334C19.817,27.334 13.666,33.483 13.666,41L13.666,123C13.666,130.517 19.817,136.668 27.334,136.668L136.668,136.668C144.184,136.668 150.332,130.517 150.332,123L150.332,41C150.332,33.483 144.184,27.334 136.668,27.334L27.334,27.334zM82.15,44.758C89.592,44.758 95.348,46.477 99.42,49.914C103.525,53.351 105.576,58.239 105.576,64.58C105.576,67.35 105.027,69.869 103.926,72.139C102.825,74.408 101.055,76.728 98.619,79.098L92.863,84.453C91.228,86.022 90.093,87.64 89.459,89.309C88.825,90.944 88.475,93.03 88.408,95.566L74.092,95.566C74.092,90.694 74.641,86.856 75.742,84.053C76.843,81.216 78.63,78.762 81.1,76.693C83.569,74.624 85.437,72.739 86.705,71.037C88.006,69.302 88.658,67.401 88.658,65.332C88.658,60.293 86.489,57.771 82.15,57.771C80.148,57.771 78.53,58.506 77.295,59.975C76.06,61.443 75.409,63.429 75.342,65.932L58.424,65.932C58.49,59.257 60.592,54.068 64.73,50.363C68.869,46.626 74.675,44.758 82.15,44.758zM81.398,102.324C84.068,102.324 86.288,103.125 88.057,104.727C89.859,106.295 90.76,108.314 90.76,110.783C90.76,113.253 89.859,115.289 88.057,116.891C86.288,118.459 84.068,119.242 81.398,119.242C78.729,119.242 76.493,118.459 74.691,116.891C72.923,115.289 72.039,113.253 72.039,110.783C72.039,108.314 72.923,106.295 74.691,104.727C76.493,103.125 78.729,102.324 81.398,102.324zM27.334,150.332L27.334,164L136.668,164L136.668,150.332L27.334,150.332z"/>
-</vector>
diff --git a/briar-android/src/main/res/drawable/ic_empty_state_forum_list.xml b/briar-android/src/main/res/drawable/ic_empty_state_forum_list.xml
deleted file mode 100644
index 132ec634e..000000000
--- a/briar-android/src/main/res/drawable/ic_empty_state_forum_list.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="100dp"
-        android:height="100dp"
-        android:viewportHeight="148"
-        android:viewportWidth="148">
-	<path
-		android:fillColor="#ffffff"
-		android:pathData="M107.266,74.679C111.34,74.679 114.055,71.964 114.055,67.89V6.789C114.055,2.716 111.34,0 107.266,0H24.44L99.119,74.679H107.266Z"/>
-	<path
-		android:fillColor="#ffffff"
-		android:pathData="M141.211,27.156H127.633V88.257H112.697L148,123.56V33.945C148,29.872 144.606,27.156 141.211,27.156Z"/>
-	<path
-		android:fillColor="#ffffff"
-		android:pathData="M8.826,1.357L0,10.183L12.22,22.403V101.835L39.376,74.679H64.495L78.074,88.257H39.376V101.835C39.376,105.908 42.092,108.624 46.165,108.624H98.44L137.817,148L146.642,139.174L8.826,1.357Z"/>
-</vector>
diff --git a/briar-android/src/main/res/drawable/ic_empty_state_group_list.xml b/briar-android/src/main/res/drawable/ic_empty_state_group_list.xml
deleted file mode 100644
index 21f892221..000000000
--- a/briar-android/src/main/res/drawable/ic_empty_state_group_list.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="100dp"
-        android:height="81dp"
-        android:viewportHeight="140"
-        android:viewportWidth="172">
-	<path
-		android:fillColor="#ffffff"
-		android:pathData="M125.091,103.444L71.927,50.556L38.309,17.111L21.109,0L10.946,10.111L31.273,30.333C31.273,31.889 31.273,32.667 31.273,34.222C31.273,47.444 41.437,57.556 54.727,57.556C56.291,57.556 57.073,57.556 58.637,56.778L78.182,76.222C69.582,74.667 60.982,73.111 54.727,73.111C36.745,73.111 0,82.444 0,100.333V119.778H109.455V107.333L142.291,140L152.455,129.889L142.291,119.778L125.091,103.444Z"/>
-	<path
-		android:fillColor="#ffffff"
-		android:pathData="M117.273,57.555C130.227,57.555 140.728,47.108 140.728,34.222C140.728,21.335 130.227,10.888 117.273,10.888C104.319,10.888 93.818,21.335 93.818,34.222C93.818,47.108 104.319,57.555 117.273,57.555Z"/>
-	<path
-		android:fillColor="#ffffff"
-		android:pathData="M78.182,34.222C78.182,20.999 68.018,10.888 54.727,10.888C53.945,10.888 53.164,10.888 52.382,10.888L78.182,36.555C78.182,35.777 78.182,34.999 78.182,34.222Z"/>
-	<path
-		android:fillColor="#ffffff"
-		android:pathData="M117.272,73.11C116.49,73.11 115.709,73.11 114.927,73.11L161.836,119.777H172V100.333C172,82.444 135.254,73.11 117.272,73.11Z"/>
-</vector>
diff --git a/briar-android/src/main/res/drawable/il_empty_state_blogs.xml b/briar-android/src/main/res/drawable/il_empty_state_blogs.xml
new file mode 100644
index 000000000..e7889087a
--- /dev/null
+++ b/briar-android/src/main/res/drawable/il_empty_state_blogs.xml
@@ -0,0 +1,37 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+	android:width="81dp"
+	android:height="81dp"
+	android:viewportWidth="81"
+	android:viewportHeight="81">
+	<path
+		android:fillColor="@color/il_background"
+		android:pathData="M14.96,62.003C13.856,62.003 12.96,61.107 12.96,60.003L12.96,30.003C12.96,28.898 13.856,28.003 14.96,28.003L34.96,28.003C36.065,28.003 36.96,28.898 36.96,30.003L36.96,60.003C36.96,61.107 36.065,62.003 34.96,62.003L14.96,62.003Z" />
+	<path
+		android:fillColor="@color/il_border"
+		android:fillType="evenOdd"
+		android:pathData="M34.96,29.503L14.96,29.503C14.684,29.503 14.46,29.727 14.46,30.003L14.46,60.003C14.46,60.279 14.684,60.503 14.96,60.503L34.96,60.503C35.237,60.503 35.46,60.279 35.46,60.003L35.46,30.003C35.46,29.727 35.237,29.503 34.96,29.503ZM12.96,60.003C12.96,61.107 13.856,62.003 14.96,62.003L34.96,62.003C36.065,62.003 36.96,61.107 36.96,60.003L36.96,30.003C36.96,28.898 36.065,28.003 34.96,28.003L14.96,28.003C13.856,28.003 12.96,28.898 12.96,30.003L12.96,60.003Z" />
+	<path
+		android:fillColor="@color/il_border"
+		android:fillType="evenOdd"
+		android:pathData="M45.596,40.67C45.596,40.256 45.931,39.92 46.346,39.92L68.345,39.92C68.76,39.92 69.095,40.256 69.095,40.67C69.095,41.084 68.76,41.42 68.345,41.42L46.346,41.42C45.931,41.42 45.596,41.084 45.596,40.67Z" />
+	<path
+		android:fillColor="@color/il_border"
+		android:fillType="evenOdd"
+		android:pathData="M45.596,32.004C45.596,31.59 45.931,31.254 46.346,31.254L68.345,31.254C68.76,31.254 69.095,31.59 69.095,32.004C69.095,32.418 68.76,32.754 68.345,32.754L46.346,32.754C45.931,32.754 45.596,32.418 45.596,32.004Z" />
+	<path
+		android:fillColor="@color/il_border"
+		android:fillType="evenOdd"
+		android:pathData="M45.596,49.337C45.596,48.923 45.931,48.587 46.346,48.587L68.346,48.587C68.76,48.587 69.096,48.923 69.096,49.337C69.096,49.751 68.76,50.087 68.346,50.087L46.346,50.087C45.931,50.087 45.596,49.751 45.596,49.337Z" />
+	<path
+		android:fillColor="@color/il_border"
+		android:fillType="evenOdd"
+		android:pathData="M45.596,58.003C45.596,57.589 45.931,57.253 46.346,57.253L57.346,57.253C57.76,57.253 58.096,57.589 58.096,58.003C58.096,58.417 57.76,58.753 57.346,58.753L46.346,58.753C45.931,58.753 45.596,58.417 45.596,58.003Z" />
+	<path
+		android:fillColor="@color/il_background"
+		android:fillType="evenOdd"
+		android:pathData="M79.868,24.902C79.852,20.497 76.277,16.931 71.868,16.931L9.868,16.931C5.45,16.931 1.868,20.513 1.868,24.931L1.868,16.874C1.868,12.456 5.45,8.874 9.868,8.874L71.868,8.874C76.286,8.874 79.868,12.456 79.868,16.874V24.902Z" />
+	<path
+		android:fillColor="@color/il_border"
+		android:fillType="evenOdd"
+		android:pathData="M1.118,16.874C1.118,12.042 5.036,8.124 9.868,8.124L71.868,8.124C76.701,8.124 80.618,12.042 80.618,16.874V64.874C80.618,69.706 76.701,73.624 71.868,73.624L9.868,73.623C5.036,73.623 1.118,69.706 1.118,64.873L1.118,56.849L1.118,56.843L1.118,16.874ZM9.868,9.624L71.868,9.624C75.872,9.624 79.118,12.87 79.118,16.874V19.954C77.545,17.631 74.885,16.105 71.868,16.105L9.868,16.105C6.852,16.105 4.191,17.631 2.618,19.954L2.618,16.874C2.618,12.87 5.864,9.624 9.868,9.624ZM2.618,64.873C2.618,68.878 5.864,72.123 9.868,72.123L71.868,72.124C75.872,72.124 79.118,68.878 79.118,64.874L79.118,24.905L79.118,24.903C79.103,20.912 75.863,17.681 71.868,17.681L9.868,17.681C5.864,17.681 2.618,20.927 2.618,24.931L2.618,64.873Z" />
+</vector>
diff --git a/briar-android/src/main/res/drawable/il_empty_state_contact_list.xml b/briar-android/src/main/res/drawable/il_empty_state_contact_list.xml
new file mode 100644
index 000000000..c1cd9bc52
--- /dev/null
+++ b/briar-android/src/main/res/drawable/il_empty_state_contact_list.xml
@@ -0,0 +1,26 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+	android:width="81dp"
+	android:height="81dp"
+	android:viewportWidth="81"
+	android:viewportHeight="81">
+	<path
+		android:fillColor="@color/il_border"
+		android:fillType="evenOdd"
+		android:pathData="M54.877,3.199L70.294,5.822C75.408,6.692 78.855,11.5 78.039,16.622L69.73,68.746C68.748,74.906 62.001,78.315 56.476,75.442L57.175,74.112C61.791,76.512 67.427,73.664 68.247,68.518L76.556,16.395C77.244,12.081 74.341,8.032 70.034,7.299L56.398,4.98L57.175,74.112L55.674,74.136L54.877,3.199Z" />
+	<path
+		android:fillColor="@color/il_background"
+		android:fillType="evenOdd"
+		android:pathData="M9.602,74.999L9.602,4H57.602C62.02,4 65.602,7.582 65.602,12V67C65.602,71.418 62.02,75 57.602,75L9.602,74.999ZM21.89,49.166V53.039C21.89,57.458 25.471,61.039 29.89,61.039H45.847C50.265,61.039 53.847,57.458 53.847,53.039V49.166C53.847,44.747 50.265,41.166 45.847,41.166H29.89C25.471,41.166 21.89,44.747 21.89,49.166ZM37.868,34.853C42.557,34.853 46.357,31.072 46.357,26.407C46.357,21.742 42.557,17.961 37.868,17.961C33.18,17.961 29.38,21.742 29.38,26.407C29.38,31.072 33.18,34.853 37.868,34.853Z" />
+	<path
+		android:fillColor="@color/il_border"
+		android:fillType="evenOdd"
+		android:pathData="M21.89,49.166V53.039C21.89,57.458 25.471,61.039 29.89,61.039H45.847C50.265,61.039 53.847,57.458 53.847,53.039V49.166C53.847,44.747 50.265,41.166 45.847,41.166H29.89C25.471,41.166 21.89,44.747 21.89,49.166ZM23.39,53.039V49.166C23.39,45.576 26.3,42.666 29.89,42.666H45.847C49.437,42.666 52.347,45.576 52.347,49.166V53.039C52.347,56.629 49.437,59.539 45.847,59.539H29.89C26.3,59.539 23.39,56.629 23.39,53.039Z" />
+	<path
+		android:fillColor="@color/il_border"
+		android:fillType="evenOdd"
+		android:pathData="M37.868,34.853C42.557,34.853 46.357,31.072 46.357,26.407C46.357,21.742 42.557,17.961 37.868,17.961C33.18,17.961 29.38,21.742 29.38,26.407C29.38,31.072 33.18,34.853 37.868,34.853ZM44.857,26.407C44.857,30.236 41.735,33.353 37.868,33.353C34.002,33.353 30.88,30.236 30.88,26.407C30.88,22.578 34.002,19.461 37.868,19.461C41.735,19.461 44.857,22.578 44.857,26.407Z" />
+	<path
+		android:fillColor="@color/il_border"
+		android:fillType="evenOdd"
+		android:pathData="M57.602,2.5H8.102L8.102,17.733H2.851C2.436,17.733 2.101,18.069 2.101,18.483C2.101,18.898 2.436,19.233 2.851,19.233H8.102L8.102,38.878H2.851C2.436,38.878 2.101,39.214 2.101,39.628C2.101,40.042 2.436,40.378 2.851,40.378H8.102L8.102,60.752H2.851C2.436,60.752 2.101,61.088 2.101,61.502C2.101,61.916 2.436,62.252 2.851,62.252H8.102L8.102,76.499L57.602,76.5C62.849,76.5 67.102,72.247 67.102,67V12C67.102,6.753 62.849,2.5 57.602,2.5ZM9.602,62.252L9.602,74.999L57.602,75C62.02,75 65.602,71.418 65.602,67V12C65.602,7.582 62.02,4 57.602,4H9.602L9.602,17.733H14.615C15.029,17.733 15.365,18.069 15.365,18.483C15.365,18.898 15.029,19.233 14.615,19.233H9.602L9.602,38.878H14.615C15.029,38.878 15.365,39.214 15.365,39.628C15.365,40.042 15.029,40.378 14.615,40.378H9.602L9.602,60.752H14.615C15.029,60.752 15.365,61.088 15.365,61.502C15.365,61.916 15.029,62.252 14.615,62.252H9.602Z" />
+</vector>
diff --git a/briar-android/src/main/res/drawable/il_empty_state_forum_list.xml b/briar-android/src/main/res/drawable/il_empty_state_forum_list.xml
new file mode 100644
index 000000000..b25b9d02a
--- /dev/null
+++ b/briar-android/src/main/res/drawable/il_empty_state_forum_list.xml
@@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+	android:width="81dp"
+	android:height="81dp"
+	android:viewportWidth="81"
+	android:viewportHeight="81">
+	<path
+		android:fillColor="@color/il_background"
+		android:fillType="evenOdd"
+		android:pathData="M20.394,48.642V58.213C20.394,62.631 23.975,66.213 28.394,66.213H63.081L79.401,75.329V30.909C79.401,26.491 75.82,22.909 71.401,22.909H60.407V40.642C60.407,45.061 56.825,48.642 52.407,48.642H20.394Z" />
+	<path
+		android:fillColor="@color/il_border"
+		android:fillType="evenOdd"
+		android:pathData="M9.401,4.579C4.569,4.579 0.651,8.497 0.651,13.329V59.02L17.915,49.378H19.644V58.213C19.644,63.046 23.561,66.963 28.394,66.963H62.886L80.151,76.606V30.909C80.151,26.077 76.234,22.159 71.401,22.159H61.152V13.329C61.152,8.497 57.235,4.579 52.402,4.579H9.401ZM2.151,13.329C2.151,9.325 5.397,6.079 9.401,6.079H52.402C56.406,6.079 59.652,9.325 59.652,13.329V40.628C59.652,44.632 56.406,47.878 52.402,47.878H17.524L2.151,56.464V13.329ZM61.157,40.642V23.659H71.401C75.406,23.659 78.651,26.905 78.651,30.909V74.051L63.277,65.463H28.394C24.389,65.463 21.144,62.217 21.144,58.213V49.392H52.407C57.239,49.392 61.157,45.475 61.157,40.642Z" />
+</vector>
diff --git a/briar-android/src/main/res/drawable/il_empty_state_group_list.xml b/briar-android/src/main/res/drawable/il_empty_state_group_list.xml
new file mode 100644
index 000000000..656a339ed
--- /dev/null
+++ b/briar-android/src/main/res/drawable/il_empty_state_group_list.xml
@@ -0,0 +1,21 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+	android:width="81dp"
+	android:height="81dp"
+	android:viewportWidth="81"
+	android:viewportHeight="81">
+	<path
+		android:fillColor="@color/il_border"
+		android:fillType="evenOdd"
+		android:pathData="M49.133,16.654C49.133,21.219 45.433,24.919 40.868,24.919C36.304,24.919 32.603,21.219 32.603,16.654C32.603,12.089 36.304,8.389 40.868,8.389C45.433,8.389 49.133,12.089 49.133,16.654ZM47.633,16.654C47.633,20.39 44.604,23.419 40.868,23.419C37.132,23.419 34.103,20.39 34.103,16.654C34.103,12.917 37.132,9.889 40.868,9.889C44.604,9.889 47.633,12.917 47.633,16.654Z" />
+	<path
+		android:fillColor="@color/il_border"
+		android:fillType="evenOdd"
+		android:pathData="M25.745,25.92C25.745,30.484 22.045,34.185 17.48,34.185C12.915,34.185 9.215,30.484 9.215,25.92C9.215,21.355 12.915,17.654 17.48,17.654C22.045,17.654 25.745,21.355 25.745,25.92ZM24.245,25.92C24.245,29.656 21.216,32.685 17.48,32.685C13.744,32.685 10.715,29.656 10.715,25.92C10.715,22.183 13.744,19.154 17.48,19.154C21.216,19.154 24.245,22.183 24.245,25.92Z" />
+	<path
+		android:fillColor="@color/il_border"
+		android:pathData="M2.618,49.168C2.618,45.164 5.864,41.918 9.868,41.918H24.506V61.165C24.506,61.579 24.842,61.915 25.256,61.915C25.671,61.915 26.006,61.579 26.006,61.165V41.975C29.579,42.424 32.342,45.473 32.342,49.168V72.392C32.342,72.806 32.678,73.142 33.092,73.142C33.506,73.142 33.842,72.806 33.842,72.392V49.168C33.842,44.644 30.409,40.922 26.006,40.465V39.777C26.006,35.773 29.252,32.527 33.256,32.527H48.48C52.485,32.527 55.73,35.773 55.73,39.777V40.465C51.327,40.922 47.894,44.644 47.894,49.168V70.555C47.894,70.969 48.23,71.305 48.644,71.305C49.058,71.305 49.394,70.969 49.394,70.555V49.168C49.394,45.473 52.158,42.424 55.73,41.975V61.165C55.73,61.579 56.066,61.915 56.48,61.915C56.895,61.915 57.23,61.579 57.23,61.165V41.918H71.868C75.872,41.918 79.118,45.164 79.118,49.168V70.555C79.118,70.969 79.454,71.305 79.868,71.305C80.282,71.305 80.618,70.969 80.618,70.555V49.168C80.618,44.335 76.701,40.418 71.868,40.418H57.23V39.777C57.23,34.945 53.313,31.027 48.48,31.027H33.256C28.424,31.027 24.506,34.945 24.506,39.777V40.418H9.868C5.036,40.418 1.118,44.335 1.118,49.168V72.392C1.118,72.806 1.454,73.142 1.868,73.142C2.282,73.142 2.618,72.806 2.618,72.392V49.168Z" />
+	<path
+		android:fillColor="@color/il_border"
+		android:fillType="evenOdd"
+		android:pathData="M72.522,25.92C72.522,30.484 68.821,34.185 64.256,34.185C59.692,34.185 55.991,30.484 55.991,25.92C55.991,21.355 59.692,17.654 64.256,17.654C68.821,17.654 72.522,21.355 72.522,25.92ZM71.022,25.92C71.022,29.656 67.993,32.685 64.256,32.685C60.52,32.685 57.491,29.656 57.491,25.92C57.491,22.183 60.52,19.154 64.256,19.154C67.993,19.154 71.022,22.183 71.022,25.92Z" />
+</vector>
diff --git a/briar-android/src/main/res/layout/briar_recycler_view.xml b/briar-android/src/main/res/layout/briar_recycler_view.xml
index 8bd992c85..3c7bab0c0 100644
--- a/briar-android/src/main/res/layout/briar_recycler_view.xml
+++ b/briar-android/src/main/res/layout/briar_recycler_view.xml
@@ -41,7 +41,7 @@
 		app:layout_constraintTop_toTopOf="parent"
 		app:layout_constraintVertical_chainStyle="packed"
 		app:tint="?attr/colorControlNormal"
-		tools:src="@drawable/ic_empty_state_group_list" />
+		tools:src="@drawable/il_empty_state_group_list" />
 
 	<TextView
 		android:id="@+id/emptyText"
diff --git a/briar-android/src/main/res/layout/fragment_forum_list.xml b/briar-android/src/main/res/layout/fragment_forum_list.xml
index b4351eae1..54b2ea145 100644
--- a/briar-android/src/main/res/layout/fragment_forum_list.xml
+++ b/briar-android/src/main/res/layout/fragment_forum_list.xml
@@ -5,6 +5,6 @@
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
 	app:emptyAction="@string/no_forums_action"
-	app:emptyImage="@drawable/ic_empty_state_forum_list"
+	app:emptyImage="@drawable/il_empty_state_forum_list"
 	app:emptyText="@string/no_forums"
 	app:layout_behavior="org.briarproject.briar.android.view.BriarRecyclerViewBehavior" />
diff --git a/briar-android/src/main/res/values-night/color.xml b/briar-android/src/main/res/values-night/color.xml
index ee94e4a5e..6d4a0fb8f 100644
--- a/briar-android/src/main/res/values-night/color.xml
+++ b/briar-android/src/main/res/values-night/color.xml
@@ -26,4 +26,7 @@
 	<color name="thread_item_highlight">@android:color/black</color>
 
 	<color name="divider">@android:color/black</color>
+
+	<color name="il_border">#64748B</color>
+	<color name="il_background">#334155</color>
 </resources>
\ No newline at end of file
diff --git a/briar-android/src/main/res/values/color.xml b/briar-android/src/main/res/values/color.xml
index f0b66de15..30325d9d3 100644
--- a/briar-android/src/main/res/values/color.xml
+++ b/briar-android/src/main/res/values/color.xml
@@ -52,6 +52,9 @@
 	<color name="msg_status_bubble_foreground">@android:color/white</color>
 	<color name="msg_selected_background">@color/briar_accent</color>
 
+	<color name="il_border">#9CA3AF</color>
+	<color name="il_background">#E5E7EB</color>
+
 	<!-- text colors -->
 	<color name="briar_text_link">@color/briar_blue_400</color>
 	<color name="briar_text_primary">#df000000</color>