From d1d2d7b4d12fea945ae748ba115ca1478ae3bbad Mon Sep 17 00:00:00 2001
From: Gregor Santner <gsantner@mailbox.org>
Date: Sun, 29 Oct 2017 15:33:59 +0100
Subject: [PATCH] Fix drawable lint issues

---
 .travis.yml                                   |   4 +-
 app/src/main/AndroidManifest.xml              | 934 +++++++++++++-----
 .../dfa/diaspora_android/ui/HtmlTextView.java |  10 +-
 .../res/drawable/ic_bug_report_black_24px.xml |  22 +-
 .../res/drawable/ic_color_lens_black_24px.xml |  24 +-
 .../res/drawable/ic_comment_black_48px.xml    |   4 +-
 .../res/drawable/ic_contacts_black_24px.xml   |  21 +-
 .../ic_format_list_bulleted_black_24px.xml    |  21 +-
 .../drawable/ic_notifications_black_24px.xml  |  18 +-
 .../drawable/ic_open_in_new_black_24px.xml    |   2 +-
 .../res/drawable/ic_people_black_24px.xml     |  21 +-
 .../res/drawable/ic_person_pin_black_48px.xml |  20 +-
 .../ic_question_answer_black_48px.xml         |   4 +-
 .../res/drawable/ic_report_black_48px.xml     |   4 +-
 .../ic_screen_rotation_black_24px.xml         |  10 +-
 .../res/drawable/ic_thumb_up_black_24px.xml   |   8 +-
 .../res/drawable/ic_thumb_up_black_48px.xml   |   8 +-
 .../res/drawable/ic_touch_app_black_24px.xml  |  21 +-
 .../drawable/ic_visibility_off_black_24px.xml |  14 +-
 .../res/drawable/ic_vpn_lock_black_24px.xml   |  14 +-
 app/src/main/res/menu/main__menu_bottom.xml   |  15 -
 app/src/main/res/menu/main__menu_top.xml      |  14 +
 22 files changed, 805 insertions(+), 408 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 290583af..b4204f72 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -42,7 +42,7 @@ env:
   global:
     - ANDROID_HOME=$HOME/android-sdk
   matrix:
-    - TASK="lintFlavorDefaultDebug --stacktrace"
-    - TASK="build check --stacktrace"
+    - TASK="clean lintFlavorDefaultDebug --stacktrace"
+    - TASK="clean build check -x lint --stacktrace"
 
 script: "./gradlew --no-daemon --parallel $TASK"
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index db1a273b..48404d25 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -59,7 +59,7 @@
             </intent-filter>
 
             <!-- Hashtag click intent from HtmlTextViews -->
-            <intent-filter>
+            <intent-filter tools:ignore="AppLinkUrlError">
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <data android:mimeType="vnd.android.cursor.item/vnd.cc.tag" />
@@ -79,239 +79,705 @@
                     android:scheme="https" />
 
                 <!--@@@ PODLIST START-->
