From e26acc39dafb9dfc82cf3d1203eba5f00077afd5 Mon Sep 17 00:00:00 2001
From: "Daniel J. Ramirez" <djrmuv@gmail.com>
Date: Mon, 15 Aug 2016 12:40:57 -0500
Subject: [PATCH] 2d collision shape icons now uses the color for shape icons

(cherry picked from commit cbad6b3faea24631642e9ffb36f97fb88c827dff)
---
 .../editor/icons/2x/icon_capsule_shape_2d.png | Bin 603 -> 552 bytes
 .../editor/icons/2x/icon_circle_shape_2d.png  | Bin 934 -> 838 bytes
 .../2x/icon_concave_polygon_shape_2d.png      | Bin 466 -> 436 bytes
 .../icons/2x/icon_convex_polygon_shape_2d.png | Bin 392 -> 373 bytes
 tools/editor/icons/2x/icon_line_shape_2d.png  | Bin 651 -> 597 bytes
 tools/editor/icons/2x/icon_ray_shape_2d.png   | Bin 382 -> 330 bytes
 .../icons/2x/icon_rectangle_shape_2d.png      | Bin 232 -> 213 bytes
 .../editor/icons/2x/icon_segment_shape_2d.png | Bin 334 -> 320 bytes
 tools/editor/icons/icon_capsule_shape_2d.png  | Bin 324 -> 309 bytes
 tools/editor/icons/icon_circle_shape_2d.png   | Bin 466 -> 425 bytes
 .../icons/icon_concave_polygon_shape_2d.png   | Bin 347 -> 321 bytes
 .../icons/icon_convex_polygon_shape_2d.png    | Bin 319 -> 297 bytes
 tools/editor/icons/icon_line_shape_2d.png     | Bin 412 -> 379 bytes
 tools/editor/icons/icon_ray_shape_2d.png      | Bin 250 -> 233 bytes
 .../editor/icons/icon_rectangle_shape_2d.png  | Bin 160 -> 159 bytes
 tools/editor/icons/icon_segment_shape_2d.png  | Bin 252 -> 241 bytes
 .../icons/source/icon_capsule_shape_2d.svg    |   6 +-
 .../icons/source/icon_circle_shape_2d.svg     |  95 ++++++++++++---
 .../source/icon_concave_polygon_shape_2d.svg  |  96 ++++++++++++---
 .../source/icon_convex_polygon_shape_2d.svg   |  96 ++++++++++++---
 .../icons/source/icon_line_shape_2d.svg       | 110 +++++++++++++++---
 .../editor/icons/source/icon_ray_shape_2d.svg | 103 +++++++++++++---
 .../icons/source/icon_rectangle_shape_2d.svg  |  99 +++++++++++++---
 .../icons/source/icon_segment_shape_2d.svg    |  95 ++++++++++++---
 24 files changed, 575 insertions(+), 125 deletions(-)

