From 9194436bc89041edb90510fef97373096cac4505 Mon Sep 17 00:00:00 2001
From: Philipp Crocoll <crocoapps@gmail.com>
Date: Tue, 10 Dec 2024 11:22:55 +0100
Subject: [PATCH] start replacing some icons

---
 .../EntryEditActivity.cs                        |   2 +-
 .../drawable-xhdpi/navigation_accept.png        | Bin 1207 -> 0 bytes
 .../Resources/drawable-xhdpi/opendb.png         | Bin 15135 -> 0 bytes
 .../Resources/drawable-xhdpi/rightarrow.png     | Bin 15060 -> 0 bytes
 .../Resources/drawable-xhdpi/vdots.png          | Bin 15380 -> 0 bytes
 .../Resources/drawable-xhdpi/vdots_bright.png   | Bin 495 -> 0 bytes
 .../drawable/baseline_account_circle_24.xml     |   5 +++++
 .../drawable/baseline_arrow_back_24.xml         |   5 +++++
 .../drawable/baseline_attachment_24.xml         |   5 +++++
 .../drawable/baseline_camera_alt_24.xml         |   7 +++++++
 .../Resources/drawable/baseline_check_24.xml    |   5 +++++
 .../Resources/drawable/baseline_close_24.xml    |   5 +++++
 .../Resources/drawable/baseline_comment_24.xml  |   5 +++++
 .../drawable/baseline_create_new_folder_24.xml  |   5 +++++
 .../drawable/baseline_date_range_24.xml         |   5 +++++
 .../Resources/drawable/baseline_delete_24.xml   |   5 +++++
 .../Resources/drawable/baseline_explicit_24.xml |   5 +++++
 .../Resources/drawable/baseline_help_24.xml     |   5 +++++
 .../Resources/drawable/baseline_lock_24.xml     |   5 +++++
 .../drawable/baseline_more_horiz_24.xml         |   5 +++++
 .../Resources/drawable/baseline_search_24.xml   |   5 +++++
 .../Resources/drawable/baseline_settings_24.xml |   5 +++++
 .../Resources/drawable/baseline_sort_24.xml     |   5 +++++
 .../Resources/drawable/baseline_vpn_key_24.xml  |   5 +++++
 .../Resources/layout/configure_totp_dialog.xml  |   2 +-
 .../Resources/layout/entry_view_contents.xml    |   2 +-
 .../Resources/layout/generate_password.xml      |   2 +-
 .../Resources/layout/plugin_details.xml         |   2 +-
 .../Resources/menu/fileselect.xml               |   4 ++--
 .../Resources/menu/group.xml                    |   2 +-
 .../services/OngoingNotificationsService.cs     |   2 +-
 31 files changed, 101 insertions(+), 9 deletions(-)
 delete mode 100644 src/keepass2android-appSdkStyle/Resources/drawable-xhdpi/navigation_accept.png
 delete mode 100644 src/keepass2android-appSdkStyle/Resources/drawable-xhdpi/opendb.png
 delete mode 100644 src/keepass2android-appSdkStyle/Resources/drawable-xhdpi/rightarrow.png
 delete mode 100644 src/keepass2android-appSdkStyle/Resources/drawable-xhdpi/vdots.png
 delete mode 100644 src/keepass2android-appSdkStyle/Resources/drawable-xhdpi/vdots_bright.png
 create mode 100644 src/keepass2android-appSdkStyle/Resources/drawable/baseline_account_circle_24.xml
 create mode 100644 src/keepass2android-appSdkStyle/Resources/drawable/baseline_arrow_back_24.xml
 create mode 100644 src/keepass2android-appSdkStyle/Resources/drawable/baseline_attachment_24.xml
 create mode 100644 src/keepass2android-appSdkStyle/Resources/drawable/baseline_camera_alt_24.xml
 create mode 100644 src/keepass2android-appSdkStyle/Resources/drawable/baseline_check_24.xml
 create mode 100644 src/keepass2android-appSdkStyle/Resources/drawable/baseline_close_24.xml
 create mode 100644 src/keepass2android-appSdkStyle/Resources/drawable/baseline_comment_24.xml
 create mode 100644 src/keepass2android-appSdkStyle/Resources/drawable/baseline_create_new_folder_24.xml
 create mode 100644 src/keepass2android-appSdkStyle/Resources/drawable/baseline_date_range_24.xml
 create mode 100644 src/keepass2android-appSdkStyle/Resources/drawable/baseline_delete_24.xml
 create mode 100644 src/keepass2android-appSdkStyle/Resources/drawable/baseline_explicit_24.xml
 create mode 100644 src/keepass2android-appSdkStyle/Resources/drawable/baseline_help_24.xml
 create mode 100644 src/keepass2android-appSdkStyle/Resources/drawable/baseline_lock_24.xml
 create mode 100644 src/keepass2android-appSdkStyle/Resources/drawable/baseline_more_horiz_24.xml
 create mode 100644 src/keepass2android-appSdkStyle/Resources/drawable/baseline_search_24.xml
 create mode 100644 src/keepass2android-appSdkStyle/Resources/drawable/baseline_settings_24.xml
 create mode 100644 src/keepass2android-appSdkStyle/Resources/drawable/baseline_sort_24.xml
 create mode 100644 src/keepass2android-appSdkStyle/Resources/drawable/baseline_vpn_key_24.xml

