diff --git a/app/routes.py b/app/routes.py
index f7cdf9f..6d53e64 100644
--- a/app/routes.py
+++ b/app/routes.py
@@ -2,7 +2,7 @@ import io
 import re
 
 from app import app
-from flask import render_template, flash, redirect, url_for, send_file
+from flask import render_template, flash, redirect, url_for, send_file, send_from_directory
 from app.forms import LoginForm, SettingsForm, Step1Form, Step2Form, Step3Form, Step4Form
 from flask_login import login_user, current_user, logout_user, login_required
 import sqlalchemy as sa
@@ -101,20 +101,20 @@ def index():
     #if enable_wifi_sharing == 'true':
     #    service_array.append({"name": _l("Share Access"), "image": url_for("static", filename="images/share-icon.svg"), "url": url_for("share")})
     if enable_deltachat == 'true':
-        service_array.append({"name": _l("Secure Messenger"), "image": url_for("static", filename="images/deltachat-icon.svg"), "url": url_for("messaging") })
+        service_array.append({"name": _l("Secure Messenger"), "image": url_for("static", filename="images/SecureMessenger.svg"), "url": url_for("messaging") })
     if enable_chat == 'true':
-        service_array.append({"name": _l("Local Chat"), "image": url_for("static", filename="images/chat-icon.png"), "url": f"{app.config["CONVENE_INSTALL_PATH"]}/#/room/join/%23public%3abutterbox.local"})
+        service_array.append({"name": _l("Local Chat"), "image": url_for("static", filename="images/LocalChat.svg"), "url": f"{app.config["CONVENE_INSTALL_PATH"]}/#/room/join/%23public%3abutterbox.local"})
     if enable_file_viewer == 'true' and usb_has_appstore:
-        service_array.append({"name": _l("Apps"), "image": url_for("static", filename="images/appstore-icon.svg")})
+        service_array.append({"name": _l("Apps"), "image": url_for("static", filename="images/Apps.svg")})
     if enable_file_viewer == 'true' and usb_has_maps:
-        service_array.append({"name": _l("Maps"), "image": url_for("static", filename="images/maps-icon.png")})
+        service_array.append({"name": _l("Maps"), "image": url_for("static", filename="images/Maps.svg")})
     if enable_file_viewer == 'true':
         name = _l("Files")
         if not usb_inserted:
             name = _l("Insert USB to browse files")
         service_array.append({
                              "name": name,
-                             "image": url_for("static", filename="images/explore-icon.svg"),
+                             "image": url_for("static", filename="images/Files.svg"),
                              "url": url_for("files", path=""),})
     return render_template('index.html', title='Home', get_setting=get_setting, services=service_array)
 
