From 88fd4cd11fbd63dca8aaae8684bd5346274e2d9d Mon Sep 17 00:00:00 2001
From: grdddj <jiri.musil06@seznam.cz>
Date: Mon, 5 Jun 2023 10:16:32 +0200
Subject: [PATCH] chore(core/rust): mark icons with empty right column, delete
 unused ones

[no changelog]
---
 .../{left_arrow.png => arrow_left.png}        | Bin
 core/assets/model_r/arrow_right.png           | Bin 0 -> 155 bytes
 core/assets/model_r/cancel_no_outline.png     | Bin 125 -> 123 bytes
 .../model_r/cancel_no_outline_inverted.png    | Bin 8230 -> 0 bytes
 core/assets/model_r/info.png                  | Bin 7869 -> 0 bytes
 core/assets/model_r/info_invert.png           | Bin 6827 -> 0 bytes
 core/assets/model_r/right_arrow.png           | Bin 156 -> 0 bytes
 core/assets/model_r/warning_right.png         | Bin 142 -> 0 bytes
 .../rust/src/ui/model_tr/bootloader/theme.rs  |   2 -
 .../rust/src/ui/model_tr/component/button.rs  |  15 +--
 .../rust/src/ui/model_tr/res/arrow_right.toif | Bin 28 -> 29 bytes
 .../ui/model_tr/res/cancel_no_outline.toif    | Bin 39 -> 40 bytes
 core/embed/rust/src/ui/model_tr/theme.rs      |  30 ++++--
 tests/ui_tests/fixtures.json                  | 102 +++++++++---------
 14 files changed, 76 insertions(+), 73 deletions(-)
 rename core/assets/model_r/{left_arrow.png => arrow_left.png} (100%)
 create mode 100644 core/assets/model_r/arrow_right.png
 delete mode 100644 core/assets/model_r/cancel_no_outline_inverted.png
 delete mode 100644 core/assets/model_r/info.png
 delete mode 100644 core/assets/model_r/info_invert.png
 delete mode 100644 core/assets/model_r/right_arrow.png
 delete mode 100644 core/assets/model_r/warning_right.png

