From 03f166509f71b455ca5938f9ca21cb0e9babc24e Mon Sep 17 00:00:00 2001
From: Jeffrey Pfau <jeffrey@endrift.com>
Date: Sun, 2 Aug 2015 15:28:53 -0700
Subject: [PATCH] Qt: Make keymapper present more information, and space things
 out a bit more

---
 CHANGES                          |   1 +
 res/keymap.qpic                  | Bin 22895 -> 48812 bytes
 res/keymap.svg                   | 268 +++++++++++++++++++++++--------
 src/platform/qt/GBAKeyEditor.cpp |  10 +-
 4 files changed, 208 insertions(+), 71 deletions(-)

diff --git a/CHANGES b/CHANGES
index bb108edd9..10d60be18 100644
--- a/CHANGES
+++ b/CHANGES
@@ -110,6 +110,7 @@ Misc:
  - GBA Input: Allow axes and buttons to be mapped to the same key
  - GBA BIOS: Stub out SoundBias
  - Qt: Gamepads can now have both buttons and analog axes mapped to the same key
+ - Qt: Increase usability of key mapper
 
 0.2.1: (2015-05-13)
 Bugfixes:
diff --git a/res/keymap.qpic b/res/keymap.qpic
index ffb7f8b7d34b14fd240edf7ce42fac58ce594c68..782d0c7f2a79a0cee1fcc21a08ba2406f6eb97ab 100644
GIT binary patch
literal 48812
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
WbU(f1Td1nE8P=8b|0Z^alK%%C)(A)d