diff --git a/src/keepass2android-appSdkStyle/EntryEditActivity.cs b/src/keepass2android-appSdkStyle/EntryEditActivity.cs
index 1c38ed65..694dd3f0 100644
--- a/src/keepass2android-appSdkStyle/EntryEditActivity.cs
+++ b/src/keepass2android-appSdkStyle/EntryEditActivity.cs
@@ -1356,7 +1356,7 @@ namespace keepass2android
 
 			//setup delete button:
 			var deleteButton = dlgView.FindViewById<Button>(Resource.Id.delete_extra);
-			deleteButton.SetCompoundDrawablesWithIntrinsicBounds(Resources.GetDrawable(Android.Resource.Drawable.IcMenuDelete), null, null, null);
+			deleteButton.SetCompoundDrawablesWithIntrinsicBounds(Resources.GetDrawable(Resource.Drawable.ic_menu_delete), null, null, null);
 			deleteButton.Click += (o, args) =>
 				{
 					DeleteAdvancedString(sender);
diff --git a/src/keepass2android-appSdkStyle/Resources/drawable-xhdpi/navigation_accept.png b/src/keepass2android-appSdkStyle/Resources/drawable-xhdpi/navigation_accept.png
deleted file mode 100644
index 4942e4a65d8b9590ed0feca12516e690375cf9e9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1207
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I0wfs{c7_5;$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWuD@%qp275hW46K32*3xq68pHF_1f1t3EhZ0suv5|gu2OB9k)
z(=+pImEP~(ucVNfVyhHx>TBRz;GCL~=}}db8eHWUl3bOYY?-2DZ>L~WVFffGH?<^D
zp&~aYuh^=>Rtapb6_5=Q)>l#hD=EpgRf0Gw!Z$#{Ilm}X!Bo#cH`&0<P{GVZ&(Orc
z(!^3n!N|bSK;O_v-@shg(7?*n+{(aE0Sc6WwiTtMSp~VcLG1$aY?U%fN(!v>^~=l4
z^~#O)@{7{-4J|D#^$m>ljf`}GDs+o0^GXscbn}XpVJ5hw7AF^F7L;V>=P7_pOiaoz
zEwNPsx)kDt+yc0<dBxCR0tT3VMPh-zp`HQAOE87LzW9~q=E7AMmjtCE+>6!V;*iRM
zRQ;gT;{4L0WMIUlDTAykuyQU+O)SYT3dzsUfrVl~Mt(_taYlZDf^)E`o}q$oVsd64
zNCd3I*VoE3uec;JFFDoI#a0PuhF)f7ij}d8nTdsyqlKxHfrX)=tD&Wdp{1*dle43n
zsiC=vlOas6OMY@`Zfaf$Om7N8uO&{spu~_{0JPa9wJ5VJHN~wcKUV?lX{$`!ZZX4Y
z9#n4%Znv1@)T<A4j6Nu8k)j$V1WZ35COqK+Iq;;Png>kpMZkm|Y4q$a0|TR`r;B4q
z#jUp&wnnl92)HKRnJd!HB<9B^`av*RbxrGz-MiOiFTAlp|Ijnl&*lcjd7XyGB$7)4
zj%hHf{=0Bi@3P(b_rVIMRYLcjOW&dHIZ;slIsXYkWw&_>zPFxRTPisBNLV&q$(Wy?
z*xWQ{{!+)^HQL@OPyYzz{`%Ve<mn%!w{@?h*Z!Nm=H9E7i;pMUhPv!bz7Sq3oLH2y
zBh6!boPp0o6~mwy!3%4|LyY{USr|q-Zj1{!#S$rWf{W{`UOH>*ulzL+uB0!GTd~H$
zmOE&E>f60>nXIciJZjsVt-M+;aa|EoQh(0>LQ~L7JHVBrvfFu=cgs00#w?DB<*&Df
zS){gYiC(|mX;M%0`rS@vR$h-ixH3FmQT=P3!O?wJemlx1Pnjx_+++BR-<H8V^SRmn
SO*2eEMTw`YpUXO@geCxmmYw<l

diff --git a/src/keepass2android-appSdkStyle/Resources/drawable-xhdpi/opendb.png b/src/keepass2android-appSdkStyle/Resources/drawable-xhdpi/opendb.png
deleted file mode 100644
index d9b8bc95d2b9aef7f1026f8615b8ad838d393d98..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 15135
zcmeI3U5MON6vyvsSJss-LP2XqNK;$<XeODDOeSGwy4#&?ccs%V+bO%-7n@1$%!bY+
zG0Apj_d%EKA}aVIBGwiJp`{O6@TDy%6rrWXC!hQRUwmo(LVXc^(0Y^1NA}L_WzmW+
zcVH$t_uT(E$?u+XCog$*`tZT6!#jon09&Uf3p40gKwo)i3;NxCVPX$DJZMkOy8t}2
z&HoO7cg}4`6Mi&GbKYF>kfK@jn5tW47;DyTG#h~IzNW2eC!xobVbw5m?9U%vV;Muw
zv9n@PDB9z2!I)fj;L+v7C2jenChP3J{BX9Zpa6B~sZ6t8GhL;bV}rN~I`@ZpmI<bK
zCv)tWpOBd=PBY_{0~s-v<}@KKF_IjMi;|R*_A&_}F7iT>PYPTjsiXuYm0(&QHb0Ec
zvW{L+W(o&d>5!FU7d+2ac)rnS#2U$%<y85&EX%x*;1dZB&EVW6(^H$A>Fx@HwBr<@
zt2u`48J5ZTan-W5=;c_}Pt^Ie?yGKh5}9s`9iqrLRhy5;1iqh0*E$+|(WwQOrfWQ`
z!8$ZO7wO`Cb@qbgS?+?hLCTJM!^CJ!ip5UuzSmo?_f7436Q>Y@7Sg^-x3pwKeg?YM
zqNBlyQ|MN9^}Bn|sB{-+T_oSL;kCo2v4PC@gtDL%!WGJ*dsW6AsCt%DvaDJ@tg`7g
zLS}qCs4C{ES;N$=hWm7u$0gnM?nZ+J)q{Dz9yvkggj5ODV=}G?@n?mEA_$Qn;Y=(>
z(bA2|()t)uDS@P-B4na5A~W$AsDE_TQ#TbQIyVwW*OZFo)KxEU)YU5FZL^x?yMvLL
zovKpCt(xVa%Yyl2mhU$lQ3aKzOqs5yni`xc<k3LPFmxp&N|mILPIH1P=$x8NmAQ<V
zE_0%;si|~1r6*G`fLJU><vpPbmbU133kn@>EV`wk@ZHNQXEZU9$y7K|l*?Q^4n<B)
zh&oqE>4Kb6bsfrbJ5eN9Pog7^f%ZMM7MbJUi;j|^5K_9VB{@;kbxzV#5~s%HG*{6w
z8Ca2_mQ1JGDf)!zNi}J>s9KjIRg7vm*x8Q47uJuq9W^7^p={N0q2GTww%vf8Ev>U-
z`I?}Q6;<>1w!G%I2h_9ty3y`sb(Afc(Yu_RLlDM~$T!Z>Sb!#}y~0qztc`=XR>f<m
z4jikZ3fWBOhf&wd@bFpQ|1YQ+|G`4I>ZyOX44dn!f4mI6JJkQT4BaZ$7F4qe^*rA$
z;P$}gRxVu6^_|u3*4|Fc`hQLe>S9z;YS2CLEZ;NM%^c33^SiOO7|fRv0{ZZA|F<QL
zx^d||SsHcY(ysEDX?XcWD;qW(QThL%;r4zMJ?z1JS`?FFmdA&2#kA3cwYh?U_F>oG
zPtuu|26yxo&Ub~P6ct7sEn&D+k;k&22g6bH(1)Hk`OX7pPkVNDv3q&ay`y^>6^lia
zU_i(w#YN_Wc_}Uo2-&2#$b2v_#f1SOn-mwB59Xz~Fd$@;;v)0Gyc8D(gltk=WImXe
z;=+KCO^S=m2lG-~7!a~aagq68UWy9?LN+NbG9S!KabZBnCdEbOgLx?~3<%kzxX64k
zFU5rcA)6EznGfcrxG*4Olj0)t!Mqd~283)<Tx33&m*T>JkWGq<%m?#QTo@3tNpX?+
zU|xy~141?_E;1j?OL1X9$R@=_=7V`DE({3Sq`1g@FfYZ00U?_d7nu*{rMNI4WRr+%
zxcdqxG|_vT4fKNMhq<%p1yI0flQTsCmUjcNavFd??xN#&04xdse18G}<!t~SwcdFC
z#sM_<gQ>z;srmI!Uw-n~z}WWFDi{@iyEu5Gb{v4&<G&ml9GwR{R$dwzILmMS`1bWT
zXI|TO-`bt`?s~`4?CbKSm!Fuvy?^<EE$^;AIdb*Ifx(GwD@Vo#XRS{^zdCr~;?n4?
zvpbEo&%XHmky|5EkFQ<(_R8opt3yt8b%=e1S+)0|AOGz9mC@(kx_PHiJy*MVeQo5-
z^}RdqKL|5=`SQckpYQ+m16x>W9(wxx&^O?#wad45%fFsM7Y?Q-4i_%%Ke75ZpvGx%

diff --git a/src/keepass2android-appSdkStyle/Resources/drawable-xhdpi/rightarrow.png b/src/keepass2android-appSdkStyle/Resources/drawable-xhdpi/rightarrow.png
deleted file mode 100644
index 866a4b6687b24bbee40edfa86f138116168f383a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 15060
zcmeI3Pl()99LH0s(5@DgDqUm`ajH_$O#UaEkeU9O*>)E@?XWxA?a6(UyxEOAlf)$3
znO#JS75{(-DHXH`g7he!yod)q)SJ+YB6zTZ^kAv<tO)v&%%AL=*~g+4FK=M}{NDHd
ze!slW`~BYJl6UH7P92zfY>Hu+0}J!jMf5#`-beQBMW3hcE?z@l`-A!O5yL!iFnRA`
zu6{JlFvcCXu^cbgPMfyhDFVlD!eXxzpxF##9qk3cUWYN;gsZMsD%}0@s{-pfrNTM2
zCe(roTyy8QLb$YbreSZb+lEs(TAs3cCJNAjF<^V0wilVbQX!3NqTk6dUtrTI@p`Fn
zJW0qd*XnG=4<V}-HO>|^oz;z^sOq|+Kg&vjsPcl$%K|6KrXrY%#P(l>@)Y`Ig-**{
zte)(rLsqG<7RQ0f^WAQ@*p-WZxXO!$Veo>)OA?1>aM7k0gC6HahqEAqI8_+gp&P`m
z@3Bc-(DXOrQlXF}8ov7L>IB0?UesrYDDpiJ@M2NmCpkIx&?ndk+v%k_HV@md1HCvx
ze&R&GV9k&HXwBat<xt)+G1`+_ZJ2xF^>#WFQ%CXK1%#lFbfRa}*bE@Q2qS+ZwBg(Z
zw3Ne>Rv){q(dKN6lqfr1JM6hTxFt&FmX<=cLl#=ASqUMC{jlNt?Q&LS^#MY*Qc0_d
zJ#x<V9KRbqZSlCvXun6%U=_r$oYW&H7@VLqP(8|`DTvPqk|_weAlXbTM$LEJ*5>vY
zvkg%-RRfiEK1OaP9s~7{17fhNDEYa$IF4<${ICP!vfBZxkPp07iysZ<W)7>$toUs|
zM3)82vc*pt&UvMkW-fS93_KeyRLf|f=(>(68!b)N4TZBoQ|1g^F*u-s1g1T!0llR+
zVFs~Q%e#+-uKM;y(k&=-cCa|Ujlz#E%TYy1Xvwpjs>vcJicsa6h6Xvqa12>#YO~HP
zNOub*$^{!sbT)L+xd+<0Imucal+0EgS%!kbiJH>l1XWQuv?znqBt^F!TXqyt8KjsH
zW-Qgb8=-35%vCX}<@97*f-i3$9SChVJ)r^+Mlk8WQen`5!y|2YVkJIlADh5V&bG3h
zv<Gx7e%t8ivWA|0H+OtHcZVR0pL5?iM|TZ+r1r`}rL%Sp68WvT3qp8&6;;S?IzNlL
z-3<?K@yUNd+x-tVA_5ow-8Ss5tN!sejGs{d-!_b@*j@wPDs;;HpnwMhyW6>JKeu<*
zpj*c~(MtZDOw`4wqCna`qQ#GmjWTERmy>R6Z=~~eNkA`NOg{Urc^P*-Pj=1Axa-LC
zdC!f@Qa>9uobyWlL9^q13Ek|$vZkuCYVr6m?ooGpu)SP$(K#F?=ZQ4i_rZmUj^{^?
z3IdWQOC57U-!a>&+-+IfgV`v$=|lIM{P2cztUZUP*uDHQTG73Xip8QyFd$@;;v)0G
zREi4&LN+NbG9OH(xG*4Olj0)t!BmP1141?_E;1iXrMNI4WRv0|^TAY#3j;znDK0V}
zOr^LmAY_x`BJ;siiVFimHYqMLA55jVFd$@;;v)0GREi4&LN+NbG9OH(xG*4Olj0)t
z!BmP1141?_E;1iXrMNI4WRv0|^TAY#3j;znDK0V}Or^LmAY_x`BJ;siiVFimHYqML
zA55jVFd$@;;v)0GREi4&LN+NbG9OH(xG*4Olj0)t!BmP1141^5xTZ#ra6%6~x7kGx
zXg;OCcO5<4$=dUaHHO)Gl3^}hVwm6mLf^kK%!a@)w^ta({D5H&`Ile(<|LZiT&Nyz
z^nU#9dvVXP`t%%lZQsQc$N2r%zIgbw|NdTP|4;Y-eCOsX@2*$gp84d4^xbs**tGWP
zm6fZH+<I`|)WO^JKb8(X`rM_DFJF1{iA#Upv0Bl$Z)|D59Qyj~TQ_HpzVPa;AN2d+
YhY#Jj{`pIfqioE=+?ncUCstnn8^%INf&c&j

diff --git a/src/keepass2android-appSdkStyle/Resources/drawable-xhdpi/vdots.png b/src/keepass2android-appSdkStyle/Resources/drawable-xhdpi/vdots.png
deleted file mode 100644
index 5ba3357c8888b903a3385ab2f541ab2a09ece4a5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 15380
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
AjQ{`u

diff --git a/src/keepass2android-appSdkStyle/Resources/drawable-xhdpi/vdots_bright.png b/src/keepass2android-appSdkStyle/Resources/drawable-xhdpi/vdots_bright.png
deleted file mode 100644
index 90926bbdbfa763a7df0a982ae6e1f732d3368e0f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 495
zcmV<L0TBL)P)<h;3K|Lk000e1NJLTq002q=003qP1ONa4#<$P600009a7bBm000XU
z000XU0RWnu7ytkO2XskIMF-*t6b}Xt!tGX^0004wNkl<Zc-rmT0cI;v6vpvWLzSX~
z0(ofB1yr?E+oFI1s4gKuSJ99l00P47A((X}5Xb@o2r$fG{tqCYBy;e57ju3q7&F(s
z-#Fj35JKn!&dIsvnw)b>j|+ZSvv1807nTmsY&c}Yv!%f|4aYQmn;suDoYL@NT3oTE
z%a$usVuHuSbjaA@u_H4T{@^t*74Gr6Hx*v-dNmc^@p?BEp744y74Go5GZijr@o2d;
z9ZEb(Q{s`9E-jCy#gr~nQzK)+DGRbRA$Z0yvxLEzPgeYE#iymk883_}S+b;L%nN50
zLI@%JFXVjj%bYpCe34sf+)z-nucqL}(qTx&Ar(VQgAu2U(!8ZEL;YH+=u(N-76l%K
zHl5da)WW3BEnc^#!UJ9protOuZ#{n~{pZs!^z>Uo`pq+r8Q*~%(Zv(;A`Ux#96|^o
z1i=_221f4DS_~om<JuT(3n~DDvP4g7CHex6zN(}zb@jadHo$ApgG!~Ue5$YMMxohL
l{f?5n=Q=@Lya*u#xxXQ*vZ7-)u?qkI002ovPDHLkV1g;u(N_Qf

diff --git a/src/keepass2android-appSdkStyle/Resources/drawable/baseline_account_circle_24.xml b/src/keepass2android-appSdkStyle/Resources/drawable/baseline_account_circle_24.xml
new file mode 100644
index 00000000..3285903d
--- /dev/null
+++ b/src/keepass2android-appSdkStyle/Resources/drawable/baseline_account_circle_24.xml
@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="?attr/colorControlNormal" android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10s10,-4.48 10,-10S17.52,2 12,2zM12,6c1.93,0 3.5,1.57 3.5,3.5S13.93,13 12,13s-3.5,-1.57 -3.5,-3.5S10.07,6 12,6zM12,20c-2.03,0 -4.43,-0.82 -6.14,-2.88C7.55,15.8 9.68,15 12,15s4.45,0.8 6.14,2.12C16.43,19.18 14.03,20 12,20z"/>
+    
+</vector>
diff --git a/src/keepass2android-appSdkStyle/Resources/drawable/baseline_arrow_back_24.xml b/src/keepass2android-appSdkStyle/Resources/drawable/baseline_arrow_back_24.xml
new file mode 100644
index 00000000..438fded4
--- /dev/null
+++ b/src/keepass2android-appSdkStyle/Resources/drawable/baseline_arrow_back_24.xml
@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:autoMirrored="true" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="?attr/colorControlNormal" android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z"/>
+    
+</vector>
diff --git a/src/keepass2android-appSdkStyle/Resources/drawable/baseline_attachment_24.xml b/src/keepass2android-appSdkStyle/Resources/drawable/baseline_attachment_24.xml
new file mode 100644
index 00000000..d38e39ae
--- /dev/null
+++ b/src/keepass2android-appSdkStyle/Resources/drawable/baseline_attachment_24.xml
@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="?attr/colorControlNormal" android:pathData="M2,12.5C2,9.46 4.46,7 7.5,7H18c2.21,0 4,1.79 4,4s-1.79,4 -4,4H9.5C8.12,15 7,13.88 7,12.5S8.12,10 9.5,10H17v2H9.41c-0.55,0 -0.55,1 0,1H18c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2H7.5C5.57,9 4,10.57 4,12.5S5.57,16 7.5,16H17v2H7.5C4.46,18 2,15.54 2,12.5z"/>
+    
+</vector>
diff --git a/src/keepass2android-appSdkStyle/Resources/drawable/baseline_camera_alt_24.xml b/src/keepass2android-appSdkStyle/Resources/drawable/baseline_camera_alt_24.xml
new file mode 100644
index 00000000..8fab5ffa
--- /dev/null
+++ b/src/keepass2android-appSdkStyle/Resources/drawable/baseline_camera_alt_24.xml
@@ -0,0 +1,7 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="?attr/colorControlNormal" android:pathData="M12,12m-3.2,0a3.2,3.2 0,1 1,6.4 0a3.2,3.2 0,1 1,-6.4 0"/>
+      
+    <path android:fillColor="?attr/colorControlNormal" android:pathData="M9,2L7.17,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,-2h-3.17L15,2L9,2zM12,17c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5z"/>
+    
+</vector>
diff --git a/src/keepass2android-appSdkStyle/Resources/drawable/baseline_check_24.xml b/src/keepass2android-appSdkStyle/Resources/drawable/baseline_check_24.xml
new file mode 100644
index 00000000..ef133c1c
--- /dev/null
+++ b/src/keepass2android-appSdkStyle/Resources/drawable/baseline_check_24.xml
@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="?attr/colorControlNormal" android:pathData="M9,16.17L4.83,12l-1.42,1.41L9,19 21,7l-1.41,-1.41z"/>
+    
+</vector>
diff --git a/src/keepass2android-appSdkStyle/Resources/drawable/baseline_close_24.xml b/src/keepass2android-appSdkStyle/Resources/drawable/baseline_close_24.xml
new file mode 100644
index 00000000..0af4b0d3
--- /dev/null
+++ b/src/keepass2android-appSdkStyle/Resources/drawable/baseline_close_24.xml
@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="?attr/colorControlNormal" android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
+    
+</vector>
diff --git a/src/keepass2android-appSdkStyle/Resources/drawable/baseline_comment_24.xml b/src/keepass2android-appSdkStyle/Resources/drawable/baseline_comment_24.xml
new file mode 100644
index 00000000..f895ba1c
--- /dev/null
+++ b/src/keepass2android-appSdkStyle/Resources/drawable/baseline_comment_24.xml
@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:autoMirrored="true" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="?attr/colorControlNormal" android:pathData="M21.99,4c0,-1.1 -0.89,-2 -1.99,-2L4,2c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h14l4,4 -0.01,-18zM18,14L6,14v-2h12v2zM18,11L6,11L6,9h12v2zM18,8L6,8L6,6h12v2z"/>
+    
+</vector>
diff --git a/src/keepass2android-appSdkStyle/Resources/drawable/baseline_create_new_folder_24.xml b/src/keepass2android-appSdkStyle/Resources/drawable/baseline_create_new_folder_24.xml
new file mode 100644
index 00000000..45d34cd8
--- /dev/null
+++ b/src/keepass2android-appSdkStyle/Resources/drawable/baseline_create_new_folder_24.xml
@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="?attr/colorControlNormal" android:pathData="M20,6h-8l-2,-2L4,4c-1.11,0 -1.99,0.89 -1.99,2L2,18c0,1.11 0.89,2 2,2h16c1.11,0 2,-0.89 2,-2L22,8c0,-1.11 -0.89,-2 -2,-2zM19,14h-3v3h-2v-3h-3v-2h3L14,9h2v3h3v2z"/>
+    
+</vector>
diff --git a/src/keepass2android-appSdkStyle/Resources/drawable/baseline_date_range_24.xml b/src/keepass2android-appSdkStyle/Resources/drawable/baseline_date_range_24.xml
new file mode 100644
index 00000000..d11665bd
--- /dev/null
+++ b/src/keepass2android-appSdkStyle/Resources/drawable/baseline_date_range_24.xml
@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="?attr/colorControlNormal" android:pathData="M9,11L7,11v2h2v-2zM13,11h-2v2h2v-2zM17,11h-2v2h2v-2zM19,4h-1L18,2h-2v2L8,4L8,2L6,2v2L5,4c-1.11,0 -1.99,0.9 -1.99,2L3,20c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2L21,6c0,-1.1 -0.9,-2 -2,-2zM19,20L5,20L5,9h14v11z"/>
+    
+</vector>
diff --git a/src/keepass2android-appSdkStyle/Resources/drawable/baseline_delete_24.xml b/src/keepass2android-appSdkStyle/Resources/drawable/baseline_delete_24.xml
new file mode 100644
index 00000000..93e97392
--- /dev/null
+++ b/src/keepass2android-appSdkStyle/Resources/drawable/baseline_delete_24.xml
@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="?attr/colorControlNormal" android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7H6v12zM19,4h-3.5l-1,-1h-5l-1,1H5v2h14V4z"/>
+    
+</vector>
diff --git a/src/keepass2android-appSdkStyle/Resources/drawable/baseline_explicit_24.xml b/src/keepass2android-appSdkStyle/Resources/drawable/baseline_explicit_24.xml
new file mode 100644
index 00000000..bb20cb25
--- /dev/null
+++ b/src/keepass2android-appSdkStyle/Resources/drawable/baseline_explicit_24.xml
@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="?attr/colorControlNormal" android:pathData="M19,3L5,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM15,9h-4v2h4v2h-4v2h4v2L9,17L9,7h6v2z"/>
+    
+</vector>
diff --git a/src/keepass2android-appSdkStyle/Resources/drawable/baseline_help_24.xml b/src/keepass2android-appSdkStyle/Resources/drawable/baseline_help_24.xml
new file mode 100644
index 00000000..b21ba738
--- /dev/null
+++ b/src/keepass2android-appSdkStyle/Resources/drawable/baseline_help_24.xml
@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:autoMirrored="true" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="?attr/colorControlNormal" android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,19h-2v-2h2v2zM15.07,11.25l-0.9,0.92C13.45,12.9 13,13.5 13,15h-2v-0.5c0,-1.1 0.45,-2.1 1.17,-2.83l1.24,-1.26c0.37,-0.36 0.59,-0.86 0.59,-1.41 0,-1.1 -0.9,-2 -2,-2s-2,0.9 -2,2L8,9c0,-2.21 1.79,-4 4,-4s4,1.79 4,4c0,0.88 -0.36,1.68 -0.93,2.25z"/>
+    
+</vector>
diff --git a/src/keepass2android-appSdkStyle/Resources/drawable/baseline_lock_24.xml b/src/keepass2android-appSdkStyle/Resources/drawable/baseline_lock_24.xml
new file mode 100644
index 00000000..540548be
--- /dev/null
+++ b/src/keepass2android-appSdkStyle/Resources/drawable/baseline_lock_24.xml
@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="?attr/colorControlNormal" android:pathData="M18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM12,17c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2zM15.1,8L8.9,8L8.9,6c0,-1.71 1.39,-3.1 3.1,-3.1 1.71,0 3.1,1.39 3.1,3.1v2z"/>
+    
+</vector>
diff --git a/src/keepass2android-appSdkStyle/Resources/drawable/baseline_more_horiz_24.xml b/src/keepass2android-appSdkStyle/Resources/drawable/baseline_more_horiz_24.xml
new file mode 100644
index 00000000..9ea224e9
--- /dev/null
+++ b/src/keepass2android-appSdkStyle/Resources/drawable/baseline_more_horiz_24.xml
@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="?attr/colorControlNormal" android:pathData="M6,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM18,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z"/>
+    
+</vector>
diff --git a/src/keepass2android-appSdkStyle/Resources/drawable/baseline_search_24.xml b/src/keepass2android-appSdkStyle/Resources/drawable/baseline_search_24.xml
new file mode 100644
index 00000000..fe51b803
--- /dev/null
+++ b/src/keepass2android-appSdkStyle/Resources/drawable/baseline_search_24.xml
@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="?attr/colorControlNormal" android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/>
+    
+</vector>
diff --git a/src/keepass2android-appSdkStyle/Resources/drawable/baseline_settings_24.xml b/src/keepass2android-appSdkStyle/Resources/drawable/baseline_settings_24.xml
new file mode 100644
index 00000000..bdb1b86b
--- /dev/null
+++ b/src/keepass2android-appSdkStyle/Resources/drawable/baseline_settings_24.xml
@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="?attr/colorControlNormal" android:pathData="M19.14,12.94c0.04,-0.3 0.06,-0.61 0.06,-0.94c0,-0.32 -0.02,-0.64 -0.07,-0.94l2.03,-1.58c0.18,-0.14 0.23,-0.41 0.12,-0.61l-1.92,-3.32c-0.12,-0.22 -0.37,-0.29 -0.59,-0.22l-2.39,0.96c-0.5,-0.38 -1.03,-0.7 -1.62,-0.94L14.4,2.81c-0.04,-0.24 -0.24,-0.41 -0.48,-0.41h-3.84c-0.24,0 -0.43,0.17 -0.47,0.41L9.25,5.35C8.66,5.59 8.12,5.92 7.63,6.29L5.24,5.33c-0.22,-0.08 -0.47,0 -0.59,0.22L2.74,8.87C2.62,9.08 2.66,9.34 2.86,9.48l2.03,1.58C4.84,11.36 4.8,11.69 4.8,12s0.02,0.64 0.07,0.94l-2.03,1.58c-0.18,0.14 -0.23,0.41 -0.12,0.61l1.92,3.32c0.12,0.22 0.37,0.29 0.59,0.22l2.39,-0.96c0.5,0.38 1.03,0.7 1.62,0.94l0.36,2.54c0.05,0.24 0.24,0.41 0.48,0.41h3.84c0.24,0 0.44,-0.17 0.47,-0.41l0.36,-2.54c0.59,-0.24 1.13,-0.56 1.62,-0.94l2.39,0.96c0.22,0.08 0.47,0 0.59,-0.22l1.92,-3.32c0.12,-0.22 0.07,-0.47 -0.12,-0.61L19.14,12.94zM12,15.6c-1.98,0 -3.6,-1.62 -3.6,-3.6s1.62,-3.6 3.6,-3.6s3.6,1.62 3.6,3.6S13.98,15.6 12,15.6z"/>
+    
+</vector>
diff --git a/src/keepass2android-appSdkStyle/Resources/drawable/baseline_sort_24.xml b/src/keepass2android-appSdkStyle/Resources/drawable/baseline_sort_24.xml
new file mode 100644
index 00000000..46f93bb5
--- /dev/null
+++ b/src/keepass2android-appSdkStyle/Resources/drawable/baseline_sort_24.xml
@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:autoMirrored="true" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="?attr/colorControlNormal" android:pathData="M3,18h6v-2L3,16v2zM3,6v2h18L21,6L3,6zM3,13h12v-2L3,11v2z"/>
+    
+</vector>
diff --git a/src/keepass2android-appSdkStyle/Resources/drawable/baseline_vpn_key_24.xml b/src/keepass2android-appSdkStyle/Resources/drawable/baseline_vpn_key_24.xml
new file mode 100644
index 00000000..479c591e
--- /dev/null
+++ b/src/keepass2android-appSdkStyle/Resources/drawable/baseline_vpn_key_24.xml
@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="?attr/colorControlNormal" android:pathData="M12.65,10C11.83,7.67 9.61,6 7,6c-3.31,0 -6,2.69 -6,6s2.69,6 6,6c2.61,0 4.83,-1.67 5.65,-4H17v4h4v-4h2v-4H12.65zM7,14c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2z"/>
+    
+</vector>
diff --git a/src/keepass2android-appSdkStyle/Resources/layout/configure_totp_dialog.xml b/src/keepass2android-appSdkStyle/Resources/layout/configure_totp_dialog.xml
index 05a82e7c..04cf9d22 100644
--- a/src/keepass2android-appSdkStyle/Resources/layout/configure_totp_dialog.xml
+++ b/src/keepass2android-appSdkStyle/Resources/layout/configure_totp_dialog.xml
@@ -64,7 +64,7 @@
             android:id="@+id/totp_length" />
 
         <Button
-          android:drawableLeft="@android:drawable/ic_menu_camera"
+          android:drawableLeft="@drawable/baseline_camera_alt_24"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
           android:text="@string/totp_scan"
diff --git a/src/keepass2android-appSdkStyle/Resources/layout/entry_view_contents.xml b/src/keepass2android-appSdkStyle/Resources/layout/entry_view_contents.xml
index 99444cee..03015b81 100644
--- a/src/keepass2android-appSdkStyle/Resources/layout/entry_view_contents.xml
+++ b/src/keepass2android-appSdkStyle/Resources/layout/entry_view_contents.xml
@@ -476,7 +476,7 @@
 			<Button android:id="@+id/btn_remove_history" 
 			android:layout_width="fill_parent"
 			android:layout_height="wrap_content"
-			android:drawableLeft="@android:drawable/ic_menu_delete"
+			android:drawableLeft="@drawable/baseline_delete_24"
 			android:text="@string/remove_history"
 			
 			/>
diff --git a/src/keepass2android-appSdkStyle/Resources/layout/generate_password.xml b/src/keepass2android-appSdkStyle/Resources/layout/generate_password.xml
index add473d7..410d8353 100644
--- a/src/keepass2android-appSdkStyle/Resources/layout/generate_password.xml
+++ b/src/keepass2android-appSdkStyle/Resources/layout/generate_password.xml
@@ -18,7 +18,7 @@
       android:layout_height="wrap_content"
       android:layout_alignParentLeft="true"
       android:text="@android:string/cancel"
-      android:drawableLeft="@android:drawable/ic_menu_close_clear_cancel"
+      android:drawableLeft="@drawable/baseline_close_24"
       style="@style/BottomBarButton" />
     <Button
       android:id="@+id/accept_button"
diff --git a/src/keepass2android-appSdkStyle/Resources/layout/plugin_details.xml b/src/keepass2android-appSdkStyle/Resources/layout/plugin_details.xml
index d57b5ec9..c556deff 100644
--- a/src/keepass2android-appSdkStyle/Resources/layout/plugin_details.xml
+++ b/src/keepass2android-appSdkStyle/Resources/layout/plugin_details.xml
@@ -41,7 +41,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:paddingRight="20dp"
-                android:drawableLeft="@android:drawable/ic_menu_close_clear_cancel"
+                android:drawableLeft="@drawable/baseline_close_24"
                 android:drawablePadding="8dp"
                 android:gravity="center_vertical"
                 android:text="@string/deny" />
diff --git a/src/keepass2android-appSdkStyle/Resources/menu/fileselect.xml b/src/keepass2android-appSdkStyle/Resources/menu/fileselect.xml
index f78ea2c1..b3a358e1 100644
--- a/src/keepass2android-appSdkStyle/Resources/menu/fileselect.xml
+++ b/src/keepass2android-appSdkStyle/Resources/menu/fileselect.xml
@@ -20,12 +20,12 @@
     
     <item android:id="@+id/menu_about"
         android:title="@string/menu_about"
-        android:icon="@android:drawable/ic_menu_help"
+        android:icon="@drawable/baseline_help_24"
         app:showAsAction="ifRoom"
     />
     <item android:id="@+id/menu_app_settings"
         android:title="@string/menu_app_settings"
-        android:icon="@android:drawable/ic_menu_preferences"
+        android:icon="@drawable/baseline_settings_24"
         app:showAsAction="ifRoom"  
     />
 </menu>
diff --git a/src/keepass2android-appSdkStyle/Resources/menu/group.xml b/src/keepass2android-appSdkStyle/Resources/menu/group.xml
index 598ecc31..3c173504 100644
--- a/src/keepass2android-appSdkStyle/Resources/menu/group.xml
+++ b/src/keepass2android-appSdkStyle/Resources/menu/group.xml
@@ -63,7 +63,7 @@
     />
 
   <item android:id="@+id/menu_sort"
-        android:icon="@android:drawable/ic_menu_sort_by_size"
+        android:icon="@drawable/baseline_sort_24"
         android:title="@string/sort_menu"
       app:showAsAction="never"
     />
diff --git a/src/keepass2android-appSdkStyle/services/OngoingNotificationsService.cs b/src/keepass2android-appSdkStyle/services/OngoingNotificationsService.cs
index 222e0cbd..5f2654c5 100644
--- a/src/keepass2android-appSdkStyle/services/OngoingNotificationsService.cs
+++ b/src/keepass2android-appSdkStyle/services/OngoingNotificationsService.cs
@@ -173,7 +173,7 @@ namespace keepass2android
 			// Default action is to show Kp2A
 			builder.SetContentIntent(GetSwitchToAppPendingIntent());
 			// Additional action to allow locking the database
-			builder.AddAction(Android.Resource.Drawable.IcLockLock, GetString(Resource.String.QuickUnlock_lockButton), 
+			builder.AddAction(Resource.Drawable.ic_action_lock, GetString(Resource.String.QuickUnlock_lockButton), 
 				PendingIntent.GetBroadcast(this, 0, new Intent(this, typeof(ApplicationBroadcastReceiver)).SetAction(Intents.CloseDatabase), Util.AddMutabilityFlag(PendingIntentFlags.UpdateCurrent, PendingIntentFlags.Immutable)));