diff --git a/app/static/images/Apps.svg b/app/static/images/Apps.svg
new file mode 100644
index 0000000..d471181
--- /dev/null
+++ b/app/static/images/Apps.svg
@@ -0,0 +1,10 @@
+<svg width="60" height="60" viewBox="0 0 60 60" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M23.0011 8.99686H11.0003C8.79105 8.99686 7 10.7879 7 12.9971V24.998C7 27.2073 8.79105 28.9983 11.0003 28.9983H23.0011C25.2104 28.9983 27.0014 27.2072 27.0014 24.998V12.9971C27.0014 10.7879 25.2104 8.99686 23.0011 8.99686Z" fill="white"/>
+<path d="M23.001 25.9978V28.9978H11V25.9978H23.001ZM24.001 24.9978V12.9969C24.0008 12.4446 23.5533 11.9969 23.001 11.9969H11C10.4478 11.997 10.0002 12.4447 10 12.9969V24.9978C10 25.5502 10.4477 25.9977 11 25.9978V28.9978C8.79089 28.9977 7 27.2071 7 24.9978V12.9969C7.00015 10.7878 8.79099 8.99701 11 8.99686H23.001C25.2101 8.99686 27.0008 10.7878 27.001 12.9969V24.9978C27.001 27.2071 25.2102 28.9978 23.001 28.9978V25.9978C23.5534 25.9978 24.001 25.5502 24.001 24.9978Z" fill="black"/>
+<path d="M51.8591 16.2334L43.7646 8.14088C43.0309 7.41019 42.0379 7 41.0023 7C39.9668 7 38.9737 7.41019 38.2401 8.14088L30.1455 16.2334C29.4146 16.9677 29.0042 17.9615 29.0042 18.9976C29.0042 20.0337 29.4146 21.0275 30.1455 21.7618L38.2401 29.8564C38.9737 30.5871 39.9668 30.9973 41.0023 30.9973C42.0379 30.9973 43.0309 30.5871 43.7646 29.8564L51.8591 21.7638C52.5906 21.0294 53.0014 20.0351 53.0014 18.9986C53.0014 17.962 52.5906 16.9677 51.8591 16.2334Z" fill="#FFDF3F"/>
+<path d="M29.0042 18.9972C29.0043 18.0261 29.3648 17.092 30.012 16.3741L30.1458 16.2335L38.2406 8.14063C38.9742 7.41017 39.967 7.00002 41.0023 7C42.0379 7 43.0314 7.40994 43.765 8.14063L51.8588 16.2335C52.5903 16.9677 53.0014 17.9625 53.0014 18.9991L52.9965 19.1925C52.9487 20.1585 52.5446 21.0753 51.8588 21.7638L43.765 29.8566L43.6244 29.9895C42.907 30.6368 41.9733 30.9973 41.0023 30.9973V27.9973C41.2443 27.9973 41.4764 27.9014 41.6478 27.7306L49.7377 19.6427C49.9067 19.4708 50.0013 19.2397 50.0014 18.9991C50.0014 18.7583 49.9064 18.5272 49.7377 18.3556L41.6478 10.2666L41.5804 10.2061C41.4179 10.0734 41.214 10 41.0023 10C40.7623 10 40.5317 10.0936 40.3607 10.2617L32.2669 18.3556C32.0989 18.527 32.0044 18.757 32.0042 18.9972C32.0042 19.2387 32.0993 19.4709 32.2689 19.6427L40.3568 27.7306C40.5282 27.9014 40.7604 27.9972 41.0023 27.9973V30.9973C40.0313 30.9973 39.0977 30.6368 38.3802 29.9895L38.2406 29.8566L30.1458 21.7618C29.4148 21.0275 29.0042 20.0333 29.0042 18.9972Z" fill="black"/>
+<path d="M47.0028 32.9986H35.0019C32.7926 32.9986 31.0016 34.7895 31.0016 36.9989V48.9997C31.0016 51.209 32.7926 53 35.0019 53H47.0028C49.2121 53 51.003 51.209 51.003 48.9997V36.9989C51.003 34.7895 49.2121 32.9986 47.0028 32.9986Z" fill="white"/>
+<path d="M47.0026 49.9996V52.9996H35.0016V49.9996H47.0026ZM48.0026 48.9996V36.9986C48.0025 36.4462 47.555 35.9986 47.0026 35.9986H35.0016C34.4494 35.9987 34.0018 36.4463 34.0016 36.9986V48.9996C34.0016 49.5519 34.4493 49.9994 35.0016 49.9996V52.9996C32.7924 52.9994 31.0016 51.2087 31.0016 48.9996V36.9986C31.0018 34.7895 32.7925 32.9987 35.0016 32.9986H47.0026C49.2119 32.9986 51.0025 34.7894 51.0026 36.9986V48.9996C51.0026 51.2088 49.212 52.9996 47.0026 52.9996V49.9996C47.5551 49.9996 48.0026 49.552 48.0026 48.9996Z" fill="black"/>
+<path d="M23.0011 32.9986H11.0003C8.79105 32.9986 7 34.7895 7 36.9989V48.9997C7 51.209 8.79105 53 11.0003 53H23.0011C25.2104 53 27.0014 51.209 27.0014 48.9997V36.9989C27.0014 34.7895 25.2104 32.9986 23.0011 32.9986Z" fill="white"/>
+<path d="M23.001 49.9996V52.9996H11V49.9996H23.001ZM24.001 48.9996V36.9986C24.0008 36.4463 23.5533 35.9986 23.001 35.9986H11C10.4478 35.9987 10.0002 36.4464 10 36.9986V48.9996C10 49.5519 10.4477 49.9994 11 49.9996V52.9996C8.79089 52.9994 7 51.2087 7 48.9996V36.9986C7.00015 34.7895 8.79099 32.9987 11 32.9986H23.001C25.2101 32.9986 27.0008 34.7894 27.001 36.9986V48.9996C27.001 51.2088 25.2102 52.9996 23.001 52.9996V49.9996C23.5534 49.9996 24.001 49.552 24.001 48.9996Z" fill="black"/>
+</svg>
diff --git a/app/static/images/Files.svg b/app/static/images/Files.svg
new file mode 100644
index 0000000..a857b99
--- /dev/null
+++ b/app/static/images/Files.svg
@@ -0,0 +1,4 @@
+<svg width="60" height="60" viewBox="0 0 60 60" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M41.8867 10.6885C43.3103 10.6239 44.4998 11.7605 44.5 13.1855V24C44.5 25.3807 43.3807 26.5 42 26.5H17C15.6206 26.5 14.5002 25.3797 14.5 23.998V14.3203C14.5 12.9847 15.5506 11.8859 16.8867 11.8252L41.8867 10.6885Z" fill="#FFDF3F" stroke="black" stroke-width="3"/>
+<path d="M11.5137 17H24.4414L28.5889 21.0869L29.0264 21.5186H47.6133C49.2716 21.5186 50.5 22.7668 50.5 24.375V46.5439C50.5 48.2028 49.2354 49.5 47.627 49.5H11.5137C9.83556 49.4997 8.50055 48.151 8.5 46.5635L8.52246 19.9385V19.9375C8.52246 18.3398 9.84507 17.0003 11.5137 17Z" fill="white" stroke="black" stroke-width="3"/>
+</svg>
diff --git a/app/static/images/LocalChat.svg b/app/static/images/LocalChat.svg
new file mode 100644
index 0000000..a0cf8c8
--- /dev/null
+++ b/app/static/images/LocalChat.svg
@@ -0,0 +1,6 @@
+<svg width="60" height="60" viewBox="0 0 60 60" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M17.2093 12.0698L16.186 17.186H40.7442L43.8139 19.2326L44.8372 36.1163L49.9535 34.5814L50.9767 31.5116V13.6046L47.907 10.5349H19.7674L17.2093 12.0698Z" fill="#FFDF3F"/>
+<path d="M48.1138 10.0349L51.4771 13.3972V31.5925L51.4507 31.6696L50.3462 34.9861L50.0972 35.0603L44.981 36.5954L44.3765 36.7761L43.3296 19.5095L40.5933 17.6862H15.5757L16.7192 11.9714L16.7622 11.7546L16.9517 11.6413L19.5103 10.1062L19.6294 10.0349H48.1138ZM17.6558 12.3845L16.7954 16.6862H40.896L44.0913 18.8161L44.2983 18.9548L44.313 19.2019L45.2974 35.4558L49.561 34.1765L50.4771 31.4294V13.8112L47.6997 11.0349H19.9058L17.6558 12.3845Z" fill="black"/>
+<path d="M45.7207 9H21.2146C17.7447 9 14.9375 11.8382 14.9375 15.3413V16.0084H14.2771C10.8072 16.0084 8 18.8466 8 22.3497V37.5923C8 41.0976 10.8094 43.9336 14.2771 43.9336H15.7635L14.4427 51.9438C14.3868 52.3328 14.5524 52.7218 14.8837 52.8892C14.9934 52.9457 15.1591 53 15.3247 53C15.5441 53 15.7657 52.9435 15.9314 52.7783L25.6246 43.9336H38.7854C42.2553 43.9336 45.0625 41.0954 45.0625 37.5923V36.9251H45.7229C49.1928 36.9251 52 34.087 52 30.5839L51.9978 15.3431C51.9978 11.8378 49.1884 9.00002 45.7208 9.00002L45.7207 9ZM43.2426 37.6511C43.2426 40.1546 41.2054 42.2126 38.7273 42.2126L25.3448 42.2148C25.1791 42.2148 25.0694 42.2148 24.9597 42.2713C24.9597 42.2713 24.9038 42.2713 24.9038 42.3278C24.8478 42.3843 24.7381 42.3843 24.6844 42.4387L16.5872 49.7257L17.6327 43.2171V43.0497C17.6327 42.9932 17.6327 42.9389 17.5768 42.8824V42.7716C17.5768 42.715 17.5208 42.6607 17.467 42.5499C17.467 42.4934 17.4111 42.4934 17.4111 42.4391L17.3014 42.3282C17.2455 42.2717 17.1917 42.2717 17.1358 42.2174C17.0798 42.2174 17.0798 42.1609 17.0261 42.1609C16.9701 42.1609 16.9163 42.1044 16.9163 42.1044H14.1628C11.6847 42.1044 9.64751 40.0464 9.64751 37.5429L9.64966 22.4088C9.64966 19.9053 11.6868 17.8473 14.165 17.8473H38.6712C41.1493 17.8473 43.1865 19.9053 43.1865 22.4088V37.6514L43.2426 37.6511ZM50.1805 30.5862C50.1805 33.0897 48.1433 35.1477 45.6652 35.1477H45.0047V22.4086C45.0047 18.9033 42.1953 16.0673 38.7277 16.0673H16.6996V15.4001C16.6996 12.8966 18.7368 10.8386 21.215 10.8386H45.7211C48.1993 10.8386 50.2365 12.8966 50.2365 15.4001V30.5862H50.1805Z" fill="black"/>
+<path d="M45.8857 8.25488C49.6981 8.34335 52.7479 11.4862 52.748 15.3428L52.75 30.584C52.7499 34.4644 49.6612 37.6245 45.8105 37.6719C45.7683 41.5453 42.6501 44.6836 38.7852 44.6836H25.915L16.4365 53.332L16.4355 53.3311C16.0858 53.6645 15.656 53.7499 15.3252 53.75C15.0158 53.75 14.7347 53.654 14.5459 53.5576L14.54 53.5557C13.8694 53.2133 13.6084 52.4752 13.7002 51.8369L13.7012 51.8291L13.7031 51.8223L14.8799 44.6836H14.2773C10.3887 44.6836 7.25025 41.505 7.25 37.5928V22.3496C7.25005 18.4695 10.3382 15.3086 14.1885 15.2607C14.2312 11.3878 17.3502 8.25 21.2148 8.25H45.877L45.8857 8.25488ZM21.2148 9.75C18.1667 9.75 15.6877 12.2448 15.6875 15.3408V16.7588H14.2773C11.2291 16.7588 8.75005 19.2534 8.75 22.3496V37.5928C8.75025 40.6907 11.2311 43.1836 14.2773 43.1836H16.6475L15.1846 52.0498C15.1761 52.1085 15.1872 52.1587 15.2012 52.1895C15.2077 52.2038 15.2143 52.2121 15.2178 52.2158C15.2201 52.2183 15.2212 52.2195 15.2217 52.2197L15.2275 52.2227C15.236 52.2269 15.2555 52.2355 15.2803 52.2422C15.3056 52.2491 15.3218 52.25 15.3252 52.25C15.372 52.25 15.3986 52.2438 15.4092 52.2402L15.4141 52.2354L15.4258 52.2246L25.334 43.1836H38.7852C41.8333 43.1836 44.3123 40.6888 44.3125 37.5928V36.1748H45.7227C48.7709 36.1748 51.2499 33.6802 51.25 30.584L51.248 15.3428C51.2479 12.2445 48.7667 9.75 45.7207 9.75H21.2148ZM38.6709 17.0977C41.5704 17.0977 43.9365 19.4987 43.9365 22.4092V36.8975H43.9922V37.6514C43.9921 40.5617 41.6269 42.9627 38.7275 42.9629L25.3447 42.9648C25.3295 42.9648 25.3162 42.9648 25.3037 42.9648C25.2518 43.0001 25.2049 43.0253 25.1689 43.042C25.149 43.0512 25.1283 43.0573 25.1104 43.0645L15.5098 51.7041L16.8701 43.2344L16.8271 43.1904V42.9414C16.8198 42.9278 16.8114 42.9138 16.8037 42.8984C16.794 42.8927 16.7833 42.8869 16.7725 42.8799C16.7553 42.8713 16.7383 42.8637 16.7227 42.8545H14.1631C11.2636 42.8545 8.89751 40.4534 8.89746 37.543L8.89941 22.4082C8.89973 19.498 11.2657 17.0977 14.165 17.0977H38.6709ZM14.165 18.5977C12.1083 18.5977 10.3994 20.3127 10.3994 22.4092L10.3975 37.543L10.4023 37.7383C10.5045 39.7449 12.1706 41.3545 14.1631 41.3545H17.2383L17.3467 41.4678H17.4404L17.6084 41.6318C17.6441 41.6518 17.6931 41.6796 17.7451 41.7207L17.834 41.8008L17.9443 41.9111L18.1611 42.1309V42.2539C18.1666 42.2628 18.1741 42.2759 18.1855 42.2949C18.1996 42.3184 18.2322 42.3742 18.2607 42.4434C18.2846 42.5014 18.3097 42.5834 18.3203 42.6836C18.3325 42.716 18.344 42.7486 18.3525 42.7822C18.386 42.9148 18.3828 43.036 18.3828 43.0498V43.2773L18.373 43.3359L17.6641 47.7461L24.1826 41.8809L24.1836 41.8818C24.2751 41.7983 24.3658 41.7496 24.4229 41.7236C24.4242 41.723 24.4254 41.7223 24.4268 41.7217C24.4837 41.6718 24.5419 41.6356 24.5938 41.6094C24.6311 41.5905 24.6671 41.5766 24.7002 41.5654C24.9714 41.4525 25.2313 41.4648 25.3447 41.4648L38.7275 41.4629C40.569 41.4627 42.1297 40.0874 42.4365 38.2949V22.4092C42.4365 20.3127 40.7277 18.5977 38.6709 18.5977H14.165ZM17.1172 41.417C17.1127 41.4164 17.1081 41.4156 17.1035 41.415L17.0264 41.4111C17.0562 41.4111 17.0864 41.4135 17.1172 41.417ZM45.7207 10.0889C48.6202 10.0889 50.9863 12.4899 50.9863 15.4004V31.3359H50.876C50.5114 33.8977 48.3112 35.8975 45.665 35.8975H44.2549V22.4082C44.2547 19.3102 41.7738 16.8174 38.7275 16.8174H15.9492V15.4004C15.9492 12.4899 18.3154 10.0889 21.2148 10.0889H45.7207ZM21.2148 11.5889C19.1853 11.5889 17.4964 13.2588 17.4521 15.3174H38.7275C42.6163 15.3174 45.7547 18.4959 45.7549 22.4082V34.3945C47.7714 34.3455 49.4307 32.6519 49.4307 30.5859V29.8359H49.4863V15.4004C49.4863 13.3039 47.7775 11.5889 45.7207 11.5889H21.2148Z" fill="black"/>
+</svg>
diff --git a/app/static/images/Maps.svg b/app/static/images/Maps.svg
new file mode 100644
index 0000000..05d3264
--- /dev/null
+++ b/app/static/images/Maps.svg
@@ -0,0 +1,7 @@
+<svg width="60" height="60" viewBox="0 0 60 60" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M51 48.3797V22.7056C51 22.3766 50.6585 22.1588 50.3602 22.2976L39.6811 27.2646C39.5856 27.309 39.4776 27.3185 39.3758 27.2915L19.6242 22.0419C19.5224 22.0148 19.4144 22.0243 19.3189 22.0688L8.26022 27.2123C8.10151 27.2861 8 27.4453 8 27.6203V53.2944C8 53.6234 8.34149 53.8412 8.63978 53.7024L19.3189 48.7354C19.4144 48.691 19.5224 48.6815 19.6242 48.7085L39.3758 53.9581C39.4776 53.9852 39.5856 53.9757 39.6811 53.9312L50.7398 48.7877C50.8985 48.7139 51 48.5547 51 48.3797Z" fill="white" stroke="black" stroke-width="3"/>
+<path d="M39.175 54V26.129" stroke="black" stroke-width="3"/>
+<path d="M19.825 48.8387V22" stroke="black" stroke-width="3"/>
+<path d="M29.5 6.5C36.6203 6.5 42.4998 12.5404 42.5 20.127C42.5 25.279 39.8543 29.4271 36.7803 32.5078C33.9313 35.363 30.8247 37.1824 29.5 37.8906C28.1753 37.1824 25.0687 35.363 22.2197 32.5078C19.1457 29.4271 16.5 25.279 16.5 20.127C16.5002 12.5404 22.3797 6.5 29.5 6.5Z" fill="#FFDF3F" stroke="black" stroke-width="3"/>
+<circle cx="29.5" cy="19.5" r="4.07692" fill="white" stroke="black" stroke-width="3"/>
+</svg>
diff --git a/app/static/images/SecureMessenger.svg b/app/static/images/SecureMessenger.svg
new file mode 100644
index 0000000..997f4e5
--- /dev/null
+++ b/app/static/images/SecureMessenger.svg
@@ -0,0 +1,8 @@
+<svg width="60" height="60" viewBox="0 0 60 60" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M24.5 15C33.6127 15 41 22.3873 41 31.5C41 34.7469 40.0621 37.7748 38.4425 40.3276L41 48L33.3276 45.4425C30.7748 47.0621 27.7469 48 24.5 48C15.3873 48 8 40.6127 8 31.5C8 22.3873 15.3873 15 24.5 15Z" fill="#FFDF3F"/>
+<path d="M24.5 16.5C16.2157 16.5 9.5 23.2157 9.5 31.5C9.5 39.7843 16.2157 46.5 24.5 46.5C27.454 46.5 30.2049 45.6474 32.5244 44.1758C32.9051 43.9344 33.3741 43.877 33.8018 44.0195L38.6279 45.6289L37.0195 40.8018L36.9756 40.6396C36.8944 40.2582 36.9646 39.8575 37.1758 39.5244C38.6474 37.2049 39.5 34.454 39.5 31.5C39.5 23.2157 32.7843 16.5 24.5 16.5ZM24.5 13.5C34.4411 13.5 42.5 21.5589 42.5 31.5C42.5 34.7807 41.6188 37.8587 40.083 40.5098L42.4229 47.5254C42.6025 48.0644 42.4623 48.6588 42.0605 49.0605C41.6588 49.4623 41.0644 49.6025 40.5254 49.4229L33.5088 47.084C30.858 48.6194 27.7802 49.5 24.5 49.5C14.5589 49.5 6.5 41.4411 6.5 31.5C6.5 21.5589 14.5589 13.5 24.5 13.5Z" fill="black"/>
+<path d="M26.5 25.5V27L37.5 31L45.5 37.5H48.5L51 15.5L50 13L26.5 25.5Z" fill="white"/>
+<path d="M51.5107 15.4316L51.4971 15.5566L48.9463 38H45.3223L45.1846 37.8877L37.25 31.4404L26.3291 27.4697L26 27.3506V25.1992L26.2656 25.0586L50.2568 12.2969L51.5107 15.4316ZM27 25.7998V26.6494L37.6709 30.5303L37.75 30.5586L37.8154 30.6123L45.6768 37H48.0537L50.4883 15.5664L49.7422 13.7021L27 25.7998Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M50.1591 14.7858L37.9352 29.7256L46.7404 37.0523C47.1409 37.3865 47.7213 37.1198 47.7709 36.6653L50.1591 14.7858ZM36.3061 28.8752L47.99 14.5957L27.1105 26.3041C26.6279 26.5753 26.7269 27.3077 27.322 27.4056L36.3061 28.8752ZM48.3783 12.3141C50.0647 11.3679 52.2 12.6786 51.985 14.6554L49.5605 36.86C49.349 38.7928 47.054 39.6547 45.5882 38.4362L36.4184 30.8061C36.3329 30.7352 36.2272 30.6868 36.1136 30.6677L27.0317 29.1826C24.7975 28.817 24.225 25.8591 26.2307 24.7342L48.3783 12.3141Z" fill="black"/>
+<path d="M48.036 11.7036C50.1875 10.4968 52.9609 12.1543 52.6805 14.7319L50.2567 36.936V36.937C49.9898 39.371 47.1978 40.4644 45.3192 39.1137L45.1405 38.9751L35.9843 31.3559L26.9188 29.8735C24.0562 29.405 23.2837 25.5858 25.8885 24.1245L48.036 11.7036ZM51.9852 14.6557C52.2002 12.6791 50.0641 11.3687 48.3778 12.3149L26.2303 24.7348C24.2255 25.86 24.7976 28.8171 27.0311 29.1831L36.1132 30.6684C36.2266 30.6875 36.3324 30.7355 36.4178 30.8061L45.5878 38.437C47.0534 39.6551 49.3484 38.793 49.5604 36.8608L51.9852 14.6557ZM47.7704 36.6655C47.7205 37.1196 47.1405 37.3869 46.7401 37.0532L37.9354 29.726L50.1591 14.7866L47.7704 36.6655ZM38.9159 29.6313L47.0917 36.4341L49.2059 17.0551L38.9159 29.6313ZM36.3055 28.8755L27.3221 27.4057C26.7272 27.3078 26.628 26.5754 27.1102 26.3042L47.9901 14.5962L36.3055 28.8755ZM27.7245 26.7622L36.0194 28.1196L45.1053 17.0151L27.7245 26.7622Z" fill="black"/>
+</svg>
diff --git a/app/static/images/appstore-icon.svg b/app/static/images/appstore-icon.svg
deleted file mode 100644
index df8a694..0000000
--- a/app/static/images/appstore-icon.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-<svg width="60" height="60" viewBox="0 0 60 60" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <path
-        d="M11.0003 10.4969H23.0011C24.3819 10.4969 25.5014 11.6163 25.5014 12.9971V24.998C25.5014 26.3788 24.3819 27.4983 23.0011 27.4983H11.0003C9.61944 27.4983 8.5 26.3789 8.5 24.998V12.9971C8.5 11.6163 9.61947 10.4969 11.0003 10.4969Z"
-        fill="white" stroke="black" stroke-width="3" />
-    <path
-        d="M42.7053 9.20295C42.7056 9.2032 42.7058 9.20344 42.7061 9.20368L50.7965 17.2921C50.7968 17.2924 50.7971 17.2927 50.7974 17.293C51.2482 17.7461 51.5014 18.3593 51.5014 18.9986C51.5014 19.6377 51.2483 20.2509 50.7974 20.7042C50.7971 20.7046 50.7967 20.705 50.7963 20.7053L42.7061 28.7936C42.7057 28.7939 42.7054 28.7942 42.7051 28.7946C42.2526 29.2447 41.6406 29.4973 41.0023 29.4973C40.364 29.4973 39.7519 29.2446 39.2995 28.7944C39.2992 28.7942 39.2989 28.7939 39.2986 28.7936L31.2086 20.7036C31.2083 20.7032 31.2079 20.7029 31.2075 20.7025C30.7571 20.2494 30.5042 19.6366 30.5042 18.9976C30.5042 18.3587 30.757 17.7459 31.2074 17.2929C31.2078 17.2925 31.2082 17.2921 31.2086 17.2917L39.2986 9.20368C39.2989 9.20339 39.2992 9.2031 39.2995 9.2028C39.752 8.75265 40.364 8.5 41.0023 8.5C41.6408 8.5 42.2529 8.7527 42.7053 9.20295Z"
-        fill="#FFDF3F" stroke="black" stroke-width="3" />
-    <path
-        d="M35.002 34.4986H47.0028C48.3837 34.4986 49.5031 35.618 49.5031 36.9989V48.9997C49.5031 50.3806 48.3837 51.5 47.0028 51.5H35.002C33.6211 51.5 32.5017 50.3806 32.5017 48.9997V36.9989C32.5017 35.618 33.621 34.4986 35.002 34.4986Z"
-        fill="white" stroke="black" stroke-width="3" />
-    <path
-        d="M11.0003 34.4986H23.0011C24.382 34.4986 25.5014 35.618 25.5014 36.9989V48.9997C25.5014 50.3805 24.3819 51.5 23.0011 51.5H11.0003C9.61947 51.5 8.5 50.3805 8.5 48.9997V36.9989C8.5 35.618 9.61944 34.4986 11.0003 34.4986Z"
-        fill="white" stroke="black" stroke-width="3" />
-</svg>
-    
\ No newline at end of file
diff --git a/app/static/images/chat-icon.png b/app/static/images/chat-icon.png
deleted file mode 100644
index b14bdd4..0000000
Binary files a/app/static/images/chat-icon.png and /dev/null differ
diff --git a/app/static/images/deltachat-icon.png b/app/static/images/deltachat-icon.png
deleted file mode 100644
index 0715643..0000000
Binary files a/app/static/images/deltachat-icon.png and /dev/null differ
diff --git a/app/static/images/deltachat-icon.svg b/app/static/images/deltachat-icon.svg
deleted file mode 100644
index 819f903..0000000
--- a/app/static/images/deltachat-icon.svg
+++ /dev/null
@@ -1,167 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48px"
-   height="48px"
-   id="svg2985"
-   version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="delta-v7-pathed.svg"
-   inkscape:export-filename="/home/bpetersen/projects/messenger-android/MessengerProj/src/main/res/drawable-xhdpi/ic_launcher.png"
-   inkscape:export-xdpi="183.83"
-   inkscape:export-ydpi="183.83">
-  <defs
-     id="defs2987">
-    <linearGradient
-       id="linearGradient4409">
-      <stop
-         style="stop-color:#f9f9f9;stop-opacity:1"
-         offset="0"
-         id="stop4411" />
-      <stop
-         style="stop-color:#cccccc;stop-opacity:0;"
-         offset="1"
-         id="stop4413" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4399">
-      <stop
-         style="stop-color:#f9f9f9;stop-opacity:1;"
-         offset="0"
-         id="stop4401" />
-      <stop
-         style="stop-color:#f9f9f9;stop-opacity:0;"
-         offset="1"
-         id="stop4403" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4375">
-      <stop
-         style="stop-color:#364e59;stop-opacity:1;"
-         offset="0"
-         id="stop4377" />
-      <stop
-         style="stop-color:#364e59;stop-opacity:0;"
-         offset="1"
-         id="stop4379" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4367">
-      <stop
-         style="stop-color:#dc000f;stop-opacity:1;"
-         offset="0"
-         id="stop4369" />
-      <stop
-         style="stop-color:#00ff00;stop-opacity:0;"
-         offset="1"
-         id="stop4371" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4359">
-      <stop
-         style="stop-color:#dc000f;stop-opacity:1;"
-         offset="0"
-         id="stop4361" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop4363" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4375"
-       id="linearGradient4381"
-       x1="31.957268"
-       y1="29.751493"
-       x2="-45.041405"
-       y2="-18.591616"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.93766393,0,0,0.93766393,1.542566,1.7199693)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4409"
-       id="linearGradient4415"
-       x1="16.345125"
-       y1="3.8388948"
-       x2="36.001561"
-       y2="24.359164"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="9.8994949"
-     inkscape:cx="1.9547978"
-     inkscape:cy="28.000232"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:snap-global="false"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true"
-     inkscape:bbox-paths="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:window-width="1543"
-     inkscape:window-height="876"
-     inkscape:window-x="57"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata2990">
-    <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>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <path
-       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.57405078;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.43921569"
-       d="m 24.015419,1.2870249 c -12.549421,0 -22.7283936,10.1789711 -22.7283936,22.7283931 0,12.549422 10.1789726,22.728395 22.7283936,22.728395 14.337742,-0.342877 9.614352,-4.702705 23.697556,0.969161 -7.545453,-13.001555 -1.082973,-13.32964 -0.969161,-23.697556 0,-12.549422 -10.178973,-22.7283931 -22.728395,-22.7283931 z"
-       id="path3769"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="sscccs" />
-    <path
-       inkscape:connector-curvature="0"
-       id="path3799"
-       d="M 23.982249,5.3106163 C 13.645822,5.4364005 5.2618355,13.92999 5.2618355,24.275753 c 0,10.345764 8.3839865,18.635301 18.7204135,18.509516 9.827724,-0.03951 7.516769,-5.489695 18.380082,-0.443187 -5.950849,-9.296115 0.201753,-10.533667 0.340336,-18.521947 0,-10.345766 -8.383989,-18.6353031 -18.720418,-18.5095187 z"
-       style="fill:url(#linearGradient4381);fill-opacity:1;stroke:none"
-       sodipodi:nodetypes="sscccs" />
-    <g
-       style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
-       id="text4383" />
-    <g
-       style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
-       id="text4421" />
-    <g
-       transform="scale(1.1122373,0.89908874)"
-       style="font-style:normal;font-weight:normal;font-size:42.10587311px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none"
-       id="text3797">
-      <path
-         d="m 21.688854,23.636251 q -1.027975,-1.151333 -2.857771,-2.754974 -2.014832,-1.768118 -2.713855,-2.775534 -0.699024,-1.027975 -0.699024,-2.240986 0,-1.809237 1.68588,-2.837212 1.68588,-1.048535 4.399735,-1.048535 2.713855,0 4.728687,0.925178 2.035391,0.925177 2.035391,2.549379 0,0.781261 -0.493428,1.295249 -0.493428,0.513987 -1.151333,0.513987 -0.945737,0 -2.220426,-1.418606 -1.295249,-1.439165 -2.199868,-2.014832 -0.884059,-0.596225 -2.07651,-0.596225 -1.521404,0 -2.50826,0.678463 -0.966297,0.678464 -0.966297,1.726999 0,0.986857 0.801821,1.850356 0.801821,0.863499 4.132461,3.145605 3.556795,2.446581 5.01652,3.824068 1.480285,1.377487 2.405462,3.3512 0.925178,1.973713 0.925178,4.17358 0,3.865188 -2.734414,6.825757 -2.713855,2.94001 -6.352888,2.94001 -3.310081,0 -5.592187,-2.364344 -2.282105,-2.364343 -2.282105,-6.311769 0,-3.803509 2.50826,-6.352888 2.528819,-2.549379 6.208971,-3.083926 z m 0.904619,0.945737 q -5.900579,0.966297 -5.900579,8.100447 0,3.680152 1.459725,5.715543 1.480285,2.035391 3.433438,2.035391 2.035391,0 3.3512,-1.953153 1.315808,-1.973713 1.315808,-5.324913 0,-4.852044 -3.659592,-8.573315 z"
-         style="font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman';fill:#ffffff;fill-opacity:1"
-         id="path4161" />
-    </g>
-  </g>
-</svg>
diff --git a/app/static/images/explore-icon.svg b/app/static/images/explore-icon.svg
deleted file mode 100644
index 3354fbe..0000000
--- a/app/static/images/explore-icon.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg width="60" height="60" viewBox="0 0 60 60" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <path d="M17.0001 10.5H42C43.3807 10.5 44.5 11.6193 44.5 13V24C44.5 25.3807 43.3807 26.5 42 26.5H17.0001C15.6201 26.5 14.5001 25.38 14.5001 23.9987L14.5001 12.9961C14.5001 11.6173 15.6175 10.5 17.0001 10.5Z" fill="#FFDF3F" stroke="black" stroke-width="3"/>
-    <path d="M8.52257 19.9388V19.9375C8.52257 18.3397 9.84533 17 11.5142 17H24.4417L28.5887 21.0866L29.0266 21.5182H29.6415H47.6132C49.2716 21.5182 50.5 22.7668 50.5 24.375V46.5442C50.5 48.2031 49.2358 49.5 47.6274 49.5H11.5142C9.83565 49.5 8.50029 48.1509 8.5 46.563C8.5 46.5628 8.5 46.5627 8.5 46.5625L8.52257 19.9388Z" fill="white" stroke="black" stroke-width="3"/>
-    </svg>
-    
\ No newline at end of file
diff --git a/app/static/images/maps-icon.png b/app/static/images/maps-icon.png
deleted file mode 100644
index b294641..0000000
Binary files a/app/static/images/maps-icon.png and /dev/null differ
diff --git a/app/static/images/share-icon.svg b/app/static/images/share-icon.svg
deleted file mode 100644
index 258019d..0000000
--- a/app/static/images/share-icon.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><defs><style>.cls-1{fill:#fff;opacity:0;}.cls-2{fill:#231f20;}</style></defs><title>share</title><g id="Layer_2" data-name="Layer 2"><g id="share"><g id="share-2" data-name="share"><rect class="cls-1" width="24" height="24"/><path class="cls-2" d="M18,15a3,3,0,0,0-2.1.86L8,12.34c0-.12,0-.22,0-.34s0-.22,0-.33L15.9,8.14A3,3,0,1,0,15,6c0,.12,0,.22,0,.34L7.1,9.86a3,3,0,1,0,0,4.28L15,17.67c0,.11,0,.22,0,.33a3,3,0,1,0,3-3Z"/></g></g></g></svg>
\ No newline at end of file