literal 22895
zcmeHP33yaR5}x-S8x|G06%ZlZh$Mu=MNmk|6;2_7;S2;OClkno2_cyzfCf<kx#V&|
zU=<bwL=1wc5F)yt3Mlu2au^X-<W>%Gb;(wDPrdHRL=r!VgX6sKOWwS{tE-P!U0q#W
zufzLx?^He2a;L>oyNt!Ww681{Egv7VgB_N>me5NgMbiojh=wqFE_^R(Iuy=`&&}6W
zu*i}M5oq|V6NVLXI%8t4UbV<d78HbpG;BC-oW%m83x4`0aaw1hre~O7(eLX1?y!>9
zk@6S5Q~prab!BT{-)K?zs}iHbGWZ3Vf#L_&+QhORsNVFYkX%eK!1bHbIOfWuU>bA~
zY!pm~rbqv~_Vd#n6wDA*SiVw*iOIUKUgQ_?#Rs!ji7#S?@>^tJn5!-X;9XPNNwBWe
zfiQ#Ws_>PV<g1x<vd)Z$h61UX@7hut0$GvjD(}tvmqtl`fssATf0dTN{P8tdUY1b7
zOoLV1=r{{=YFXlsOj}DDs8C0mk0nhnB#NYKvStw{9a@BsIQc`&4Um`twL~&xo;iE|
zznyO2lY#|OUd^PF<6Ac|7hj&2%5d@J7}Z5$rmi6#NT*XB6byB%s6W-6^CL{wMKkH7
zu0c_B<yG6}`b}w^AL(k@FH%=a3`u=ichO6d4fYER8w|f)VE(|mD{|hziX(gPhq3L}
z{<TG;Z-Jh}3Qjx?Z%-<zZel~HsEhJ5-KAGWikghdEM?fdK3_f(Js2S!!cV@@r~KsJ
zATa~rAWw(rvTK$;xu`wTNh~2BANi%5bV-{BtempF5u%34Pqgd|$EbA@(;@m*uBBZ)
zAm|dJ%2a<bWeX&29+=+#^GQ4}VWM1a;R0c5{fM914k}k-tPi3dd%jICNVetG{M(7M
zScVS$Ue7OoUvjE~84%WMPnFl2hQOHpL?<z|4~Q=M+#{bpv}z!)Gx3W$oqe+5y8m#D
z%9WT7)?9nLpC-%(i5U>Lz1gEn&gFs1k1(}d!qoZ^KiM{;i1wDp`uLiy=ofNj0Q-g9
zVj&^-!W^-wqWcQnTu-ubhkxc;5?5%8@!GJ#ZH3;dRY*veE=*f*6m!IgF5(`&{LK$r
z?idL4JZP`|)kAl*&y5?uV)vNrMAG?K0>8Fh+Z=xOncACk?XN}5&9NjB4vzJS_2SDN
zgjP>-O-T9pT(JzP>M}}*nbNo0J(tRYs&fd7U%m3;%Q-<vW<X4%ho=ncaTVf3ZGQpN
zAnK}Ug`|_1bu!n3m{&LHBxXPqrr-tE25erKh(DQL6Z|Bm!;q%y13z5!PdB<jz$Vyq
zQ2BXc8W5(|ukUf3i(8LT+NOgiW<cNCm0FiM(-YKwAx!N*!fe%O{>8kmG7|5Qed>wH
z`bj#8+3)}0lM6e4!hX@sc1X-H`^DaS{|6(gfLs4b4Er8a@B)cp-@D$M%Fh#%?^3N_
zOrth$z0ztiNK8k0DU6{Exnxc47s6!!v8wspytND)<sWcp3bU7M4hA_0{R56EJMRuS
zFU+C+nLmB#(1?hvEIB!%h!lCz3|3?!f|OophNBt89&`Xr?(;~9GsqV+hc>zT0Z7b%
z!BJucu~#8F0|w=}uz>5R&RSz$)W$B%wu3ae2H|bl9NhsVhAXZBF<aQ2M2EA$5`m4{
zYJDzd?i<KYVp0R*U~thT=!?hy-4@R2!UM|b$1VFHUf2l&bCnw>w6{_}ClrNQb9j4@
zPItA}3D$*j6*lCHSp^Fkq=GeCVxs>JD3}hz!w(&~^6U)-L*b2i@z{cE&5&PbTv9#A
z>ld|=&EA;z&Fjl%1%1WqM;O-cM2#3`U1$(}eQ9p$#~WFlT^P<FmHW-O+}p<5>%wpb
z>DniC_~CVspugNb{OL8k3=_+@?0x%QvDzhUR4y*Ew&e)A%GNql%NbyEo}4i?IiF+E
z*Tt&Xwqw=%{XcmYF`VIeo%iFr^u+9@9O&3yVVS7%GQ2MuCM&*nlPgd8!(x1ShVyK&
zf57<%Ts{iDfdk!}1I`OG+^<<B+U-e6Q>WrYc9Ch<pWnf`F({}>la3wHR*w|EJg`lF
zt1apskLPfEgFDlVFq#9IiYe+UX?oc}7})9UZ!7#b7UJ6AqNm4n=+brg;n&wJrMnO9
zLYAnpUXYzz6$21|{7Rj=LE~Y<GA<H8&uJBMg6@teQ&O2IN}d=-`3rfW<BxNj3DQC`
z@B1R0d8T!Uoh<AriJ?kZ1dlIYwH?wMaG^&!i8-I(b1ctGbQu%5$ClFxeon|tX?`x^
z;2w@qxf0XC)>e3aC1$|rddw~h2Enfd&r6tEuE2ua>PP(4c2KzzvtUn)KFBz_;M#+u
zPV;ueJ;?h5B!+g)j?Bp$kA4Ih&2Yqpp;rj|fH1W#gr%nuKlCJXe)mDz$1<XV%9WT7
zqvphyJ20<?8=dWP(!M(1p8}O1VQRUAsr3{5s=Kv=%9U*+2c0iPEGS-RYOs9iej#TA
z{m&`nxA`1FE@x8MieuWG6EX&H4P-v2_g>cciT)!f3u>k!uac(YR2zG6a&N8O9B^?4
z=sAHcI_d6Pc17`x^@7Zlir0m`*`F5<54biL(nmB6d9vk5=+JPB_Uf4Cboa40TWn*!
z@Mdq7#h5&6;?6nknwl0PJ(sS<m^_Q`qq|v*cI%z_$M-$2U<QmiCgK)Ui;*zZY9UOu
z7>S>12~xQd(_!q^A3pp1o@d=GOGnNS3=;U-&0-`>E!UBQ&c*FB-7H4pCk+Jys9cFz
zOiWr(I@mXT#KJ|~EG>HgZrcUSaI+W*Q|m&QYT*ffo82ryvo59;iG47N$2z#tIcjcu
zbI5=WZWbe9YPpV@Jf6a>e#B3<P4<DreB5F*J6c&5kx)uO@C!Lx0+H~l%MQX+VI%C1
zC*-&J9C0&?kp!76MtZ*W7NdRIP7L`?`Eyu|#W&UqGE-U>qkU;VoM!L+b6AYUH`WVp
z_EuSpsU5lZ4wAElcZ;5*zGP10h?1@ki(FhHNcowM(O_ZeY~RoV8N-Ez5}UmE?%Xez
zBcy}#;=S*0T~P_F4%<7^Cp1CKfb>Yd2MZ&%@HCE%KR#`3@?AMFaxq1<YT&5U_&xL_
zLQG<XS@Yjp$oVDDDf@BH$XyWI3;$a$@x1m;%o02S2}u}VTTARiCO2X>^8=7Ln)%dD
zioEk#=$0LlY%Fkg63^>sBI;+Kon~}B8p*Mgl`L9j5!mZe#E=H*DY%o^?*|w?_ENwL
zo8RU9oR>H3$(+0i66dg>uR1($#%^J4CM3zIAJ2ZVfOAE!=GhrNU{tHHbyb~gFBbc1
z2=^I+ts}ShIluIL+<K`03M7{0WeKd8h*nJ;#?uhfAY}rEsSQ{KNx?kQ2QeK|x{J4;
z)H`n3kL6e_ngJ=5S?u!}NQ!*;{;X}?IOaHVG}8K9tb*y_IC2;_j#n#~@e3H=pI7M6
zQa#H112N_Y-p$KMzMg^`$dALA0B$`CY`xe$NvuWf&>{Jm&T&{X7<GA<^}ELc1>JmJ
zS4emlJrgPY1eVX@=?*~r8usd0Br}%Vbb08hPijHjVzzQQ#p%Yb5P4${v3EI$V~)1W
zU;7QjPD*1;5Yr$npnzRqU7wd-dCUUDbVz#?+1+0ith48`eKMXm&A~h}ox%DP>+h8U
zdyNGgw@@%0(pUYAp?nt=%mC*Loo)=By$7NXw;uhke?QFgIu9}*d>X`Vr>JEeGAxcW
z8{+-}ac7w?{(V7raT3b}2@TkXf)5GILxw6K?rYIneg)%KFiXz+70hj=U~Y5U=w>UW
zv|Qm$v$bo5W=cNLbMyf|3zBVvnzYEPr0M8^9p8}IF9RU@0Dc*nTpqg5dn%y8vF3F5
zEe~w*jrD@el-5dVd?#UF$5dt(?;r?UJ>kbA_4d-;$KGtQjrGEt{WUA4n`r~bMX?qc
zeMM*mdXAe}t5dTT&XSJyB2@)~lpnRh*a)_|z6auFid9W_*EeylyKl)%@s0I@%#@Zk
z7(0%ALAe#;b_p2@Tg~EU-$HG`?>_csi*2kI-s~;X26@5Nwqq#zHRzXt3;T`7pyzJ(
z$<^I?)fTc(psX~SiyQ65r8B>Y7KK!m7$tqt%YM5q4Ia;<-*m?~^xDi1@>1xfARa%3
z2?q2z6JF!9vcug@8Sun3=<{739*NKyg0C|-M>OWuO)PXUpS?K0ZWF~9!rk#nTn0RH
zgT-<W0*T=X3b?i0)$z1~;Ry;Jm=XFjUuqwQ9*ucVB1?H9Oy>f0OW2q%MRS#9QBHC(
zzu1Gul#1<bB4%0>VSV8Ga$3RIPhVRH`vnF{UtqkTyGmtN;u_{T90gU_P=NX~vLX_%
z)PZjE`4<}q=}@mA^Ze|12Xspf#!p;#B4$9{wi8EgT9*Z3-(O&#XK*Y~D+um(dL?vy
zV%S5WnHLb#fH0WELQJ|MrkhxZlRRh!wA>qruGuzFOJ|XnA)H^wgS%IMx@59~p?1p8
zEq}hr3kt@x)8hPb*Zv2!4>M2NIi9!Abv!a)+zhCjjgGXvy##h1{g@MXLH*_|ShEdc
z$nVTo=vK{u`it75yLgzuz8Bw>w#?qLfABM`Z?Fs(24h+1Z4JZ>=pKki74-ZFx|wY=
zAhdvK#n%-~g9iP(I-WXo)D83OXJqMnn#eC$w~t_XL1Wz_YYWmV^3(9p+7i(zSs8pS
zmRId1u7$R--JP3Ug{?7|ZaK`(ccCnlUdY<YI7LzHM5uwY2|ojc0KB6I|2p@$yIEUK
zU3`Th&wfI$z6XZ<G_gmnT3dvv)|T@U|4u})qVR|wD2(BGP%}?==s5U-LWk!;d0=?H
z)YoEHM6tH;+&Xc-i!yndm^^ceodqc9RBJ1%9sjmp=@$b$`;R62u(jpcV86hy0rJ}g
z#tXXZ_pr9Ith3k(&CS}%iWmEQs<oAsD)uH-Yb$G__&P|nwg^+LEy7f5D{~*)n|@ER
zqHwgX5Rr+}0z=_7*y(r$3LWk}YwSCo7H-y-lP}9OH*3qOix?5r+H&elZwI@qt)WaC
zAU_su90J1Hnt~WBLtw(%s*V_H&m(LO=%QFrr~xfiEB|GSp<t*1BiXqrz1=a7enytQ
gr-`Js<rge(3s$)4(f!@d9xj!mUik^ZdL7IE0omMbJ^%m!

diff --git a/res/keymap.svg b/res/keymap.svg
index 5ec9d5099..9b37a3aa4 100644
--- a/res/keymap.svg
+++ b/res/keymap.svg
@@ -7,130 +7,266 @@
 	<stop  offset="0" style="stop-color:#7A65F5"/>
 	<stop  offset="1" style="stop-color:#302575"/>
 </linearGradient>
-<path fill="url(#SVGID_1_)" d="M480,450c0,16.5684-13.4316,30-30,30H30c-16.5684,0-30-13.4316-30-30V30C0,13.4316,13.4316,0,30,0
-	h420c16.5684,0,30,13.4316,30,30V450z"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="239.9995" y1="-479" x2="239.9994" y2="1159.0004">
-	<stop  offset="0" style="stop-color:#7A65F5"/>
+<path fill="url(#SVGID_1_)" d="M480,450c0,16.568-13.432,30-30,30H30c-16.568,0-30-13.432-30-30V30C0,13.432,13.432,0,30,0h420
+	c16.568,0,30,13.432,30,30V450z"/>
+<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="239.9995" y1="-479.0015" x2="239.9994" y2="1158.9995">
+	<stop  offset="0" style="stop-color:#7762F5"/>
+	<stop  offset="1" style="stop-color:#372E75"/>
+</linearGradient>
+<path fill="url(#SVGID_2_)" d="M30,473c-12.682,0-23-10.317-23-23V30C7,17.318,17.318,7,30,7h420c12.683,0,23,10.318,23,23v420
+	c0,12.683-10.317,23-23,23H30z"/>
+<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="118.3335" y1="291.667" x2="118.3335" y2="47.9995">
+	<stop  offset="0" style="stop-color:#7466CF"/>
 	<stop  offset="1" style="stop-color:#302575"/>
 </linearGradient>
-<path fill="url(#SVGID_2_)" d="M30,473c-12.6821,0-23-10.3174-23-23V30C7,17.3179,17.3179,7,30,7h420c12.6826,0,23,10.3179,23,23
-	v420c0,12.6826-10.3174,23-23,23H30z"/>
-<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="118.3335" y1="291.667" x2="118.3335" y2="47.9991">
-	<stop  offset="0" style="stop-color:#7A65F5"/>
-	<stop  offset="1" style="stop-color:#302575"/>
-</linearGradient>
-<path fill="url(#SVGID_3_)" d="M118.3335,122.333c-46.7603,0-84.667,37.9067-84.667,84.667c0,46.7607,37.9067,84.667,84.667,84.667
-	s84.667-37.9062,84.667-84.667C203.0005,160.2397,165.0938,122.333,118.3335,122.333z M118.334,278.7344
-	c-39.6172,0-71.7339-32.1172-71.7339-71.7344c0-39.6177,32.1167-71.7339,71.7339-71.7339S190.0679,167.3823,190.0679,207
-	C190.0679,246.6172,157.9512,278.7344,118.334,278.7344z"/>
+<path fill="url(#SVGID_3_)" d="M118.333,122.333c-46.76,0-84.667,37.907-84.667,84.667c0,46.761,37.907,84.667,84.667,84.667
+	S203,253.761,203,207C203,160.24,165.094,122.333,118.333,122.333z M118.334,278.734C78.717,278.734,46.6,246.617,46.6,207
+	c0-39.618,32.117-71.734,71.734-71.734s71.734,32.116,71.734,71.734C190.068,246.617,157.951,278.734,118.334,278.734z"/>
 <g>
 	
-		<radialGradient id="SVGID_4_" cx="118.8335" cy="138.167" r="103.2725" fx="165.1467" fy="138.167" gradientTransform="matrix(-4.371139e-08 1 -1.42 -6.206884e-08 315.0264 19.3335)" gradientUnits="userSpaceOnUse">
+		<radialGradient id="SVGID_4_" cx="118.8335" cy="138.167" r="103.2721" fx="165.1465" fy="138.167" gradientTransform="matrix(-4.371139e-08 1 -1.42 -6.206886e-08 315.0265 19.3335)" gradientUnits="userSpaceOnUse">
 		<stop  offset="0" style="stop-color:#9C9CB3"/>
 		<stop  offset="1" style="stop-color:#333045"/>
 	</radialGradient>
-	<path fill="url(#SVGID_4_)" d="M172.1973,207c0-9.667-3.0029-17.333-3.0029-17.333H135.667v-33.5283
-		c0,0-7.667-3.0029-17.3335-3.0029s-17.333,3.0029-17.333,3.0029v33.5283H67.4727c0,0-3.0029,7.666-3.0029,17.333
-		c0,9.666,3.0029,17.333,3.0029,17.333h33.5278v33.5273c0,0,7.6665,3.0039,17.333,3.0039s17.3335-3.0039,17.3335-3.0039V224.333
-		h33.5273C169.1943,224.333,172.1973,216.666,172.1973,207z"/>
-	<path fill="#5C567D" d="M118.3335,258.8643c-6.9185,0-12.833-1.625-15.333-2.4287V222.333h-34.103
-		c-0.8027-2.5-2.4277-8.4146-2.4277-15.333s1.6245-12.833,2.4277-15.333h34.103v-34.1035c2.5-0.8027,8.4146-2.4277,15.333-2.4277
-		c6.9453,0,12.8408,1.6226,15.3335,2.4258v34.1055h34.1025c0.8032,2.5,2.4277,8.4146,2.4277,15.333
-		c0,6.9448-1.6226,12.8403-2.4258,15.333H133.667v34.1025C131.167,257.2393,125.252,258.8643,118.3335,258.8643z"/>
-	<radialGradient id="SVGID_5_" cx="118.333" cy="220.397" r="69.7522" gradientUnits="userSpaceOnUse">
+	<path fill="url(#SVGID_4_)" d="M172.197,207c0-9.667-3.003-17.333-3.003-17.333h-33.527v-33.528c0,0-7.667-3.003-17.333-3.003
+		S101,156.139,101,156.139v33.528H67.473c0,0-3.003,7.666-3.003,17.333c0,9.666,3.003,17.333,3.003,17.333H101v33.527
+		c0,0,7.667,3.004,17.333,3.004s17.333-3.004,17.333-3.004v-33.527h33.527C169.194,224.333,172.197,216.666,172.197,207z"/>
+	<path fill="#5C567D" d="M118.333,258.864c-6.918,0-12.833-1.625-15.333-2.429v-34.103H68.897c-0.803-2.5-2.428-8.415-2.428-15.333
+		s1.625-12.833,2.428-15.333H103v-34.104c2.5-0.803,8.415-2.428,15.333-2.428c6.945,0,12.841,1.623,15.333,2.426v34.105h34.103
+		c0.803,2.5,2.428,8.415,2.428,15.333c0,6.945-1.623,12.84-2.426,15.333h-34.104v34.103
+		C131.167,257.239,125.252,258.864,118.333,258.864z"/>
+	<radialGradient id="SVGID_5_" cx="118.333" cy="220.397" r="69.7523" gradientUnits="userSpaceOnUse">
 		<stop  offset="0" style="stop-color:#706F8A"/>
 		<stop  offset="0.9951" style="stop-color:#2D2842"/>
 	</radialGradient>
-	<circle fill="url(#SVGID_5_)" cx="118.333" cy="207" r="21.2749"/>
+	<circle fill="url(#SVGID_5_)" cx="118.333" cy="207" r="21.275"/>
 </g>
 <g>
 	<g>
-		<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="198.9673" y1="490" x2="198.9673" y2="384.981">
+		<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="198.9673" y1="490" x2="198.9673" y2="384.9809">
 			<stop  offset="0" style="stop-color:#7A65F5"/>
 			<stop  offset="1" style="stop-color:#302575"/>
 		</linearGradient>
-		<path fill="url(#SVGID_6_)" d="M198.9678,387.0303c-18.8418,0-34.1162,15.2734-34.1162,34.1162
-			c0,18.8418,15.2744,34.1152,34.1162,34.1152c18.8408,0,34.1152-15.2734,34.1152-34.1152
-			C233.083,402.3037,217.8086,387.0303,198.9678,387.0303z M198.9678,445.7871c-13.6089,0-24.6401-11.0332-24.6401-24.6406
-			c0-13.6094,11.0312-24.6406,24.6401-24.6406c13.6074,0,24.6396,11.0312,24.6396,24.6406
-			C223.6074,434.7539,212.5752,445.7871,198.9678,445.7871z"/>
+		<path fill="url(#SVGID_6_)" d="M198.968,387.03c-18.842,0-34.116,15.273-34.116,34.116c0,18.842,15.274,34.115,34.116,34.115
+			c18.841,0,34.115-15.273,34.115-34.115C233.083,402.304,217.809,387.03,198.968,387.03z M198.968,445.787
+			c-13.609,0-24.64-11.033-24.64-24.641c0-13.609,11.031-24.641,24.64-24.641c13.607,0,24.64,11.031,24.64,24.641
+			C223.607,434.754,212.575,445.787,198.968,445.787z"/>
 		<g>
 			<linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="198.9673" y1="437.4414" x2="198.9673" y2="404.8516">
 				<stop  offset="0" style="stop-color:#333045"/>
 				<stop  offset="1" style="stop-color:#9C9CB3"/>
 			</linearGradient>
-			<circle fill="url(#SVGID_7_)" cx="198.9673" cy="421.1465" r="16.2949"/>
-			<circle fill="#5C567D" cx="198.9673" cy="421.1465" r="15.0737"/>
+			<circle fill="url(#SVGID_7_)" cx="198.967" cy="421.146" r="16.295"/>
+			<circle fill="#5C567D" cx="198.967" cy="421.146" r="15.074"/>
 		</g>
 	</g>
 	<g>
-		<linearGradient id="SVGID_8_" gradientUnits="userSpaceOnUse" x1="281.0312" y1="490" x2="281.0312" y2="384.981">
+		<linearGradient id="SVGID_8_" gradientUnits="userSpaceOnUse" x1="281.0312" y1="490" x2="281.0312" y2="384.9809">
 			<stop  offset="0" style="stop-color:#7A65F5"/>
 			<stop  offset="1" style="stop-color:#302575"/>
 		</linearGradient>
-		<path fill="url(#SVGID_8_)" d="M281.0322,387.0303c-18.8418,0-34.1162,15.2734-34.1162,34.1162
-			c0,18.8418,15.2744,34.1152,34.1162,34.1152c18.8408,0,34.1152-15.2734,34.1152-34.1152
-			C315.1475,402.3037,299.873,387.0303,281.0322,387.0303z M281.0322,445.7871c-13.6084,0-24.6396-11.0332-24.6396-24.6406
-			c0-13.6094,11.0312-24.6406,24.6396-24.6406c13.6074,0,24.6396,11.0312,24.6396,24.6406
-			C305.6719,434.7539,294.6396,445.7871,281.0322,445.7871z"/>
+		<path fill="url(#SVGID_8_)" d="M281.032,387.03c-18.842,0-34.116,15.273-34.116,34.116c0,18.842,15.274,34.115,34.116,34.115
+			c18.841,0,34.115-15.273,34.115-34.115C315.147,402.304,299.873,387.03,281.032,387.03z M281.032,445.787
+			c-13.608,0-24.64-11.033-24.64-24.641c0-13.609,11.031-24.641,24.64-24.641c13.607,0,24.64,11.031,24.64,24.641
+			C305.672,434.754,294.64,445.787,281.032,445.787z"/>
 		<g>
 			<linearGradient id="SVGID_9_" gradientUnits="userSpaceOnUse" x1="281.0322" y1="437.4414" x2="281.0322" y2="404.8516">
 				<stop  offset="0" style="stop-color:#333045"/>
 				<stop  offset="1" style="stop-color:#9C9CB3"/>
 			</linearGradient>
-			<circle fill="url(#SVGID_9_)" cx="281.0322" cy="421.1465" r="16.2949"/>
-			<circle fill="#5C567D" cx="281.0317" cy="421.1465" r="15.0737"/>
+			<circle fill="url(#SVGID_9_)" cx="281.032" cy="421.146" r="16.295"/>
+			<circle fill="#5C567D" cx="281.032" cy="421.146" r="15.074"/>
 		</g>
 	</g>
 </g>
-<linearGradient id="SVGID_10_" gradientUnits="userSpaceOnUse" x1="356.1787" y1="280.2178" x2="356.1787" y2="134.9952">
-	<stop  offset="0" style="stop-color:#7A65F5"/>
+<linearGradient id="SVGID_10_" gradientUnits="userSpaceOnUse" x1="356.1787" y1="280.2178" x2="356.1787" y2="134.9951">
+	<stop  offset="0" style="stop-color:#7466CF"/>
 	<stop  offset="1" style="stop-color:#302575"/>
 </linearGradient>
-<path fill="url(#SVGID_10_)" d="M437.9521,179.5503c-7.0088-23.9434-32.0986-37.6724-56.043-30.6646l-76.8369,22.4912
-	c-23.9453,7.0073-37.6748,32.0991-30.666,56.043c7.0088,23.9443,32.0996,37.6719,56.0449,30.6621l76.8369-22.4902
-	C431.2314,228.585,444.96,203.4946,437.9521,179.5503z M426.3311,209.6025c-4.6377,8.4756-12.2979,14.6382-21.5703,17.3516
-	l-76.8379,22.4902c-3.3301,0.9746-6.7559,1.4688-10.1816,1.4688c-0.001,0-0.001,0-0.002,0
-	c-15.9443-0.001-30.2109-10.7012-34.6953-26.0215c-2.7148-9.2729-1.6553-19.0479,2.9824-27.5244
-	c4.6387-8.4761,12.2998-14.6387,21.5732-17.3525l76.8379-22.4912c3.3281-0.9741,6.7539-1.4683,10.1807-1.4683
-	c15.9434,0,30.2109,10.7012,34.6963,26.0234C432.0283,191.3516,430.9688,201.1265,426.3311,209.6025z"/>
+<path fill="url(#SVGID_10_)" d="M437.952,179.55c-7.009-23.943-32.099-37.672-56.043-30.665l-76.837,22.491
+	c-23.945,7.007-37.675,32.099-30.666,56.043c7.009,23.944,32.1,37.672,56.045,30.662l76.837-22.49
+	C431.231,228.585,444.96,203.495,437.952,179.55z M426.331,209.603c-4.638,8.476-12.298,14.638-21.57,17.352l-76.838,22.49
+	c-3.33,0.975-6.756,1.469-10.182,1.469c-0.001,0-0.001,0-0.001,0c-15.945-0.001-30.212-10.701-34.696-26.021
+	c-2.715-9.273-1.655-19.048,2.982-27.524c4.639-8.476,12.3-14.639,21.573-17.353l76.838-22.491
+	c3.328-0.974,6.754-1.468,10.181-1.468c15.943,0,30.211,10.701,34.696,26.023C432.028,191.352,430.969,201.126,426.331,209.603z"/>
 <g>
 	<linearGradient id="SVGID_11_" gradientUnits="userSpaceOnUse" x1="395.9062" y1="217.8188" x2="395.9062" y2="166.6519">
 		<stop  offset="0" style="stop-color:#333045"/>
 		<stop  offset="1" style="stop-color:#9C9CB3"/>
 	</linearGradient>
-	<circle fill="url(#SVGID_11_)" cx="395.9062" cy="192.2358" r="25.584"/>
-	<circle fill="#5C567D" cx="395.9072" cy="192.2358" r="23.666"/>
+	<circle fill="url(#SVGID_11_)" cx="395.906" cy="192.236" r="25.584"/>
+	<circle fill="#5C567D" cx="395.907" cy="192.236" r="23.666"/>
 </g>
 <g>
 	<linearGradient id="SVGID_12_" gradientUnits="userSpaceOnUse" x1="318.9785" y1="239.6406" x2="318.9785" y2="188.4722">
 		<stop  offset="0" style="stop-color:#333045"/>
 		<stop  offset="1" style="stop-color:#9C9CB3"/>
 	</linearGradient>
-	<circle fill="url(#SVGID_12_)" cx="318.979" cy="214.0571" r="25.5835"/>
-	<circle fill="#5C567D" cx="318.98" cy="214.0571" r="23.6665"/>
+	<circle fill="url(#SVGID_12_)" cx="318.979" cy="214.057" r="25.583"/>
+	<circle fill="#5C567D" cx="318.98" cy="214.057" r="23.667"/>
 </g>
 <g>
-	<linearGradient id="SVGID_13_" gradientUnits="userSpaceOnUse" x1="-15.0425" y1="77.9346" x2="55.6245" y2="-5.3989">
+	<linearGradient id="SVGID_13_" gradientUnits="userSpaceOnUse" x1="-15.0435" y1="77.9331" x2="55.6236" y2="-5.4006">
 		<stop  offset="0" style="stop-color:#333045"/>
 		<stop  offset="1" style="stop-color:#9C9CB3"/>
 	</linearGradient>
-	<path fill="url(#SVGID_13_)" d="M33.6665,0H61.5c2.9697,1.0112,2.3306,7,2.3306,7l0.0581,8.4844
-		C63.8887,31.3535,48.9922,50,27.9922,50H7.0068c0,0-5.2197,2.312-7.0068-8.0029V30C0,11.5,12.333,0,33.6665,0z"/>
-	<path fill="#5C567D" d="M9.7783,49.1743c-0.2793-0.251-1.166-1.2764-1.7744-4.5308V33.0029c0-16.5234,10.813-26,29.6665-26h26.0854
-		c0.1318,0.709,0.1821,1.7549,0.0996,2.5908L63.835,9.8032l0.0576,8.7114c0,14.3774-13.6406,30.4883-31.8965,30.4883H10.1646
-		L9.7783,49.1743z"/>
+	<path fill="url(#SVGID_13_)" d="M33.667,0H61.5c2.97,1.011,2.331,7,2.331,7l0.058,8.484C63.889,31.354,48.992,50,27.992,50H7.007
+		c0,0-5.22,2.312-7.007-8.003V30C0,11.5,12.333,0,33.667,0z"/>
+	<path fill="#5C567D" d="M9.778,49.174c-0.279-0.251-1.166-1.276-1.774-4.531V33.003c0-16.523,10.813-26,29.667-26h26.085
+		c0.132,0.709,0.182,1.755,0.1,2.591l-0.021,0.209l0.058,8.711c0,14.377-13.641,30.488-31.896,30.488H10.165L9.778,49.174z"/>
 </g>
 <g>
 	
-		<linearGradient id="SVGID_14_" gradientUnits="userSpaceOnUse" x1="401.0615" y1="77.9336" x2="471.7285" y2="-5.3999" gradientTransform="matrix(-1 0 0 1 896.1055 0)">
+		<linearGradient id="SVGID_14_" gradientUnits="userSpaceOnUse" x1="401.0605" y1="77.9331" x2="471.7277" y2="-5.4007" gradientTransform="matrix(-1 0 0 1 896.1055 0)">
 		<stop  offset="0" style="stop-color:#333045"/>
 		<stop  offset="1" style="stop-color:#9C9CB3"/>
 	</linearGradient>
-	<path fill="url(#SVGID_14_)" d="M446.334,0h-27.833c-2.9697,1.0112-2.3311,7-2.3311,7l-0.0576,8.4844
-		C416.1123,31.3535,431.0088,50,452.0088,50h20.9854c0,0,5.2197,2.312,7.0068-8.0029V30C480.001,11.5,467.668,0,446.334,0z"/>
-	<path fill="#5C567D" d="M470.2227,49.1743c0.2793-0.251,1.166-1.2764,1.7744-4.5308V33.0029c0-16.5234-10.8135-26-29.667-26
-		h-26.085c-0.1318,0.709-0.1826,1.7549-0.0996,2.5908l0.0205,0.2095l-0.0576,8.7114c0,14.3774,13.6406,30.4883,31.8965,30.4883
-		h21.8311L470.2227,49.1743z"/>
+	<path fill="url(#SVGID_14_)" d="M446.334,0h-27.833c-2.97,1.011-2.331,7-2.331,7l-0.058,8.484
+		c0,15.869,14.896,34.516,35.896,34.516h20.985c0,0,5.22,2.312,7.007-8.003V30C480.001,11.5,467.668,0,446.334,0z"/>
+	<path fill="#5C567D" d="M470.223,49.174c0.279-0.251,1.166-1.276,1.774-4.531V33.003c0-16.523-10.813-26-29.667-26h-26.085
+		c-0.132,0.709-0.183,1.755-0.1,2.591l0.021,0.209l-0.058,8.711c0,14.377,13.641,30.488,31.896,30.488h21.831L470.223,49.174z"/>
+</g>
+<g opacity="0.5">
+	<path fill="#9C9CB3" stroke="#9C9CB3" stroke-miterlimit="10" d="M312.197,226v-21.475h8.057c1.641,0,2.956,0.217,3.947,0.652
+		s1.768,1.104,2.33,2.007c0.561,0.903,0.842,1.848,0.842,2.834c0,0.918-0.249,1.782-0.747,2.593s-1.25,1.465-2.256,1.963
+		c1.299,0.381,2.297,1.03,2.995,1.948s1.048,2.002,1.048,3.252c0,1.006-0.212,1.941-0.638,2.805c-0.424,0.864-0.949,1.531-1.574,2
+		s-1.409,0.823-2.352,1.062S321.753,226,320.386,226H312.197z M315.039,213.549h4.644c1.26,0,2.163-0.083,2.71-0.249
+		c0.723-0.215,1.268-0.571,1.633-1.069c0.367-0.498,0.55-1.123,0.55-1.875c0-0.713-0.171-1.34-0.513-1.882s-0.83-0.913-1.465-1.113
+		s-1.724-0.3-3.267-0.3h-4.292V213.549z M315.039,223.466h5.347c0.918,0,1.562-0.034,1.934-0.103
+		c0.654-0.117,1.201-0.312,1.641-0.586s0.801-0.671,1.084-1.194s0.425-1.125,0.425-1.809c0-0.801-0.205-1.497-0.615-2.087
+		s-0.979-1.006-1.707-1.245s-1.774-0.359-3.142-0.359h-4.966V223.466z"/>
+</g>
+<g opacity="0.5">
+	<path fill="#9C9CB3" stroke="#9C9CB3" stroke-miterlimit="10" d="M385.956,203l8.247-21.475h3.062L406.054,203h-3.237l-2.505-6.504
+		h-8.979L388.974,203H385.956z M392.152,194.182h7.28l-2.241-5.947c-0.684-1.807-1.191-3.291-1.523-4.453
+		c-0.273,1.377-0.659,2.744-1.157,4.102L392.152,194.182z"/>
+</g>
+<g>
+	<path fill="#333045" d="M312.197,224v-21.475h8.057c1.641,0,2.956,0.217,3.947,0.652s1.768,1.104,2.33,2.007
+		c0.561,0.903,0.842,1.848,0.842,2.834c0,0.918-0.249,1.782-0.747,2.593s-1.25,1.465-2.256,1.963
+		c1.299,0.381,2.297,1.03,2.995,1.948s1.048,2.002,1.048,3.252c0,1.006-0.212,1.941-0.638,2.805c-0.424,0.864-0.949,1.531-1.574,2
+		s-1.409,0.823-2.352,1.062S321.753,224,320.386,224H312.197z M315.039,211.549h4.644c1.26,0,2.163-0.083,2.71-0.249
+		c0.723-0.215,1.268-0.571,1.633-1.069c0.367-0.498,0.55-1.123,0.55-1.875c0-0.713-0.171-1.34-0.513-1.882s-0.83-0.913-1.465-1.113
+		s-1.724-0.3-3.267-0.3h-4.292V211.549z M315.039,221.466h5.347c0.918,0,1.562-0.034,1.934-0.103
+		c0.654-0.117,1.201-0.312,1.641-0.586s0.801-0.671,1.084-1.194s0.425-1.125,0.425-1.809c0-0.801-0.205-1.497-0.615-2.087
+		s-0.979-1.006-1.707-1.245s-1.774-0.359-3.142-0.359h-4.966V221.466z"/>
+</g>
+<g>
+	<path fill="#333045" d="M385.956,201l8.247-21.475h3.062L406.054,201h-3.237l-2.505-6.504h-8.979L388.974,201H385.956z
+		 M392.152,192.182h7.28l-2.241-5.947c-0.684-1.807-1.191-3.291-1.523-4.453c-0.273,1.377-0.659,2.744-1.157,4.102L392.152,192.182z
+		"/>
+</g>
+<g opacity="0.5">
+	<g>
+		<path fill="#1B0942" stroke="#1B0942" stroke-width="2" stroke-miterlimit="10" d="M320.35,425.264l2.658-0.258
+			c0.16,0.893,0.484,1.547,0.974,1.967c0.489,0.418,1.148,0.627,1.979,0.627c0.88,0,1.543-0.186,1.988-0.559
+			c0.446-0.373,0.669-0.807,0.669-1.307c0-0.318-0.094-0.592-0.281-0.816s-0.515-0.42-0.982-0.586
+			c-0.32-0.111-1.049-0.307-2.188-0.59c-1.464-0.363-2.491-0.809-3.082-1.338c-0.831-0.744-1.246-1.652-1.246-2.723
+			c0-0.689,0.195-1.334,0.586-1.934s0.954-1.057,1.689-1.371c0.734-0.312,1.622-0.471,2.662-0.471c1.698,0,2.977,0.373,3.834,1.117
+			c0.858,0.744,1.31,1.738,1.353,2.98l-2.731,0.121c-0.117-0.695-0.368-1.195-0.753-1.5c-0.384-0.305-0.961-0.457-1.729-0.457
+			c-0.794,0-1.416,0.162-1.864,0.488c-0.29,0.209-0.435,0.49-0.435,0.84c0,0.32,0.136,0.594,0.406,0.822
+			c0.345,0.289,1.182,0.59,2.511,0.904s2.312,0.639,2.948,0.973c0.637,0.336,1.135,0.795,1.495,1.375
+			c0.359,0.582,0.54,1.301,0.54,2.156c0,0.775-0.216,1.5-0.646,2.178c-0.431,0.676-1.04,1.18-1.827,1.508
+			c-0.787,0.33-1.769,0.494-2.943,0.494c-1.711,0-3.024-0.395-3.941-1.186C321.076,427.93,320.528,426.777,320.35,425.264z"/>
+		<path fill="#1B0942" stroke="#1B0942" stroke-width="2" stroke-miterlimit="10" d="M336.694,429.666v-11.24h-4.015v-2.289h10.751
+			v2.289h-4.005v11.24H336.694z"/>
+		<path fill="#1B0942" stroke="#1B0942" stroke-width="2" stroke-miterlimit="10" d="M355.99,429.666h-2.972l-1.182-3.072h-5.407
+			l-1.117,3.072h-2.897l5.27-13.529h2.889L355.99,429.666z M350.961,424.314l-1.864-5.021l-1.827,5.021H350.961z"/>
+		<path fill="#1B0942" stroke="#1B0942" stroke-width="2" stroke-miterlimit="10" d="M357.449,429.666v-13.529h5.749
+			c1.445,0,2.496,0.123,3.151,0.365c0.655,0.244,1.18,0.676,1.573,1.297s0.591,1.332,0.591,2.131c0,1.016-0.299,1.854-0.896,2.516
+			s-1.488,1.078-2.676,1.25c0.591,0.346,1.078,0.723,1.463,1.135c0.384,0.412,0.902,1.145,1.555,2.197l1.652,2.639h-3.268
+			l-1.975-2.943c-0.701-1.053-1.182-1.715-1.439-1.988c-0.259-0.273-0.532-0.463-0.821-0.562c-0.289-0.102-0.748-0.152-1.375-0.152
+			h-0.554v5.646H357.449z M360.181,421.859h2.021c1.311,0,2.129-0.055,2.455-0.166s0.581-0.301,0.766-0.572s0.277-0.609,0.277-1.016
+			c0-0.455-0.122-0.822-0.364-1.102c-0.243-0.281-0.587-0.457-1.029-0.531c-0.222-0.031-0.886-0.047-1.993-0.047h-2.132V421.859z"/>
+		<path fill="#1B0942" stroke="#1B0942" stroke-width="2" stroke-miterlimit="10" d="M374.134,429.666v-11.24h-4.015v-2.289h10.751
+			v2.289h-4.005v11.24H374.134z"/>
+	</g>
+</g>
+<g opacity="0.5">
+	<g>
+		<path fill="#1B0942" stroke="#1B0942" stroke-width="2" stroke-miterlimit="10" d="M87.35,425.264l2.658-0.258
+			c0.16,0.893,0.484,1.547,0.974,1.967c0.489,0.418,1.148,0.627,1.979,0.627c0.88,0,1.543-0.186,1.988-0.559
+			c0.446-0.373,0.669-0.807,0.669-1.307c0-0.318-0.094-0.592-0.281-0.816s-0.515-0.42-0.982-0.586
+			c-0.32-0.111-1.049-0.307-2.188-0.59c-1.464-0.363-2.491-0.809-3.082-1.338c-0.831-0.744-1.246-1.652-1.246-2.723
+			c0-0.689,0.195-1.334,0.586-1.934s0.954-1.057,1.689-1.371c0.734-0.312,1.622-0.471,2.662-0.471c1.698,0,2.977,0.373,3.834,1.117
+			c0.858,0.744,1.31,1.738,1.353,2.98l-2.731,0.121c-0.117-0.695-0.368-1.195-0.753-1.5c-0.384-0.305-0.961-0.457-1.729-0.457
+			c-0.794,0-1.416,0.162-1.864,0.488c-0.29,0.209-0.435,0.49-0.435,0.84c0,0.32,0.136,0.594,0.406,0.822
+			c0.345,0.289,1.182,0.59,2.511,0.904s2.312,0.639,2.948,0.973c0.637,0.336,1.135,0.795,1.495,1.375
+			c0.359,0.582,0.54,1.301,0.54,2.156c0,0.775-0.216,1.5-0.646,2.178c-0.431,0.676-1.04,1.18-1.827,1.508
+			c-0.787,0.33-1.769,0.494-2.943,0.494c-1.711,0-3.024-0.395-3.941-1.186C88.076,427.93,87.528,426.777,87.35,425.264z"/>
+		<path fill="#1B0942" stroke="#1B0942" stroke-width="2" stroke-miterlimit="10" d="M100.648,429.666v-13.529h10.031v2.289h-7.3v3
+			h6.792v2.279h-6.792v3.682h7.559v2.279H100.648z"/>
+		<path fill="#1B0942" stroke="#1B0942" stroke-width="2" stroke-miterlimit="10" d="M113.328,429.666v-13.418h2.731v11.139h6.792
+			v2.279H113.328z"/>
+		<path fill="#1B0942" stroke="#1B0942" stroke-width="2" stroke-miterlimit="10" d="M124.799,429.666v-13.529h10.031v2.289h-7.3v3
+			h6.792v2.279h-6.792v3.682h7.559v2.279H124.799z"/>
+		<path fill="#1B0942" stroke="#1B0942" stroke-width="2" stroke-miterlimit="10" d="M146.062,424.691l2.648,0.84
+			c-0.406,1.477-1.081,2.574-2.025,3.291s-2.143,1.074-3.595,1.074c-1.796,0-3.272-0.613-4.43-1.84
+			c-1.156-1.229-1.734-2.906-1.734-5.035c0-2.252,0.581-4,1.744-5.246c1.162-1.246,2.691-1.869,4.586-1.869
+			c1.655,0,3,0.49,4.033,1.469c0.615,0.578,1.076,1.408,1.384,2.49l-2.703,0.646c-0.16-0.701-0.494-1.256-1.002-1.66
+			c-0.507-0.406-1.124-0.609-1.85-0.609c-1.003,0-1.817,0.359-2.441,1.08c-0.624,0.719-0.937,1.885-0.937,3.496
+			c0,1.711,0.308,2.93,0.923,3.654c0.615,0.727,1.415,1.09,2.399,1.09c0.726,0,1.351-0.23,1.873-0.691
+			C145.459,426.408,145.834,425.684,146.062,424.691z"/>
+		<path fill="#1B0942" stroke="#1B0942" stroke-width="2" stroke-miterlimit="10" d="M154.101,429.666v-11.24h-4.015v-2.289h10.751
+			v2.289h-4.005v11.24H154.101z"/>
+	</g>
+</g>
+<g>
+	<g>
+		<path fill="#7A65F5" d="M320.35,423.264l2.658-0.258c0.16,0.893,0.484,1.547,0.974,1.967c0.489,0.418,1.148,0.627,1.979,0.627
+			c0.88,0,1.543-0.186,1.988-0.559c0.446-0.373,0.669-0.807,0.669-1.307c0-0.318-0.094-0.592-0.281-0.816s-0.515-0.42-0.982-0.586
+			c-0.32-0.111-1.049-0.307-2.188-0.59c-1.464-0.363-2.491-0.809-3.082-1.338c-0.831-0.744-1.246-1.652-1.246-2.723
+			c0-0.689,0.195-1.334,0.586-1.934s0.954-1.057,1.689-1.371c0.734-0.312,1.622-0.471,2.662-0.471c1.698,0,2.977,0.373,3.834,1.117
+			c0.858,0.744,1.31,1.738,1.353,2.98l-2.731,0.121c-0.117-0.695-0.368-1.195-0.753-1.5c-0.384-0.305-0.961-0.457-1.729-0.457
+			c-0.794,0-1.416,0.162-1.864,0.488c-0.29,0.209-0.435,0.49-0.435,0.84c0,0.32,0.136,0.594,0.406,0.822
+			c0.345,0.289,1.182,0.59,2.511,0.904s2.312,0.639,2.948,0.973c0.637,0.336,1.135,0.795,1.495,1.375
+			c0.359,0.582,0.54,1.301,0.54,2.156c0,0.775-0.216,1.5-0.646,2.178c-0.431,0.676-1.04,1.18-1.827,1.508
+			c-0.787,0.33-1.769,0.494-2.943,0.494c-1.711,0-3.024-0.395-3.941-1.186C321.076,425.93,320.528,424.777,320.35,423.264z"/>
+		<path fill="#7A65F5" d="M336.694,427.666v-11.24h-4.015v-2.289h10.751v2.289h-4.005v11.24H336.694z"/>
+		<path fill="#7A65F5" d="M355.99,427.666h-2.972l-1.182-3.072h-5.407l-1.117,3.072h-2.897l5.27-13.529h2.889L355.99,427.666z
+			 M350.961,422.314l-1.864-5.021l-1.827,5.021H350.961z"/>
+		<path fill="#7A65F5" d="M357.449,427.666v-13.529h5.749c1.445,0,2.496,0.123,3.151,0.365c0.655,0.244,1.18,0.676,1.573,1.297
+			s0.591,1.332,0.591,2.131c0,1.016-0.299,1.854-0.896,2.516s-1.488,1.078-2.676,1.25c0.591,0.346,1.078,0.723,1.463,1.135
+			c0.384,0.412,0.902,1.145,1.555,2.197l1.652,2.639h-3.268l-1.975-2.943c-0.701-1.053-1.182-1.715-1.439-1.988
+			c-0.259-0.273-0.532-0.463-0.821-0.562c-0.289-0.102-0.748-0.152-1.375-0.152h-0.554v5.646H357.449z M360.181,419.859h2.021
+			c1.311,0,2.129-0.055,2.455-0.166s0.581-0.301,0.766-0.572s0.277-0.609,0.277-1.016c0-0.455-0.122-0.822-0.364-1.102
+			c-0.243-0.281-0.587-0.457-1.029-0.531c-0.222-0.031-0.886-0.047-1.993-0.047h-2.132V419.859z"/>
+		<path fill="#7A65F5" d="M374.134,427.666v-11.24h-4.015v-2.289h10.751v2.289h-4.005v11.24H374.134z"/>
+	</g>
+</g>
+<g>
+	<g>
+		<path fill="#7A65F5" d="M87.35,423.264l2.658-0.258c0.16,0.893,0.484,1.547,0.974,1.967c0.489,0.418,1.148,0.627,1.979,0.627
+			c0.88,0,1.543-0.186,1.988-0.559c0.446-0.373,0.669-0.807,0.669-1.307c0-0.318-0.094-0.592-0.281-0.816s-0.515-0.42-0.982-0.586
+			c-0.32-0.111-1.049-0.307-2.188-0.59c-1.464-0.363-2.491-0.809-3.082-1.338c-0.831-0.744-1.246-1.652-1.246-2.723
+			c0-0.689,0.195-1.334,0.586-1.934s0.954-1.057,1.689-1.371c0.734-0.312,1.622-0.471,2.662-0.471c1.698,0,2.977,0.373,3.834,1.117
+			c0.858,0.744,1.31,1.738,1.353,2.98l-2.731,0.121c-0.117-0.695-0.368-1.195-0.753-1.5c-0.384-0.305-0.961-0.457-1.729-0.457
+			c-0.794,0-1.416,0.162-1.864,0.488c-0.29,0.209-0.435,0.49-0.435,0.84c0,0.32,0.136,0.594,0.406,0.822
+			c0.345,0.289,1.182,0.59,2.511,0.904s2.312,0.639,2.948,0.973c0.637,0.336,1.135,0.795,1.495,1.375
+			c0.359,0.582,0.54,1.301,0.54,2.156c0,0.775-0.216,1.5-0.646,2.178c-0.431,0.676-1.04,1.18-1.827,1.508
+			c-0.787,0.33-1.769,0.494-2.943,0.494c-1.711,0-3.024-0.395-3.941-1.186C88.076,425.93,87.528,424.777,87.35,423.264z"/>
+		<path fill="#7A65F5" d="M100.648,427.666v-13.529h10.031v2.289h-7.3v3h6.792v2.279h-6.792v3.682h7.559v2.279H100.648z"/>
+		<path fill="#7A65F5" d="M113.328,427.666v-13.418h2.731v11.139h6.792v2.279H113.328z"/>
+		<path fill="#7A65F5" d="M124.799,427.666v-13.529h10.031v2.289h-7.3v3h6.792v2.279h-6.792v3.682h7.559v2.279H124.799z"/>
+		<path fill="#7A65F5" d="M146.062,422.691l2.648,0.84c-0.406,1.477-1.081,2.574-2.025,3.291s-2.143,1.074-3.595,1.074
+			c-1.796,0-3.272-0.613-4.43-1.84c-1.156-1.229-1.734-2.906-1.734-5.035c0-2.252,0.581-4,1.744-5.246
+			c1.162-1.246,2.691-1.869,4.586-1.869c1.655,0,3,0.49,4.033,1.469c0.615,0.578,1.076,1.408,1.384,2.49l-2.703,0.646
+			c-0.16-0.701-0.494-1.256-1.002-1.66c-0.507-0.406-1.124-0.609-1.85-0.609c-1.003,0-1.817,0.359-2.441,1.08
+			c-0.624,0.719-0.937,1.885-0.937,3.496c0,1.711,0.308,2.93,0.923,3.654c0.615,0.727,1.415,1.09,2.399,1.09
+			c0.726,0,1.351-0.23,1.873-0.691C145.459,424.408,145.834,423.684,146.062,422.691z"/>
+		<path fill="#7A65F5" d="M154.101,427.666v-11.24h-4.015v-2.289h10.751v2.289h-4.005v11.24H154.101z"/>
+	</g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
 </g>
 </svg>
diff --git a/src/platform/qt/GBAKeyEditor.cpp b/src/platform/qt/GBAKeyEditor.cpp
index c86ed2bab..73e0f6ac6 100644
--- a/src/platform/qt/GBAKeyEditor.cpp
+++ b/src/platform/qt/GBAKeyEditor.cpp
@@ -18,9 +18,9 @@
 using namespace QGBA;
 
 const qreal GBAKeyEditor::DPAD_CENTER_X = 0.247;
-const qreal GBAKeyEditor::DPAD_CENTER_Y = 0.431;
-const qreal GBAKeyEditor::DPAD_WIDTH = 0.1;
-const qreal GBAKeyEditor::DPAD_HEIGHT = 0.1;
+const qreal GBAKeyEditor::DPAD_CENTER_Y = 0.432;
+const qreal GBAKeyEditor::DPAD_WIDTH = 0.12;
+const qreal GBAKeyEditor::DPAD_HEIGHT = 0.12;
 
 GBAKeyEditor::GBAKeyEditor(InputController* controller, int type, const QString& profile, QWidget* parent)
 	: QWidget(parent)
@@ -148,8 +148,8 @@ void GBAKeyEditor::resizeEvent(QResizeEvent* event) {
 	setLocation(m_keyDR, DPAD_CENTER_X + DPAD_WIDTH, DPAD_CENTER_Y);
 	setLocation(m_keySelect, 0.415, 0.93);
 	setLocation(m_keyStart, 0.585, 0.93);
-	setLocation(m_keyA, 0.826, 0.451);
-	setLocation(m_keyB, 0.667, 0.490);
+	setLocation(m_keyA, 0.826, 0.475);
+	setLocation(m_keyB, 0.667, 0.514);
 	setLocation(m_keyL, 0.1, 0.1);
 	setLocation(m_keyR, 0.9, 0.1);