From ec37905b75842d660644cdf5fe110fa1870eafc7 Mon Sep 17 00:00:00 2001
From: sunsets <845944018@qq.com>
Date: Wed, 17 Jan 2024 14:35:16 +0800
Subject: [PATCH] Fix some bugs

---
 resources/web/guide/img/MenuBtnIcon.svg |  13 ++++++++++++-
 resources/web/guide/img/logo.png        | Bin 7695 -> 2098 bytes
 src/slic3r/GUI/BitmapCache.cpp          |   6 ++++--
 src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp |   6 ++++++
 src/slic3r/GUI/Plater.cpp               |   9 +++++++--
 src/slic3r/GUI/Widgets/UIColors.hpp     |   3 ++-
 6 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/resources/web/guide/img/MenuBtnIcon.svg b/resources/web/guide/img/MenuBtnIcon.svg
index 4d67aeb..0d5e8fe 100644
--- a/resources/web/guide/img/MenuBtnIcon.svg
+++ b/resources/web/guide/img/MenuBtnIcon.svg
@@ -1 +1,12 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1687832492956" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="10887" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M972.146238 0.005962h-3.629346c-15.683959 0.907336-246.277047 15.683959-374.341111 93.714898-27.479334 16.850535-36.16384 49.12579-41.867098 104.602935a94.362995 94.362995 0 0 0-67.920617-31.627158 85.16001 85.16001 0 0 0-52.625517 18.924447c-47.051878 37.330416-207.391197 171.356977-277.256107 332.862872C68.698334 717.320267 82.826859 863.66068 83.474957 869.752797c0 1.555434 0.907336 2.981248 1.166575 4.536682-47.959214 61.439642-77.123602 104.732555-80.364089 109.398857a25.9239 25.9239 0 0 0 7.129073 35.515743A25.9239 25.9239 0 0 0 25.9239 1024a25.9239 25.9239 0 0 0 21.387217-11.406516c0-1.036956 27.479334-40.830142 72.716539-98.899677h1.685053A250.295251 250.295251 0 0 0 181.467298 920.304401c99.547775 0 305.902016-38.88585 570.325793-296.958271C987.570958 393.012282 1019.716594 99.294498 1023.086701 58.723595A47.829595 47.829595 0 0 0 1023.994038 51.853762a51.070082 51.070082 0 0 0-51.8478-51.8478zM716.406968 586.404573C461.575034 835.533249 267.405025 868.456602 181.467298 868.456602c-10.499179 0-18.794827 0-25.9239-1.166576 87.363542-107.195325 220.353147-251.202588 368.378615-349.972645a25.9239 25.9239 0 0 0-28.51629-42.644815c-145.173838 97.214624-272.200947 232.148522-361.89764 338.825369a795.215623 795.215623 0 0 1 67.531759-274.274859c64.809749-151.136335 221.001245-280.626214 262.220245-312.901469a33.182592 33.182592 0 0 1 20.998359-8.166029c45.237205 0 81.401045 108.750759 100.195872 108.75076h1.944293c16.202437-7.517931 9.591843-173.560508 34.349167-188.72599C741.034672 64.815712 972.146238 51.853762 972.146238 51.853762s-19.054066 303.180007-255.73927 534.550811z" fill="#4479FB" p-id="10888"></path></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="20px" height="20px" viewBox="0 0 20 20" enable-background="new 0 0 20 20" xml:space="preserve">
+<path fill="#4479FB" d="M19,0L19,0c-0.4,0-4.9,0.3-7.4,1.8c-0.5,0.3-0.7,1-0.8,2C10.4,3.5,10,3.3,9.5,3.3c-0.4,0-0.7,0.1-1,0.4
+	C7.5,4.4,4.4,7,3,10.1C1.3,14,1.6,16.9,1.6,17c0,0,0,0.1,0,0.1c-0.9,1.2-1.5,2-1.6,2.1c-0.1,0.2-0.1,0.5,0.1,0.7
+	C0.3,20,0.4,20,0.5,20c0.2,0,0.3-0.1,0.4-0.2c0,0,0.5-0.8,1.4-1.9h0C2.8,17.9,3.2,18,3.5,18c1.9,0,6-0.8,11.1-5.8
+	c4.6-4.5,5.2-10.2,5.3-11c0,0,0-0.1,0-0.1C20,0.5,19.6,0,19,0C19,0,19,0,19,0z M14,11.5C9,16.3,5.2,17,3.5,17c-0.2,0-0.4,0-0.5,0
+	c1.7-2.1,4.3-4.9,7.2-6.8c0.2-0.2,0.2-0.5,0-0.7c-0.1-0.2-0.4-0.2-0.6-0.1c-2.8,1.9-5.3,4.5-7.1,6.6c0.1-1.9,0.6-3.7,1.3-5.4
+	c1.3-3,4.3-5.5,5.1-6.1c0.1-0.1,0.3-0.2,0.4-0.2c0.9,0,1.6,2.1,2,2.1h0c0.3-0.1,0.2-3.4,0.7-3.7C14.5,1.3,19,1,19,1
+	S18.6,6.9,14,11.5L14,11.5z"/>
+</svg>
diff --git a/resources/web/guide/img/logo.png b/resources/web/guide/img/logo.png
index 8bca3a6618bb733c8056bc1ba52551482780bbba..994d0c90f014663f71cb39f407debea2082ad6bc 100644
GIT binary patch
literal 2098
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