diff --git a/tools/editor/icons/2x/icon_capsule_shape_2d.png b/tools/editor/icons/2x/icon_capsule_shape_2d.png
index 7f4734618b825450f8ecac77a0c0a208d779ff8b..e449ce49858f5596b7508b5a47df9115f37170ca 100644
GIT binary patch
delta 509
zcmV<Z0RsNp1gHd%HGcu!Nkl<ZScUDE%}N_#6o#KOTC%Z<xNuX^y+63<4Ol6)sUU^o
z1vC;3LB!aL=%%z-p=qhT0XG%mPc<#{4irkEJ4@C^Fs^2tIo+gX=A)DOlEzi%-JO^B
zobwFB%zOj?yQJNQ{GLuau%yDQ17iRIoC#D3cwe5EZ#M$4x__@34_*SxfD;q*RVddR
zly(-y?Ha)9zGhtEK$ICv-Y@4@JhXv`yOM~m;Z+;U0qza;@xmsU2$0{?Nrk*&*HE6g
z9{sLIzrbVQhmk214|P0ges3b7kTXDQp2PI^oYX_!$3jKFs>3NT()4<KpBzwXIX?*i
zxF4yMbz?aIZ-3_HLWGToDMoLH03+eTz2+z`*sFXptkG@&+zuBX7Nijue4UlcR=u49
z+^AB36d(mi0a5@PfXKW5>8{4U-}A>h(5kmnfLgf7++sF%n9Bph`q>SD<8Yzyyin0W
zGgPeV5Mms|G}`+&B_2vwDmsC~3D6U=Ya(p?{{DN)Ty}H$olwSCn0lL)@Bah<uza9f
zq7-eif23@dAIVx$%<3tqHz)z0+gM%=hIwWawF1~#6!-j!EU*RmEuuckW-v_l-Cgl)
zX1D!oRy@>k-zV2RaE>+YGZBsgWjpDfr!w^mDh-bspy_;*00000NkvXXu0mjf-@Ek|

delta 561
zcmV-10?z%Y1lt6VHGcvSNkl<ZScUDEO=}ZT6o%h-l8`nb)HLnRkA3Y%^auEDr~wzk
zENWLNe&9}w{scFoixd|wN)g&pTnL3)Z5tK*0o^IMtXT@Rbec4o%*=6-P-X^Z=C)~9
z&e`3=bIyG(m$~;2@V^HSTd=g&9(Tl^7RR{;@*Ds_WDC@4WPf6IvY7sHA_CP_Nf+3B
z1>yk&S^#Dfc$+jb6<w!!Yy#C)Ne{E}k>F)DUHO(WvbR+vf>z>*5jJ0|PYwXQ(#h?=
zR3Re;me$(iLfrSI>j3qZ+03`hW*)>{0KdG5Jesey$D;ZtqX65n%RbS1iq=KFIJE7`
zEibI>d`BX+34h>BFPG3Py9}Tb)?Z-@<hpmvr@qMn0QX9#{)+IKr&637QQe~jc(5V>
zK+9}w1jGC5-ddjRUqFy^52x>p8bRpPL}53q_Gkhp9I-$w5DUZtv4F~D<T?9im;VHw
z@9#IZhr())CLpN0hXd)%)gZKE4czqB%J2RKz?x6!#ec%ePTo(w`><O8#PbXzwUDd3
z$3y{(pWEj}tW5w3SGwMPe01-Ba`0Af^3yKH7I7|2P2_&|B>(`6pBhyG9;>hijmeqG
zV&+K{r}PyhjZ6h1U)86VFUH8=a}`oaK-X!e_Oc~_ZvfaKs7-QaZ!}wac!?dA-iQ7*
zo3FLUG%Cw3cORU+Uo*%SpskD8b5VO9hd=%SwQ;NoqWGl700000NkvXXu0mjf?G+B^

diff --git a/tools/editor/icons/2x/icon_circle_shape_2d.png b/tools/editor/icons/2x/icon_circle_shape_2d.png
index 5975c90f916391d447a3f2de7b32f85d87738816..feb84d2f1c33df6351019cc29ea1cc0ca00891d3 100644
GIT binary patch
delta 798
zcmV+(1L6Fp2gU}FHGcy8Nkl<ZScT=6J8TnK6o$Wl93BN7XvHHm0l}8AEH6PMXdpHS
zvO&;npV+CRfOs@Kgdjj`JEEn7kf1PzEmpj<NUNajpxA{XyV(Ld1R{y&P{biKcLrj|
zMil&=&%NjT-yPpO_Y8dRQq?ofl)KGOfoPX#1(pk%0Sv}~aev@p;4#?WrqRX$m?`UX
z*u)vZx+?3wFgRIEa|6ld4bbV^niO0!*jlBrt3MR*Ykt4}sTrWNWIH|M2Jpi?&1dum
zI8w;y_o@N9hi!M@aTi$N3{41bniv#3d+RX<uq2?_V55w7gI|D!ZXRN9A+39J0(APe
z#)GH8QfKJ;RDX)zt9$h_33^7kVQVpui@+gg==D^JEpC1kz)ZOkBhG(b296doy8I<$
zS6#mK2rd9#C_GX~vm?AQy+~4tBkqPXqqkObfMQ0MB#t@Z?OC6Wa9|d|Ou%U;;d*hO
zuGDHiqkLL@G6tOR*@{;bpvz~IbIvCMVk@XwlTGvhAAddt#E;n$8)5(w2b|o2{*3;v
z7of7~ZiQol_80)rN_5sxz2+fBY6Y703IjBUCwbz}M!CzWC1Yh0!174eBK~g}z+(P&
zLaUMhzM4|+V?IF=z<7AZ<h$9&RIfgyoLa_zNdS?@<aumr6o6NDYAG4uVI;{o*eC#S
zYKaFi0DlG1qhip}eaF_;>zo_578k(8U<@F?k5S-7Xx;)VbD>^<z~eIE>)Ci-Y|~#c
z03?$*<&buC`PMUE^PF!-!*9Kc<MHs%*mayO@dVfwUWCN4d|G|Am}h<K1<n)QXO9bM
zTEo|ItRbm16i<O=5mIBIEPCg<AG+_@+Hyc&Y=7nO8nL;M)~iU}MEa8L!uXAZmJAq@
zF<5S5v}xgVOExt@bLFTVWZF2XmD`ig=)UXq&70ECzKZ+PdZd8uz{tF<#S_HOpEIAH
zGMA=5Oga$ffb~@w8_&(-M6r#Vb$yt)%KElZ&>o0Z1+0)*ZD1H<<}t2-2Z*6UM$c-g
c`xkxdBR1pxmWgQSUH||907*qoM6N<$f^WZuod5s;

delta 894
zcmV-^1A+X;2Brs)HGczJNkl<ZScT=6&u<$=7>3_>9Fq_>QY0iO5H3vx+$cFv5JctF
zI2ObNfuPwo;(w^9O2u!4T8RSxLZrm5P!*bl%67v6(b7^5C>5vnKzj+0Ly%muxUI80
zFNYL+ckK{6w&2k3=5N0Fo@eaYoiT8?2b(RF#4pd5pRzzkvVX$>9|SOPXLuRF3c&M5
znBSkiZ>eJfl9(%cuaf*w!edSLy-Mo6{Ugp-B(-gUseEZL$;33kr<(*vLeP&4f`jgh
z{nuI+m{}}8$H1Nf@W6K9A;KSk-f&ZW-!?69vat4o1q%R@v7w59IY{%OF3Xgc0f4r5
zfZ}eD83Hc@xPK=;kJ9Kwy6?L!1*Y<)!KCTB2;u&4Ucjtf_m51D^<Uq7xj^<zX(tlN
z<A7d?kye9>|7?7IMBvVbyAb=$0|IYPj5?qH8#o>_dG8PnjzKUX!lj9nGaTNSCOqln
zS?{$58}3M}Z~!=vc0Pl}(P);><ci*SI8zmnM1UWJ2Y&_3x}(k)t-}8aH|?AtbUNz5
zk2Y8_f!tzwDE6FJeEG2zv>yI?a2UYtYC?D-_sw5V)(ODkrKl-RznSj;rCou^vHt5I
zzK$ftOuYa!9I3HdXcu1X1w?wu)>z?9_(-J4*q=HkplB}w4>c0l5iaWPzP-{Zf$pAL
zzs6G4#eW+72T{41h;wYc0P%ac;%2$$;Z6ydAQ|mN{8lfZS`q-d42L=;V3Q`=OSQ#@
zz8ap7)^My-0t6zxBvn~efdr$E3W4$I;*DMH!n0>eJE5q6A?NA@ULWaQ0&q1{mrTeU
zYgYh?#HR=!&%~99QRnA60g{sRet53H@tM4LXn(uxnf#xJf!bRS0BHG6<Z}clF<bP$
zC%7k6VPSF9O*<!Afln8_w+!(~_&64H(M>sfH$9F?ia~G?#A?k72E_4PVeQmZzBITc
zxOih%wy-v95W5QytLyM5<CoNiSF&7wZLi288eGXhEKrz-Z<o59Tgw38dp!d-X@&@l
zL3hYBoM#d#cjVr4an}ESDc$r{d|+Si1qA-{fG%yHt{*B|-?JHf!*8n=8~4O<fFA>R
zyeTemMY8X@slK_k{+PrgyXftPn32^mi5(Cg1t1X15>^a(PDTsvKId{Peedr08!q}$
UnWExu&j0`b07*qoM6N<$f`7)bXaE2J

diff --git a/tools/editor/icons/2x/icon_concave_polygon_shape_2d.png b/tools/editor/icons/2x/icon_concave_polygon_shape_2d.png
index 39e4d888af675ca9c867a1209af0b057d5e0c6cd..1ad3f30950d801be61fe60424dbfbec7fc0ba05a 100644
GIT binary patch
delta 392
zcmV;30eAk=1GEE>Hh*bJL_t(oh3%BhPQpMGg};kD1wN6*ox#RPBD<E2596v`>B1jK
zFl?kek-UQm<hr26v36jlATI1#O)@{{n{)3B{C7z)h-Z3^kOH9GCS7?wq)|N63xvD;
z{3z+l8$ioINq`Q}K^R4uhKDkbG7S+%#`#Gx*D}_f8soOW(|>TT{e8`cbL|N{0_`fV
z*3T^)ov3oZPZCk4p(@WM^KaS)0DB~1xw$t0tdn@~ff&xUx9jFE0Lv1DQ#mZLFKz3s
z018*7jXTR>iG2kOyaCccCKV9Ya#&(t0XIn?Pu>7N5OvMLp-Iv}CQ+scycp{X2!M~e
z=HT`UiX{3}G=FAQ!zo<5m^%aH5aSAnc7=IA4P@+kt~0<Eh}!1f00u<4F;~FA*Sr=$
z4lzNv1Qx&oC3LNMSvy~WP05)|foa|Sg=!^mNHqWrKm%a?2jWci7yy5sfC=z^MBk0q
m7l0D8{@Z_Bi`=Ub0G}=zvZqKPyITMN002ovPDHLkU;%<Himw>}

delta 422
zcmV;X0a^aE1JVPKHh+gnL_t(oh3%F>PQpMKh2N{}uou7!Roxjv1e8Q}vhpadaHR{S
zH6g*U5qcrHKyhIL{4Ux`ZD#1S6pfL$nxym3`{w;KlLG%;j0eyD`{@dD2LKScX&>7!
zWg5BD;0)v~09fF4)2Y6O<47w=AA%YLHGrPy2aU4K!?oze>wm8x{rKA#00c*gnu-XY
z+{wJXt@&UQ)J6CRprZ1!R7H^vK-_PWgy#nhl7nyNDQyA(wn##`^8x@sn8ZUKh`}VN
zXYJesV3C3_YKJEFg>JqUfRuKsFtZ(+*q1_da|5&-d!&HSwnG#9Qi!Vy=g`XykO!iu
zIbd)|T8=&P{C@x<bQAMq2ngh(s5xME3*sa?P#jFvfg|P8#M~Glf*2|wDhl&X%dv;1
z>ly=WfGBL98z2FZKA1}(x_QkD0YnfZ3eQ2zK+FJXn)W=c%v+#^IH`^SjEmOCDwIH(
z+5_wX_5j*<z@5&ue=%k1*ArL+5N|)`n((sL1NOpqeIMuMGYjnP+~?2e6JTk#WqZL9
QFaQ7m07*qoM6N<$g37(c?*IS*

diff --git a/tools/editor/icons/2x/icon_convex_polygon_shape_2d.png b/tools/editor/icons/2x/icon_convex_polygon_shape_2d.png
index 38ed87089dac60e7038f3cbf3489d0fb313d6156..6d46a96f9d96afec08244a4574890b63e7fda42d 100644
GIT binary patch
delta 328
zcmV-O0k{5$1N8!sHh(HfL_t(oh3%F>PJ=)gM&ECG3r{32wNVoiyDMzGi*9W9t=dJG
z!inrDN`5y3g*v0dK<Prh4asC?-pc?Vz<-Z~E=)f42H^z&<!Ny(+rb3VT&JqM0TVM+
zh%kG-lGVutEbuZx60HR0ncfMkEbuaWg?Jgsrgs4cd~dFev41ua7e15HT&EUz0n8L0
zY9as=fpwZ|?6dcuC*Zi}1@O3tWDPLS^j6^gc#h9A@vDFjyiBNsQ=kpJi-c7m1Rg5!
zL!b*hM4}<k2fVFBC1AS!gAVVsMZ(@4%6<9mIP`$<+$S7h8OcT==BOtOi>3fv))#k$
zTO{hKSk5Nw13~Vymsb^^GNZsKFbbSq!1Z%UlBo_MaP||Z3w#a8tyl*EB>{E=z;}i<
a27qscC#<%;c%1D30000<MNUMnLSTX@*O9RR

delta 347
zcmV-h0i^!*0*C{UHh(=yL_t(oh3%F-Zi6rwhTj)u3@7M?XvZ|_09B-B%+#B-XJ|1)
zhK`U6H5YJ3(ANbDq;|`HRE2i|8Qaez1D_3Cd)RfLO7sfkD*!;`Ik<H{CKCu_y(Sp~
zSmaF^1l!<lsYVwtz>9Q}XeAIG^n(cB4Dcc;DI4E&_k#;q;D2d;t+ln0aGG=qW4$)O
zGa<I51QihgScvdl#iyXj+<&fs<(+3jJUx2L2mqpkz89f7@6+U)_*I|@yhv9Gt3Vrg
z9|@yC7kF2R9|C>gT_kD(L%`cgd<&>VuK-5q@lP8hEVV=YV(%#H0QoW`8~}XJ-IKDx
zS)IsPs0#>gs#Jsf!VMB-DlBUy90J~Cu12MJ%*+C_z$|ca0o&mcDmkULXG7-VD^S^t
t@HrW^!g9(R?m!$TfFB)jH#+Cv<O|}+!X(&6#5e!|002ovPDHLkV1h@0mO}sl

diff --git a/tools/editor/icons/2x/icon_line_shape_2d.png b/tools/editor/icons/2x/icon_line_shape_2d.png
index 5ec406ea1f752beb818ec9dedc110ba8e187160f..490db5ca5b2756c2d18bf30e87be31919015be98 100644
GIT binary patch
delta 554
zcmV+_0@eMC1=R$QHh&69L_t(og~iv+Y7<cy#_|7ijFfikQV=cTB`Bz1yK6oS;?k{>
zq$1MdM=zmB(MmT>Y<madqD@-e_yK}?3nF&qCAcUi^SDXqv?Rr}bK<j`GiR9JyyxXG
zN0lv~BXAuc>F{N}tX)Q!puja?0+>*a>Di_yM+!(^$b@!aYJZf7(CP5iBKcnk0o>d4
z1?8BQ3BcI^R{%PJ`dVI_F#!Q!y{uig`CyTRz-5bZi}BE5uJX>eq65+heBiG1hleo{
z2byrbtX<41-tURn2=yDRwOlgHBLe1(#3cZWl}27qvjl{GgY}}Cf@Mt7efbzLhIw4w
z@$)PJeJjvQt$*bb;&m4QfWe66MqZDy0Q9XuFZH6DGB3=2YYK#!&#DqfR-l(!%ZnBZ
zO3xQYtkh>T7ab52@y~!*h@k*65JLm9MjQ)}CF0nCtPm#xWPvy_0HCt%XM!hbgu#NP
zdO-`(0fP|0p2eL;UT+3HcjQ()OkNeVU|33T+W;gysDJMGc62}wAy@?VfIXY<2pxsU
zYzfk-Zu=%?4y8UY!R^5EMnPNYxtUg=mqtNbh?j@|tWHDi?pt4s4j70K<l5XwBcd!p
zI+do23fz}b0^fjNGH&Piv@xR}(E$LnO;5H1Q{8h102aw9@qQ$LK?uR`XgzQ^t0n!+
sC45XD10%bL(WbWJ^GU*001`g`1z0-s-))}F4*&oF07*qoM6N<$g5M_sH2?qr

delta 608
zcmV-m0-ycW1d9cbHh(}#L_t(og~iuTYZE~L1@QM~o0QfN0v-j?qJ9Jg6>LFBQ>utJ
zlhCsVl@$Nt2hf7Wh#vGNv`sI92U~0dMLh_LUqLY6Kx0TF?RMvR+Pbl6?4O<ZZacdJ
zzkM?dyPR40ei#YwEC66#pC&G5YUp7M`;un}4iX$R{fUvvN`HN*r-0~%6c`1G;a(z)
z{Eg3~Xa5(105DUnA2mpfNP#ipAyKDb1&@4jC6|8V5?}yeBAcmM`0q*2!tf-(0T?sj
z1Etw&<C1eg6w!8*q%3Z@M6_+fiEO5(4f|Ze=ALkkV5h;kYGYiMlOzm<gCI`;g2boA
zT<T7o0Mlu(n14+#(x@!Kf;<i&2`~xZ=KOMVI!-{x2Exo$8{?FD1)x71lORKs^P{O-
zaR53t5T=+-FG{v7LE#t)T46G-Cb~8dX1>~dU@h*Fk>>?Lcvcuom7D`yB6bXLh1eCq
z1!C8LxDk5-#EIB5ATGqd0C6C?9z;7yKAXBv;!*Ul0)Igf*DG&ZQ~#R3?*_tDmYY)&
zZnrf7tU;zw$PK>UZr;8d2vZnM-P_Ux0CD45WvO-9IUqzB>LGwN0PB#x0%SKtY)cT$
ze0B9gU~P%~^MY1VpHR+^r5B>l#@axbeD=VCXUvl=Usj&EI=lSym~+5(2mp|HE{bpl
z2oVVU$61tGfPTU13kgOMPWHgxsjSq86eNbFVDp7Z&-!-#T~7epAt1BrbP1v<oX>ot
u=YNR)1_C`=f@oeY{W#*$oCW~+!N=c8T0R`rsKM3%0000<MNUMnLSTYC{u2`b

diff --git a/tools/editor/icons/2x/icon_ray_shape_2d.png b/tools/editor/icons/2x/icon_ray_shape_2d.png
index 37eedfb7de6f348194ba110fa30b933dabf2941a..2dc7041a93cc3a29e8b5b46ba12633b3c869644b 100644
GIT binary patch
delta 286
zcmV+(0pb4s0?GoAHGcsANkl<ZScUDEF^<A85Jlf0P5~z(p+Q;+twcc=8sHXi0Sc#Q
zrG;HY1L1Osh9(7AVI3Ppv!2R|zW;xk!uo;#J`#FycGe+64uF!GR8Ap2olpP-1N4Ai
zeGZy%0O&tBzYX9e69FPX1c(3;AOb{yu1jDwpM^=~@TdNwBY%`lt#>vh_Xh5p&v#bn
z_>nX#bd0jcqbWHzVCx08S)q;L0$X2C_Xd<DP}&f-tRcKam_H3*QaLDm+7J!W+iw*x
zH3K=i{9D&@j}?~+lRS}K8(**gf))^7;obla2=DM9fEwZh_^~ceOd?;tUO_Kmp2)Aj
kN}*DyL|KP~#}@&(0$_GhrdF|8O8@`>07*qoM6N<$g3@et(EtDd

delta 338
zcmV-Y0j>VZ0{#M!HGcs!Nkl<ZScUDEu}*_f6o$WpZj~3PFGO`QF=--gI=DHh4`JLL
z+Pwps8XFf4??t*5eg~^Tqyo3b#e1epa_;|soD1X!{(G70#`|=2T%Z|1fL)wLy%!gq
zz!jiCQ$!!pFVNIg#~A=|SiAl+fL|&P-~l{<2k-zMzys_zHGh<o57O0W5H5e}PhM9i
z3UmkUl2YRY%E<>TNz!b%)jZ9HGCg!jN{th!_DeQT(hRA_TsH5j+58Mh*TA|8!Ph`*
zHRfw8>~d#-(I8x!X;g&(0)$DJ-gV06xs3DpsQ28Y-#V7pjCk+k6gDFH=5lSONgRcX
zHoC1}!#D~TW=on-nuPJ~4mz240@wzzi#a&{86|0UD%s=benW!sI66qWYB_xg<0yOz
kup5jVBM05OnEL{F1A^&)TYpOs`Tzg`07*qoM6N<$g18--K>z>%

diff --git a/tools/editor/icons/2x/icon_rectangle_shape_2d.png b/tools/editor/icons/2x/icon_rectangle_shape_2d.png
index a2754e6880541a04f0f7cf5883d746af0eabcac3..51a93cdb1da23a26e3d96f2ebb76219913191e26 100644
GIT binary patch
delta 167
zcmV;Y09gO%0o4JJHh+pqL_t(oh3%EW4Z<)G1m~hu5jrCDflD%dKst)sxO_qq1m=O@
z@?hs>*_LK>4;zH|ckI4MH$P!qfbPf6f^*KjT>+X+N)C_%bhC@c05}B5pIptmTM@Li
zgM2iroqa+Y++XeQJ^=+NKmiI+K=m)Ez1`nt_X%tR#z61lS|9_Q1e5@InO#B%045kx
V7D!>A6#xJL002ovPDHLkV1k+6Mgjl;

delta 186
zcmV;r07d`R0q6mcHh-N-L_t(oh3%BF4FWL?MV~D?nBZ6l!~}>5xPgud5ECF+h)e(-
zim9Tz;zEH)P6)rsu_L`N7Y4`qcO(_3>thqK14dKW7!=uWSMxJ~rhde_;&K3^iCCAO
zIv6aA%ST-L?q3aNxxsF|$j(0Dc)35v`jc<K19$)r-~l{9_A}n+ZuhsDd;@&|;a1H$
oaA{viix4WvgCcElkK_CdFE_3pcn+cr#{d8T07*qoM6N<$f-V+NSO5S3

diff --git a/tools/editor/icons/2x/icon_segment_shape_2d.png b/tools/editor/icons/2x/icon_segment_shape_2d.png
index 11b28d81df6e294a3b5be954ce1d1b04dfb827f9..43d5d837ccdd91bd8f66c3ffe5a93f551733a89a 100644
GIT binary patch
delta 276
zcmV+v0qg$G0>A>0HGcs0Nkl<ZScUD@F-`(O6o>Ke5su-7#EO^=7AD%U6dZ=cV(7tW
zMT72*I0fWUX?AfJnAtb4k$*Xv<o6X*4E*<r7gSa{MtK83nT7}10t`Ly>9<Z$R==JQ
zfIEPJ2QJj`lVuI)!1oCA>;bb%ix&I<yoP(({2XL?gtJNuRe#=F@Ru->b^We+Kn!jk
z5R01zq~K-&skli%AG~)!U%Xd<1)dyWg(n4A;?V)tcvL_R{OW*Q_*DTp@rwbu@v{LQ
zcxQkY-WuSE{|WHM8v*5)J|cXa;CqGV<w!nr;86dR3JY(%8PJ>y-V9JmU<d3_o;>i|
a0FIIh#}|>&*bP_!0000<MNUMnLSTZyo_%cq

delta 290
zcmV+-0p0$<0?q=EHGcsENkl<ZScUD@F-pWx5P;!-g4Jg4;B|u4B0(^Spq(}zMcBdv
zNK9e1jnNb32By-Cg$jwA=q8yrjXUMz!S_FS#lU|b@q&u-b)^w&fC#QmllTeXzy*J)
zPgM0D{q!2)4mkXZal!{48#G`5f0Krr-~oAAr#<+)ie6?%@qgy~Ajl`o%Q_X&ya&HH
zOO{3Zu6e*1+&o|`ZW=HJHw&1Gn*_|kX9vv1X9ZZ`lLM^qNdcDl=m2YcR6q!P=YUZ7
zP5~kDKLbMJzXo{Vg8^Q6Z-6Jh72u6`0v?|0W6*-13#7<-mMk7a;Lu)5MQ^?FZa{Zj
o@J>Jk*9a9t1sjri;QImi0DExe61}D$v;Y7A07*qoM6N<$g4ZR4?f?J)

diff --git a/tools/editor/icons/icon_capsule_shape_2d.png b/tools/editor/icons/icon_capsule_shape_2d.png
index f4f990f72faa95c986f58d71c057729a57bb29b3..6f6554fbc75b1dbe2011cc66fc1f37dba8a73c27 100644
GIT binary patch
delta 264
zcmV+j0r&pI0<{8=Hh=0#L_t(IjqQ>#Y64LZhQE2c*hSFVJ%hPHI%S1G4k1x&(|Czs
z=Zbg&Q%BjtJEXPNltDD@z8#z0usnq|Xz5=K|3CB1Ja}-W<eWK(HApQZpar0?GQuzl
zWnBu$hQENi6YY#gbKI6q(KId~+gw-W6H6n309XRG)bj53pML=Iv#rpdJj?g2BU|Iq
z%d++*fCqqCN4B|9IJ<fY;9t4}&I5h{x(jXO#vs-pEB9`*?-~j#ffpa9-G#nZJVaBb
z00?m@zz9QCo`BGYO=|z5pG0{peL@t<+ITd958wbC5atOy7C+a`bOarnMaDhD<N5#q
O002ovPDHLkU;%;#dUw?T

delta 279
zcmV+y0qFj<0>lE4Hh=j^L_t(IjqQ@LN&`_4MbEsoT5v&YgMLHo?V?5yYr$Zv>22~0
zl0F|0NTKy&Eb<3_Kq>{b6j5QTWUhr9SvCucXz9R%$DKQeJ23FevMO;j&KmCOW3&Je
z6KCG*w3BHqARoR1)=RC|5UhE;7e5xoPzJcGpAV<AnQcn8C4aa9)?9vB_ODbd)j}Xy
z_w+D+&QqPc>mJ!|*}jwju?lc<5I-%XLhPg-@Wc8CQ~`_+fMJ?#ETqvmYvkXzvVHju
z!~{6PG#IAYSrlRJ8syE}T7Wa}1)?2;eM}GT-^pI&;i7hhPCJ=~U`<Td!28$JmE5+A
d$Mt9R33XRn&Jgmq40Heh002ovPDHLkV1fc`gk%5!

diff --git a/tools/editor/icons/icon_circle_shape_2d.png b/tools/editor/icons/icon_circle_shape_2d.png
index 281658b062d9cdf34a270c9de95875e247a18b1f..7865ed3dbe17bee4a1b39b9a6f80ec49fe6097d0 100644
GIT binary patch
delta 380
zcmV-?0fYY11E~X$Hh*48L_t(Ijir&hGDA@mhQD<ph9Np$K)eBZ8Z(Jh;RVu2ikOiy
zYIMvv1qyn%hU6HpU_61_1JK1}7?<-a&Q4s9%&@96Ywzz{Yo8zfS@yM2Jk=1d%p<1F
zNCSj$iKtl@{^pe3#tKR&nw8iFQZWPX1%<7Q9kd!=>tim^jDN(ggO9wB$!3E7W`cf<
z34>!GWw2MQEB|Q&xAql~lBjNFZRMx&r9f4|63|FO+RxaX2cQ?qt;umPz(&TFff_LI
z4CVF{403LtwK%x_=8#nYImUC~Fo4&?c_+c+Yjnqm67qh({=NE=?c~CDfw%^s$yg`B
zGmJ(EH*JBUh;@+1LMMSl1;E7`3A&ASpdrYW0#)PSVxUDcvP3cZPUH^j%46)iUJY3D
zdN~6K9~hUYI9Q0;&8!`M5`2*C00S{gG!TUr{7nE*4m9{A=H0Xr*S-MiN$~xQ-NpW(
aztkIk#&uXk*mXhx0000<MNUMnLSTXoShhC+

delta 422
zcmV;X0a^a31JVPKHh+gnL_t(Ijir&jPE=78g};6H8KyWxB@f_`@BrWwU?MYO112Ow
zC<q->U<t9a&`t`c(pZ>5p@4?@!Dk>m0D)jH-MxgFQRXg+JC_W~%@|$P$=+GtUV9(-
zPucH<&)>qa0l5;=ERY8foH?`VwMFISC;mq&pi&Q?o3jrHpMNqgG_?9+#_uI1mpr~4
zhVy3j72z=*IP|#VE=N1=a@3@0P!-`N+u3e}b9WNNvF!xmMf7T^kb8SyfJ!6SFx+b(
zXiF0-MStM{2Ibb0$!TVQr9$qFPz}gs%&pz7An6%^MQo*+6Ai#S01<nV8$1LU%r=kv
z0j_?wj=Q_(dw&6ct;~>1elF?-oC9=P*{Oa2bHkGWg73EgGdt)a*ZW40y#z2~j{|5$
z(R&~Oo2@j0jWq9eJ=g?_K+slHjzLMY5zc|_0wz>5V{0hWJOcRD&OYi+F2?D#uvqZ>
zcK|(*k3cRZL;zY%%zpp?KGnkqBhHm1Jq5<Q<x{X)TOUz*rRXox5A+YZ0ptgft_H6(
QvH$=807*qoM6N<$g2jfu<p2Nx

diff --git a/tools/editor/icons/icon_concave_polygon_shape_2d.png b/tools/editor/icons/icon_concave_polygon_shape_2d.png
index 71d8e62dbc7dbe60605a2ff883fe3de933ecf1e6..2e87eea5aa7adc57feb26213bd638d4dd79dec87 100644
GIT binary patch
delta 277
zcmV+w0qXwS0>J{1HGcs1Nkl<ZIE}@TO=`kW6h_ZYEbRswa0ea4S%#K^S_IukNe8Y*
zP&Z;|N>eCy>MR3ypx6x*Vsbl)@bY7dcF+rN@P5vB&wCI4SOV}I=t|)RoAF{O`zF8-
z)gfgm@I4>Ny#=7q1w2wBKUC)zI0C$!!780`Iq>oHqU|y~34ipKlsCXN*UJGh!kv}z
zYMS_=Itjc39UwM=mN~hCUIG!&$xV9K8HeQ9S=m_dm<iijgXu`Vuo;*ph0ZM=W@Fhk
zU4g|=_Sp1uRW~0oHvPIEsst25gf+tY6kK_ON(gwT_8Se(ss9fsyn!F6USuHfc`kSf
bQ(Hf?LsT=O01gAR00000NkvXXu0mjf=*@YP

delta 303
zcmV+~0nq-z0^0(RHGcsRNkl<ZIE}@Ty-EW?6h_aTm1yCXF8Bt*rVH3u2;#aB@d<>0
zKA1&9o<N8jR{|Ec=@xtd3yI|#@FzRhVnxPHvXEGKVTzgIeD};9_+tq`e~{lJvQ-#8
z>%{(~4(JZ^z_W6V>f3qSKQv{G8~`oPl6HrAP!E#=t#1ZX5q}Cjl~FI5?pEQeLB3-w
zw;-W=UJ1|)WzVQhT$AoF4>pB6L7JeMOKiBCcjdStnhMhNlu<94MxWNsemV<}ABDsX
z!_z{8%eMbw4JWRN+qn=ux;Wi_u6Y7<Vt-N?qEc1Da%ol=qD4P67vP2{j1|Vq;JF!8
zLxBBd_q7JA)F}T4{F*`k=5@B7f$GD`t=C}|)fc!mZFT_&Qs@8x002ovPDHLkV1jxk
BixmI>

diff --git a/tools/editor/icons/icon_convex_polygon_shape_2d.png b/tools/editor/icons/icon_convex_polygon_shape_2d.png
index 283bc68786aec0f5a5063123cac3a159195c1f22..e449c6930fae286111f8215545eeaec0c7e088e8 100644
GIT binary patch
delta 251
zcmV<X00jTP0;vL!Hh<npL_t(Ijm6P1N&`U@hw<O+#v?@V1{RynUQCpTxre05X#@!#
zLvT?rh2Ra`A~#Ut5n?hn8(EUwsIl<hy?OI}^LWD_6Pg;shq!Oy4x|R-ewh7OP{I>r
z<xwHktCMU9*5IN%&YC1iwHW2GZQ&7_XqrT4dvx)F%!jAT`*e6vJHaTA?Ku;4MAL+m
z>p^&{>n&5=oAdDcCD;ZxJ+P7_FegU`g_h%W7_KhDyVNNP!C|s=TiwACG;Mm7aX-wY
zdQ~RbxbRK3{=zQ#e?hBS4D%RwnjrA}TW}YqHlN!qS<F(TzXJdO002ovPDHLkV1ktk
Bc)$Pv

delta 274
zcmV+t0qy>&0>1)~Hh=U<L_t(Ijm40?P6AO7g})h$7P=)QzJbZo`38h_jmAfiL?4U-
zLr<c?9}+s=z)g4q4VJ5g#CyjAF)Qpf2!*Gcne&~Q3~VR~4LbLEt>Wbxz^R?J(rB`B
zzzk*p63;r8IVC9zSqk_GTlQs(Lm^r$+Wow$o(GT^VLbJczJD7{!yZB6iplWm?rp#H
zf_6WzZVLlJ>Imbhqj_<<_gpsfNOFF>`}7^~8ys3N4^e;}ksCqkV3`wZEW!YnC((;n
zj=(aE12yXve{cv8`t)3_G@3XiDKfff2*DwbhK#G~{{yy)MfdjgW4#N^Mt@$t4pXL2
YG)-(gh0T?g01E&B07*qoM6N<$f@?>64FCWD

diff --git a/tools/editor/icons/icon_line_shape_2d.png b/tools/editor/icons/icon_line_shape_2d.png
index a4fb049f3fdba2b766ea942d98eb47f4f36335d8..e31722d69c9830f49c64a9b45ab3c3fe5a8fd85f 100644
GIT binary patch
delta 334
zcmV-U0kQs^1N#DyHh(ZlL_t(Ijg`(nOG057hVkn;MxquPS`>YNf`Znd2%IF#(VAP#
z+WI1qOO!3nHim*rPJwIC;1`I3!u}Ac&^dS00hjEYYkPTle%w}WXxB3)-o9vE?^&Oa
zIf4ixlS+^;))fm44CAy+^diQ7dYY?pOLL)sTGj@`1Wk#d#DAjaQ3-=M0JW?Q6z2r-
z<cMuty5*Kug8(-AD7BSw26Pc=j1L?(FLL(q?*hMS)?O{jhQT``X)bq%H(Cq4!0+f*
zOAP1;QU;%%%hqMV?gIm1kUxQ-$XEcN)Yh`orvoGfy@*&j-?3-^-x+fYKs9S!FUGoz
zo<YPl&W;<J4@bPf@1UvKNuz>T03PL1sut`!Fff9gnurSOa%qMF0E%_RQVH?~GX^iA
g0Uw!}BIk&oU%zUEOwIOzHvj+t07*qoM6N<$f@#f|MgRZ+

delta 367
zcmV-#0g(Rt0-OVoHh)n`L_t(Ijg`-_O9EjS2Jq+oF1u6GQ!xvoIR~LRBH|`Rnk|F|
z|AhXJh#Dhk$dI@-ux`mEs5J<37b+^0%gpmrzqiS7$?l%*<>meHyman#w-}=t-F2N}
zak+<p5yT@6j8s1sFW7c792k&#)DcWABHkWG<0ofMCmjeVTYuz9W3C2;z9KAX3P(W@
z0RUx-JYhulz<2>6uPHoTIIXN7fF_4(om0yDY7kKpU{|BT#!fEz_-})8N)~;v9$IIm
zT!73GW^XIk?N#3m#;M$RE9A+062b)GQ}JMPH=lU$4Fo~{1pFdX0RX7h`x(`fcO=LJ
zqZKl~vqdZYI%wXDX~zIivh;=s&#p0Z8^qc`Mh@-z+oEq^j7Ua?8CT4_Fp%N><ICrW
zuNNkBTI<Xk#0N@12gvTqPAw1s0Jhx>_haz_zzG4o2L^r-)65aH;Sa<5n^$$y(eVHP
N002ovPDHLkV1nQ@rg{JX

diff --git a/tools/editor/icons/icon_ray_shape_2d.png b/tools/editor/icons/icon_ray_shape_2d.png
index 2f102bbb91c294a696a5d878ec33ff2c09bef0de..c91a63570d62f9e8859f8f360bbd4a9e9dca2a73 100644
GIT binary patch
delta 187
zcmV;s07U=#0qFsdHh-Q;L_t(IjqQ)I4Z<)GMc>6p5evWowCU19MG+}t5Ihk~Vu>P^
zS8&S!umF{FG$uj_IUs>V!Il5tz55@&Io7GSPJM1?k~0;SV^4~AQ~d$I2#`m?I`t|{
zDQJnD05HtyaiUyyt*o*M6iSquNH>U)4y9Ho$14~%Kme*cwKM`k^70h`wg;W11UE>)
pu--RvehDx@dX6dQ;@R;><_ZciDVeTpw?6;?002ovPDHLkV1mT=O%MP8

delta 204
zcmV;-05kvT0r~-uHh-^4L_t(IjqQ)23IbsegumGn#BkMMwjCI(29pRPzJTDv3HJta
zAf|f-;hNcCy<qZRgI*E2Q&2ECad!9H8Th8stjyD_%<FbqwFGI@^u*o_^#}YUK#xY6
zmAOluU_Ot6jsO?)o&{~>eqPSvacu%eZNV@K>?$t`>;ywc?M224A@T)y0ZNb?aswsc
z#ckG50bso?ySD@y+;i<O#$+{(PcH!~hy@M+!RS9b{)nz%ZZ`p^qwp^P0000<MNUMn
GLSTX*Lt4ZD

diff --git a/tools/editor/icons/icon_rectangle_shape_2d.png b/tools/editor/icons/icon_rectangle_shape_2d.png
index eb123c6f6ac678d7b444bbf4dd48a952ebc9074a..002730b9427d61c56dbe43531b5a178a2cab047a 100644
GIT binary patch
delta 112
zcmZ3$IG=HXS!Rf*i(`mIZ*qdfr-q4*jg5-MxBnmhFDa4Zait<<m-u2`VP+s$IcwtA
z4GP@nJ|v~6xD_AU_Wyrkj#^Nz8~b9m1xJ~RUQBwz<i^&fyd+D-{k#GzgJqYXiRPN!
Q-x+|w)78&qol`;+08%L|)c^nh

delta 113
zcmV-%0FM8k0iXepHfmK#L_t(IjbmUK@_><nfq`M^w$BF{7#Xce()s`Y(P%GTdnSl6
zBx**|!-6ap?a9M}T{S9Ly8X)^7@LV?o6*3i0cf#+9J-{r;Q#-lBwJ06p1}zK6h{<f
T^NGv&00000NkvXXu0mjffzUH^

diff --git a/tools/editor/icons/icon_segment_shape_2d.png b/tools/editor/icons/icon_segment_shape_2d.png
index c90255a405b771984cab02da107568d62c3a7a75..8f3771be7ab77f4e70bed1c0e897b8cad7318729 100644
GIT binary patch
delta 195
zcmV;!06hQv0r3HlHh-o`L_t(IjjhtZX@XG{#^L9F5u8A$&?>csSOg+ChmGr~i{t}A
zN3gSS1jzy+h@LbdApW~o^Y+gV4ji6bDh1<3v>nwce9hiduPVj|E8#V0LUv$MN6Wzy
z9bsFA5t%1U>S*m*p(|`F`qN?BWd&~GyMcT7W*`S&4dmjBfjkm?7AVChfk*IP;86?>
x*z<udHW~)gxAd8V`F-WYw`A?bU|xX#Wj_q0Wfu+dBPRd=002ovPDHLkV1hceSGE8E

delta 206
zcmV;<05SjZ0sH}wHh-~6L_t(Ijjhr#3c^4Th2i&Bh)pcxB~0Z71W^QS>;=J#rSJ+$
zKywE>Ax99~Ekq?dHWCmunT@{w`(a>!A4gxX-r25kW=oOFVj2#NFK#(z1o{HD0YDu{
zQX3h^J-{A_{4O#FlqV#qjRG<w7=y@fg^X6S@T3Y<;o3kQu15@L@YjGAe+>BGw}3Bx
z2{gfFpeY8PpBTVw2*!XM3%a2emjObq0vrk><K?7t*5beH0rAsy6LX?Lw*UYD07*qo
IM6N<$f=2dK{Qv*}

diff --git a/tools/editor/icons/source/icon_capsule_shape_2d.svg b/tools/editor/icons/source/icon_capsule_shape_2d.svg
index 03ac3f8255f..13c66483683 100644
--- a/tools/editor/icons/source/icon_capsule_shape_2d.svg
+++ b/tools/editor/icons/source/icon_capsule_shape_2d.svg
@@ -40,8 +40,8 @@
      showgrid="true"
      inkscape:current-layer="layer1"
      inkscape:document-units="px"
-     inkscape:cy="10.812487"
-     inkscape:cx="8.3752367"
+     inkscape:cy="10.749987"
+     inkscape:cx="2.8752365"
      inkscape:zoom="31.999999"
      inkscape:pageshadow="2"
      inkscape:pageopacity="0.0"
@@ -73,7 +73,7 @@
      inkscape:groupmode="layer"
      inkscape:label="Layer 1">
     <path
-       style="opacity:1;fill:#a5b7f4;fill-opacity:0.98823529;stroke:none;stroke-width:4;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       style="opacity:1;fill:#68b6ff;fill-opacity:1;stroke:none;stroke-width:4;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        d="M 8 1 A 4 4 0 0 0 4 5 L 4 11 A 4 4 0 0 0 8 15 A 4 4 0 0 0 12 11 L 12 5 A 4 4 0 0 0 8 1 z M 8 3 A 2.0000174 2.0000174 0 0 1 10 5 L 10 11 A 2.0000174 2.0000174 0 0 1 8 13 A 2.0000174 2.0000174 0 0 1 6 11 L 6 5 A 2.0000174 2.0000174 0 0 1 8 3 z "
        transform="translate(0,1036.3622)"
        id="path4135" />
diff --git a/tools/editor/icons/source/icon_circle_shape_2d.svg b/tools/editor/icons/source/icon_circle_shape_2d.svg
index 4f81ae0e627..56ac5386723 100644
--- a/tools/editor/icons/source/icon_circle_shape_2d.svg
+++ b/tools/editor/icons/source/icon_circle_shape_2d.svg
@@ -1,21 +1,82 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
-<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" sodipodi:docname="icon_circle_shape_2d.svg" inkscape:export-ydpi="90" inkscape:export-xdpi="90" inkscape:export-filename="/home/djrm/Projects/godot/tools/editor/icons/icon_box_shape.png" inkscape:version="0.91 r13725" version="1.1" id="svg2" viewBox="0 0 16 16" height="16" width="16">
- <sodipodi:namedview inkscape:snap-smooth-nodes="false" inkscape:object-nodes="false" inkscape:snap-intersection-paths="false" inkscape:object-paths="false" inkscape:window-maximized="1" inkscape:window-y="0" inkscape:window-x="0" inkscape:window-height="1055" inkscape:window-width="1920" inkscape:snap-center="true" inkscape:snap-object-midpoints="true" inkscape:snap-bbox-midpoints="true" inkscape:snap-bbox-edge-midpoints="true" inkscape:bbox-nodes="true" inkscape:bbox-paths="true" inkscape:snap-bbox="true" units="px" showgrid="true" inkscape:current-layer="layer1" inkscape:document-units="px" inkscape:cy="11.031037" inkscape:cx="-1.7366522" inkscape:zoom="22.627416" inkscape:pageshadow="2" inkscape:pageopacity="0.0" borderopacity="1.0" bordercolor="#666666" pagecolor="#ffffff" id="base">
-  <inkscape:grid id="grid3336" type="xygrid" empspacing="4" />
- </sodipodi:namedview>
- <defs id="defs4" />
- <metadata id="metadata7">
-  <rdf:RDF>
-   <cc:Work rdf:about="">
-    <dc:format>image/svg+xml</dc:format>
-    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-    <dc:title></dc:title>
-   </cc:Work>
-  </rdf:RDF>
- </metadata>
- <g transform="translate(0,-1036.3622)" id="layer1" inkscape:groupmode="layer" inkscape:label="Layer 1">
-  <path style="opacity:1;fill:none;fill-opacity:1;stroke:#a5b7f3;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.98823529" d="m 8,1038.3622 a 6,6 0 0 0 -6,6 6,6 0 0 0 6,6 6,6 0 0 0 6,-6 6,6 0 0 0 -6,-6 z" id="path4157" inkscape:connector-curvature="0" />
- </g>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   sodipodi:docname="icon_circle_shape_2d.svg"
+   inkscape:export-ydpi="90"
+   inkscape:export-xdpi="90"
+   inkscape:export-filename="/home/djrm/Projects/godot/tools/editor/icons/icon_box_shape.png"
+   inkscape:version="0.91 r13725"
+   version="1.1"
+   id="svg2"
+   viewBox="0 0 16 16"
+   height="16"
+   width="16">
+  <sodipodi:namedview
+     inkscape:snap-smooth-nodes="false"
+     inkscape:object-nodes="false"
+     inkscape:snap-intersection-paths="false"
+     inkscape:object-paths="false"
+     inkscape:window-maximized="1"
+     inkscape:window-y="27"
+     inkscape:window-x="0"
+     inkscape:window-height="1016"
+     inkscape:window-width="1920"
+     inkscape:snap-center="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:bbox-nodes="true"
+     inkscape:bbox-paths="true"
+     inkscape:snap-bbox="true"
+     units="px"
+     showgrid="true"
+     inkscape:current-layer="layer1"
+     inkscape:document-units="px"
+     inkscape:cy="10.942649"
+     inkscape:cx="-9.5148271"
+     inkscape:zoom="22.627416"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base">
+    <inkscape:grid
+       id="grid3336"
+       type="xygrid"
+       empspacing="4" />
+  </sodipodi:namedview>
+  <defs
+     id="defs4" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(0,-1036.3622)"
+     id="layer1"
+     inkscape:groupmode="layer"
+     inkscape:label="Layer 1">
+    <path
+       style="opacity:1;fill:none;fill-opacity:1;stroke:#68b6ff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 8,1038.3622 a 6,6 0 0 0 -6,6 6,6 0 0 0 6,6 6,6 0 0 0 6,-6 6,6 0 0 0 -6,-6 z"
+       id="path4157"
+       inkscape:connector-curvature="0" />
+  </g>
 </svg>
diff --git a/tools/editor/icons/source/icon_concave_polygon_shape_2d.svg b/tools/editor/icons/source/icon_concave_polygon_shape_2d.svg
index 79e71425f7e..624105e5a8a 100644
--- a/tools/editor/icons/source/icon_concave_polygon_shape_2d.svg
+++ b/tools/editor/icons/source/icon_concave_polygon_shape_2d.svg
@@ -1,21 +1,83 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
-<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="16" height="16" viewBox="0 0 16 16" id="svg2" version="1.1" inkscape:version="0.91 r13725" inkscape:export-filename="/home/djrm/Projects/godot/tools/editor/icons/icon_collision_shape_2d.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90" sodipodi:docname="icon_concave_polygon_shape_2d.svg">
- <defs id="defs4" />
- <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="22.627416" inkscape:cx="-0.53108971" inkscape:cy="10.128279" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" units="px" inkscape:snap-bbox="true" inkscape:bbox-paths="true" inkscape:bbox-nodes="true" inkscape:snap-bbox-edge-midpoints="true" inkscape:snap-bbox-midpoints="true" inkscape:snap-object-midpoints="true" inkscape:snap-center="true" inkscape:window-width="1920" inkscape:window-height="1055" inkscape:window-x="0" inkscape:window-y="0" inkscape:window-maximized="1" inkscape:object-paths="true" inkscape:snap-intersection-paths="true" inkscape:object-nodes="true" inkscape:snap-smooth-nodes="true" inkscape:snap-midpoints="true">
-  <inkscape:grid type="xygrid" id="grid3336" />
- </sodipodi:namedview>
- <metadata id="metadata7">
-  <rdf:RDF>
-   <cc:Work rdf:about="">
-    <dc:format>image/svg+xml</dc:format>
-    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-    <dc:title></dc:title>
-   </cc:Work>
-  </rdf:RDF>
- </metadata>
- <g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" transform="translate(0,-1036.3622)">
-  <path style="fill:none;fill-rule:evenodd;stroke:#a5b7f3;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.98823529" d="m 14,1050.3622 -12,0 0,-12 6,6 6,-6 z" id="path4139" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccc" />
- </g>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   inkscape:export-filename="/home/djrm/Projects/godot/tools/editor/icons/icon_collision_shape_2d.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90"
+   sodipodi:docname="icon_concave_polygon_shape_2d.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="31.999999"
+     inkscape:cx="9.3658684"
+     inkscape:cy="6.9741169"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1016"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3336" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3622)">
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#68b6ff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 14,1050.3622 -12,0 0,-12 6,6 6,-6 z"
+       id="path4139"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccc" />
+  </g>
 </svg>
diff --git a/tools/editor/icons/source/icon_convex_polygon_shape_2d.svg b/tools/editor/icons/source/icon_convex_polygon_shape_2d.svg
index fc84cf931bf..3b55df7fba7 100644
--- a/tools/editor/icons/source/icon_convex_polygon_shape_2d.svg
+++ b/tools/editor/icons/source/icon_convex_polygon_shape_2d.svg
@@ -1,21 +1,83 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
-<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="16" height="16" viewBox="0 0 16 16" id="svg2" version="1.1" inkscape:version="0.91 r13725" inkscape:export-filename="/home/djrm/Projects/godot/tools/editor/icons/icon_collision_shape_2d.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90" sodipodi:docname="icon_convex_polygon_shape_2d.svg">
- <defs id="defs4" />
- <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="22.627416" inkscape:cx="-0.53108971" inkscape:cy="10.128279" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" units="px" inkscape:snap-bbox="true" inkscape:bbox-paths="true" inkscape:bbox-nodes="true" inkscape:snap-bbox-edge-midpoints="true" inkscape:snap-bbox-midpoints="true" inkscape:snap-object-midpoints="true" inkscape:snap-center="true" inkscape:window-width="1920" inkscape:window-height="1055" inkscape:window-x="0" inkscape:window-y="0" inkscape:window-maximized="1" inkscape:object-paths="true" inkscape:snap-intersection-paths="true" inkscape:object-nodes="true" inkscape:snap-smooth-nodes="true" inkscape:snap-midpoints="true">
-  <inkscape:grid type="xygrid" id="grid3336" />
- </sodipodi:namedview>
- <metadata id="metadata7">
-  <rdf:RDF>
-   <cc:Work rdf:about="">
-    <dc:format>image/svg+xml</dc:format>
-    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-    <dc:title></dc:title>
-   </cc:Work>
-  </rdf:RDF>
- </metadata>
- <g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" transform="translate(0,-1036.3622)">
-  <path style="fill:none;fill-rule:evenodd;stroke:#a5b7f3;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.98823529" d="m 14,1050.3622 -12,0 0,-6 6,-6 6,6 z" id="path4139" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccc" />
- </g>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   inkscape:export-filename="/home/djrm/Projects/godot/tools/editor/icons/icon_collision_shape_2d.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90"
+   sodipodi:docname="icon_convex_polygon_shape_2d.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="31.999999"
+     inkscape:cx="3.9121254"
+     inkscape:cy="7.1557164"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1016"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3336" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3622)">
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#68b6ff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 14,1050.3622 -12,0 0,-6 6,-6 6,6 z"
+       id="path4139"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccc" />
+  </g>
 </svg>
diff --git a/tools/editor/icons/source/icon_line_shape_2d.svg b/tools/editor/icons/source/icon_line_shape_2d.svg
index 551439b4f32..6a8ab39ef36 100644
--- a/tools/editor/icons/source/icon_line_shape_2d.svg
+++ b/tools/editor/icons/source/icon_line_shape_2d.svg
@@ -1,23 +1,95 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
-<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="16" height="16" viewBox="0 0 16 16" id="svg2" version="1.1" inkscape:version="0.91 r13725" inkscape:export-filename="/home/djrm/Projects/godot/tools/editor/icons/icon_collision_shape_2d.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90" sodipodi:docname="icon_line_shape_2d.svg">
- <defs id="defs4" />
- <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="22.627416" inkscape:cx="-0.53108971" inkscape:cy="10.128279" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" units="px" inkscape:snap-bbox="true" inkscape:bbox-paths="true" inkscape:bbox-nodes="true" inkscape:snap-bbox-edge-midpoints="true" inkscape:snap-bbox-midpoints="true" inkscape:snap-object-midpoints="true" inkscape:snap-center="true" inkscape:window-width="1920" inkscape:window-height="1055" inkscape:window-x="0" inkscape:window-y="0" inkscape:window-maximized="1" inkscape:object-paths="true" inkscape:snap-intersection-paths="true" inkscape:object-nodes="true" inkscape:snap-smooth-nodes="true" inkscape:snap-midpoints="true">
-  <inkscape:grid type="xygrid" id="grid3336" />
- </sodipodi:namedview>
- <metadata id="metadata7">
-  <rdf:RDF>
-   <cc:Work rdf:about="">
-    <dc:format>image/svg+xml</dc:format>
-    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-    <dc:title></dc:title>
-   </cc:Work>
-  </rdf:RDF>
- </metadata>
- <g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" transform="translate(0,-1036.3622)">
-  <path style="fill:none;fill-rule:evenodd;stroke:#a5b7f3;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.39215687" d="m 1,1037.3622 14,14" id="path4139" inkscape:connector-curvature="0" sodipodi:nodetypes="cc" />
-  <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" id="path4201" d="m 3,1039.3622 10,10" style="fill:none;fill-rule:evenodd;stroke:#a5b7f3;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.58823532" />
-  <path style="fill:none;fill-rule:evenodd;stroke:#a5b7f3;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.98823529" d="m 5,1041.3622 6,6" id="path4203" inkscape:connector-curvature="0" sodipodi:nodetypes="cc" />
- </g>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   inkscape:export-filename="/home/djrm/Projects/godot/tools/editor/icons/icon_collision_shape_2d.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90"
+   sodipodi:docname="icon_line_shape_2d.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.627416"
+     inkscape:cx="0.66215304"
+     inkscape:cy="8.0069586"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1016"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3336" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3622)">
+    <path
+       style="fill:#68b6ff;fill-rule:evenodd;stroke:#68b6ff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.39215687;fill-opacity:1"
+       d="m 1,1037.3622 14,14"
+       id="path4139"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       sodipodi:nodetypes="cc"
+       inkscape:connector-curvature="0"
+       id="path4201"
+       d="m 3,1039.3622 10,10"
+       style="fill:none;fill-rule:evenodd;stroke:#68b6ff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.58823532" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#68b6ff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 5,1041.3622 6,6"
+       id="path4203"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+  </g>
 </svg>
diff --git a/tools/editor/icons/source/icon_ray_shape_2d.svg b/tools/editor/icons/source/icon_ray_shape_2d.svg
index e6ac9c40fa8..7ffc2ff3b51 100644
--- a/tools/editor/icons/source/icon_ray_shape_2d.svg
+++ b/tools/editor/icons/source/icon_ray_shape_2d.svg
@@ -1,22 +1,89 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
-<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="16" height="16" viewBox="0 0 16 16" id="svg2" version="1.1" inkscape:version="0.91 r13725" inkscape:export-filename="/home/djrm/Projects/godot/tools/editor/icons/icon_collision_shape_2d.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90" sodipodi:docname="icon_ray_shape_2d.svg">
- <defs id="defs4" />
- <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="1" inkscape:cx="-0.53108971" inkscape:cy="10.128279" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" units="px" inkscape:snap-bbox="true" inkscape:bbox-paths="true" inkscape:bbox-nodes="true" inkscape:snap-bbox-edge-midpoints="true" inkscape:snap-bbox-midpoints="true" inkscape:snap-object-midpoints="true" inkscape:snap-center="true" inkscape:window-width="1920" inkscape:window-height="1055" inkscape:window-x="0" inkscape:window-y="0" inkscape:window-maximized="1" inkscape:object-paths="true" inkscape:snap-intersection-paths="true" inkscape:object-nodes="true" inkscape:snap-smooth-nodes="true" inkscape:snap-midpoints="true">
-  <inkscape:grid type="xygrid" id="grid3336" />
- </sodipodi:namedview>
- <metadata id="metadata7">
-  <rdf:RDF>
-   <cc:Work rdf:about="">
-    <dc:format>image/svg+xml</dc:format>
-    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-    <dc:title></dc:title>
-   </cc:Work>
-  </rdf:RDF>
- </metadata>
- <g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" transform="translate(0,-1036.3622)">
-  <path style="fill:none;fill-rule:evenodd;stroke:#a5b7f3;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.98823529" d="m 8,1038.3622 0,12" id="path4203" inkscape:connector-curvature="0" sodipodi:nodetypes="cc" />
-  <path sodipodi:nodetypes="ccc" inkscape:connector-curvature="0" id="path4224" d="m 5,1047.3622 3,3 3,-3" style="fill:none;fill-rule:evenodd;stroke:#a5b7f3;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.98823529" />
- </g>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   inkscape:export-filename="/home/djrm/Projects/godot/tools/editor/icons/icon_collision_shape_2d.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90"
+   sodipodi:docname="icon_ray_shape_2d.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="16"
+     inkscape:cx="-3.626492"
+     inkscape:cy="10.256723"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1016"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3336" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3622)">
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#68b6ff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 8,1038.3622 0,12"
+       id="path4203"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       sodipodi:nodetypes="ccc"
+       inkscape:connector-curvature="0"
+       id="path4224"
+       d="m 5,1047.3622 3,3 3,-3"
+       style="fill:none;fill-rule:evenodd;stroke:#68b6ff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  </g>
 </svg>
diff --git a/tools/editor/icons/source/icon_rectangle_shape_2d.svg b/tools/editor/icons/source/icon_rectangle_shape_2d.svg
index dd0941fe853..d362944e7a0 100644
--- a/tools/editor/icons/source/icon_rectangle_shape_2d.svg
+++ b/tools/editor/icons/source/icon_rectangle_shape_2d.svg
@@ -1,21 +1,86 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
-<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="16" height="16" viewBox="0 0 16 16" id="svg2" version="1.1" inkscape:version="0.91 r13725" inkscape:export-filename="/home/djrm/Projects/godot/tools/editor/icons/icon_collision_shape_2d.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90" sodipodi:docname="icon_rectangle_shape_2d.svg">
- <defs id="defs4" />
- <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="52.6875" inkscape:cx="8" inkscape:cy="8" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" units="px" inkscape:snap-bbox="true" inkscape:bbox-paths="true" inkscape:bbox-nodes="true" inkscape:snap-bbox-edge-midpoints="true" inkscape:snap-bbox-midpoints="true" inkscape:snap-object-midpoints="true" inkscape:snap-center="true" inkscape:window-width="1920" inkscape:window-height="1055" inkscape:window-x="0" inkscape:window-y="0" inkscape:window-maximized="1" inkscape:object-paths="true" inkscape:snap-intersection-paths="true" inkscape:object-nodes="true" inkscape:snap-smooth-nodes="true" inkscape:snap-midpoints="true">
-  <inkscape:grid type="xygrid" id="grid3336" />
- </sodipodi:namedview>
- <metadata id="metadata7">
-  <rdf:RDF>
-   <cc:Work rdf:about="">
-    <dc:format>image/svg+xml</dc:format>
-    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-    <dc:title></dc:title>
-   </cc:Work>
-  </rdf:RDF>
- </metadata>
- <g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" transform="translate(0,-1036.3622)">
-  <rect style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:none;fill-opacity:0.98823529;fill-rule:evenodd;stroke:#a5b7f3;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:0.98823529;marker:none;enable-background:accumulate" id="rect4226" width="12" height="7.9999824" x="2" y="1040.3622" rx="1.7382812e-05" ry="1.7382812e-05" />
- </g>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   inkscape:export-filename="/home/djrm/Projects/godot/tools/editor/icons/icon_collision_shape_2d.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90"
+   sodipodi:docname="icon_rectangle_shape_2d.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="52.6875"
+     inkscape:cx="4.6595492"
+     inkscape:cy="7.9620403"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1016"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3336" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3622)">
+    <rect
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:none;fill-opacity:0.98823529;fill-rule:evenodd;stroke:#68b6ff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate"
+       id="rect4226"
+       width="12"
+       height="7.9999824"
+       x="2"
+       y="1040.3622"
+       rx="1.7382812e-05"
+       ry="1.7382812e-05" />
+  </g>
 </svg>
diff --git a/tools/editor/icons/source/icon_segment_shape_2d.svg b/tools/editor/icons/source/icon_segment_shape_2d.svg
index 99c8f80e9b4..b509a31362d 100644
--- a/tools/editor/icons/source/icon_segment_shape_2d.svg
+++ b/tools/editor/icons/source/icon_segment_shape_2d.svg
@@ -1,21 +1,82 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
-<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="16" height="16" viewBox="0 0 16 16" id="svg2" version="1.1" inkscape:version="0.91 r13725" inkscape:export-filename="/home/djrm/Projects/godot/tools/editor/icons/icon_collision_shape_2d.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90" sodipodi:docname="icon_segment_shape_2d.svg">
- <defs id="defs4" />
- <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="52.6875" inkscape:cx="8" inkscape:cy="8" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" units="px" inkscape:snap-bbox="true" inkscape:bbox-paths="true" inkscape:bbox-nodes="true" inkscape:snap-bbox-edge-midpoints="true" inkscape:snap-bbox-midpoints="true" inkscape:snap-object-midpoints="true" inkscape:snap-center="true" inkscape:window-width="1920" inkscape:window-height="1055" inkscape:window-x="0" inkscape:window-y="0" inkscape:window-maximized="1" inkscape:object-paths="true" inkscape:snap-intersection-paths="true" inkscape:object-nodes="true" inkscape:snap-smooth-nodes="true" inkscape:snap-midpoints="true">
-  <inkscape:grid type="xygrid" id="grid3336" />
- </sodipodi:namedview>
- <metadata id="metadata7">
-  <rdf:RDF>
-   <cc:Work rdf:about="">
-    <dc:format>image/svg+xml</dc:format>
-    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-    <dc:title></dc:title>
-   </cc:Work>
-  </rdf:RDF>
- </metadata>
- <g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" transform="translate(0,-1036.3622)">
-  <path style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#a4b6f2;fill-opacity:1;fill-rule:evenodd;stroke:#a5b7f4;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:0.98823529;marker:none;enable-background:accumulate" d="m 2,1050.3622 12,-12" id="path4268" inkscape:connector-curvature="0" />
- </g>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   inkscape:export-filename="/home/djrm/Projects/godot/tools/editor/icons/icon_collision_shape_2d.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90"
+   sodipodi:docname="icon_segment_shape_2d.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="52.6875"
+     inkscape:cx="5.5326216"
+     inkscape:cy="8.6453144"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1016"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3336" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3622)">
+    <path
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#68b6ff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate"
+       d="m 2,1050.3622 12,-12"
+       id="path4268"
+       inkscape:connector-curvature="0" />
+  </g>
 </svg>