diff --git a/core/assets/model_r/left_arrow.png b/core/assets/model_r/arrow_left.png
similarity index 100%
rename from core/assets/model_r/left_arrow.png
rename to core/assets/model_r/arrow_left.png
diff --git a/core/assets/model_r/arrow_right.png b/core/assets/model_r/arrow_right.png
new file mode 100644
index 0000000000000000000000000000000000000000..bb640d564efdb5c843f10bb1df87e3608c3ff098
GIT binary patch
literal 155
zcmeAS@N?(olHy`uVBq!ia0vp^Y(UJ#0VEhUr53ygQk(@Ik;M!QddeWoSh3W;3@FH6
z;_2(k{+x}KlY=jQw?qd}NV3E=qQp5rH#aq}gu%HeHL)Z$MWH;iBtya7(>EZzkxv|`
vNYvBCF@)oK@{jWjj5{*b*erhZH?uIfgmL`(`r%L#PyvIdtDnm{r-UW|EV(F9

literal 0
HcmV?d00001

diff --git a/core/assets/model_r/cancel_no_outline.png b/core/assets/model_r/cancel_no_outline.png
index eb92d0e834d9456284d7874a32653475def5b31b..0f9e81163e187ac059409ba6e037fc9c7ca8fec8 100644
GIT binary patch
delta 79
zcmb=eo*>S}$-w{wdS@S<pQtEj^PG*9%ShR_TjefLP|DNAF@)oK@{jWjjQ<x(%yc<%
gFoH)z=g}7?27fz&4}Y>A?E>lbboFyt=akR{0O+F|0ssI2

delta 81
zcmb=fogmJ|#lZjsD<UT(PE?e$d&a@U#x5LrsOlb2P{z~6F@)oKa)Lv{e~&NqDii-}
h6#X~6qTK!HIyZyAr@)8Y=N(cY-JY&~F6*2UngAV@8{Gf^

diff --git a/core/assets/model_r/cancel_no_outline_inverted.png b/core/assets/model_r/cancel_no_outline_inverted.png
deleted file mode 100644
index bddaff791311df0db9b55c13eacc2990b22b074f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8230
zcmeHrc{r49*#6k}D9Rd>CF__OW-zvFg_tO^Z!=?zi7{hlY)L4jgeXFUBq95fkS(&4
zrAP|dm!goR=o{+Yj^FpsdmO*-zjuyfp5?l)^SrL>yszh;dG71xXAHU6h1dZA0GF|m
z!8zJ_@0y*Jb^tuKy@dh*4k}%=w4t6u`2k5}q8r{53#0~+ut2Oo-VFfoA1SaS_)26J
z{^*tad}#BC0t-(n#cw4s*yM_rM$Bzfw+~aMOTz>^qwM(8!(BhWFDw0QtoNj-K+m?r
zaZ$k~FBgRG^VR%>?|kwc9P2G=9}{y@-4GT9GigTb;M!-m7k&J|#bQGDvva~b)QD@b
z#6kZzU@%9TFjGm}BwKp;g00NvPJ{+WIR;-Ce*fvK*~^;gV_q_)@E`0CJ;tJHcaO4t
zm<;2;x}jX<@<k&IqjT$LV_1YVTfL)E)vNHxStwu7^j9{KuRUfP_3TlJNkU^zYf!r(
z<&9mRRiT2pUa5(e_N~j8zE^wC2U!lToB72|Yp#kp_cl%w`l2?bf7&@Deip28hrW2d
z<+<=JMYGZ8=+j&F{0sx7Qa{XWuB_#J%mF-RIE&HnZ0#kz4)70tHa84^Iy%@o!EAc-
zvXGho$DI{jXNAy9>k><w6RjY#Oy*M}K>|YG1bz^r2Hsg|-26~5-m^r?^|R@kkf`5<
z*6%df#k2RkC4Xo44FLB<2p&RgMR)QXd>UhMTYYmoU`N`UE7Ii<*yM(#TII6TMKbqs
zR-w5N4qj2eYPFAL0EaMpX@N<4@sP*IR2_U1Yo%w$+pYlMNuTxCjvge*21LYZN8CDi
z@8k5FO;*J7LFw4LTuv;>#}3I(=|m#AxEgOj=}z!*KnBklL9_4hX2)N+fS5|M=t(ZU
zh0fCHGk;)e5H447=(IxalwS57JG*sw2+X28;X-ajWkjILlhKv=2oAf&x@)3=N?Lvk
z*+U<g$CW=CNpK5c2m6L8E-Ng!<BAT?kg9aqg1D4`euc80N<hWot{d_NweAV$t!uJ;
zo3`g?`Oi|MFE~j^@%JBv*Pf<=Cc@6dH*?ah9#=O=m1G2z-%Wb^5xsT@aXq;p;{-|c
zrs*MN-$PIX$eGyzvh~u<v4aV1I~JpyE!^I#!NLfM%<tGK?bc6@gEk$nUPXRV;L8~a
zS$grk4Cb7|S7R1CldpRD`{pdiI@>l=&Z9cdoQdr<)L}BH=Vie?2mk4QoFk?%B;*^P
z;U}$FsJ#qZ@xdum*;&{l{ei}ESL1hRmVSK6r`oQ(%-gqBnO%yPuTL+ruNb8?;HL|V
z%nZ0QHZo!u>u(G(yD;Q0*!B5u3PQ(qza|QEaa7r`_1Whm=%=)%1=o&Pbj#hfwOLT<
zeC+5yFHqTi5z79?tIR1n-Y@3tsolt4x90*(){kvhHdU5hKbZurl7{L7IyFbvi64{}
zF?>Hq>}MtlgI5y+SPJXE{B`X8u)r{QuwRHS`Hj`}cuyCof`<Gs!vql?5~myJQM#J-
zCbE)oG$K~5Rkq(0a(U!1?`K)Ah3~C_9xpOaJRV0U#oTAANr7Jx#QuCYHC!@wVM6Me
zb{2a<#0`*!$43d<zLB+}*bTk%tcEksCnwp@PQE4ZreA$*VgL3tqB(!`%7`lEb$+R`
zF@FdP`mRny(dYR$PX1x$R=N#tUviCIVZINI?bYUko;1H)XzG45>aAMU!4_kYqMud`
za^AQ&9A4;7ZKt0s5egU*IDA))<xc(R(KfzEHg^Pv<g<cAMsXsJ9j)wiOze)xnYh$k
z*}_I1zCuaWCzuP5HN1?g+^3?Y$IgZisvdPog>yE!y*;E5C39UuK{;xXpg~F)k-BQL
z8#aV{MNqkiJKNU379f4ftfAuboiB+6K}n<bEp>fczNfifmyLwoIC@Il0AG3EUa%lL
z@+GhpK{?>FrjD}ynA>=t1Zr~@Pa}C;FH-`De}eb_G#^S_%wH>ZI4+6Ma}v@#qVc``
z7&*ZvW+5k^tKvpRm?8SOuoAg|bKYQ8k2TE|kr83tK$mD61UqP$IM|In3Ot?X1sw4u
zxqlsw(MQLe@Frhlo#&8M!Sg`X#rQr**>kkSURT43y?Wg|Qd)$4fIL;iL^x=uOKg%*
z5k-Vu&}V`@F=$dOj2}h2C>PUzJKy5orLT5%46`9vjs9-TQ1RSt0Dew`w|Uc0k#kCV
zyAdy(z)9ay);9Nu*_EF{pImWZ*mo_olfkh4j84;AL4u%HqHbC)qjv4QIzi}=>FhI*
zPG?8Qc5JGOkx5-H<8r}{aaD##OB+Sn+u_X6nbNdQ^C@<7L3K`e>$$b?NTV7M=zyr=
zx`3UV2ZXxJFF6M9Y`!MpsqO8Cd)u!NsP=_kr<(=fAqq%!cem5Tg$EdOF#6)Rx9NOD
zC|ENfekDwpBM5BqH6d#??pPt(Cz}-7eI&?tEj+|GR&RRT>rzH$juxYL6L-X`6@IRt
zcaXlhZ)z&pZgP#;w5{r(F8WQ_Ea`5rwjEjWgV<5O$$vWlgjq|=NNmLG9(z=5Qj(C`
z56JGNGe*W}%%bC{$N}5R-StWKFxDhE*}5ph9}ONHKOG@6rwtv~6i@(AGrYbn+)}8t
zl6SxQ?A)u5Z_}v~DLMSp%R8UmqljN{&Y_+p!MwJHZkvuyQca>MYxvD`8XCna<~0t>
z4C!_*BBPnWcP#GZdgkSH>tzk`vPlZr+O3j(yi4I%VzQ6tVd7Z^kn_%k=cHDu8!9p@
zLZvL_5!DxEYJ{(PLmzvK^3#hq*-K?fd!MZ4vpoA=a$NY~VGqKU=Z?U&Tjp9pMqTzq
zh3Y4M2M`P!?|Iqv7IM`KrPS!VEk(2Gh*gv5W)SJUCKs;gJ*1@Eti)W8p4#8skbr#v
zq+cOO$eTQ!iK{EVt4eHPKIQOwSlTA+*}yc&t%>jSkGQg@`8+R)4`ib1c$Tg@cOM^a
zwHvECdP-OLa;P_@zPMp=fzkGO_dBkpX&+|q+uI%l;*~qv{sZQr?Q>S(gl9q@+G`Mn
z_b=Qo=7+#6<-W;1^o3(Fv%ANoC_dQpHKj!t)_ddN!G}gpTz~R*xvAS)m}`+EUOp#B
zrP_}g>FwxP9>oad7$}comZ1w&?o;%Pb+1>n4epGrjk!5jRzx_E`aC@5T~H&)hcjzC
z@{RFak|YLO$3&*zdgf$)nHdo+*$I@09@NW&qOL+>#QCVnF<&E(pH~1L{RoINx$~TT
z75r{I*0I<(crL&SYUsqKJI-J{ect-;Rjb)V>l&G@VN0hkie)2PYzBBq?uomNe)0*2
z9t?`wjAE|fCRUubMYJ;NASw0YJ{HFTikvXJxx<I=uiR}Iphn8MJn%F%e;*Tcl1GG-
zlhBy>H2y_Go}}!;XHK!`N{__~4ZNsI2;b5|`m!pASZ4AyAwB!?V?Wr<>bDtFT*BH8
z_DRcdI~B|sEi_xcjULSGe;6x0eB_cU4?oB#AL7BZ8OCJb7roQhTW!+vPIxq#yCHDS
zy78TUeScpOnLE+T{VAVHrk0^>+yi%@Y_8kT@g}C-G_DqbAt__Lm?19-73Z2i*ACZp
zTu-~KR9cIk&4mV*TU&cnJ`I%R_1v&cZZ^UT64S$ECpyH+7hi{p*qy>;mM<Ys)Q&cE
z-t57!oX9FxoQB(Vcx<B}_l7D7qkdkSCa;SRGOe?6K=Kc~_9Azp%-@%Z#L#0TSIa8z
z<jgGS`*DBQJw2ONC6`S!49aeerq8Mp(=4;Fe;%}z;%5_6^c?Z>2T#RpwC4H%?PppT
zT2!@}iLI}^*FE&I?qk!)@;71~sqN`_O^%4!o0R3lFZmAy1U($_Q(pMEWWKFqFw@ay
zb>+Nx@aMBV?j_9588_poWV!1v+Y2tLK8zRV4<hDOzqQ|4?;5MI4t!AVXrOzczwTc8
z3hI0lANWO>^upCI=7t2_>z*Iqad7cyU$uMDa_MF)C;ng!PkPZnB3mf?$3^F^sV<C6
zj!(Jl7P0#0MUqjvG<gOuDeYrseZyB-ioMnCw5-TEl>-*{o4zy_&17LJTth4#E?)fl
z<=e`)qDocuYjL0lpTaMPZ9{J1EKW;QyUe9ph)6eakA%;-eMVTs>$l9Z1?+}-t^N$X
zKv%J)YI))~WoG#lC0&{_gT9&m*vG7@uyiXqor`t5U4Jsy?uXYad|e9l@^V^l#j77k
z=p}28Zu>kiXSOr8>U9P;Xcy2XbOS!k4gyz$T2K2zfNuhe-`-=pK9|9aK2RB^_(I=4
zSk&m`$bgMMx<zaCnq=ffTMmSAt(4i<9u?Utdv)>pTXJpBiyPabI|XeOjFPmG9I?sa
zop<yT5#Qit0C_c-ST?8p1OBfr+maGdau|WB?5=AK)|4a(Qx{aJaJ=jdMK;^I0VT5m
zmhj`eYVFk7<Xf)-0k!zE&FOJmA-A8vIIL#Qmxg9LgKvRgOjUWDj18;tGjg|9G&qUR
zvYtNpFak-4znS`N(5TfOYG_`|9b!S6TX7ba&$)eV$hK@t%`;|g=hhh<3<pZ?*JSpc
z5poC?8IF#pvmcIK3WMMoM40Am=LJ^7m?r?X5%eu4%o$g6+Ur7&wYQ|61F!+LT|kIg
zhQ6y)k-;go6a8~K6({tUq2+aMZ*XW(t32oF_)|kwOm1SE0z&qZbV7melFCviPu<Nw
zdG-qaW`j;F<CwX_*%9+#xenefV;&K<F3<9(wI|iDJQ08IcX+-4hF2If<$ald37)>5
ze?;YVV^f+vo5?ethwqhRq+bu5&%F0tzzV?PS5qk(g2784ImaXC@Z|_=-bs21f0HTp
zLxwAEnK6uq=@D|Xqm!J)PA{z&h8;UUoN4G149)DftM0|CsHS#Fbk`y|m7bH^$YIVD
z(P8Io-MEZ`>()K?2O8)M6{TnMFX5SUODUpgP2lW{j7skv@0S<&4(sLZq`sX)bxklI
z%@Recm1opWSKtqwewC@sii(99n6_J<czR$wv5nmCoh}L(kGq||sI8Tx)H5T}J0Hqm
z)#hK6!_xNd@t{C(D(V9!ja&byV6@gFb)~l}?mZ5cclF$PuaCTa$WSklFkosMaf5A<
zj_~!pkYtv!eQ%tNMGmKFcwv3os#Xn7`O%tr&H7}N66nSc__ki|P~TmXS$EyK$HycT
zL*_*A8ShSBqBm*~LJX{A_DtV({S@>t^ea#5CAt+6JfH((fanLL>W9zz=v`OBY#c1N
zOo3H?38ZJZ@%C`8qY_DMOyuj++V-F2oeY;PqB5G#VavJAqg<-<Q?0aKbwqY3<{;Tz
z%N>ykI^`+!K9*q6*CEFd%5As0&;7e|q)Baln6oIS_?P9&7zUl;W%<vGGmkIKzjJ;R
zo|m^#yCS^4d*1r{-22O-&zj<kV~W8Mm8EwtSqWDURcGA3vTRrwTj8p)kfj%BSU3Np
ztY$K4Z0*C0AI@syF6Yc5pi>iBd|#USbX#pq+5diTT9M$|8AE(DsWNdbka^r2b#6{$
z?Q)Oq<BSUrUh@U9oX>vYB557|X)afu)hy!H<K6eyEN`YFt*v<<-Z4ELTBO$C-LZzO
zdt{3r(wX`=MG$K<vwbzvI^I#6=J3Ab^IXZ|yCa4%(UmPpU5xm{tfqIlaQ%}fVe9Xe
z+VM$z`su=jU%7Y+MAu0f0(Na(k8!@8PY<6slh<8Te@g0yguVlUmANldrU80*f%UxL
zC&tofWu7ik?15XS%5xatfzsiGkm1HB3C3-!C5t&)_p)%yNFtZqn94Ki?hZUDYZZ4T
z#PYr1F})m1HcKboey0nIBdO$qDe?p-pzr{<QgtnG?2TRvNzlX}zpHsi?_h01SV-$m
zTI90yg)eR6+?yKXx8qCdk#0_pp5YSnA2{5057uRfF<#+_6ey(w#ol~n5iF`IT%PZZ
zQf2gNv$uS)(D(f0PMLchCEc~2bxKgBO=e{7OY^m})ZE>z@p<KPuuJPK+3T`q{*SCy
zpEEJ_7JW5Ub!idWT>4RclZ8cRni2<z22;T<{DWt=?)ifN06Iy$zP`D!zWyJ(C$v42
z)U;dAPdA(Mgx5c*Z@UqWK6XUbQ{jlGDYi^5j452enpDwo+}6PqZB(jI7fO7<T^0`9
zWdFwg=DsjU!E`blr5%w>aZ@Z`k~Hny(lRQ`Bkg=1CzG(?=Oqn71ob6mRI;Dea@fm_
ztsB^{Cav!9jh(F{Syh|~xEl&xQS46`N|X!8FW6PQzVF6u>UtXDk6cf0);KF9s8V)0
z#k5HbS%%c;QS3oFmPDJxT4;Jkm<rrBpRa@_%eAU4$=C2Pj#?a&lWxvKzP9j|kjtJT
z%Pd5dBd?BGeVT2@%0!ox-+Xa27Zxox6I|b_-LqiqK}lpeX?}Nxub_|hgBZ#Ou-IEn
zem`FE<9lU<XwK)Y*=T24fFL292!yr^C4{H#HrXIe)iFeZBFdGB#wz*~NPF8+0L>Hr
zBoxL2O9i5_IJ}pZ_;O9XI1uluC2kEzLXaeVtUKQ5A{lFO@r)(rq6Y@yDt<znUDIEk
zMnJ$)Q9yr!rx!)tUrT(SSDkjfX9kM{_g$zSTH-cHbD%zvj0M6JVTusYNq@YrlDIZI
zP?PNHrhd-g)NcyfotC&el}b_vgZ=#c6#bMHiDVoYia;R15GAmZ5{Tvjq6BzRQT`w=
zio_npFAf7N1w+P@sCc3maE}v(Ci+md#Kmdjz(4XMkdVkf>AfhwRiNns_D7MxP(=us
zKmh+8L7|@XrIGwj=zm2}ENPo|;B#0C(T9w|p7h0fQ6>IP;fnbaPx2vq?w8|=0b@O}
z1ez;_78UxBkcP%c^FI-L65#Lz(mskN_CGwSc(=dA`bTbiBm3q2JrNrGPu_oc|55wC
zGtCQ$R5u`EeD=~aHqa8^i?8lV#Nb`k_b(9$6$}cFMuFUvplA?GO$7!*DM3*nRfw{R
zs+y}Z$_=XgH!5Q<3Kivr!R}Gf$QAK49yhG2GFlbx2BLwnAeb8#4N`+c5g<6tt^$QA
zVKJ_%f1@xX<7r)q^89;NdsMD8DkvJGih!!Bf>d4Ma1aava|I#PXv{Dr2wFu|35tMW
zQ2SJ_81+*`G66-KPCNmH!-7d(xcz}W!PRxmjkUy;6d`|E%so+5HyS`o+!XKS<Nw!y
zC7yt_prZEFgsP~)pm3NP0*X+D!XdD~oUE{93au0OIH3?l<zKve)1po*h9)d(uTN<N
z`v_Vs>iT3Xib^C~5{aH#;(I9p_mKPT4b=QKDMok-%_Cs1<A3+O1=jo5-LFT$6Td$M
z1n#%3ItueE2nFSfb=?m{!~Gh<xTCyqSlaXbyP^KD<Nue*Qlcq~QpP|)P^c<RVK*2Q
zgjPl%KoD9JKw(%cS`GVavi@YJ5Z$PLC^A+TN2`=p4XuIps{zXFODX%$T>RXzdpbds
zltB<U2nx4^!qj1E>QJaWL`fY25eNS+7`*pX|533f`2W#FbKl`_%K#1c%SKyXXsZ?Y
z&*kd3W_vRJAAWw%#s6Uh8ufoc{*}J}$@QOH|4M;><@{fF{U_JIQs7@X|JPmr-{fNd
z>xBpFMf(@zM|+*obsXTMy$Z3BjBF_Y00-~hmkyAUDnK)`P>qo%S!S8IIUyWJl3257
zCaAH2t|jZx`K}T!02I)q^I}&+gQ?xb%qN`b5{LGn>A5b0MxIdmQ;KDEJVSnITRWok
XU%3y8*YfMozyRZuXABDUT(0~Ni}%iL

diff --git a/core/assets/model_r/info.png b/core/assets/model_r/info.png
deleted file mode 100644
index fa7aeaf534499e4bc4e74b3428f958e63a9f5af9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7869
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
Z&ZDkMg04{sjVvg@%FNER{GfZ(e*jw6|AGJj

diff --git a/core/assets/model_r/info_invert.png b/core/assets/model_r/info_invert.png
deleted file mode 100644
index a719af2d53f47afc1b2866f784f369b0d89f10a8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6827
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
TXX~s%42Z3zqs8To-ckPpaE`V=

diff --git a/core/assets/model_r/right_arrow.png b/core/assets/model_r/right_arrow.png
deleted file mode 100644
index 24d28fd0ee313828713d70d457c2572e34c9861d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 156
zcmeAS@N?(olHy`uVBq!ia0vp^Y(UJ#0VEhUr53ygQk(@Ik;M!QddeWoSh3W;3@FH6
z;_2(k{)~f(O;~pu?*;{+kYtH#M2T~LZf<H`34?P{YGO%hib8p2Nrr;Er*A-bBcC`>
wk(j58V+hCf<b)sR85k`x)!0~m^v`8su#V^W#iHik093)?>FVdQ&MBb@03&%N{Qv*}

diff --git a/core/assets/model_r/warning_right.png b/core/assets/model_r/warning_right.png
deleted file mode 100644
index 1705d4b3e6f8b6e5c704a907e323639f1fd998d5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 142
zcmeAS@N?(olHy`uVBq!ia0vp^JRr;gBp8b2n5}^nXMsm#F#`j)FbFd;%$g$s6l5>)
z^mS!_#=*p<X(dqpdLB?n*VDx@gyVX00vP-_-@x#HV#WW7PyQVim}C+2&tB|mMpeMm
gz_*U2j3NvS&m_cO&fM0!1E`U~)78&qol`;+0B}Vp0ssI2

diff --git a/core/embed/rust/src/ui/model_tr/bootloader/theme.rs b/core/embed/rust/src/ui/model_tr/bootloader/theme.rs
index 2df47ce52..56c349ac3 100644
--- a/core/embed/rust/src/ui/model_tr/bootloader/theme.rs
+++ b/core/embed/rust/src/ui/model_tr/bootloader/theme.rs
@@ -14,8 +14,6 @@ include_icon!(ICON_ALERT, "model_tr/res/alert.toif");
 include_icon!(ICON_SPINNER, "model_tr/res/spinner.toif");
 include_icon!(ICON_REDO, "model_tr/res/redo.toif");
 include_icon!(ICON_EXIT, "model_tr/res/exit.toif");
-include_icon!(ICON_INFO, "model_tr/res/info.toif");
-include_icon!(ICON_INFO_INVERTED, "model_tr/res/info_inverted.toif");
 
 pub const TEXT_NORMAL: TextStyle = TextStyle::new(Font::NORMAL, BLD_FG, BLD_BG, BLD_FG, BLD_FG);
 pub const TEXT_BOLD: TextStyle = TextStyle::new(Font::BOLD, BLD_FG, BLD_BG, BLD_FG, BLD_FG);
diff --git a/core/embed/rust/src/ui/model_tr/component/button.rs b/core/embed/rust/src/ui/model_tr/component/button.rs
index 900c662d4..35eeb5ab3 100644
--- a/core/embed/rust/src/ui/model_tr/component/button.rs
+++ b/core/embed/rust/src/ui/model_tr/component/button.rs
@@ -124,18 +124,7 @@ where
             };
             let content_width = match &self.content {
                 ButtonContent::Text(text) => style.font.visible_text_width(text.as_ref()),
-                ButtonContent::Icon(icon, icon_pressed) => {
-                    let width = if self.state == State::Pressed {
-                        if let Some(icon_pressed) = icon_pressed {
-                            icon_pressed.toif.width()
-                        } else {
-                            icon.toif.width()
-                        }
-                    } else {
-                        icon.toif.width()
-                    };
-                    width - 1
-                }
+                ButtonContent::Icon(icon) => icon.toif.width(),
             };
             content_width + 2 * outline
         };