literal 7695
zcmYLObzIZm_Z}f3-Q7rx7$_l#bP9q9qhWM+Nr%EfkWvW+DGLUS?$HW3kWxBE$B>SV
z7<~8n{qy_dzV9FR^*ZM{=ic{y&OOiTXNEddciHa(001gIUCrnCIqttfMuPwLDLV||
zCvtyX%OC)N`p18RAX|)@0|4Oa(bH5j4V&Bh6dnbhY#iwFDjFu|BR^3>Dv9yFq7<Sg
z<1b|<<pef1Q8(_bHR?4^T0zv7yu7Td=8U+|rlgFp<hukvUMBN8u{jsIk&&qn{+`{%
z1>6^Qe%LB+Qm<STrEK}4sQ#cevbuiCuexJuPCZ#fK~{`@o5qIllvt5aB3_f1UFxri
zT3xpSFVRE5KY$!SEPj&Wn@$1E&)g@O!jFwLg$NnqvS94O{Nbn)nAPajsu58tIHV~V
zk*h4B^jVu+^@)`|;4l-mB*HI!#=!jihVxMJ(Dbt55IhM4{3^G^X|0pnQ}UiMn0`gT
z&^r9by7;w8@c*s7?han|?Jk!`O+Jx4<j-ugkI>W}yu*7>!k_7oa13^nR%v`41O8NJ
zAMrz&k1p<gL)>Rr7jssF4KYN8KsLRZ|2|ciOte)ChYW$P9>otpbvZiWlAxODTHHPm
z@1;JQId1)L<wJXFsnVr|Dc~g~Yct*y8;UTq;3Ja&e^7kZnV&_~I!o%H>{ky$(Z0<t
z0siS}8uzMAHzIjkGKPfgQb5e7wegDYb5EzYhBpK@rv3}boFM4c9uWTBQ{WC<)Z?|t
zy|Nok`)HhEm*FLO1WO2Wwlm>3qAE1xqoPh#;O6-fg=ZWm>L$eo<BQ`k-NJg)v6=cG
z6qk{Nse_-U{~p}^k||xj<@Mm849(Cz<H(MWUrH5hKGh{1Qb^h&_(H6;m;@Wp@!>jy
zmw=mafA|kTVKBA`raj%ocT0C|Ssa27^-WCy^mSN3M935gyTC*3KxM-GpxIavp=1&v
zLQn!h@*uHixMl{OdsafIujs@#@&*I?k3z{pKllQSY1s&}97K2tSnk*JK8SNI&`vKh
zOLy+RS%bA_@U~NneIK0+Pm>}DQ+qx^nAL4utmbp2Ch=}e%~p#fm^q?>Y1N7B$t@gA
z?bhA@7`FSOymAT7sbsuGyxahjBk!YF^nGScYw(;%cSqP}X>_bsfe{<cI3C*hOIm$M
zdyJp_`6Y*`!)?Gu>Tl#*s+_b)UR?<I(_g?g2%l&gKrC#$23+jrwbH)=b$Fau<2fSo
zFz_xj+*tVnS$AMjm6O1e_*!>#VN&&}sim!T>Ox53%G*?gP9^#1v^aq;+dTtzzBbn+
zWaVh~Mn04Em4W)GRI$lZ#@|04wrqJOt>3)-74BN)5MfSC5-dl#P1&9y;wN4g)n-`R
zs3RIoNo4i6;ro*v;cNeb6189l4#>N5TNA#sM^I~>zM&HdeYwAPMcqa5NUsh9&tab&
zKPT`QNxeavT=mgT9lUf?_MeTZ(WdAn(9@&fBz+5;7i#n*&Oq(E&wmSXTl};K8@aUE
zIM~TKiD$n+2=|r|ShhW$>s@Pp^kd+!#P@cm<!?ij8f_F0T-&@CY}dHQ6TldT(>*{}
zYagHDb5G7e3g$*%@#`DzBy(nqC7ViFWD+kP3!7>m8hc#0mmqu)noPN+0yXnC{?_56
z5Z$D$+arpH;tU`M`@FJ}hkoA=X>j-#yX3pD^ch)g7cv{!FjutY+?W@ar;9yXZ*w~t
z()amDX0*6_IAm@sw^zR8R?bWiwymgv4`6yTH;KLf?t}f%uv735Y;RJY8k|m`eI~6G
z6%-v_Y=cBXbs+VX3yu|ch!QsP5`eQ5$*JlG9B#+Tcg=3Mh>#;1HCtuq5=z0fhCm^P
zIzo|`nou<x89`ZEpTgt@A7F#mT{?%!u4Y;`$>VJwC<O7P5(VBsK^ldYn}(?LsDK9>
z^=20lJmT}-mW@wmV*qtkm{%#jG%TAw+&r7ATg+o!@1)8qN+PX6WnUCU6xGA7sgsJ7
z4(hISxqbqkviCN=5|i&0Htbtq%DJfU@r~1N#oXm2a!6kf+eUOfjm-Xiwak-h%RbPz
z5uGSaL{-IM-XSQH%p4Px)c0z%t>CgL#}SZ4LHcAteq`mc<c8#YTQn>>%jL%No>(!<
z^?v`6db6DRcV_k7{xNZ5T~EN#_!5WT5B;!biK=q{9+U7?HHh0(6#PEDl+|Wk0Jr!w
zlz8pJrb)a)MLa;3b&Eg(XipzNyVyu)Tz0<EA~KlRCOY6J=A@nw<`?trc*;@VEc7VU
zX{?h=6MDu-Vkg+33v7=CuMbrr3pS9*Dj57MragJRF}Bw7!m)m+hPxE=MtTBf>@ThF
z5p`>*y{`++-JG9GB<QDPq~-**`Z)XX3BeqPI(<mr3!?&NLt4VD)x~Wd&G?_)Q~#52
zoS0DF+a)JbEm;#Do#UdO<6ToZQ@S8Gcle3!rHNK*ZobZ4h!4ZmK3NAdSqk8XcJC)q
zXylDWpl#`R^icIBm@m3<qkI;B*n1fmc?1^jBmMX6`GBR@gpHW8<G<cRZJ%;dToG<A
zk$!6|kUo%*f{YPm2Y^+;prhvyry}~nl8-sAK&{eLayczmfi>O)1%xqrW~8b|Hjfrn
z)?G%fnN)yAU!2rv`YM_{QCV54g+it6Za4N0`ao66S0(oz=u;$H{EXr0?qBr3eIS{!
z;Mf4sDY?G}=I#tH#XNtEDdCt<ihtr1M>5XO0F6LH8e6FLC+!54D!n;icdJ2lmzZEN
zUWK^lvT{$>zcWw?M6eZKk8W9Q>|m-!E}m1&Vv#e$CMej=s*9M3pOhfx0blbt1GJc@
zigq@rfy61U_EkcQ2;W-pufj@hpP}!8DpnpBk!{wxTJlDWg)M(dq92H^EOtn>!kgF5
zcN95JGwZxrToFzIwk?jT?zySy@sa(kF&9s^5eeD!aZ)-hp*2ZwM(m37!oLS<a{A6y
zDB(J_Cap&Z8Vp|E;tEa3*0WhOu8)dxe(q|J7FYHjxLP`XMo67Kn^=ZJm-e#H+SN}Y
zfr$i?``+#!m!lc|^*cMkPNJvA<LATTlftObU&xW>o!0@q4F`%c9u@)l=RJWHLFO}=
z^X}7$JAT$T{?+bkd^G2nc=X<{-ch?6SsEfiOfDgU*?NmZ?cJ)#B<A*#U+gMlYkpfw
zXFbcB(@GB3@_Q*-^X#HkZab2SWp&i0T=@nnHmbZ#%W;qIsxyWw5nd&ckD217q@^Rt
z4SlB`CC#y^YMSsKy%PDt!y&#%Mtys}cGVNiR2YK_V$E)8peIWV+FK?MJJ%Tc%b{*A
zV@oVVEqi?~A&(X6K1hpxba$NYj=ap1x%I*3oqOZ+MV5qjget)TD^ue)2nn$!i>ZGi
z;h$7)o;xfW`VB}i${dK@`&u;7?6h6eeQ2lNn?!#aO^9N(S9LQ<9$nlJ3+sT{9NyG#
zIV=Hxuia^R@RN`K&2#C#L~OJ25LMH#A4|NbIUCokb=Ym{zf1?hJB9hX$HO>k=$L)F
z|G<1@gkO0T8*A~4tKLrBH}aHZ_a1Yp2Na2fA|>58eL0Jf!qF{j!Ja|o)kpolizBP7
z>rLaO@)<JsV?*GsWL!csF|;>lev`)027^)q8_{Wa{;1#~(o9er*i2MO&7h-qTyZ8~
z+OT>UY4<t}2+zr7*89}vT71;O1DSYxFyY(FC0dv>7xcwb9lmsv>*DOEQC2tG)^Of5
znNbLHr5tM#O-N!o|Cy?qwAqU$Jo15q4GW+%Wu+sGE_)+{7{bpHS3HeOTD|4$ntevq
z^5L*D*!gtxzIo@;_h2suc5+&KdlrZNlx6Y;5Z>5p(Qy`36;<V&8TK-Iz|>k^GU~Qa
z;LykQ2DkT-{5L&rwx%);J%vlekoa=#Wzy!xc6beSy?ACB)5Bh2Yn`8Yrc(TFI|)KE
zI=VtZBx58#+r0Gs)wYVVL=^7))nMj+;`By)#*8`!;|c1FKD$bfl#LBM$jG2$lP~j+
zrE}<+r4XU%@_vVmUOUFzf4LYt8cJ`VlBB|r$q1=S*<G|trc64CzaEv_7lp&AT^K`H
zuFOA>8Zqw2217(QBi%Vccd~7CcMkQc3k=G7k?cS9p9RE$2y~M>q#h#H`5kupuX~ni
ztbZZR_<N5@*Yo*3j3wS(-^RVuqSj=a>%ew5d#GnmY<83|0O+<Co<EELJ|x_uAWBHG
zo%xoI7HD(U=uEqmGYMHV+*lpCz>wBapo;#gM$K<O_;A6apuN4+gk93eow{Hz2BHu5
z6f60Da{A<VZ*jc((*>fWwM==+HDN2LtbKQK)*4~hx?XyX3(D%n3}{|9k2Ctq$UIg3
zERb@=_3@r+s^CiZ5$tulN&%hK@VJuk%gHVkhG$k(1%v)8$kfCax$BVA*{<xXeo<qE
z{ngSTb(7Z??PY`?ex|X%{};i0WY9N!5B!SA@Dr8KZQ5$ZEDi0TWJh%GSLkd}yYtpR
z+k(e5I~Cah3gHBW^A;518~7Yx3Bv?|$GxGL<4))YeV7mqsB$eX!^p#+6oubQXV>gb
zxNi>GFI<9AClYfuYU9cFV5~<PR>jWLd28_PHYDO5^g<350*b<ERTb-tISk#5IRTsm
zzp(Nu@`uGxL0Ea$3})qgk2j!NUSJ~lG$wwn#y$-VX5rWw<9wrQXWQX~60x<uO0D&p
z6yYH%P&SXS>;B=OT@*C{<s|x{t*0xk>fB-mB6)cJbQTELdh5TKiAS4#Cnu{T@yEkz
z#@$Y*rLC)s3v&nZTJ`6g1rLdI40E`5RbUy1Xm!cFE?OB5uGQZ5o=S~veE{-N+&hqb
zRNKhLjJ$&3Tgr{!KXcmQ{w-MkUt;xbCpEVaLBhrPh|VOx5#WH4#u`PO;6PZ()Ssoh
z63p&Qs|&rus<d~yX-H;*8lvPxgy^|h{Z4DAkJqkImj)ruelB4~D@8+yUHOBmf~ULl
z#)D^%z2`nFBDNB%c@}j}i-wd)!DZg3S`r%Vm}kr+6bd8{{W(WIC2bGZ1sy>{<pZ^1
z@l^>8t!w+>n-7w)*iMal&2a(YEZjiHFzO4*&G8wj-TMqZGar-I%3RU2OVWWyN{1}D
z-tt&EMSg=X*7;+Oaqrx`&#nlX{(ZOMd&Ym*9oE<X*thUEDimN>;Kn9Dc(|$r;*8ob
z+jvqGa9+huv6tV2ukXCy9e0QQe$4en6TR>}Pewf~+W0Wnt7DErI;%vMpjD`GP72W7
zW^1*-{5wx~#k^VJ8mo{Sq|oYHuWZiE3HqTK5%cmZ2aY0+?9IN@O!(ji*2ALSwiU}S
z%20$aKD-~(F8nIj<^BRu^hbPLBLJBBG%m!nn(XgBl6h6M=#2f%VYbN0dUb81UqoGs
zzwFI?<Ns_Gt2L<P=S)DtT;enFCHTd2wz1Y=4z|s1kZ)+qfrt5MVRaa#qh6FvgH&BJ
zHpQcotm{fw)(H^zG;-x{v%9*@h0jP0_cqM{d$?;l>C6bJ>Gb~T)Dgk-34@KwUx<P2
zA7a)C+u&a$&a*-;w*l^xWx)pHuq^anjyFn2H2EeEO9SOX7I??=2FLbg%lIErgX?*C
zSxChf%ieIAN@vSEl&u&DT|ZuA4iby4SqNPG`tpd4GptXl?=6)iJTW%P^FxHjY(8b~
zncPBzu2>qW<LBl6l@buI|FWjP#sV;#qs6~!<6}G%%}a!Y@VSaPS)j*(vCG9YGIRfi
zxY+H{_Pm-!yNMp8YC(!pF()fuq?=0=N+c{!F^y$;IS-PTc|(O$)~HF<HU-N2<0KEt
z8qLyxzOQ^aBz|ad+}t04Ni5Gr_>@fcEDC~(>r3VKM#SFSoK{Q1!T3d&ehg>!{e2dD
zG!^unoBd={%D^JVUD$vX$X9=H=c2mF^O>~v*Fd5w@Td9(Bu&3!r}tP$ZfV+D+HlxF
z;7E|~b`GwPif5`1wWL}d%C8YgR^*q^_z1ie{Wb9H-nZc^f!^iXU)m;+=f5OSR`5$Q
zY5sC~g@;0?(n(uHFtKLOvjJk}FB#^*cki-WL}EQ7!;CbB1Xqsak8#AYS2Op^QfW5@
z77dB_xtuIoe{Mtp3iG{oruEzlEzVE0bh;bbIiEv<XA#w$=s$Gah0gA?Wu8c6^hM*Q
z#Ah#J5&-sG={o2`;Jo|otFhX|Lp-y`7Wh~;7|y<+T(X8mxg~TdTg%b=a=C<gbPhFt
zkiz-o-d+`&!1;}8jeAeqxwvoI@eG$O>5eZDZ6>~=kxL^GuBZX<Gc<Ak09my`NQ%}a
zwxm3^zH-swbvk2V>{v<SXxz9r3wP9%%RGVKm@i`3{~+(!$jp^l=>{s16a4mSGt$Ko
z1}|P8H}N01ZS8^cup&+fh0<uh*|-3GPMWw?xvx`G!T4Pd?q?Ke9qLUvZ(b`#<6kgu
z^Y7oF<k>p{RWERq@!pfD(Ym*til`lWF45x|A80D*KG@0{>&MfMXq}l_I3aY6hQDFk
z=DIOuLr*+uaV?hG(s%hyJ@iOlsjGtrJ;u4;I+wW{7U7xmRZpWN_WSV}%VzheuZ)b5
zsU2inA@zR!@{q)nB5E|nXKcxzt@jELXql!#jUp0xeplxDT=M(GuPhVzeewDApL7T%
z)I@v7`}P@A<2K*q!-K`%)ib-8UZ?8T;k?zc#*m9k2D*J+x;eQ-RLAb8o3o|oE`PYE
zD>(8PBM8D?yxy1}9y{eaJt2&Vd8hH@7CGO)0TJtp`k5-={+3rMs7S-HpsN#)r)0|}
zl=FD06k6N+M%1vDa;wh$N-gY~O5X2*kfarMJOnz<r?hqW!vnj2V0(Ap{I4!$=Fosv
zs?u$-M*R<DRVsL8^q~E+CvY_5PrZba!q4$R|5zLs@>$GjWd)m?Qjty+B|b8p_9nPR
ztlRx8REL*koAJq<4u)>OYl?Ued-?ME&4)y3-5P0CUFtOSZ2E$W`ByF;n#Wtn^H<z>
zvT>gi6zKmh;Cx~?S=6!oWZz0rh(6l8PM|ff7=bGX*5``iPqn96lkhV=s^y*|?W8lQ
zd(1x$`>L0G&$d7o<74r|@Aw|cdap{YkWQP%fc-^?T5s8M|7;<Q;5?q|Nlsj-+2)F-
z^6O(J{qElx%NM^iHJ)^(fcfvtgzJV}K7#*ym>2u=uuyxS$IX4ACXoGb-e7|?HuUTn
z3EyK`ac4J@@O1it7nwS0RvotCSQq_nu;y}(G4#N01x0Z3({)4MZw4`!z~3t&kk}3{
z!}gnXCr-0iEnOO%Ol{X1+d<YqOenC?&5Lg?OR!Agx`gwEZYfe+(W5j*agmMYt_*Xl
z7))Wlx&G;tF|-{{i^56FJ74_fkOTP<*gs<#FNz(|_1%1`bva)Lx#$x&Z{`|2s5YTE
z?F>ji-Fa4fqip4HfvW^6fR>#HY0}@M(T5-VCi(gR$?wL?t2AD&Dp~W6Yn(1g-*9O`
zd>Suzr+v7E4(mQ@P6#QSdYT_?h1gD74w>57+ABmVcSVO8IUvE`h5=0A$+XDK+nAnv
znNJsK0d!d{B6%^*8o6fKI=?_8^~am5QKkhGsKMB$GOe<yzy;LwRVJhZ{Wd_TYf;*N
z*S)Xmvu0mGipoK)2@<7TD{k`{rtqlBf!ZeM^>)?gG?^5Tr9Fnr1o!I%zRo-cqbDeX
z1rc%lATwH68T;(BaTT$`Fl1dci?DeW^NF&nZE}ov4iZah)cs!%2P~-eRo}}2t(ipq
z8+X<oKy!U2AP*uXKp@MfshK+;^fCe)0{(GecOZ+7Oh%rvBqB&1=w}*~x3ew==|Bh$
z3n|%{ymOIP>_V?3H#?3u@_Anv)zs!4w4xZbl0NuU0I~RU&_C)gh}N>M=lD2kXkXxB
zFKb0AG;=$xFRfVW>`pFj0Cw|l8K|N(C(W<I>Xj$;WpxN%nqEqiV;$|9&g2z@k~}Th
zeS?1@cjmmFg55aPBE=}gr<i^H3dvABPQhVDv05K(%q?ro&e952XIl5@9Qg5vCHg1&
zp;FtNAx)QK+~HVAf3q7X7t*BXGB=-75G=|>*XkMPk7|T&lf~va?NJ|e!vusWnqPSq
zQETI`CM-!KT#LENWXZ}K-`cn|qNzTve?@UHMNWhIHwO3ExSS0j<BqJV!FkUP&exBM
zdRRLs22tN!$GePMS^xV&Pscjd=dV+Dlt#k{>UG<sciE$^g1>4o0_T$qZhYp~?2P>C
z&`aBsd<*WCcgtowu&})e>7-&&tL739#ANrsczpYn1B`#Q23`jrh0+D<%4g{bP%X}5
zE3_#2=V^cku?~11k$sQ~lqVR7|AMBEv+2~a#vT#h@=8uaM{P=vC!+M5@=;47+?^`@
zQgd$7=m%TxbGNLOE#RJw>*VNJYWxo!Y(bN?AmAx>dF?h*E@@M7d}N+efc{>>earCn
zE%OX%1I(8I;7_S|^E~TUF2}0V^`rEreRJ30;Mwpp|H#p%?Z-}>JL6N3d!u`#9SnMb
zyL`F9(Q9E@6_U(wPJ8#+!7lCj5DPtsPsmY3_CoJRKGs{@+k%gc+}nCorC3&n3Ee(y
z&s%fL%2LL`^AV1iE65XGYl=Hzlsl3O9~^<4G@1GkUt_zEZYQf$`ut7_+&=cfkOO<s
zF0ck87T?OdXm-IDO{3$*j)_!wz<H!L#tbs5#>#xm9RV#_|20tDW7!?19oBbf#CJnI
zOG4@JowMKxU4h5Z?!*<yEsl-{8BJUwxCj9|zCFIhH0po+;j(Y9uM2SlSxnaNtDAtk
zp|HXVPS-qPQIB}Hc%HwS1cQ&F6zSodyl*(18*EL=4`bSa;&y)FM+_CD`ZIQWQ|$dT
z(r>o!G1=w39EADgU~+(BO%cEHT^5UIDWVnccFes#cNd%J{9q2LEnR!J7opa`5h}`o
z5y{7tb6=5&2BJMZaF73UM;fOx?MyIef+}8|=NH9M<(@IJ_nRHc9D7gF<W}HGHgMJ8
z=p4%$Y|4}M{$^?X=y}hdk^im%_pjNfU@OO4mQ{h?;t;3pF`I^`PFc)p#g;F}M7Yy3
z)DZQ#DHO@z$)K&QcW%pvdM*dX!Dpe_AUQF(#56|bzpijDVUfv@$S_^R3tDI}14$^|
z-9o)*%%5nw7nqR4_i_Y;8-G|pne}>WxO>O;q5D4NW4~75iQxJ7T3-Lz`96BlJfD7a
z|4S*q5~kJ-hFJZ$Rfo7HosONYDZ%elGI2T~m1i4?NSYrfO~+g$uu)&E+S$N>P4*2T
z9K9NXXDZ9iC3CAq70_;r5$QPho~EK4s0%p~nswHWsN4e2n_@WCDyNc<9#z4f65}<H
zLjozd9EGa!5}Ax|a+Bvem;d;el1$npxnym88;hJW2vPTPR<d%j9MLt5F0Xf)KRlFj
z|HC>b%iy#4usK#YnJFz*o4>Eaq?1u*UJFn5`St#*4d~5|K?FFbPq-o)vH8V_qDxL5
zWG^R`uBd6&(UzcNxCtstVa^gy1^K*gU8D6@ao0yc20>O;AB!R(OE(qCt{R4p$*@k+
zYw~1xO2lQzCy-4*{6{QeD-IJFht~`|;>}G%0&S%U&Z5e%#diMm9{i`*oH9y%h=A>W
z>E<~xGiklW`-Nl|d_1G`e~M$B^tcp>w!*?32{Sb^%Fx+yCVqc*1rK0ofy5|ot)Bw;
zOeh`VBJwSTFS;c2xC8w7lB~#q{7kI*?OHZQA<*-!VTrGIRsR!#-ZykJ+WYFUmlk?{
zw<gZR>t>qT(#@E}eO<%f5rkMR+{`5T<=)F3x{UXKpFK&Wjb{9klxzd>)9{j2;Rrib
zueX7v7#aRfq04IR9=s%|%D#4_YZbzSvxE?4)&rA?HUR>=qzz_Acm;3)Z^rFOJ}NLC
zf!Ekrmu2nMI~1yzWGGsqdrp(@k4j0%BaI9nAH-c-X-)u4ZlRO9ODTgg%j2gWE56~I
zjlDw%JX~-$g=z&}vipCXkLiOEWcT`ggDSt2E%<;rtLBot%xq~Bky(yU<^!N&Zg$|Q
z;CI(E(n3K0-~2_-l8iVVW`hiiz2;ZNVV8J~iYSh!0!_tFk9P@uuR=OZd}HBnUTt-!
zI8IxaG3&KLMIv6#G*@v@TQS-a-*rtLjEpgj&L&f(tD-H3;nhld#NT>D*qpj1eY|_O
zsf>1Y`iU8M^tCRDKVYT=#-ZtauSOA{l8a}<e{PBB=#sh}zpiiM6<&azmZ2tG-TvkO
E0M}4My8r+H

diff --git a/src/slic3r/GUI/BitmapCache.cpp b/src/slic3r/GUI/BitmapCache.cpp
index f2a06e6..c647fa4 100644
--- a/src/slic3r/GUI/BitmapCache.cpp
+++ b/src/slic3r/GUI/BitmapCache.cpp
@@ -403,11 +403,12 @@ wxBitmapBundle* BitmapCache::from_svg(const std::string& bitmap_name, unsigned t
         return it->second;
 
     // map of color replaces
+    //B48
     std::map<std::string, std::string> replaces;
     if (dark_mode)
         replaces["#808080"] = "#FFFFFF";
     if (!new_color.empty())
-        replaces["#ED6B21"] = new_color;
+        replaces["#4479FB"] = new_color;
 
     replaces["#ButtonBG"] = dark_mode ? "#4E4E4E" : "#828282";
 
@@ -461,11 +462,12 @@ wxBitmap* BitmapCache::load_svg(const std::string &bitmap_name, unsigned target_
         return it->second;
 
     // map of color replaces
+    //B48
     std::map<std::string, std::string> replaces;
     if (dark_mode)
         replaces["#808080"] = "#FFFFFF";
     if (!new_color.empty())
-        replaces["#ED6B21"] = new_color;
+        replaces["#4479FB"] = new_color;
 
     NSVGimage *image =  nsvgParseFromFileWithReplace(Slic3r::var(bitmap_name + ".svg").c_str(), "px", 96.0f, replaces);
     if (image == nullptr)
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp b/src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp
index 60a3922..96c8e71 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp
@@ -321,7 +321,13 @@ void GLGizmoEmboss::create_volume(ModelVolumeType volume_type, const Vec2d &mous
     return ;
 
     // NOTE: change style manager - be carefull with order changes
+    #if defined(__linux__)
+        m_style_manager.get_font_prop().size_in_mm = 8;
+    #elif defined(__APPLE__)
+        m_style_manager.get_font_prop().size_in_mm = 9.2;
+    #else
     m_style_manager.get_font_prop().size_in_mm = 7;
+    #endif
 
     DataBasePtr base = create_emboss_data_base(str, m_style_manager, m_text_lines, m_parent.get_selection(), volume_type, m_job_cancel);
     CreateVolumeParams input = create_input(m_parent, m_style_manager.get_style(), m_raycast_manager, volume_type);
diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp
index 4dcaccd..0a33008 100644
--- a/src/slic3r/GUI/Plater.cpp
+++ b/src/slic3r/GUI/Plater.cpp
@@ -5555,7 +5555,7 @@ void Plater::calib_pa_line(const double StartPA, double EndPA, double PAStep)
     DynamicPrintConfig  new_config;
 
     //B34 Get parameter
-    double       start_x = plate_center.x() - 40;
+    double       start_x = plate_center.x() - 38;
     double       start_y = plate_center.y() - count * step_spacing / 2;
     const double speed_fast = 7200;
     const double speed_slow = 1200;
@@ -5582,9 +5582,11 @@ void Plater::calib_pa_line(const double StartPA, double EndPA, double PAStep)
     const double e_per_mm = line_flow.mm3_per_mm() / filament_area * print_flow_ratio;
 
     // Position aided model
+    select_all();
     wxGetApp().plater()->get_camera().select_view("top");
     sidebar().obj_manipul()->on_change("position", 0, plate_center.x() - 50);
     sidebar().obj_manipul()->set_uniform_scaling(false);
+    sidebar().obj_manipul()->on_change("size", 0, 25);
     sidebar().obj_manipul()->on_change("size", 1, count * step_spacing + pa_line_width);
     sidebar().obj_manipul()->on_change("size", 2, pa_first_layer_height);
     sidebar().obj_manipul()->set_uniform_scaling(true);
@@ -5676,7 +5678,7 @@ void Plater::calib_pa_pattern(const double StartPA, double EndPA, double PAStep)
     const double step_spacing = 4.62;
     double       line_spacing = pa_line_width - pa_layer_height * (1 - M_PI / 4);
     double       line_spacing_xy = line_spacing * 1.4142;
-    const double pa_wall_length = 42 - line_spacing;
+    const double pa_wall_length = 38 - line_spacing;
     int max_count = int((plate_center.y() * 2 - pa_wall_length / 2) / step_spacing) - 4;
     if (count > max_count) {
         count = max_count;
@@ -5694,9 +5696,11 @@ void Plater::calib_pa_pattern(const double StartPA, double EndPA, double PAStep)
     double retract_speed  = double(printer_config->opt_float("retract_speed", 0)) * 60;
 
     // Position aided model
+    select_all();
     wxGetApp().plater()->get_camera().select_view("top");
     sidebar().obj_manipul()->on_change("position", 0, plate_center.x() - 31);
     sidebar().obj_manipul()->set_uniform_scaling(false);
+    sidebar().obj_manipul()->on_change("size", 0, 25);
     sidebar().obj_manipul()->on_change("size", 1, pa_wall_width + line_spacing);
     double pa_first_layer_height = print_config->get_abs_value("first_layer_height");
     sidebar().obj_manipul()->on_change("size", 2, pa_first_layer_height);
@@ -5796,6 +5800,7 @@ void Plater::calib_pa_tower(const double StartPA, double EndPA, double PAStep)
     }
 
     // Scale model height
+    select_all();
     sidebar().obj_manipul()->set_uniform_scaling(false);
     sidebar().obj_manipul()->on_change("size", 2, (count + 1) * 5);
     sidebar().obj_manipul()->set_uniform_scaling(true);
diff --git a/src/slic3r/GUI/Widgets/UIColors.hpp b/src/slic3r/GUI/Widgets/UIColors.hpp
index 15c04b2..4f73628 100644
--- a/src/slic3r/GUI/Widgets/UIColors.hpp
+++ b/src/slic3r/GUI/Widgets/UIColors.hpp
@@ -8,7 +8,8 @@ static const int clr_border_disabled    = 0x646464;//0xDBDBDB;
 
 static const int clr_background_normal_light    = 0xFFFFFF;
 static const int clr_background_normal_dark     = 0x2B2B2B;//0x434343;
-static const int clr_background_focused         = 0xED6B21;//0xEDFAF2;
+//B48
+static const int clr_background_focused         = 0x4479FB;//0xEDFAF2;
 static const int clr_background_disabled_dark   = 0x404040;//0xF0F0F0;
 static const int clr_background_disabled_light  = 0xD9D9D9;//0xF0F0F0;