From 90e2feb9772829cb5631fcb5e6d7ec16ce6be938 Mon Sep 17 00:00:00 2001
From: David Back <davidback@highfidelity.io>
Date: Mon, 7 Jan 2019 14:04:11 -0800
Subject: [PATCH] replace placeholder icon with real icon from Alan

---
 interface/resources/fonts/hifi-glyphs.ttf     | Bin 33952 -> 34396 bytes
 .../icons/create-icons/142-grid-01.svg        |  12 ++++++++++++
 .../resources/qml/hifi/tablet/EditTabView.qml |   2 +-
 .../qml/hifi/tablet/EditToolsTabView.qml      |   2 +-
 scripts/system/html/js/includes.js            |   2 +-
 5 files changed, 15 insertions(+), 3 deletions(-)
 create mode 100644 interface/resources/icons/create-icons/142-grid-01.svg

diff --git a/interface/resources/fonts/hifi-glyphs.ttf b/interface/resources/fonts/hifi-glyphs.ttf
index c27553333bda29cdfd06e4c1ebdd964b83ff6175..aaeb1d2ace9c0f76f01de9035c05cf1af5f44df3 100644
GIT binary patch
delta 935
zcmZ8fOK4L;6g~IlWy~|$p*BgYR&5iTUkx^SdHLA-S=826gMz6jeo9DUUeneTjao}%
zsz|L=5qwxbxNuQ$BUOp$Mi4i;QK_yJU39G?-BiSl@|qyxz?^en=AL_oJ9jS$pDznV
z5P;<vg8_RwI^wa>`N<hzd>erJ&i3sccm)QGHvnkZy?0|^_p@CEfc68}mmEwC-Fxt$
z2N1pi!dND8V(9m87=ZCQ0H(~qnWI;vrfz^u1E)8r=|rmfo#zvP&j3QInl2{97McUd
z0${y5m>+Juzv>1+4*_Z$$R!hB_r09}i~|6L1{1?W_(?|qis*rkB?i;|u5(X-!mM61
zlsl1E7Uq8e#W8^0Tznh>_WGrkUf#9<vjBa4IFQekS;*(E(Pp}>ZK1;yDczwM$ua2W
zhRUvAGy#pku&C-G>H%Pa31zplbCFV=p_2?ZajSGhj0j?@t#zt2#U@Ys42Yqdp3-Af
zVHISc$?jBw;gB4twOK7on8D7h7F!^s1YOQ0+Vf0ZI|)0pO1LW)3@YKS)_D9>-0SHP
zT_%fZMUBN>Q@y@}31W5ivZ`p6(4CESDM~1)BelmjwZ-GnHgEH^HlJBp1dNElPqXwI
z2hocpGUx}I^k&VZ$Q2Gc9riWkP=XFS`-k;htz>oBtrpuqY_Z9K%_RTN6)%_7p*Uo#
z!>Y*EqU=y)dch>__39uop5{zaIg>n0;vNr|SQ#Y7Rf+MG#CS84c=OuSxT>n>Q>pI~
z<5`Ju{l44HB~}KB@&1aFd-3Ei=uQ*aY*w!q0Bzl<+vUW?@&qBmjF%N{gc)Bdn!!v}
z+Og3_*Dgf$DT@+B*f3MkM%eJaq8V)Xq47ek_GYw~hv9=CJ_OJLKcd>!LW3#n^ZNoV
z{;2k-;MA@bc4!|94RpKotI$FsU8kv%x46+*vplJ$ll{JA-|^%?IwfX~_ocK$7uL`%
OZREmg^WX28&;0>Eq`H{^

delta 552
zcmY+CKWGzC9LGPu%jK*D6>Ev2Q4$g35|X<ireJl^)WOn#T12$rX#OFM4K|gE$z6pY
zYMnf!85~R&2SJ4sCqWmtinvI?4s{X1#YHEfa+h0t@O$qA@4YX-&*N=8RG!{fYy{ZB
z3Ly&l{DrAjvoZ>u4iK9>eJ0NbH0YFo`1JX-G5z-3ZIDaA%v{}UJd3_?LHPknt7<Mb
zwzddC=L#@VoxfGtR(OyAtqV){YGt#u`=WXZ*Z{J%TG=+$jBJ980Y_@}=5nIAzX<XQ
zBsae>XTE&z+<<Ti#HgFg4gScix92r<-K>|dRYpHTD-QCev9Q=&d;Tp9?Ez?ad^v&d
zk7vFXcb)i6M8O+_17>fyDrWDIOi0%`DOV-yK9MO&;~DrB^8=8ZgnWvj%4N@t5r#?D
zX4Z{`CdI9)#}&7)tu8sA+eeefSRGzPCBk~ZVIuqrSR*21&LJz2EHLiHtJ_hD@;cx!
zQ3e5PMEUEyv-Ub|tGLHNCx!0M1{rj6&QB{IG4zzKr;LoABRIR$8Mn_mwtZN-Zr{#`
g`(-5^_S~F(cMm4l5L5_6yl=qzME}$O?_>7<0Uo1uSpWb4

diff --git a/interface/resources/icons/create-icons/142-grid-01.svg b/interface/resources/icons/create-icons/142-grid-01.svg
new file mode 100644
index 0000000000..b4353c1caa
--- /dev/null
+++ b/interface/resources/icons/create-icons/142-grid-01.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
+<path d="M448.8,273.5c8.3,0,15-6.7,15-15s-6.7-15-15-15h-42.3V137.5h42.3c8.3,0,15-6.7,15-15s-6.7-15-15-15h-42.3V67.1
+	c0-8.3-6.7-15-15-15s-15,6.7-15,15v40.3H276.3V67.1c0-8.3-6.7-15-15-15s-15,6.7-15,15v40.3H142.2V67.1c0-8.3-6.7-15-15-15
+	s-15,6.7-15,15v40.3H70.9c-8.3,0-15,6.7-15,15s6.7,15,15,15h41.3v106.1H70.9c-8.3,0-15,6.7-15,15s6.7,15,15,15h41.3v104.1H70.9
+	c-8.3,0-15,6.7-15,15s6.7,15,15,15h41.3V448c0,8.3,6.7,15,15,15s15-6.7,15-15v-40.3h104.1V448c0,8.3,6.7,15,15,15s15-6.7,15-15
+	v-40.3h100.1V448c0,8.3,6.7,15,15,15s15-6.7,15-15v-40.3h42.3c8.3,0,15-6.7,15-15s-6.7-15-15-15h-42.3V273.5H448.8z M376.4,137.5
+	v106.1H276.3V137.5H376.4z M142.2,137.5h104.1v106.1H142.2V137.5z M142.2,377.7V273.5h104.1v104.1H142.2z M376.4,377.7H276.3V273.5
+	h100.1V377.7z"/>
+</svg>
diff --git a/interface/resources/qml/hifi/tablet/EditTabView.qml b/interface/resources/qml/hifi/tablet/EditTabView.qml
index c6b66ae24d..122d87250c 100644
--- a/interface/resources/qml/hifi/tablet/EditTabView.qml
+++ b/interface/resources/qml/hifi/tablet/EditTabView.qml
@@ -192,7 +192,7 @@ TabBar {
                         }
                         
                         NewEntityButton {
-                            icon: "icons/create-icons/21-cube-01.svg"
+                            icon: "icons/create-icons/142-grid-01.svg"
                             text: "GRID"
                             onClicked: {
                                 editRoot.sendToScript({
diff --git a/interface/resources/qml/hifi/tablet/EditToolsTabView.qml b/interface/resources/qml/hifi/tablet/EditToolsTabView.qml
index 9db09cd229..8da2e839ce 100644
--- a/interface/resources/qml/hifi/tablet/EditToolsTabView.qml
+++ b/interface/resources/qml/hifi/tablet/EditToolsTabView.qml
@@ -198,7 +198,7 @@ TabBar {
                         }
                         
                         NewEntityButton {
-                            icon: "icons/create-icons/21-cube-01.svg"
+                            icon: "icons/create-icons/142-grid-01.svg"
                             text: "GRID"
                             onClicked: {
                                 editRoot.sendToScript({
diff --git a/scripts/system/html/js/includes.js b/scripts/system/html/js/includes.js
index 01fce937bf..c604115f91 100644
--- a/scripts/system/html/js/includes.js
+++ b/scripts/system/html/js/includes.js
@@ -10,7 +10,7 @@
 
 const ENTITY_TYPE_ICON = {
     Box: "m",
-    Grid: "m",
+    Grid: "&#xe038;",
     Image: "&#xe02a;",
     Light: "p",
     Material: "&#xe00b;",