-                <data android:host="joindiaspora.com" android:scheme="https" />
-                <data android:host="diasporaaqmjixh5.onion" android:scheme="http" />
-                <data android:host="pod.geraspora.de" android:scheme="https" />
-                <data android:host="diasp.org" android:scheme="https" />
-                <data android:host="diasporgc3d32vv4.onion" android:scheme="https" />
-                <data android:host="framasphere.org" android:scheme="https" />
-                <data android:host="nerdpol.ch" android:scheme="https" />
-                <data android:host="despora.de" android:scheme="https" />
-                <data android:host="sechat.org" android:scheme="https" />
-                <data android:host="sechatqpscuj2npx.onion" android:scheme="http" />
-                <data android:host="berdaguermontes.eu" android:scheme="https" />
-                <data android:host="berlinspora.de" android:scheme="https" />
-                <data android:host="community.kanalinseln.de" android:scheme="https" />
-                <data android:host="d.consumium.org" android:scheme="https" />
-                <data android:host="dia.manuelbichler.at" android:scheme="https" />
-                <data android:host="dia.myocastor.de" android:scheme="https" />
-                <data android:host="diapod.net" android:scheme="https" />
-                <data android:host="diapod.org" android:scheme="https" />
-                <data android:host="diasp.ca" android:scheme="https" />
-                <data android:host="diasp.cz" android:scheme="https" />
-                <data android:host="diasp.de" android:scheme="https" />
-                <data android:host="diasp.eu" android:scheme="https" />
-                <data android:host="diasp.eu.com" android:scheme="https" />
-                <data android:host="diasp.nl" android:scheme="https" />
-                <data android:host="diaspod.de" android:scheme="https" />
-                <data android:host="diaspora-fr.org" android:scheme="https" />
-                <data android:host="diaspora.alfter.us" android:scheme="https" />
-                <data android:host="diaspora.bohramt.de" android:scheme="https" />
-                <data android:host="diaspora.com.ar" android:scheme="https" />
-                <data android:host="diaspora.deadhexagon.com" android:scheme="https" />
-                <data android:host="diaspora.digi-merc.org" android:scheme="https" />
-                <data android:host="diaspora.dorf-post.de" android:scheme="https" />
-                <data android:host="diaspora.espiritolivre.org" android:scheme="https" />
-                <data android:host="diaspora.horwood.biz" android:scheme="https" />
-                <data android:host="diaspora.hzsogood.net" android:scheme="https" />
-                <data android:host="diaspora.kapper.net" android:scheme="https" />
-                <data android:host="diaspora.koehn.com" android:scheme="https" />
-                <data android:host="diaspora.kosebamse.com" android:scheme="https" />
-                <data android:host="diaspora.lebarjack.com" android:scheme="https" />
-                <data android:host="diaspora.microdata.co.uk" android:scheme="https" />
-                <data android:host="diaspora.moosje.nl" android:scheme="https" />
-                <data android:host="diaspora.net.gr" android:scheme="https" />
-                <data android:host="diaspora.permutationsofchaos.com" android:scheme="https" />
-                <data android:host="diaspora.pimpmypony.eu" android:scheme="https" />
-                <data android:host="diaspora.pingupod.de" android:scheme="https" />
-                <data android:host="diaspora.podzimek.org" android:scheme="https" />
-                <data android:host="diaspora.poleni.com" android:scheme="https" />
-                <data android:host="diaspora.psyco.fr" android:scheme="https" />
-                <data android:host="diaspora.raven-ip.com" android:scheme="https" />
-                <data android:host="diaspora.retrodigital.net" android:scheme="https" />
-                <data android:host="diaspora.soh.re" android:scheme="https" />
-                <data android:host="diaspora.subsignal.org" android:scheme="https" />
-                <data android:host="diaspora.trash-talk.de" android:scheme="https" />
-                <data android:host="diaspora.u4u.org" android:scheme="https" />
-                <data android:host="diaspora.unixcorn.org" android:scheme="https" />
-                <data android:host="diasporabr.com.br" android:scheme="https" />
-                <data android:host="diasporabrazil.org" android:scheme="https" />
-                <data android:host="diasporapr.tk" android:scheme="https" />
-                <data android:host="diasporing.ch" android:scheme="https" />
-                <data android:host="distributed.chat" android:scheme="https" />
-                <data android:host="espora.com.es" android:scheme="https" />
-                <data android:host="espora.social" android:scheme="https" />
-                <data android:host="failure.net" android:scheme="https" />
-                <data android:host="flokk.no" android:scheme="https" />
-                <data android:host="freehuman.fr" android:scheme="https" />
-                <data android:host="iliketoast.net" android:scheme="https" />
-                <data android:host="jons.gr" android:scheme="https" />
-                <data android:host="kapok.se" android:scheme="https" />
-                <data android:host="karmasphe.re" android:scheme="https" />
-                <data android:host="laba.mba" android:scheme="https" />
-                <data android:host="liberdade.digital" android:scheme="https" />
-                <data android:host="librenet.co.za" android:scheme="https" />
-                <data android:host="librenet.gr" android:scheme="https" />
-                <data android:host="misamigos.online" android:scheme="https" />
-                <data android:host="mondiaspora.net" android:scheme="https" />
-                <data android:host="networkwizard.de" android:scheme="https" />
-                <data android:host="nx-pod.de" android:scheme="https" />
-                <data android:host="pe.spbstu.ru" android:scheme="https" />
-                <data android:host="pod.4ray.co" android:scheme="https" />
-                <data android:host="pod.8n1.org" android:scheme="https" />
-                <data android:host="pod.alterworld.info" android:scheme="https" />
-                <data android:host="pod.asap-soft.com" android:scheme="https" />
-                <data android:host="pod.cannyfoxx.me" android:scheme="https" />
-                <data android:host="pod.cyberdungeon.de" android:scheme="https" />
-                <data android:host="pod.dapor.net" android:scheme="https" />
-                <data android:host="pod.datenknoten.me" android:scheme="https" />
-                <data android:host="pod.diaspora.software" android:scheme="https" />
-                <data android:host="pod.dirkomatik.de" android:scheme="https" />
-                <data android:host="pod.disroot.org" android:scheme="https" />
-                <data android:host="pod.gedankenausbruch.com" android:scheme="https" />
-                <data android:host="pod.gleisnetze.de" android:scheme="https" />
-                <data android:host="pod.goodsharing.at" android:scheme="https" />
-                <data android:host="pod.hashtagueule.fr" android:scheme="https" />
-                <data android:host="pod.hoizi.net" android:scheme="https" />
-                <data android:host="pod.itabs.nl" android:scheme="https" />
-                <data android:host="pod.jpope.org" android:scheme="https" />
-                <data android:host="pod.liebeleu.de" android:scheme="https" />
-                <data android:host="pod.nomorestars.com" android:scheme="https" />
-                <data android:host="pod.orkz.net" android:scheme="https" />
-                <data android:host="pod.ponk.pink" android:scheme="https" />
-                <data android:host="pod.promedol.com" android:scheme="https" />
-                <data android:host="pod.psynet.su" android:scheme="https" />
-                <data android:host="pod.roocita.com" android:scheme="https" />
-                <data android:host="pod.sertelon.fr" android:scheme="https" />
-                <data android:host="pod.storel.li" android:scheme="https" />
-                <data android:host="pod.tchncs.de" android:scheme="https" />
-                <data android:host="pod.thomasdalichow.de" android:scheme="https" />
-                <data android:host="pod.volt.io" android:scheme="https" />
-                <data android:host="podbay.net" android:scheme="https" />
-                <data android:host="poddery.com" android:scheme="https" />
-                <data android:host="podricing.pw" android:scheme="https" />
-                <data android:host="pubpod.alqualonde.org" android:scheme="https" />
-                <data android:host="revreso.de" android:scheme="https" />
-                <data android:host="ruhrspora.de" android:scheme="https" />
-                <data android:host="russiandiaspora.org" android:scheme="https" />
-                <data android:host="shrekislove.us" android:scheme="https" />
-                <data android:host="social.acclaro.digital" android:scheme="https" />
-                <data android:host="social.baldr.io" android:scheme="https" />
-                <data android:host="social.daxbau.net" android:scheme="https" />
-                <data android:host="social.elaon.de" android:scheme="https" />
-                <data android:host="social.lanham.id.au" android:scheme="https" />
-                <data android:host="social.mbuto.me" android:scheme="https" />
-                <data android:host="socializer.cc" android:scheme="https" />
-                <data android:host="spora.zone" android:scheme="https" />
-                <data android:host="subvillage.de" android:scheme="https" />
-                <data android:host="sysad.org" android:scheme="https" />
-                <data android:host="teki.be" android:scheme="https" />
-                <data android:host="therealtalk.org" android:scheme="https" />
-                <data android:host="thinkopen.net" android:scheme="https" />
-                <data android:host="tippentappen.de" android:scheme="https" />
-                <data android:host="whatsnewz.com" android:scheme="https" />
-                <data android:host="wk3.org" android:scheme="https" />
-                <data android:host="www.datataffel.dk" android:scheme="https" />
-                <data android:host="www.diasporaix.de" android:scheme="https" />
-                <data android:host="diaspora.hofud.com" android:scheme="https" />
-                <data android:host="diaspora.softwarelivre.org" android:scheme="https" />
-                <data android:host="confetticake.club" android:scheme="https" />
-                <data android:host="diaspote.org" android:scheme="https" />
-                <data android:host="diaspora.zone" android:scheme="https" />
-                <data android:host="pod.userzap.de" android:scheme="https" />
-                <data android:host="www.vodeoo.com" android:scheme="https" />
-                <data android:host="diaspora.punkbeer.me" android:scheme="https" />
-                <data android:host="ingtech.net" android:scheme="https" />
-                <data android:host="mmkr.co" android:scheme="https" />
-                <data android:host="pod.kneedrag.org" android:scheme="https" />
-                <data android:host="spyurk.am" android:scheme="https" />
-                <data android:host="pod.mew.cat" android:scheme="https" />
-                <data android:host="dfhz.tk" android:scheme="https" />
-                <data android:host="netiz.in" android:scheme="https" />
-                <data android:host="pod1.orobouros.net" android:scheme="https" />
-                <data android:host="witchcraft.ml" android:scheme="https" />
-                <data android:host="libellula.criptica.org" android:scheme="https" />
-                <data android:host="pod.datamol.org" android:scheme="https" />
-                <data android:host="social.berdaguermontes.eu" android:scheme="https" />
-                <data android:host="mh8.lat-clan.fr" android:scheme="https" />
-                <data android:host="dp.lumy.me" android:scheme="https" />
-                <data android:host="social.souvenirfromlife.fr" android:scheme="https" />
-                <data android:host="diaspora.mokrynskyi.com" android:scheme="https" />
-                <data android:host="hub.transition-regensburg.de" android:scheme="https" />
-                <data android:host="co.zy.lc" android:scheme="https" />
-                <data android:host="diaspora.treefish.org" android:scheme="https" />
-                <data android:host="diaspora.bke.ro" android:scheme="https" />
-                <data android:host="pod.sd.vc" android:scheme="https" />
-                <data android:host="diaspora.cxx.rocks" android:scheme="https" />
-                <data android:host="social.homenet.org" android:scheme="https" />
-                <data android:host="social.cigliola.com" android:scheme="https" />
-                <data android:host="friaspora.tk" android:scheme="https" />
-                <data android:host="pod.lasserh.dk" android:scheme="https" />
-                <data android:host="hubz.tk" android:scheme="https" />
-                <data android:host="hubzilla.kosebamse.com" android:scheme="https" />
-                <data android:host="driaans.nl" android:scheme="https" />
-                <data android:host="dispersio.us" android:scheme="https" />
-                <data android:host="go.lookbehind.eu" android:scheme="https" />
-                <data android:host="diasp.ot-si.com" android:scheme="https" />
-                <data android:host="diaspora.crossfamilyweb.com" android:scheme="https" />
-                <data android:host="hub.aoeu.me" android:scheme="https" />
-                <data android:host="dia.pwn.ninja" android:scheme="https" />
-                <data android:host="3ogsbs3vuvapgg37.onion.to" android:scheme="https" />
-                <data android:host="hubz.secretlair.me" android:scheme="https" />
-                <data android:host="got.noip.me" android:scheme="https" />
-                <data android:host="pod.bitcast.info" android:scheme="https" />
-                <data android:host="f.tschlotfeldt.de" android:scheme="https" />
-                <data android:host="hubloq.net" android:scheme="https" />
-                <data android:host="hubzilla.kneedrag.org" android:scheme="https" />
-                <data android:host="gesichtsbu.ch" android:scheme="https" />
-                <data android:host="hubzi.fraengii.de" android:scheme="https" />
-                <data android:host="friendica.narf.ssji.net" android:scheme="https" />
-                <data android:host="durohr.de" android:scheme="https" />
-                <data android:host="0kcg.com" android:scheme="https" />
-                <data android:host="aegibson.me" android:scheme="https" />
-                <data android:host="redmatrix.us" android:scheme="https" />
-                <data android:host="15o2.de" android:scheme="https" />
-                <data android:host="upt.social" android:scheme="https" />
-                <data android:host="friendica.bohrshouse.com" android:scheme="https" />
-                <data android:host="hubzilla.site" android:scheme="https" />
-                <data android:host="hubzilla.zavb.de" android:scheme="https" />
-                <data android:host="diaspora.aeriesguard.com" android:scheme="https" />
-                <data android:host="pod.cornify.de" android:scheme="https" />
-                <data android:host="hochminuseins.net" android:scheme="https" />
-                <data android:host="thecrimsontint.com" android:scheme="https" />
-                <data android:host="diaspora.clubelek.fr" android:scheme="https" />
-                <data android:host="teamhubzilla.org" android:scheme="https" />
-                <data android:host="diaspora.schlimme.net" android:scheme="https" />
-                <data android:host="www.wiwiec.com" android:scheme="https" />
-                <data android:host="diasp.danletard.de" android:scheme="https" />
-                <data android:host="libertypod.com" android:scheme="https" />
-                <data android:host="hubzilla.pskosinski.pl" android:scheme="https" />
-                <data android:host="pod.juvenesco.eu" android:scheme="https" />
-                <data android:host="pirati.ca" android:scheme="https" />
-                <data android:host="diasp.sk" android:scheme="https" />
-                <data android:host="f.libreden.net" android:scheme="https" />
-                <data android:host="pod.mausdompteur.de" android:scheme="https" />
-                <data android:host="diaspora.raitisoja.com" android:scheme="https" />
-                <data android:host="squeet.me" android:scheme="https" />
-                <data android:host="pod.kakise.xyz" android:scheme="https" />
-                <data android:host="pod.diasporacaribe.org" android:scheme="https" />
-                <data android:host="hub.feder8.ru" android:scheme="https" />
-                <data android:host="hubzilla.a-zwenkau.de" android:scheme="https" />
-                <data android:host="social.punkbeer.me" android:scheme="https" />
-                <data android:host="pod.sapient.fun" android:scheme="https" />
-                <data android:host="pod.phantasie.cc" android:scheme="https" />
-                <data android:host="diaspora.masharih.me" android:scheme="https" />
-                <data android:host="hub.mariovavti.com" android:scheme="https" />
-                <data android:host="social.patur.in" android:scheme="https" />
-                <data android:host="jeroenpraat.nl" android:scheme="https" />
-                <data android:host="grindcore.ch" android:scheme="https" />
-                <data android:host="pod.vixiv.net" android:scheme="https" />
-                <data android:host="social.deuxfleurs.fr" android:scheme="https" />
-                <data android:host="parlementum.net" android:scheme="https" />
-                <data android:host="villianbook.com" android:scheme="https" />
-                <data android:host="frolix8.asia" android:scheme="https" />
-                <data android:host="hub.vilarejo.pro.br" android:scheme="https" />
-                <data android:host="social.vixiv.net" android:scheme="https" />
+                <data
+                    android:host="joindiaspora.com"
+                    android:scheme="https" />
+                <data
+                    android:host="diasporaaqmjixh5.onion"
+                    android:scheme="http" />
+                <data
+                    android:host="pod.geraspora.de"
+                    android:scheme="https" />
+                <data
+                    android:host="diasp.org"
+                    android:scheme="https" />
+                <data
+                    android:host="diasporgc3d32vv4.onion"
+                    android:scheme="https" />
+                <data
+                    android:host="framasphere.org"
+                    android:scheme="https" />
+                <data
+                    android:host="nerdpol.ch"
+                    android:scheme="https" />
+                <data
+                    android:host="despora.de"
+                    android:scheme="https" />
+                <data
+                    android:host="sechat.org"
+                    android:scheme="https" />
+                <data
+                    android:host="sechatqpscuj2npx.onion"
+                    android:scheme="http" />
+                <data
+                    android:host="berdaguermontes.eu"
+                    android:scheme="https" />
+                <data
+                    android:host="berlinspora.de"
+                    android:scheme="https" />
+                <data
+                    android:host="community.kanalinseln.de"
+                    android:scheme="https" />
+                <data
+                    android:host="d.consumium.org"
+                    android:scheme="https" />
+                <data
+                    android:host="dia.manuelbichler.at"
+                    android:scheme="https" />
+                <data
+                    android:host="dia.myocastor.de"
+                    android:scheme="https" />
+                <data
+                    android:host="diapod.net"
+                    android:scheme="https" />
+                <data
+                    android:host="diapod.org"
+                    android:scheme="https" />
+                <data
+                    android:host="diasp.ca"
+                    android:scheme="https" />
+                <data
+                    android:host="diasp.cz"
+                    android:scheme="https" />
+                <data
+                    android:host="diasp.de"
+                    android:scheme="https" />
+                <data
+                    android:host="diasp.eu"
+                    android:scheme="https" />
+                <data
+                    android:host="diasp.eu.com"
+                    android:scheme="https" />
+                <data
+                    android:host="diasp.nl"
+                    android:scheme="https" />
+                <data
+                    android:host="diaspod.de"
+                    android:scheme="https" />
+                <data
+                    android:host="diaspora-fr.org"
+                    android:scheme="https" />
+                <data
+                    android:host="diaspora.alfter.us"
+                    android:scheme="https" />
+                <data
+                    android:host="diaspora.bohramt.de"
+                    android:scheme="https" />
+                <data
+                    android:host="diaspora.com.ar"
+                    android:scheme="https" />
+                <data
+                    android:host="diaspora.deadhexagon.com"
+                    android:scheme="https" />
+                <data
+                    android:host="diaspora.digi-merc.org"
+                    android:scheme="https" />
+                <data
+                    android:host="diaspora.dorf-post.de"
+                    android:scheme="https" />
+                <data
+                    android:host="diaspora.espiritolivre.org"
+                    android:scheme="https" />
+                <data
+                    android:host="diaspora.horwood.biz"
+                    android:scheme="https" />
+                <data
+                    android:host="diaspora.hzsogood.net"
+                    android:scheme="https" />
+                <data
+                    android:host="diaspora.kapper.net"
+                    android:scheme="https" />
+                <data
+                    android:host="diaspora.koehn.com"
+                    android:scheme="https" />
+                <data
+                    android:host="diaspora.kosebamse.com"
+                    android:scheme="https" />
+                <data
+                    android:host="diaspora.lebarjack.com"
+                    android:scheme="https" />
+                <data
+                    android:host="diaspora.microdata.co.uk"
+                    android:scheme="https" />
+                <data
+                    android:host="diaspora.moosje.nl"
+                    android:scheme="https" />
+                <data
+                    android:host="diaspora.net.gr"
+                    android:scheme="https" />
+                <data
+                    android:host="diaspora.permutationsofchaos.com"
+                    android:scheme="https" />
+                <data
+                    android:host="diaspora.pimpmypony.eu"
+                    android:scheme="https" />
+                <data
+                    android:host="diaspora.pingupod.de"
+                    android:scheme="https" />
+                <data
+                    android:host="diaspora.podzimek.org"
+                    android:scheme="https" />
+                <data
+                    android:host="diaspora.poleni.com"
+                    android:scheme="https" />
+                <data
+                    android:host="diaspora.psyco.fr"
+                    android:scheme="https" />
+                <data
+                    android:host="diaspora.raven-ip.com"
+                    android:scheme="https" />
+                <data
+                    android:host="diaspora.retrodigital.net"
+                    android:scheme="https" />
+                <data
+                    android:host="diaspora.soh.re"
+                    android:scheme="https" />
+                <data
+                    android:host="diaspora.subsignal.org"
+                    android:scheme="https" />
+                <data
+                    android:host="diaspora.trash-talk.de"
+                    android:scheme="https" />
+                <data
+                    android:host="diaspora.u4u.org"
+                    android:scheme="https" />
+                <data
+                    android:host="diaspora.unixcorn.org"
+                    android:scheme="https" />
+                <data
+                    android:host="diasporabr.com.br"
+                    android:scheme="https" />
+                <data
+                    android:host="diasporabrazil.org"
+                    android:scheme="https" />
+                <data
+                    android:host="diasporapr.tk"
+                    android:scheme="https" />
+                <data
+                    android:host="diasporing.ch"
+                    android:scheme="https" />
+                <data
+                    android:host="distributed.chat"
+                    android:scheme="https" />
+                <data
+                    android:host="espora.com.es"
+                    android:scheme="https" />
+                <data
+                    android:host="espora.social"
+                    android:scheme="https" />
+                <data
+                    android:host="failure.net"
+                    android:scheme="https" />
+                <data
+                    android:host="flokk.no"
+                    android:scheme="https" />
+                <data
+                    android:host="freehuman.fr"
+                    android:scheme="https" />
+                <data
+                    android:host="iliketoast.net"
+                    android:scheme="https" />
+                <data
+                    android:host="jons.gr"
+                    android:scheme="https" />
+                <data
+                    android:host="kapok.se"
+                    android:scheme="https" />
+                <data
+                    android:host="karmasphe.re"
+                    android:scheme="https" />
+                <data
+                    android:host="laba.mba"
+                    android:scheme="https" />
+                <data
+                    android:host="liberdade.digital"
+                    android:scheme="https" />
+                <data
+                    android:host="librenet.co.za"
+                    android:scheme="https" />
+                <data
+                    android:host="librenet.gr"
+                    android:scheme="https" />
+                <data
+                    android:host="misamigos.online"
+                    android:scheme="https" />
+                <data
+                    android:host="mondiaspora.net"
+                    android:scheme="https" />
+                <data
+                    android:host="networkwizard.de"
+                    android:scheme="https" />
+                <data
+                    android:host="nx-pod.de"
+                    android:scheme="https" />
+                <data
+                    android:host="pe.spbstu.ru"
+                    android:scheme="https" />
+                <data
+                    android:host="pod.4ray.co"
+                    android:scheme="https" />
+                <data
+                    android:host="pod.8n1.org"
+                    android:scheme="https" />
+                <data
+                    android:host="pod.alterworld.info"
+                    android:scheme="https" />
+                <data
+                    android:host="pod.asap-soft.com"
+                    android:scheme="https" />
+                <data
+                    android:host="pod.cannyfoxx.me"
+                    android:scheme="https" />
+                <data
+                    android:host="pod.cyberdungeon.de"
+                    android:scheme="https" />
+                <data
+                    android:host="pod.dapor.net"
+                    android:scheme="https" />
+                <data
+                    android:host="pod.datenknoten.me"
+                    android:scheme="https" />
+                <data
+                    android:host="pod.diaspora.software"
+                    android:scheme="https" />
+                <data
+                    android:host="pod.dirkomatik.de"
+                    android:scheme="https" />
+                <data
+                    android:host="pod.disroot.org"
+                    android:scheme="https" />
+                <data
+                    android:host="pod.gedankenausbruch.com"
+                    android:scheme="https" />
+                <data
+                    android:host="pod.gleisnetze.de"
+                    android:scheme="https" />
+                <data
+                    android:host="pod.goodsharing.at"
+                    android:scheme="https" />
+                <data
+                    android:host="pod.hashtagueule.fr"
+                    android:scheme="https" />
+                <data
+                    android:host="pod.hoizi.net"
+                    android:scheme="https" />
+                <data
+                    android:host="pod.itabs.nl"
+                    android:scheme="https" />
+                <data
+                    android:host="pod.jpope.org"
+                    android:scheme="https" />
+                <data
+                    android:host="pod.liebeleu.de"
+                    android:scheme="https" />
+                <data
+                    android:host="pod.nomorestars.com"
+                    android:scheme="https" />
+                <data
+                    android:host="pod.orkz.net"
+                    android:scheme="https" />
+                <data
+                    android:host="pod.ponk.pink"
+                    android:scheme="https" />
+                <data
+                    android:host="pod.promedol.com"
+                    android:scheme="https" />
+                <data
+                    android:host="pod.psynet.su"
+                    android:scheme="https" />
+                <data
+                    android:host="pod.roocita.com"
+                    android:scheme="https" />
+                <data
+                    android:host="pod.sertelon.fr"
+                    android:scheme="https" />
+                <data
+                    android:host="pod.storel.li"
+                    android:scheme="https" />
+                <data
+                    android:host="pod.tchncs.de"
+                    android:scheme="https" />
+                <data
+                    android:host="pod.thomasdalichow.de"
+                    android:scheme="https" />
+                <data
+                    android:host="pod.volt.io"
+                    android:scheme="https" />
+                <data
+                    android:host="podbay.net"
+                    android:scheme="https" />
+                <data
+                    android:host="poddery.com"
+                    android:scheme="https" />
+                <data
+                    android:host="podricing.pw"
+                    android:scheme="https" />
+                <data
+                    android:host="pubpod.alqualonde.org"
+                    android:scheme="https" />
+                <data
+                    android:host="revreso.de"
+                    android:scheme="https" />
+                <data
+                    android:host="ruhrspora.de"
+                    android:scheme="https" />
+                <data
+                    android:host="russiandiaspora.org"
+                    android:scheme="https" />
+                <data
+                    android:host="shrekislove.us"
+                    android:scheme="https" />
+                <data
+                    android:host="social.acclaro.digital"
+                    android:scheme="https" />
+                <data
+                    android:host="social.baldr.io"
+                    android:scheme="https" />
+                <data
+                    android:host="social.daxbau.net"
+                    android:scheme="https" />
+                <data
+                    android:host="social.elaon.de"
+                    android:scheme="https" />
+                <data
+                    android:host="social.lanham.id.au"
+                    android:scheme="https" />
+                <data
+                    android:host="social.mbuto.me"
+                    android:scheme="https" />
+                <data
+                    android:host="socializer.cc"
+                    android:scheme="https" />
+                <data
+                    android:host="spora.zone"
+                    android:scheme="https" />
+                <data
+                    android:host="subvillage.de"
+                    android:scheme="https" />
+                <data
+                    android:host="sysad.org"
+                    android:scheme="https" />
+                <data
+                    android:host="teki.be"
+                    android:scheme="https" />
+                <data
+                    android:host="therealtalk.org"
+                    android:scheme="https" />
+                <data
+                    android:host="thinkopen.net"
+                    android:scheme="https" />
+                <data
+                    android:host="tippentappen.de"
+                    android:scheme="https" />
+                <data
+                    android:host="whatsnewz.com"
+                    android:scheme="https" />
+                <data
+                    android:host="wk3.org"
+                    android:scheme="https" />
+                <data
+                    android:host="www.datataffel.dk"
+                    android:scheme="https" />
+                <data
+                    android:host="www.diasporaix.de"
+                    android:scheme="https" />
+                <data
+                    android:host="diaspora.hofud.com"
+                    android:scheme="https" />
+                <data
+                    android:host="diaspora.softwarelivre.org"
+                    android:scheme="https" />
+                <data
+                    android:host="confetticake.club"
+                    android:scheme="https" />
+                <data
+                    android:host="diaspote.org"
+                    android:scheme="https" />
+                <data
+                    android:host="diaspora.zone"
+                    android:scheme="https" />
+                <data
+                    android:host="pod.userzap.de"
+                    android:scheme="https" />
+                <data
+                    android:host="www.vodeoo.com"
+                    android:scheme="https" />
+                <data
+                    android:host="diaspora.punkbeer.me"
+                    android:scheme="https" />
+                <data
+                    android:host="ingtech.net"
+                    android:scheme="https" />
+                <data
+                    android:host="mmkr.co"
+                    android:scheme="https" />
+                <data
+                    android:host="pod.kneedrag.org"
+                    android:scheme="https" />
+                <data
+                    android:host="spyurk.am"
+                    android:scheme="https" />
+                <data
+                    android:host="pod.mew.cat"
+                    android:scheme="https" />
+                <data
+                    android:host="dfhz.tk"
+                    android:scheme="https" />
+                <data
+                    android:host="netiz.in"
+                    android:scheme="https" />
+                <data
+                    android:host="pod1.orobouros.net"
+                    android:scheme="https" />
+                <data
+                    android:host="witchcraft.ml"
+                    android:scheme="https" />
+                <data
+                    android:host="libellula.criptica.org"
+                    android:scheme="https" />
+                <data
+                    android:host="pod.datamol.org"
+                    android:scheme="https" />
+                <data
+                    android:host="social.berdaguermontes.eu"
+                    android:scheme="https" />
+                <data
+                    android:host="mh8.lat-clan.fr"
+                    android:scheme="https" />
+                <data
+                    android:host="dp.lumy.me"
+                    android:scheme="https" />
+                <data
+                    android:host="social.souvenirfromlife.fr"
+                    android:scheme="https" />
+                <data
+                    android:host="diaspora.mokrynskyi.com"
+                    android:scheme="https" />
+                <data
+                    android:host="hub.transition-regensburg.de"
+                    android:scheme="https" />
+                <data
+                    android:host="co.zy.lc"
+                    android:scheme="https" />
+                <data
+                    android:host="diaspora.treefish.org"
+                    android:scheme="https" />
+                <data
+                    android:host="diaspora.bke.ro"
+                    android:scheme="https" />
+                <data
+                    android:host="pod.sd.vc"
+                    android:scheme="https" />
+                <data
+                    android:host="diaspora.cxx.rocks"
+                    android:scheme="https" />
+                <data
+                    android:host="social.homenet.org"
+                    android:scheme="https" />
+                <data
+                    android:host="social.cigliola.com"
+                    android:scheme="https" />
+                <data
+                    android:host="friaspora.tk"
+                    android:scheme="https" />
+                <data
+                    android:host="pod.lasserh.dk"
+                    android:scheme="https" />
+                <data
+                    android:host="hubz.tk"
+                    android:scheme="https" />
+                <data
+                    android:host="hubzilla.kosebamse.com"
+                    android:scheme="https" />
+                <data
+                    android:host="driaans.nl"
+                    android:scheme="https" />
+                <data
+                    android:host="dispersio.us"
+                    android:scheme="https" />
+                <data
+                    android:host="go.lookbehind.eu"
+                    android:scheme="https" />
+                <data
+                    android:host="diasp.ot-si.com"
+                    android:scheme="https" />
+                <data
+                    android:host="diaspora.crossfamilyweb.com"
+                    android:scheme="https" />
+                <data
+                    android:host="hub.aoeu.me"
+                    android:scheme="https" />
+                <data
+                    android:host="dia.pwn.ninja"
+                    android:scheme="https" />
+                <data
+                    android:host="3ogsbs3vuvapgg37.onion.to"
+                    android:scheme="https" />
+                <data
+                    android:host="hubz.secretlair.me"
+                    android:scheme="https" />
+                <data
+                    android:host="got.noip.me"
+                    android:scheme="https" />
+                <data
+                    android:host="pod.bitcast.info"
+                    android:scheme="https" />
+                <data
+                    android:host="f.tschlotfeldt.de"
+                    android:scheme="https" />
+                <data
+                    android:host="hubloq.net"
+                    android:scheme="https" />
+                <data
+                    android:host="hubzilla.kneedrag.org"
+                    android:scheme="https" />
+                <data
+                    android:host="gesichtsbu.ch"
+                    android:scheme="https" />
+                <data
+                    android:host="hubzi.fraengii.de"
+                    android:scheme="https" />
+                <data
+                    android:host="friendica.narf.ssji.net"
+                    android:scheme="https" />
+                <data
+                    android:host="durohr.de"
+                    android:scheme="https" />
+                <data
+                    android:host="0kcg.com"
+                    android:scheme="https" />
+                <data
+                    android:host="aegibson.me"
+                    android:scheme="https" />
+                <data
+                    android:host="redmatrix.us"
+                    android:scheme="https" />
+                <data
+                    android:host="15o2.de"
+                    android:scheme="https" />
+                <data
+                    android:host="upt.social"
+                    android:scheme="https" />
+                <data
+                    android:host="friendica.bohrshouse.com"
+                    android:scheme="https" />
+                <data
+                    android:host="hubzilla.site"
+                    android:scheme="https" />
+                <data
+                    android:host="hubzilla.zavb.de"
+                    android:scheme="https" />
+                <data
+                    android:host="diaspora.aeriesguard.com"
+                    android:scheme="https" />
+                <data
+                    android:host="pod.cornify.de"
+                    android:scheme="https" />
+                <data
+                    android:host="hochminuseins.net"
+                    android:scheme="https" />
+                <data
+                    android:host="thecrimsontint.com"
+                    android:scheme="https" />
+                <data
+                    android:host="diaspora.clubelek.fr"
+                    android:scheme="https" />
+                <data
+                    android:host="teamhubzilla.org"
+                    android:scheme="https" />
+                <data
+                    android:host="diaspora.schlimme.net"
+                    android:scheme="https" />
+                <data
+                    android:host="www.wiwiec.com"
+                    android:scheme="https" />
+                <data
+                    android:host="diasp.danletard.de"
+                    android:scheme="https" />
+                <data
+                    android:host="libertypod.com"
+                    android:scheme="https" />
+                <data
+                    android:host="hubzilla.pskosinski.pl"
+                    android:scheme="https" />
+                <data
+                    android:host="pod.juvenesco.eu"
+                    android:scheme="https" />
+                <data
+                    android:host="pirati.ca"
+                    android:scheme="https" />
+                <data
+                    android:host="diasp.sk"
+                    android:scheme="https" />
+                <data
+                    android:host="f.libreden.net"
+                    android:scheme="https" />
+                <data
+                    android:host="pod.mausdompteur.de"
+                    android:scheme="https" />
+                <data
+                    android:host="diaspora.raitisoja.com"
+                    android:scheme="https" />
+                <data
+                    android:host="squeet.me"
+                    android:scheme="https" />
+                <data
+                    android:host="pod.kakise.xyz"
+                    android:scheme="https" />
+                <data
+                    android:host="pod.diasporacaribe.org"
+                    android:scheme="https" />
+                <data
+                    android:host="hub.feder8.ru"
+                    android:scheme="https" />
+                <data
+                    android:host="hubzilla.a-zwenkau.de"
+                    android:scheme="https" />
+                <data
+                    android:host="social.punkbeer.me"
+                    android:scheme="https" />
+                <data
+                    android:host="pod.sapient.fun"
+                    android:scheme="https" />
+                <data
+                    android:host="pod.phantasie.cc"
+                    android:scheme="https" />
+                <data
+                    android:host="diaspora.masharih.me"
+                    android:scheme="https" />
+                <data
+                    android:host="hub.mariovavti.com"
+                    android:scheme="https" />
+                <data
+                    android:host="social.patur.in"
+                    android:scheme="https" />
+                <data
+                    android:host="jeroenpraat.nl"
+                    android:scheme="https" />
+                <data
+                    android:host="grindcore.ch"
+                    android:scheme="https" />
+                <data
+                    android:host="pod.vixiv.net"
+                    android:scheme="https" />
+                <data
+                    android:host="social.deuxfleurs.fr"
+                    android:scheme="https" />
+                <data
+                    android:host="parlementum.net"
+                    android:scheme="https" />
+                <data
+                    android:host="villianbook.com"
+                    android:scheme="https" />
+                <data
+                    android:host="frolix8.asia"
+                    android:scheme="https" />
+                <data
+                    android:host="hub.vilarejo.pro.br"
+                    android:scheme="https" />
+                <data
+                    android:host="social.vixiv.net"
+                    android:scheme="https" />
                 <!--@@@ PODLIST END-->
             </intent-filter>
 