@@ -225,7 +214,7 @@ where
             // Baselines are adjusted to give space between text and icon.
             // 2 px because 1px might lead to odd coordinate which can't be render
             theme::ICON_ARM_LEFT.draw(
-                area.left_center() + Offset::x(-2),
+                area.left_center() - Offset::x(2),
                 TOP_RIGHT,
                 text_color,
                 background_color,
diff --git a/core/embed/rust/src/ui/model_tr/res/arrow_right.toif b/core/embed/rust/src/ui/model_tr/res/arrow_right.toif
index b69281847fbf7de1caaeff63280c7348b796cea6..1f34e3ff539da33c3ef991c4aed04ac1d8ca44c2 100644
GIT binary patch
literal 29
jcmWIX_jG4t;9?MDU|@Khp77%U5b!Vm;mD(LkbwaJfNlxf

literal 28
icmWIX_jG4t;9?M9U|{%t00_<>_`v8_%V3zm!T<nzuL&;z

diff --git a/core/embed/rust/src/ui/model_tr/res/cancel_no_outline.toif b/core/embed/rust/src/ui/model_tr/res/cancel_no_outline.toif
index 4dcd41a0f872e0f3677713fccfd43470dc1c8f71..accf48d22c0c0de2d54744a58b026ce9c7155503 100644
GIT binary patch
literal 40
wcmWIX_jKoC;AD_tU|@Kho{;e1|A7MxE`J<Od|*7mV7O3cf<%Ov${~IR01M&`)&Kwi

literal 39
ucmWIX_jKoC;9`(wU|>j2U|^~f_;=vI2gV~TMRqj}olTJnh8uJuWElX=hYOzo

diff --git a/core/embed/rust/src/ui/model_tr/theme.rs b/core/embed/rust/src/ui/model_tr/theme.rs
index da15efa4e..4d1befc84 100644
--- a/core/embed/rust/src/ui/model_tr/theme.rs
+++ b/core/embed/rust/src/ui/model_tr/theme.rs
@@ -50,29 +50,45 @@ include_icon!(ICON_FAIL, "model_tr/res/fail.toif");
 // Firmware icons
 include_icon!(ICON_ARM_LEFT, "model_tr/res/arm_left.toif"); // 6*10
 include_icon!(ICON_ARM_RIGHT, "model_tr/res/arm_right.toif"); // 6*10
-include_icon!(ICON_ARROW_LEFT, "model_tr/res/arrow_left.toif"); // 6*10
-include_icon!(ICON_ARROW_RIGHT, "model_tr/res/arrow_right.toif"); // 6*10
+include_icon!(
+    ICON_ARROW_LEFT,
+    "model_tr/res/arrow_left.toif",
+    empty_right_col = true
+); // 6*10
+include_icon!(
+    ICON_ARROW_RIGHT,
+    "model_tr/res/arrow_right.toif",
+    empty_right_col = true
+); // 6*10
 include_icon!(ICON_ARROW_RIGHT_FAT, "model_tr/res/arrow_right_fat.toif"); // 4*8
 include_icon!(ICON_ARROW_UP, "model_tr/res/arrow_up.toif"); // 10*6
 include_icon!(ICON_ARROW_DOWN, "model_tr/res/arrow_down.toif"); // 10*6
 include_icon!(ICON_ARROW_BACK_UP, "model_tr/res/arrow_back_up.toif"); // 8*8
 include_icon!(ICON_BIN, "model_tr/res/bin.toif"); // 10*10
-include_icon!(ICON_CANCEL, "model_tr/res/cancel_no_outline.toif"); // 8*8
 include_icon!(
-    ICON_CANCEL_INVERTED,
-    "model_tr/res/cancel_no_outline_inverted.toif"
+    ICON_CANCEL,
+    "model_tr/res/cancel_no_outline.toif",
+    empty_right_col = true
 ); // 8*8
 include_icon!(ICON_DELETE, "model_tr/res/delete.toif"); // 10*7
 include_icon!(ICON_EYE, "model_tr/res/eye_round.toif"); // 12*7
 include_icon!(ICON_LOCK, "model_tr/res/lock.toif"); // 10*10
 include_icon!(ICON_LOGO, "model_tr/res/logo_22_33.toif"); // 22*33
-include_icon!(ICON_NEXT_PAGE, "model_tr/res/next_page.toif"); // 10*8
+include_icon!(
+    ICON_NEXT_PAGE,
+    "model_tr/res/next_page.toif",
+    empty_right_col = true
+); // 10*8
 include_icon!(ICON_PREV_PAGE, "model_tr/res/prev_page.toif"); // 8*10
 include_icon!(ICON_SPACE, "model_tr/res/space.toif"); // 12*3
 include_icon!(ICON_SUCCESS, "model_tr/res/success.toif");
 include_icon!(ICON_TICK, "model_tr/res/tick.toif"); // 8*6
 include_icon!(ICON_TICK_FAT, "model_tr/res/tick_fat.toif"); // 8*6
-include_icon!(ICON_WARNING, "model_tr/res/warning.toif"); // 12*12
+include_icon!(
+    ICON_WARNING,
+    "model_tr/res/warning.toif",
+    empty_right_col = true
+); // 12*12
 include_icon!(ICON_WARN_TITLE, "model_tr/res/bld_header_warn.toif");
 
 // checklist settings
diff --git a/tests/ui_tests/fixtures.json b/tests/ui_tests/fixtures.json
index f1313ac47..44c8ee332 100644
--- a/tests/ui_tests/fixtures.json
+++ b/tests/ui_tests/fixtures.json
@@ -699,42 +699,42 @@
 "click_tests": {
 "TR_test_autolock.py::test_autolock_does_not_interrupt_preauthorized": "852bedaf4727ea1b5cb56ab55ac314e6b09dccefc71bc6e32df201bdc98817e2",
 "TR_test_autolock.py::test_autolock_does_not_interrupt_signing": "f99ab9a7fe7808c787269647288086ec6911691319d0b324d471258e031db74b",
-"TR_test_autolock.py::test_autolock_interrupts_passphrase": "d12fccb3e8578043bed55ea5a7c2fa1fa6c834a2629c91f37cf7c46d33e802c9",
+"TR_test_autolock.py::test_autolock_interrupts_passphrase": "34baec847a2c903af27aa804502d8c6f451832712f90ce59f9292d6a6fe332ea",
 "TR_test_autolock.py::test_autolock_interrupts_signing": "062408fd528052b9ae39c5ca6be25d81259dd3b86112d917da40a588a11fce6e",
-"TR_test_autolock.py::test_autolock_passphrase_keyboard": "83ce820d94307fca8b964d1087f54b57f3a0524b77f050d959db719c6cefa0e5",
-"TR_test_autolock.py::test_dryrun_enter_word_slowly": "96dd19df7cd85394ed9b11c5c6ee2575b4e6dddb75d9e709ee905f265e3ff965",
+"TR_test_autolock.py::test_autolock_passphrase_keyboard": "e2afffef8cde239f3db95c377141b1fd44433a6dc4506fcbd836dbffde64fa3b",
+"TR_test_autolock.py::test_dryrun_enter_word_slowly": "41ad6438a6fe987b0f67fee9eeaebc981fd1f93cf361ad8331c3f71792101beb",
 "TR_test_autolock.py::test_dryrun_locks_at_number_of_words": "cb114503460241b59aa6dff465e5d07266c939e18da5665fc83dcd6fd4edea53",
-"TR_test_autolock.py::test_dryrun_locks_at_word_entry": "2930cb8c4e03f5b485cfcc234f6c061266b66174b60483ac305e6128bcc79ad5",
+"TR_test_autolock.py::test_dryrun_locks_at_word_entry": "0247675051a4e054524cb49fc4379532233464163f6147cf90655f72aaf93be5",
 "TR_test_lock.py::test_hold_to_lock": "9faab870f373edf47416d80e8297a14089ba1bed36f0aa0c67b3819b2cea03e3",
-"TR_test_passphrase_tr.py::test_cancel": "490472798c6107483c0ffffc043d69af96d5701b311abed9c8534ee9e4f08f37",
-"TR_test_passphrase_tr.py::test_passphrase_delete": "2edff7335a27d3f9fea5ed9291a835ff3025014df8c67a160c23b20d20ad06da",
-"TR_test_passphrase_tr.py::test_passphrase_input[Y@14lw%p)JN@f54MYvys@zj'g-mnkoxeaMzLgfCxUdDSZW-381132c0": "883a69432774d30762fd442a89fa1364483935ecc660d52cceff2f006a4e75cf",
-"TR_test_passphrase_tr.py::test_passphrase_input[aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-166c898a": "b035194b44bbcfc715ed8514ed81b46daf0e65c7cd84ddcaaee64fd369df70c7",
-"TR_test_passphrase_tr.py::test_passphrase_input[aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-334262e9": "5297b79f4657be0e187f5d46b05b60998bddd7f978cd8c712919a5c78789bf44",
-"TR_test_passphrase_tr.py::test_passphrase_input[abc 123-mvqzZUb9NaUc62Buk9WCP4L7hunsXFyamT]": "27fbe8ef2b0f880f16ae59a9664237e7be06497395fc3cfffbfc135ded354612",
-"TR_test_passphrase_tr.py::test_passphrase_input[abc123ABC_<>-mtHHfh6uHtJiACwp7kzJZ97yueT6sEdQiG]": "18a225184fae76d633d6d822dfb194612122e7fb9da85b0d0827f91bb0bd810e",
-"TR_test_passphrase_tr.py::test_passphrase_input_over_50_chars": "4348ca13e8f87b3d6b90821c9d2fa0a7575da9d113b855d09d3a2c072d2f79a7",
-"TR_test_passphrase_tr.py::test_passphrase_loop_all_characters": "f0b53c5b71f5521aa87d03a570957afe63c9313d8c3903d1ceeb4db5228a5301",
-"TR_test_pin.py::test_pin_change": "b7c0e303098d91546a266ba0f59e3eed8aa0c40845d6811698b58b09ee9b47b9",
-"TR_test_pin.py::test_pin_incorrect": "3b57d4a025689b145fd10593b78963294633ed7ad129c076865377f87fbe51be",
-"TR_test_pin.py::test_pin_long": "53bcc304d0e9181a5b467ada641998837f5081da55406bc5ef80fd70ac29001a",
-"TR_test_pin.py::test_pin_long_delete": "e87c64f69295a134ff2c04c00a7065cc93d8666c2b66c02e849848b242e323a2",
-"TR_test_pin.py::test_pin_longer_than_max": "c15b2a40cba62a14db70f405e21b9e319f655cb86037b0510b0f141ed5da14be",
-"TR_test_pin.py::test_pin_same_as_wipe_code": "495213f0ee5e57c4c07998a347d3e9c9f82e2c68bcf400031acb2f3a74cc82ff",
-"TR_test_pin.py::test_pin_setup": "47ce6cfa489b484ba980102d896c87d4e67a9d177266549004f0a168f51656aa",
-"TR_test_pin.py::test_pin_setup_mismatch": "edad7b7156edff69ef54cb024e952c69fffe0ede13997102d6c7b8a15ae570fe",
-"TR_test_pin.py::test_pin_short": "6fbef41cd1b516565683d6c4274d7c09f9254b545c140f14a6f5f09e4ec43dfa",
-"TR_test_pin.py::test_wipe_code_same_as_pin": "af78871940ecd25399d12fda760a6019ace98660d1abedf5b2c3a191c79ce6f2",
-"TR_test_pin.py::test_wipe_code_setup": "f529d924eba2056a0c3a6b48ca54edbdca210bb31302148662346c65a035a3bc",
-"TR_test_recovery.py::test_recovery_bip39": "2147a7b5723915352ee2d474974b395a6936acdecf07c3c99a1ead1fed761300",
-"TR_test_recovery.py::test_recovery_slip39_basic": "37eb68c729b99776816515c341fc5b2c23673cb367d41b231e456690b4caa224",
+"TR_test_passphrase_tr.py::test_cancel": "49898dbd64673d3763aee3aa609cfd21d1c6ed1219783af44ea1eac6b993624f",
+"TR_test_passphrase_tr.py::test_passphrase_delete": "0050894d50932b826237a94b9d23b72fb545e8fc01a9ba927695cdb5ef750576",
+"TR_test_passphrase_tr.py::test_passphrase_input[Y@14lw%p)JN@f54MYvys@zj'g-mnkoxeaMzLgfCxUdDSZW-381132c0": "fe1196852821d5f5a9bc0c2c7d7012b7773679f8d8e61bea1ddbcdacf367606f",
+"TR_test_passphrase_tr.py::test_passphrase_input[aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-166c898a": "2c5120f28009ae002cb92c7786e358dc526c24dc05a78023701a6d21890f8429",
+"TR_test_passphrase_tr.py::test_passphrase_input[aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-334262e9": "dfde4314dc24df3631835de93e0ff5d17e312c982f8107dff395c6adbccd0767",
+"TR_test_passphrase_tr.py::test_passphrase_input[abc 123-mvqzZUb9NaUc62Buk9WCP4L7hunsXFyamT]": "4de4b104ee41cb6b8a40c86b63bac1eeb3a638a10999a724345e511dde4b5ded",
+"TR_test_passphrase_tr.py::test_passphrase_input[abc123ABC_<>-mtHHfh6uHtJiACwp7kzJZ97yueT6sEdQiG]": "5753745a4fb6876befe1b82104939d2de9504a59a9bbcc70818d7c56902fd6f9",
+"TR_test_passphrase_tr.py::test_passphrase_input_over_50_chars": "6b645cf0bab2c73a845d510764d6af185f3cf06c964e1ff3243ee3e3052c6538",
+"TR_test_passphrase_tr.py::test_passphrase_loop_all_characters": "d972114b5595927e994fa6f7699225c3edfc185fd86ba7df994f2c6df624ce8b",
+"TR_test_pin.py::test_pin_change": "33d27069e11c7e30529692118469cb8d3d2d7bc525e8a1ac7430aa916f635b86",
+"TR_test_pin.py::test_pin_incorrect": "1fdd48fbd1e040b4bb009a0eafe0ac692d62e8843e316c14bf24ad19664c6c45",
+"TR_test_pin.py::test_pin_long": "c26647dd6b7c5801c271bfde027d6730b5d88002f552fad0e27101f2830739c6",
+"TR_test_pin.py::test_pin_long_delete": "9313e1c26e9c8520110b486ed47f058dd4804566ab9e02722ba7c10f1aa4b0b7",
+"TR_test_pin.py::test_pin_longer_than_max": "5e83434ce99dbc3914e90eaef7ab129a158838f6540edd69e66fa50653db1589",
+"TR_test_pin.py::test_pin_same_as_wipe_code": "0e6d658f047c0fefaf4230dcbfe0ed04411f6e7185cc7300ae4b759125db0ec6",
+"TR_test_pin.py::test_pin_setup": "22f3334a910105e43327aa2138d4634272fc6ce08cb57b6e6d4023d65fbdee28",
+"TR_test_pin.py::test_pin_setup_mismatch": "99547ac5af382da1161eb1bfe2b735579356b35850cfb6529f5e10df9e6d25e2",
+"TR_test_pin.py::test_pin_short": "1eed6ee2abd70ea907b6bc27a025881524c16042aa463e131f3fbd1ece3bb212",
+"TR_test_pin.py::test_wipe_code_same_as_pin": "f7be6478cf07bc3ee2f3bdb8e31f14d71b585a9016e9421af923d918d3c0e167",
+"TR_test_pin.py::test_wipe_code_setup": "eb2543665a66bda19752c9167207ac09cb34bb0bafbdc1e52348da16605524c1",
+"TR_test_recovery.py::test_recovery_bip39": "3a3a014f0a82ef190ec4316e61e5618a61bba2dd61802faab632b4bbf16923e9",
+"TR_test_recovery.py::test_recovery_slip39_basic": "e901bae323d7c0c2c33beb87b0066c1f8d21d27f21888a507777f2f123425278",
 "TR_test_reset_bip39.py::test_reset_bip39": "45a8f1ec97b152438fcd4161c709efd61f7b98283102432a256c95051721abe2",
-"TR_test_reset_slip39_advanced.py::test_reset_slip39_advanced[16of16]": "78da94ed0a465fb093fca05404c474bc05b5fdfab9c2881805c1c6258122c5c6",
-"TR_test_reset_slip39_advanced.py::test_reset_slip39_advanced[2of2]": "c37ec2580398f2d7129072cd0b18f8813debfd2fdefe3b17b1cc9b6a1c1bac6b",
-"TR_test_reset_slip39_basic.py::test_reset_slip39_basic[16of16]": "72ea356096ec36af86c2f2e7561e6b6f11a1ca02319bf6e76398434f78ece69f",
-"TR_test_reset_slip39_basic.py::test_reset_slip39_basic[1of1]": "29647900796fe07bc7c15e1b9f4540180e230135a684321095d15d25b0e534f0",
-"TR_test_tutorial.py::test_tutorial_again_and_skip": "361dfaa421a210e8b9adf47b6f966efc4c5bd2d7b2b0642a4d5242525dad7078",
-"TR_test_tutorial.py::test_tutorial_finish": "e6894ec903c03124a3ca92c8c0d79b86c0c01791b555b492f5e50b629fbe9960",
+"TR_test_reset_slip39_advanced.py::test_reset_slip39_advanced[16of16]": "e5256575528344273ad2a029efd9389e01d64d16cdf9c8e328c5ca6f7ad85f06",
+"TR_test_reset_slip39_advanced.py::test_reset_slip39_advanced[2of2]": "80c95ede02a1ca62e99ec8b58f17f7ed4e0064c031067913486b76bfbcdac347",
+"TR_test_reset_slip39_basic.py::test_reset_slip39_basic[16of16]": "9fd63c7498adbf9c9a4b3309e967d9c65f34a27eaa934fcd0b995f297a80a70d",
+"TR_test_reset_slip39_basic.py::test_reset_slip39_basic[1of1]": "a0c65abca499b63ba2f49f5c491360ca163a97ea0beb9ada625867ae93cd2c9a",
+"TR_test_tutorial.py::test_tutorial_again_and_skip": "1b6c44532ea2c4eb078e369690908a4cee6e969fd0246d58e919288964a0caa5",
+"TR_test_tutorial.py::test_tutorial_finish": "a4c624e30123c3dbd21bee62342532a6efd73c5aaa5bb38da045414a7929e94a",
 "TR_test_tutorial.py::test_tutorial_skip": "c5343d06a573f7603f4b04b773d203ee33b6ca866d24be79e9dd75d4a3da3896"
 },
 "device_tests": {
@@ -855,22 +855,22 @@
 "TR_bitcoin-test_getaddress_segwit_native.py::test_show_segwit[Testnet-m-86h-1h-0h-0-0-InputScr-821a199d": "57e3aa5a6a55926dcc95ca290bf1b2826bbc86b535e0baa162f7c79b1784c96b",
 "TR_bitcoin-test_getaddress_segwit_native.py::test_show_segwit[Testnet-m-86h-1h-0h-1-0-InputScr-9d2fa8bc": "57e3aa5a6a55926dcc95ca290bf1b2826bbc86b535e0baa162f7c79b1784c96b",
 "TR_bitcoin-test_getaddress_segwit_native.py::test_show_segwit[Testnet-m-86h-1h-0h-1-0-InputScr-d5b7f8fc": "94d0e2a7d463fbfea32e006425f316f2ba1abfc36ee7f26efa4a51be57a2e159",
-"TR_bitcoin-test_getaddress_show.py::test_show_cancel[m-44h-0h-12h-0-0-InputScriptType.SPENDADD-4eca71e0": "3dca800a87874a857b3c40a4c524ceef11925b9537a7a11e6412548ec0f50a78",
-"TR_bitcoin-test_getaddress_show.py::test_show_cancel[m-49h-0h-12h-0-0-InputScriptType.SPENDP2S-4ec777e0": "2c979dfb3a67302e4e716629e397fe033dc1309259768464dfb91fc84c9635e2",
-"TR_bitcoin-test_getaddress_show.py::test_show_cancel[m-84h-0h-12h-0-0-InputScriptType.SPENDWIT-d6991e22": "1265f3be7c25a04687c49b091c5b3a4e6793e6daf1b58287a7d6305a26e7e811",
-"TR_bitcoin-test_getaddress_show.py::test_show_cancel[m-86h-0h-12h-0-0-InputScriptType.SPENDTAP-4c5b2b38": "b571aff99f69f50660f1dc78cade1326c21b3b90056b1105f5391457634805a3",
+"TR_bitcoin-test_getaddress_show.py::test_show_cancel[m-44h-0h-12h-0-0-InputScriptType.SPENDADD-4eca71e0": "5a84068819645c82dab93cdaf3c6dc667e5c87d1d3dbee4624712371d7c30ab0",
+"TR_bitcoin-test_getaddress_show.py::test_show_cancel[m-49h-0h-12h-0-0-InputScriptType.SPENDP2S-4ec777e0": "61954f277ee68818e626e12ead3d1e91cd2651f44738fe2fc6d61027793aca69",
+"TR_bitcoin-test_getaddress_show.py::test_show_cancel[m-84h-0h-12h-0-0-InputScriptType.SPENDWIT-d6991e22": "30082738e58c41791a2eb44b32a0e23976a787bdff5bc4dcc2d51f7fc817b823",
+"TR_bitcoin-test_getaddress_show.py::test_show_cancel[m-86h-0h-12h-0-0-InputScriptType.SPENDTAP-4c5b2b38": "05eca8060ed4cd1abb732c9f5252d5776a56fa3caf1beb392d9f31ec2273b10a",
 "TR_bitcoin-test_getaddress_show.py::test_show_multisig_15": "36b83d6fab39cefd75c3852b3e897f96a2250998678a93593233bfe08356280e",
 "TR_bitcoin-test_getaddress_show.py::test_show_multisig_3": "875414bf1fa9b8c898cf48f426140d55af3b7071daf34a14a4e879ef7221f870",
-"TR_bitcoin-test_getaddress_show.py::test_show_multisig_xpubs[InputScriptType.SPENDMULTISIG-0-3-4efd9cf3": "c22c48bcaa595e5aa2842d3c2d1054097ed49b39585408334ecb154ef413ecc3",
-"TR_bitcoin-test_getaddress_show.py::test_show_multisig_xpubs[InputScriptType.SPENDMULTISIG-0-3-98a7e339": "c22c48bcaa595e5aa2842d3c2d1054097ed49b39585408334ecb154ef413ecc3",
-"TR_bitcoin-test_getaddress_show.py::test_show_multisig_xpubs[InputScriptType.SPENDP2SHWITNESS--2cf5f03c": "78dd78c0717156b653c830f136e60b7199ce211013bf8363bc8428fcd60e9325",
-"TR_bitcoin-test_getaddress_show.py::test_show_multisig_xpubs[InputScriptType.SPENDP2SHWITNESS--5ea18367": "54560d76bac2e60658948123590f83a50d6e3e63601fb03a554bc0e91bed7a53",
-"TR_bitcoin-test_getaddress_show.py::test_show_multisig_xpubs[InputScriptType.SPENDWITNESS-2-bc-e70b56ea": "3205596cd86232fd1f9f907493a91e8c7277e37b0f03e33c33c82cefa7618856",
-"TR_bitcoin-test_getaddress_show.py::test_show_multisig_xpubs[InputScriptType.SPENDWITNESS-2-bc-f3c4650f": "a812f84cdff2b7148466ea311537619a5affbfaf2cba0f3e14f00a0108ebe70e",
-"TR_bitcoin-test_getaddress_show.py::test_show_tt[m-44h-0h-12h-0-0-InputScriptType.SPENDADDRESS-7e3bc134": "0ff292a149050fc8e73569a593eeecf3301d9211c51311e39bb5bd3756d3c6f0",
-"TR_bitcoin-test_getaddress_show.py::test_show_tt[m-49h-0h-12h-0-0-InputScriptType.SPENDP2SHWIT-fffcf75c": "8b9db22289569987bbd0871d877df15252784440c12ed02df08a1a5fd9e4765f",
-"TR_bitcoin-test_getaddress_show.py::test_show_tt[m-84h-0h-12h-0-0-InputScriptType.SPENDWITNESS-2ad0a0fd": "4a03437ac3ca130aa4f7a7166ae20b720486872e83b2bb072c4956473ce4f983",
-"TR_bitcoin-test_getaddress_show.py::test_show_tt[m-86h-0h-12h-0-0-InputScriptType.SPENDTAPROOT-299be1ac": "f9a7c113692ce73e1db0f72237f565979e8aaa45ee1a8d36283e35b0f664d036",
+"TR_bitcoin-test_getaddress_show.py::test_show_multisig_xpubs[InputScriptType.SPENDMULTISIG-0-3-4efd9cf3": "980a3954ba300c96382cd3570a9f56d406bf51cf62a7f47a92ccdd6c082c1120",
+"TR_bitcoin-test_getaddress_show.py::test_show_multisig_xpubs[InputScriptType.SPENDMULTISIG-0-3-98a7e339": "980a3954ba300c96382cd3570a9f56d406bf51cf62a7f47a92ccdd6c082c1120",
+"TR_bitcoin-test_getaddress_show.py::test_show_multisig_xpubs[InputScriptType.SPENDP2SHWITNESS--2cf5f03c": "30134f37a8986cdc54dffded0b684e976cb7df3222ae93d8225a7a2f8e515280",
+"TR_bitcoin-test_getaddress_show.py::test_show_multisig_xpubs[InputScriptType.SPENDP2SHWITNESS--5ea18367": "de3fbfafe094941c769cc114dbf28f42292c9ab170c2dcfc4d928e6068091317",
+"TR_bitcoin-test_getaddress_show.py::test_show_multisig_xpubs[InputScriptType.SPENDWITNESS-2-bc-e70b56ea": "255fbd34527b664b206653239b5e3015fb9e3f79c27d0e8611b3b2648448b92b",
+"TR_bitcoin-test_getaddress_show.py::test_show_multisig_xpubs[InputScriptType.SPENDWITNESS-2-bc-f3c4650f": "ba3719dcfcd26a1425589d38515c79223beb365a634fe89e669fbddbf50dc1a9",
+"TR_bitcoin-test_getaddress_show.py::test_show_tt[m-44h-0h-12h-0-0-InputScriptType.SPENDADDRESS-7e3bc134": "2e0607adba9b7cc7ec5fab13db5c8c6a90e45341c3eecf091850a7c580a208e1",
+"TR_bitcoin-test_getaddress_show.py::test_show_tt[m-49h-0h-12h-0-0-InputScriptType.SPENDP2SHWIT-fffcf75c": "4240c18f4ddec9345a312087a88679a4f1675453a601293f012e3b33af11fc5f",
+"TR_bitcoin-test_getaddress_show.py::test_show_tt[m-84h-0h-12h-0-0-InputScriptType.SPENDWITNESS-2ad0a0fd": "4ea9e5eb26158d84258332668188e27a1e22b3f51a8b37757fb0993baf181403",
+"TR_bitcoin-test_getaddress_show.py::test_show_tt[m-86h-0h-12h-0-0-InputScriptType.SPENDTAPROOT-299be1ac": "85feecba576d249a3283e4c53a8604d27c4d4eca52e7c0ee0b94183a7b6f0ebf",
 "TR_bitcoin-test_getaddress_show.py::test_show_unrecognized_path": "57e3aa5a6a55926dcc95ca290bf1b2826bbc86b535e0baa162f7c79b1784c96b",
 "TR_bitcoin-test_getownershipproof.py::test_attack_ownership_id": "57e3aa5a6a55926dcc95ca290bf1b2826bbc86b535e0baa162f7c79b1784c96b",
 "TR_bitcoin-test_getownershipproof.py::test_confirm_ownership_proof": "58e0a6e67dcb3d23eb89bb40969e8a65814cde0256e63992a74df319ad4bf35e",
@@ -1292,7 +1292,7 @@
 "TR_cardano-test_sign_tx.py::test_cardano_sign_tx[simple_plutus_transaction]": "df7e8b64dd214d506690090dabf2b5e3f12759f8076ae4a99d71ca32507f56c6",
 "TR_cardano-test_sign_tx.py::test_cardano_sign_tx[simple_plutus_transaction_with_additional_wit-36ba8ce8": "ba8437b39fa9b3552c15019a3ef2ac2c6bc50e13eb08c045a860538843cf5d0a",
 "TR_cardano-test_sign_tx.py::test_cardano_sign_tx[simple_plutus_transaction_with_required_signers]": "3e2985891282173c0043e544dadf2935eff5477a06d5aa34926bbaa13947c70c",
-"TR_cardano-test_sign_tx.py::test_cardano_sign_tx[simple_transaction_with_base_address_change_o-0c37e6dc": "695e91da2c50dfc25a1bff9c4a01db02e1409ef06a6ccb6220ffdd152fb9dab3",
+"TR_cardano-test_sign_tx.py::test_cardano_sign_tx[simple_transaction_with_base_address_change_o-0c37e6dc": "242a5b73c052094ef1bb89834acaed9a8097765c07250a59039cba5281063ec1",
 "TR_cardano-test_sign_tx.py::test_cardano_sign_tx[simple_transaction_with_base_address_change_o-7f1d12f6": "ce7eaa445d97283fa0a43a87a8b4f8848da9b4075e1cfd9b9ccc682bf3bf698d",
 "TR_cardano-test_sign_tx.py::test_cardano_sign_tx[simple_transaction_with_base_address_change_output]": "b218e5fa46b31875f15ab948128c2ba2811729a7801f43557541112a2a71e560",
 "TR_cardano-test_sign_tx.py::test_cardano_sign_tx[simple_transaction_with_base_script_address_a-56fc16f7": "afcc1e47bc323cccf5e8cd6feca4e20ac5c677ef3df5f1ad7814aa619245e635",
@@ -1311,7 +1311,7 @@
 "TR_cardano-test_sign_tx.py::test_cardano_sign_tx[transaction_with_cip36_registration_and_non-p-26df89e6": "b99898edcc13abd63aaff8c4fac7466b78259b0a6ce2f809fda07580cd503d74",
 "TR_cardano-test_sign_tx.py::test_cardano_sign_tx[transaction_with_cip36_registration_and_other-6a6c5c8d": "91a6971fdfb2f8365efc4e433eaf9add064f88771b06adefdcb52a55248d0c16",
 "TR_cardano-test_sign_tx.py::test_cardano_sign_tx[transaction_with_cip36_registration_and_votin-1b01d6f0": "d1b389cf4d9488c4d0ec21a0456d6fc55dcbcf5b69ab7ee91571a4a0eecc1e4c",
-"TR_cardano-test_sign_tx.py::test_cardano_sign_tx[transaction_with_everything_set_except_pool_r-1e1ef130": "d00239398e36c83dc9ca261ae8b54de09e3c1311cce951ab6a28f9ade25e198f",
+"TR_cardano-test_sign_tx.py::test_cardano_sign_tx[transaction_with_everything_set_except_pool_r-1e1ef130": "78499e763dc8f0b072e9a373afbb255fb6802873353165f8eb94e957688571a3",
 "TR_cardano-test_sign_tx.py::test_cardano_sign_tx[transaction_with_stake_deregistration]": "bf24bed0b0715e10bc5437ecdf5e53028d903594dde8fbcab55f978ab4bdd818",
 "TR_cardano-test_sign_tx.py::test_cardano_sign_tx[transaction_with_stake_deregistration_and_withdrawal]": "bf24bed0b0715e10bc5437ecdf5e53028d903594dde8fbcab55f978ab4bdd818",
 "TR_cardano-test_sign_tx.py::test_cardano_sign_tx[transaction_with_stake_deregistration_with_ac-9ca046f0": "fe03f08dd1aa74e033ec947468663b26dd9a82b7400613b2fe2ac7a5ba05a710",
@@ -1652,7 +1652,7 @@
 "TR_reset_recovery-test_recovery_bip39_dryrun.py::test_bad_parameters[pin_protection-True]": "57e3aa5a6a55926dcc95ca290bf1b2826bbc86b535e0baa162f7c79b1784c96b",
 "TR_reset_recovery-test_recovery_bip39_dryrun.py::test_bad_parameters[u2f_counter-1]": "57e3aa5a6a55926dcc95ca290bf1b2826bbc86b535e0baa162f7c79b1784c96b",
 "TR_reset_recovery-test_recovery_bip39_dryrun.py::test_dry_run": "590daa1cb3c66ffc542e399f4e1800a92e6b29f66b0559291b78a7b5ef5a91aa",
-"TR_reset_recovery-test_recovery_bip39_dryrun.py::test_invalid_seed_core": "9c8036e097d1edcc95ba18a3fafc293e4d9062b68a176fd57aff65937547432b",
+"TR_reset_recovery-test_recovery_bip39_dryrun.py::test_invalid_seed_core": "b20e60f198f0255df242b2f80fc47be374ad16f2c6b6d64758c5e1735ca1ba44",
 "TR_reset_recovery-test_recovery_bip39_dryrun.py::test_seed_mismatch": "79442e2fc2418d74cfdddcb68fc3b18979ec2eefecea94bc0eccb1947424c6e2",
 "TR_reset_recovery-test_recovery_bip39_dryrun.py::test_uninitialized": "f49c8d846c2d56a575f0ad49463845ba641b02656783e4fcfc67d74e8fa671dd",
 "TR_reset_recovery-test_recovery_bip39_t2.py::test_already_initialized": "57e3aa5a6a55926dcc95ca290bf1b2826bbc86b535e0baa162f7c79b1784c96b",
@@ -1848,10 +1848,10 @@
 "TR_test_session_id_and_passphrase.py::test_multiple_passphrases": "6ef3032ecd01d4f62294f878bb2e682b57c91521cca0ee158d2098bd6ad8375c",
 "TR_test_session_id_and_passphrase.py::test_multiple_sessions": "57e3aa5a6a55926dcc95ca290bf1b2826bbc86b535e0baa162f7c79b1784c96b",
 "TR_test_session_id_and_passphrase.py::test_passphrase_ack_mismatch": "97df1d41e48484b8372bf540ccc580b9532ef50e95101876777809029207deca",
-"TR_test_session_id_and_passphrase.py::test_passphrase_always_on_device": "420c224571fe05c13286fac19363eaf954adcaa3fdc6735363e6f3d717210128",
+"TR_test_session_id_and_passphrase.py::test_passphrase_always_on_device": "eed2533300c737b2d14bf2fca7e7266ce91d39f11477a679a54f8ea752635e74",
 "TR_test_session_id_and_passphrase.py::test_passphrase_length": "1b586b3f59194b29ffecc26198339e70dd8b140647a8bb668fb48284295b746c",
 "TR_test_session_id_and_passphrase.py::test_passphrase_missing": "c5d0b5c38f3bddbedf6dd096587707c541e64cec208e653019f9c7c36e81adf3",
-"TR_test_session_id_and_passphrase.py::test_passphrase_on_device": "5f799f05463021be742fee81eeddbdf71eb9369b800a8171587d3aebc066bb56",
+"TR_test_session_id_and_passphrase.py::test_passphrase_on_device": "9498dd9de430ddd83334b97200f77577e540f3c7196b08b3562553e6e0815eac",
 "TR_test_session_id_and_passphrase.py::test_session_enable_passphrase": "05ac00a6703559a8354c8d5ca158e43dc0c13caec53434a999fd82d733d48dd0",
 "TR_test_session_id_and_passphrase.py::test_session_with_passphrase": "43325012941787da894d614d0760a52d3e509e31f88602fbc22a8d2f7fb986af",
 "TR_tezos-test_getaddress.py::test_tezos_get_address": "537e61b567a83d0f04debff71a0f4bb15fa7057b3156cefd00f1599cb7b52352",