diff --git a/app/src/main/java/com/github/dfa/diaspora_android/ui/HtmlTextView.java b/app/src/main/java/com/github/dfa/diaspora_android/ui/HtmlTextView.java
index b542ab52..3e39d79c 100644
--- a/app/src/main/java/com/github/dfa/diaspora_android/ui/HtmlTextView.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/ui/HtmlTextView.java
@@ -20,12 +20,12 @@ package com.github.dfa.diaspora_android.ui;
 
 import android.annotation.TargetApi;
 import android.content.Context;
+import android.support.v7.widget.AppCompatTextView;
 import android.text.Html;
 import android.text.SpannableString;
 import android.text.util.Linkify;
 import android.util.AttributeSet;
 import android.util.Patterns;
-import android.widget.TextView;
 
 import com.github.dfa.diaspora_android.activity.MainActivity;
 
@@ -38,7 +38,7 @@ import java.util.regex.Pattern;
  * Hashtags open the MainActivity, load the new-post site of the selected pod and insert the
  * hashtag into the post editor. See data/HashtagContentProvider.
  */
-public class HtmlTextView extends TextView {
+public class HtmlTextView extends AppCompatTextView {
 
     public HtmlTextView(Context context) {
         super(context);
@@ -55,12 +55,6 @@ public class HtmlTextView extends TextView {
         init();
     }
 
-    @TargetApi(21)
-    public HtmlTextView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
-        super(context, attrs, defStyleAttr, defStyleRes);
-        init();
-    }
-
     /**
      * Linkify, format markdown and escape the displayed message.
      */
diff --git a/app/src/main/res/drawable/ic_bug_report_black_24px.xml b/app/src/main/res/drawable/ic_bug_report_black_24px.xml
index 58308de9..4d83902b 100644
--- a/app/src/main/res/drawable/ic_bug_report_black_24px.xml
+++ b/app/src/main/res/drawable/ic_bug_report_black_24px.xml
@@ -1,17 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
     <path
-        android:pathData="M0 0h24v24H0z" />
-    <path
-        android:fillColor="#000000"
-        android:pathData="M20 8h-2.81c-.45-.78-1.07-1.45-1.82-1.96L17 4.41 15.59 3l-2.17 2.17C12.96 5.06
-12.49 5 12 5c-.49 0-.96 .06 -1.41 .17 L8.41 3 7 4.41l1.62 1.63C7.88 6.55 7.26
-7.22 6.81 8H4v2h2.09c-.05 .33 -.09 .66 -.09 1v1H4v2h2v1c0 .34 .04 .67 .09
-1H4v2h2.81c1.04 1.79 2.97 3 5.19 3s4.15-1.21 5.19-3H20v-2h-2.09c.05-.33 .09 -.66
-.09 -1v-1h2v-2h-2v-1c0-.34-.04-.67-.09-1H20V8zm-6 8h-4v-2h4v2zm0-4h-4v-2h4v2z" />
-</vector>
\ No newline at end of file
+        android:fillColor="#FF000000"
+        android:pathData="M20,8h-2.81c-0.45,-0.78 -1.07,-1.45 -1.82,-1.96L17,4.41 15.59,3l-2.17,2.17C12.96,5.06 12.49,5 12,5c-0.49,0 -0.96,0.06 -1.41,0.17L8.41,3 7,4.41l1.62,1.63C7.88,6.55 7.26,7.22 6.81,8L4,8v2h2.09c-0.05,0.33 -0.09,0.66 -0.09,1v1L4,12v2h2v1c0,0.34 0.04,0.67 0.09,1L4,16v2h2.81c1.04,1.79 2.97,3 5.19,3s4.15,-1.21 5.19,-3L20,18v-2h-2.09c0.05,-0.33 0.09,-0.66 0.09,-1v-1h2v-2h-2v-1c0,-0.34 -0.04,-0.67 -0.09,-1L20,10L20,8zM14,16h-4v-2h4v2zM14,12h-4v-2h4v2z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_color_lens_black_24px.xml b/app/src/main/res/drawable/ic_color_lens_black_24px.xml
index 9294749e..f75e2fbe 100644
--- a/app/src/main/res/drawable/ic_color_lens_black_24px.xml
+++ b/app/src/main/res/drawable/ic_color_lens_black_24px.xml
@@ -1,19 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
     <path
-        android:fillColor="#000000"
-        android:pathData="M12 3c-4.97 0-9 4.03-9 9s4.03 9 9 9c.83 0 1.5-.67 1.5-1.5
-0-.39-.15-.74-.39-1.01-.23-.26-.38-.61-.38-.99 0-.83 .67 -1.5 1.5-1.5H16c2.76 0
-5-2.24 5-5 0-4.42-4.03-8-9-8zm-5.5 9c-.83 0-1.5-.67-1.5-1.5S5.67 9 6.5 9 8 9.67
-8 10.5 7.33 12 6.5 12zm3-4C8.67 8 8 7.33 8 6.5S8.67 5 9.5 5s1.5 .67 1.5
-1.5S10.33 8 9.5 8zm5 0c-.83 0-1.5-.67-1.5-1.5S13.67 5 14.5 5s1.5 .67 1.5
-1.5S15.33 8 14.5 8zm3 4c-.83 0-1.5-.67-1.5-1.5S16.67 9 17.5 9s1.5 .67 1.5
-1.5-.67 1.5-1.5 1.5z" />
-    <path
-        android:pathData="M0 0h24v24H0z" />
-</vector>
\ No newline at end of file
+        android:fillColor="#FF000000"
+        android:pathData="M12,3c-4.97,0 -9,4.03 -9,9s4.03,9 9,9c0.83,0 1.5,-0.67 1.5,-1.5 0,-0.39 -0.15,-0.74 -0.39,-1.01 -0.23,-0.26 -0.38,-0.61 -0.38,-0.99 0,-0.83 0.67,-1.5 1.5,-1.5L16,16c2.76,0 5,-2.24 5,-5 0,-4.42 -4.03,-8 -9,-8zM6.5,12c-0.83,0 -1.5,-0.67 -1.5,-1.5S5.67,9 6.5,9 8,9.67 8,10.5 7.33,12 6.5,12zM9.5,8C8.67,8 8,7.33 8,6.5S8.67,5 9.5,5s1.5,0.67 1.5,1.5S10.33,8 9.5,8zM14.5,8c-0.83,0 -1.5,-0.67 -1.5,-1.5S13.67,5 14.5,5s1.5,0.67 1.5,1.5S15.33,8 14.5,8zM17.5,12c-0.83,0 -1.5,-0.67 -1.5,-1.5S16.67,9 17.5,9s1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_comment_black_48px.xml b/app/src/main/res/drawable/ic_comment_black_48px.xml
index f6a725cd..040e3245 100644
--- a/app/src/main/res/drawable/ic_comment_black_48px.xml
+++ b/app/src/main/res/drawable/ic_comment_black_48px.xml
@@ -7,8 +7,8 @@
 
     <path
         android:fillColor="#000000"
-        android:pathData="M21.99 4c0-1.1-.89-2-1.99-2H4c-1.1 0-2 .9-2 2v12c0 1.1 .9 2 2 2h14l4
-4-.01-18zM18 14H6v-2h12v2zm0-3H6V9h12v2zm0-3H6V6h12v2z" />
+        android:pathData="M21.99 4c0-1.1-0.89-2-1.99-2H4c-1.1 0-2 0.9-2 2v12c0 1.1 0.9 2 2 2h14l4
+4-0.01-18zM18 14H6v-2h12v2zm0-3H6V9h12v2zm0-3H6V6h12v2z" />
     <path
         android:pathData="M0 0h24v24H0z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_contacts_black_24px.xml b/app/src/main/res/drawable/ic_contacts_black_24px.xml
index e8aa75ab..674b66b7 100644
--- a/app/src/main/res/drawable/ic_contacts_black_24px.xml
+++ b/app/src/main/res/drawable/ic_contacts_black_24px.xml
@@ -1,16 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
     <path
-        android:pathData="M0 0h24v24H0zm0 0h24v24H0zm0 0h24v24H0z" />
-    <path
-        android:fillColor="#000000"
-        android:pathData="M20 0H4v2h16V0zM4 24h16v-2H4v2zM20 4H4c-1.1 0-2 .9-2 2v12c0 1.1 .9 2 2 2h16c1.1
-0 2-.9 2-2V6c0-1.1-.9-2-2-2zm-8 2.75c1.24 0 2.25 1.01 2.25 2.25s-1.01 2.25-2.25
-2.25S9.75 10.24 9.75 9 10.76 6.75 12 6.75zM17 17H7v-1.5c0-1.67 3.33-2.5 5-2.5s5
-.83 5 2.5V17z" />
-</vector>
\ No newline at end of file
+        android:fillColor="#FF000000"
+        android:pathData="M20,0L4,0v2h16L20,0zM4,24h16v-2L4,22v2zM20,4L4,4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM12,6.75c1.24,0 2.25,1.01 2.25,2.25s-1.01,2.25 -2.25,2.25S9.75,10.24 9.75,9 10.76,6.75 12,6.75zM17,17L7,17v-1.5c0,-1.67 3.33,-2.5 5,-2.5s5,0.83 5,2.5L17,17z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_format_list_bulleted_black_24px.xml b/app/src/main/res/drawable/ic_format_list_bulleted_black_24px.xml
index 3eef7771..6cb93c69 100644
--- a/app/src/main/res/drawable/ic_format_list_bulleted_black_24px.xml
+++ b/app/src/main/res/drawable/ic_format_list_bulleted_black_24px.xml
@@ -1,16 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
     <path
-        android:fillColor="#000000"
-        android:pathData="M4 10.5c-.83 0-1.5 .67 -1.5 1.5s.67 1.5 1.5 1.5 1.5-.67
-1.5-1.5-.67-1.5-1.5-1.5zm0-6c-.83 0-1.5 .67 -1.5 1.5S3.17 7.5 4 7.5 5.5 6.83 5.5
-6 4.83 4.5 4 4.5zm0 12c-.83 0-1.5 .68 -1.5 1.5s.68 1.5 1.5 1.5 1.5-.68
-1.5-1.5-.67-1.5-1.5-1.5zM7 19h14v-2H7v2zm0-6h14v-2H7v2zm0-8v2h14V5H7z" />
-    <path
-        android:pathData="M0 0h24v24H0V0z" />
-</vector>
\ No newline at end of file
+        android:fillColor="#FF000000"
+        android:pathData="M4,10.5c-0.83,0 -1.5,0.67 -1.5,1.5s0.67,1.5 1.5,1.5 1.5,-0.67 1.5,-1.5 -0.67,-1.5 -1.5,-1.5zM4,4.5c-0.83,0 -1.5,0.67 -1.5,1.5S3.17,7.5 4,7.5 5.5,6.83 5.5,6 4.83,4.5 4,4.5zM4,16.5c-0.83,0 -1.5,0.68 -1.5,1.5s0.68,1.5 1.5,1.5 1.5,-0.68 1.5,-1.5 -0.67,-1.5 -1.5,-1.5zM7,19h14v-2L7,17v2zM7,13h14v-2L7,11v2zM7,5v2h14L21,5L7,5z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_notifications_black_24px.xml b/app/src/main/res/drawable/ic_notifications_black_24px.xml
index d74fba00..7009a676 100644
--- a/app/src/main/res/drawable/ic_notifications_black_24px.xml
+++ b/app/src/main/res/drawable/ic_notifications_black_24px.xml
@@ -1,13 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
     <path
-        android:fillColor="#000000"
-        android:pathData="M12 22c1.1 0 2-.9 2-2h-4c0 1.1 .89 2 2
-2zm6-6v-5c0-3.07-1.64-5.64-4.5-6.32V4c0-.83-.67-1.5-1.5-1.5s-1.5 .67 -1.5
-1.5v.68C7.63 5.36 6 7.92 6 11v5l-2 2v1h16v-1l-2-2z" />
-</vector>
\ No newline at end of file
+        android:fillColor="#FF000000"
+        android:pathData="M12,22c1.1,0 2,-0.9 2,-2h-4c0,1.1 0.89,2 2,2zM18,16v-5c0,-3.07 -1.64,-5.64 -4.5,-6.32L13.5,4c0,-0.83 -0.67,-1.5 -1.5,-1.5s-1.5,0.67 -1.5,1.5v0.68C7.63,5.36 6,7.92 6,11v5l-2,2v1h16v-1l-2,-2z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_open_in_new_black_24px.xml b/app/src/main/res/drawable/ic_open_in_new_black_24px.xml
index d6abe89b..6c4a8cb2 100644
--- a/app/src/main/res/drawable/ic_open_in_new_black_24px.xml
+++ b/app/src/main/res/drawable/ic_open_in_new_black_24px.xml
@@ -9,6 +9,6 @@
         android:pathData="M0 0h24v24H0z" />
     <path
         android:fillColor="#000000"
-        android:pathData="M19 19H5V5h7V3H5c-1.11 0-2 .9-2 2v14c0 1.1 .89 2 2 2h14c1.1 0 2-.9
+        android:pathData="M19 19H5V5h7V3H5c-1.11 0-2 0.9-2 2v14c0 1.1 0.89 2 2 2h14c1.1 0 2-0.9
 2-2v-7h-2v7zM14 3v2h3.59l-9.83 9.83 1.41 1.41L19 6.41V10h2V3h-7z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_people_black_24px.xml b/app/src/main/res/drawable/ic_people_black_24px.xml
index 8cbf2980..4cfd8696 100644
--- a/app/src/main/res/drawable/ic_people_black_24px.xml
+++ b/app/src/main/res/drawable/ic_people_black_24px.xml
@@ -1,16 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
     <path
-        android:pathData="M0 0h24v24H0z" />
-    <path
-        android:fillColor="#000000"
-        android:pathData="M16 11c1.66 0 2.99-1.34 2.99-3S17.66 5 16 5c-1.66 0-3 1.34-3 3s1.34 3 3 3zm-8
-0c1.66 0 2.99-1.34 2.99-3S9.66 5 8 5C6.34 5 5 6.34 5 8s1.34 3 3 3zm0 2c-2.33 0-7
-1.17-7 3.5V19h14v-2.5c0-2.33-4.67-3.5-7-3.5zm8 0c-.29 0-.62 .02 -.97 .05 1.16
-.84 1.97 1.97 1.97 3.45V19h6v-2.5c0-2.33-4.67-3.5-7-3.5z" />
-</vector>
\ No newline at end of file
+        android:fillColor="#FF000000"
+        android:pathData="M16,11c1.66,0 2.99,-1.34 2.99,-3S17.66,5 16,5c-1.66,0 -3,1.34 -3,3s1.34,3 3,3zM8,11c1.66,0 2.99,-1.34 2.99,-3S9.66,5 8,5C6.34,5 5,6.34 5,8s1.34,3 3,3zM8,13c-2.33,0 -7,1.17 -7,3.5L1,19h14v-2.5c0,-2.33 -4.67,-3.5 -7,-3.5zM16,13c-0.29,0 -0.62,0.02 -0.97,0.05 1.16,0.84 1.97,1.97 1.97,3.45L17,19h6v-2.5c0,-2.33 -4.67,-3.5 -7,-3.5z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_person_pin_black_48px.xml b/app/src/main/res/drawable/ic_person_pin_black_48px.xml
index 3c0c9441..62a0a5d6 100644
--- a/app/src/main/res/drawable/ic_person_pin_black_48px.xml
+++ b/app/src/main/res/drawable/ic_person_pin_black_48px.xml
@@ -1,16 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-
-    <path
-        android:fillColor="#000000"
-        android:pathData="M19 2H5c-1.11 0-2 .9-2 2v14c0 1.1 .89 2 2 2h4l3 3 3-3h4c1.1 0 2-.9
-2-2V4c0-1.1-.9-2-2-2zm-7 3.3c1.49 0 2.7 1.21 2.7 2.7 0 1.49-1.21 2.7-2.7
-2.7-1.49 0-2.7-1.21-2.7-2.7 0-1.49 1.21-2.7 2.7-2.7zM18 16H6v-.9c0-2 4-3.1
-6-3.1s6 1.1 6 3.1v.9z" />
-    <path
-        android:pathData="M0 0h24v24H0z" />
-</vector>
\ No newline at end of file
+<vector android:height="48dp" android:viewportHeight="24.0"
+    android:viewportWidth="24.0" android:width="48dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M19,2L5,2c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h4l3,3 3,-3h4c1.1,0 2,-0.9 2,-2L21,4c0,-1.1 -0.9,-2 -2,-2zM12,5.3c1.49,0 2.7,1.21 2.7,2.7 0,1.49 -1.21,2.7 -2.7,2.7 -1.49,0 -2.7,-1.21 -2.7,-2.7 0,-1.49 1.21,-2.7 2.7,-2.7zM18,16L6,16v-0.9c0,-2 4,-3.1 6,-3.1s6,1.1 6,3.1v0.9z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_question_answer_black_48px.xml b/app/src/main/res/drawable/ic_question_answer_black_48px.xml
index 2683c740..5216a9ae 100644
--- a/app/src/main/res/drawable/ic_question_answer_black_48px.xml
+++ b/app/src/main/res/drawable/ic_question_answer_black_48px.xml
@@ -9,6 +9,6 @@
         android:pathData="M0 0h24v24H0z" />
     <path
         android:fillColor="#000000"
-        android:pathData="M21 6h-2v9H6v2c0 .55 .45 1 1 1h11l4 4V7c0-.55-.45-1-1-1zm-4
-6V3c0-.55-.45-1-1-1H3c-.55 0-1 .45-1 1v14l4-4h10c.55 0 1-.45 1-1z" />
+        android:pathData="M21 6h-2v9H6v2c0 0.55 0.45 1 1 1h11l4 4V7c0-0.55-0.45-1-1-1zm-4
+6V3c0-0.55-0.45-1-1-1H3c-0.55 0-1 0.45-1 1v14l4-4h10c0.55 0 1-0.45 1-1z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_report_black_48px.xml b/app/src/main/res/drawable/ic_report_black_48px.xml
index 7777c6b4..586f1aab 100644
--- a/app/src/main/res/drawable/ic_report_black_48px.xml
+++ b/app/src/main/res/drawable/ic_report_black_48px.xml
@@ -7,8 +7,8 @@
 
     <path
         android:fillColor="#000000"
-        android:pathData="M15.73 3H8.27L3 8.27v7.46L8.27 21h7.46L21 15.73V8.27L15.73 3zM12 17.3c-.72
-0-1.3-.58-1.3-1.3 0-.72 .58 -1.3 1.3-1.3 .72 0 1.3 .58 1.3 1.3 0 .72-.58 1.3-1.3
+        android:pathData="M15.73 3H8.27L3 8.27v7.46L8.27 21h7.46L21 15.73V8.27L15.73 3zM12 17.3c-0.72
+0-1.3-0.58-1.3-1.3 0-0.72 0.58 -1.3 1.3-1.3 0.72 0 1.3 0.58 1.3 1.3 0 0.72-0.58 1.3-1.3
 1.3zm1-4.3h-2V7h2v6z" />
     <path
         android:pathData="M0 0h24v24H0z" />
diff --git a/app/src/main/res/drawable/ic_screen_rotation_black_24px.xml b/app/src/main/res/drawable/ic_screen_rotation_black_24px.xml
index 9163901e..b63eaae7 100644
--- a/app/src/main/res/drawable/ic_screen_rotation_black_24px.xml
+++ b/app/src/main/res/drawable/ic_screen_rotation_black_24px.xml
@@ -9,10 +9,10 @@
         android:pathData="M0 0h24v24H0z" />
     <path
         android:fillColor="#000000"
-        android:pathData="M16.48 2.52c3.27 1.55 5.61 4.72 5.97 8.48h1.5C23.44 4.84 18.29 0 12 0l-.66 .03
-3.81 3.81 1.33-1.32zm-6.25-.77c-.59-.59-1.54-.59-2.12 0L1.75 8.11c-.59 .59 -.59
-1.54 0 2.12l12.02 12.02c.59 .59 1.54 .59 2.12 0l6.36-6.36c.59-.59 .59 -1.54
+        android:pathData="M16.48 2.52c3.27 1.55 5.61 4.72 5.97 8.48h1.5C23.44 4.84 18.29 0 12 0l-0.66 0.03
+3.81 3.81 1.33-1.32zm-6.25-0.77c-0.59-0.59-1.54-0.59-2.12 0L1.75 8.11c-0.59 0.59 -0.59
+1.54 0 2.12l12.02 12.02c0.59 0.59 1.54 0.59 2.12 0l6.36-6.36c0.59-0.59 0.59 -1.54
 0-2.12L10.23 1.75zm4.6 19.44L2.81 9.17l6.36-6.36 12.02 12.02-6.36 6.36zm-7.31
-.29 C4.25 19.94 1.91 16.76 1.55 13H.05C.56 19.16 5.71 24 12
-24l.66-.03-3.81-3.81-1.33 1.32z" />
+0.29 C4.25 19.94 1.91 16.76 1.55 13H0.05C0.56 19.16 5.71 24 12
+24l0.66-0.03-3.81-3.81-1.33 1.32z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_thumb_up_black_24px.xml b/app/src/main/res/drawable/ic_thumb_up_black_24px.xml
index 5d721440..1fca08b3 100644
--- a/app/src/main/res/drawable/ic_thumb_up_black_24px.xml
+++ b/app/src/main/res/drawable/ic_thumb_up_black_24px.xml
@@ -9,8 +9,8 @@
         android:pathData="M0 0h24v24H0z" />
     <path
         android:fillColor="#000000"
-        android:pathData="M1 21h4V9H1v12zm22-11c0-1.1-.9-2-2-2h-6.31l.95-4.57 .03
--.32c0-.41-.17-.79-.44-1.06L14.17 1 7.59 7.59C7.22 7.95 7 8.45 7 9v10c0 1.1 .9 2
-2 2h9c.83 0 1.54-.5 1.84-1.22l3.02-7.05c.09-.23 .14 -.47 .14
--.73v-1.91l-.01-.01L23 10z" />
+        android:pathData="M1 21h4V9H1v12zm22-11c0-1.1-0.9-2-2-2h-6.31l0.95-4.57 0.03
+-0.32c0-0.41-0.17-0.79-0.44-1.06L14.17 1 7.59 7.59C7.22 7.95 7 8.45 7 9v10c0 1.1 0.9 2
+2 2h9c0.83 0 1.54-0.5 1.84-1.22l3.02-7.05c0.09-0.23 0.14 -0.47 0.14
+-0.73v-1.91l-0.01-0.01L23 10z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_thumb_up_black_48px.xml b/app/src/main/res/drawable/ic_thumb_up_black_48px.xml
index 5d721440..1fca08b3 100644
--- a/app/src/main/res/drawable/ic_thumb_up_black_48px.xml
+++ b/app/src/main/res/drawable/ic_thumb_up_black_48px.xml
@@ -9,8 +9,8 @@
         android:pathData="M0 0h24v24H0z" />
     <path
         android:fillColor="#000000"
-        android:pathData="M1 21h4V9H1v12zm22-11c0-1.1-.9-2-2-2h-6.31l.95-4.57 .03
--.32c0-.41-.17-.79-.44-1.06L14.17 1 7.59 7.59C7.22 7.95 7 8.45 7 9v10c0 1.1 .9 2
-2 2h9c.83 0 1.54-.5 1.84-1.22l3.02-7.05c.09-.23 .14 -.47 .14
--.73v-1.91l-.01-.01L23 10z" />
+        android:pathData="M1 21h4V9H1v12zm22-11c0-1.1-0.9-2-2-2h-6.31l0.95-4.57 0.03
+-0.32c0-0.41-0.17-0.79-0.44-1.06L14.17 1 7.59 7.59C7.22 7.95 7 8.45 7 9v10c0 1.1 0.9 2
+2 2h9c0.83 0 1.54-0.5 1.84-1.22l3.02-7.05c0.09-0.23 0.14 -0.47 0.14
+-0.73v-1.91l-0.01-0.01L23 10z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_touch_app_black_24px.xml b/app/src/main/res/drawable/ic_touch_app_black_24px.xml
index 1c1e60b3..dda5c85c 100644
--- a/app/src/main/res/drawable/ic_touch_app_black_24px.xml
+++ b/app/src/main/res/drawable/ic_touch_app_black_24px.xml
@@ -1,16 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
     <path
-        android:fillColor="#000000"
-        android:pathData="M9 11.24V7.5C9 6.12 10.12 5 11.5 5S14 6.12 14 7.5v3.74c1.21-.81 2-2.18 2-3.74C16
-5.01 13.99 3 11.5 3S7 5.01 7 7.5c0 1.56 .79 2.93 2 3.74zm9.84
-4.63l-4.54-2.26c-.17-.07-.35-.11-.54-.11H13v-6c0-.83-.67-1.5-1.5-1.5S10 6.67 10
-7.5v10.74l-3.43-.72c-.08-.01-.15-.03-.24-.03-.31 0-.59 .13 -.79 .33 l-.79 .8
-4.94 4.94c.27 .27 .65 .44 1.06 .44 h6.79c.75 0 1.33-.55
-1.44-1.28l.75-5.27c.01-.07 .02 -.14 .02 -.2 0-.62-.38-1.16-.91-1.38z" />
-</vector>
\ No newline at end of file
+        android:fillColor="#FF000000"
+        android:pathData="M9,11.24L9,7.5C9,6.12 10.12,5 11.5,5S14,6.12 14,7.5v3.74c1.21,-0.81 2,-2.18 2,-3.74C16,5.01 13.99,3 11.5,3S7,5.01 7,7.5c0,1.56 0.79,2.93 2,3.74zM18.84,15.87l-4.54,-2.26c-0.17,-0.07 -0.35,-0.11 -0.54,-0.11L13,13.5v-6c0,-0.83 -0.67,-1.5 -1.5,-1.5S10,6.67 10,7.5v10.74l-3.43,-0.72c-0.08,-0.01 -0.15,-0.03 -0.24,-0.03 -0.31,0 -0.59,0.13 -0.79,0.33l-0.79,0.8 4.94,4.94c0.27,0.27 0.65,0.44 1.06,0.44h6.79c0.75,0 1.33,-0.55 1.44,-1.28l0.75,-5.27c0.01,-0.07 0.02,-0.14 0.02,-0.2 0,-0.62 -0.38,-1.16 -0.91,-1.38z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_visibility_off_black_24px.xml b/app/src/main/res/drawable/ic_visibility_off_black_24px.xml
index 1eeca64f..b3bb7460 100644
--- a/app/src/main/res/drawable/ic_visibility_off_black_24px.xml
+++ b/app/src/main/res/drawable/ic_visibility_off_black_24px.xml
@@ -9,11 +9,11 @@
         android:pathData="M0 0h24v24H0zm0 0h24v24H0zm0 0h24v24H0zm0 0h24v24H0z" />
     <path
         android:fillColor="#000000"
-        android:pathData="M12 7c2.76 0 5 2.24 5 5 0 .65-.13 1.26-.36 1.83l2.92 2.92c1.51-1.26 2.7-2.89
-3.43-4.75-1.73-4.39-6-7.5-11-7.5-1.4 0-2.74 .25 -3.98 .7 l2.16 2.16C10.74 7.13
-11.35 7 12 7zM2 4.27l2.28 2.28 .46 .46C3.08 8.3 1.78 10.02 1 12c1.73 4.39 6 7.5
-11 7.5 1.55 0 3.03-.3 4.38-.84l.42 .42 L19.73 22 21 20.73 3.27 3 2 4.27zM7.53
-9.8l1.55 1.55c-.05 .21 -.08 .43 -.08 .65 0 1.66 1.34 3 3 3 .22 0 .44-.03 .65
--.08l1.55 1.55c-.67 .33 -1.41 .53 -2.2 .53 -2.76 0-5-2.24-5-5 0-.79 .2 -1.53 .53
--2.2zm4.31-.78l3.15 3.15 .02 -.16c0-1.66-1.34-3-3-3l-.17 .01 z" />
+        android:pathData="M12 7c2.76 0 5 2.24 5 5 0 0.65-0.13 1.26-0.36 1.83l2.92 2.92c1.51-1.26 2.7-2.89
+3.43-4.75-1.73-4.39-6-7.5-11-7.5-1.4 0-2.74 0.25 -3.98 0.7 l2.16 2.16C10.74 7.13
+11.35 7 12 7zM2 4.27l2.28 2.28 0.46 0.46C3.08 8.3 1.78 10.02 1 12c1.73 4.39 6 7.5
+11 7.5 1.55 0 3.03-0.3 4.38-0.84l0.42 0.42 L19.73 22 21 20.73 3.27 3 2 4.27zM7.53
+9.8l1.55 1.55c-0.05 0.21 -0.08 0.43 -0.08 0.65 0 1.66 1.34 3 3 3 0.22 0 0.44-0.03 0.65
+-0.08l1.55 1.55c-0.67 0.33 -1.41 0.53 -2.2 0.53 -2.76 0-5-2.24-5-5 0-0.79 0.2 -1.53 0.53
+-2.2zm4.31-0.78l3.15 3.15 0.02 -0.16c0-1.66-1.34-3-3-3l-0.17 0.01 z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_vpn_lock_black_24px.xml b/app/src/main/res/drawable/ic_vpn_lock_black_24px.xml
index 14dd79ed..266f1578 100644
--- a/app/src/main/res/drawable/ic_vpn_lock_black_24px.xml
+++ b/app/src/main/res/drawable/ic_vpn_lock_black_24px.xml
@@ -7,13 +7,13 @@
 
     <path
         android:fillColor="#000000"
-        android:pathData="M22 4v-.5C22 2.12 20.88 1 19.5 1S17 2.12 17 3.5V4c-.55 0-1 .45-1 1v4c0 .55 .45 1
-1 1h5c.55 0 1-.45 1-1V5c0-.55-.45-1-1-1zm-.8 0h-3.4v-.5c0-.94 .76 -1.7
-1.7-1.7s1.7 .76 1.7 1.7V4zm-2.28 8c.04 .33 .08 .66 .08 1 0 2.08-.8 3.97-2.1
-5.39-.26-.81-1-1.39-1.9-1.39h-1v-3c0-.55-.45-1-1-1H7v-2h2c.55 0 1-.45
-1-1V8h2c1.1 0 2-.9 2-2V3.46c-.95-.3-1.95-.46-3-.46C5.48 3 1 7.48 1 13s4.48 10 10
-10 10-4.48 10-10c0-.34-.02-.67-.05-1h-2.03zM10 20.93c-3.95-.49-7-3.85-7-7.93
-0-.62 .08 -1.21 .21 -1.79L8 16v1c0 1.1 .9 2 2 2v1.93z" />
+        android:pathData="M22 4v-0.5C22 2.12 20.88 1 19.5 1S17 2.12 17 3.5V4c-0.55 0-1 0.45-1 1v4c0 0.55 0.45 1
+1 1h5c0.55 0 1-0.45 1-1V5c0-0.55-0.45-1-1-1zm-0.8 0h-3.4v-0.5c0-0.94 0.76 -1.7
+1.7-1.7s1.7 0.76 1.7 1.7V4zm-2.28 8c0.04 0.33 0.08 0.66 0.08 1 0 2.08-0.8 3.97-2.1
+5.39-0.26-0.81-1-1.39-1.9-1.39h-1v-3c0-0.55-0.45-1-1-1H7v-2h2c0.55 0 1-0.45
+1-1V8h2c1.1 0 2-0.9 2-2V3.46c-0.95-0.3-1.95-0.46-3-0.46C5.48 3 1 7.48 1 13s4.48 10 10
+10 10-4.48 10-10c0-0.34-0.02-0.67-0.05-1h-2.03zM10 20.93c-3.95-0.49-7-3.85-7-7.93
+0-0.62 0.08 -1.21 0.21 -1.79L8 16v1c0 1.1 0.9 2 2 2v1.93z" />
     <path
         android:pathData="M0 0h24v24H0z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/menu/main__menu_bottom.xml b/app/src/main/res/menu/main__menu_bottom.xml
index 579b90ad..8cc61e1a 100644
--- a/app/src/main/res/menu/main__menu_bottom.xml
+++ b/app/src/main/res/menu/main__menu_bottom.xml
@@ -4,19 +4,4 @@
     tools:context="com.github.dfa.diaspora_android.activity.MainActivity"
     tools:ignore="AlwaysShowAction">
 
-
-    <item
-        android:id="@+id/action_search"
-        android:icon="@drawable/ic_search_white_48px"
-        android:orderInCategory="100"
-        android:title="@string/action_search_by_tags_or_persons"
-        app:showAsAction="always" />
-
-    <item
-        android:id="@+id/action_compose"
-        android:icon="@drawable/ic_mode_edit_white_48px"
-        android:orderInCategory="200"
-        android:title="@string/action_compose_new_post"
-        app:showAsAction="always" />
-
 </menu>
diff --git a/app/src/main/res/menu/main__menu_top.xml b/app/src/main/res/menu/main__menu_top.xml
index 5f9d92fa..4aa39f38 100644
--- a/app/src/main/res/menu/main__menu_top.xml
+++ b/app/src/main/res/menu/main__menu_top.xml
@@ -4,6 +4,13 @@
     tools:context="com.github.dfa.diaspora_android.activity.MainActivity"
     tools:ignore="AlwaysShowAction">
 
+    <item
+        android:id="@+id/action_search"
+        android:icon="@drawable/ic_search_white_48px"
+        android:orderInCategory="100"
+        android:title="@string/action_search_by_tags_or_persons"
+        app:showAsAction="always" />
+
     <item
         android:id="@+id/action_notifications"
         android:icon="@drawable/ic_notifications_white_48px__layer"
@@ -61,4 +68,11 @@
         android:title="@string/conversations"
         app:showAsAction="always" />
 
+    <item
+        android:id="@+id/action_compose"
+        android:icon="@drawable/ic_mode_edit_white_48px"
+        android:orderInCategory="200"
+        android:title="@string/action_compose_new_post"
+        app:showAsAction="always" />
+
 </menu>