diff --git a/interface/resources/icons/create-icons/142-grid-01.svg b/interface/resources/icons/create-icons/142-grid-01.svg
deleted file mode 100644
index b4353c1caa..0000000000
--- a/interface/resources/icons/create-icons/142-grid-01.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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 122d87250c..5959725a6a 100644
--- a/interface/resources/qml/hifi/tablet/EditTabView.qml
+++ b/interface/resources/qml/hifi/tablet/EditTabView.qml
@@ -190,18 +190,6 @@ TabBar {
                                 editTabView.currentIndex = 2
                             }
                         }
-                        
-                        NewEntityButton {
-                            icon: "icons/create-icons/142-grid-01.svg"
-                            text: "GRID"
-                            onClicked: {
-                                editRoot.sendToScript({
-                                    method: "newEntityButtonClicked",
-                                    params: { buttonName: "newGridButton" }
-                                });
-                                editTabView.currentIndex = 2
-                            }
-                        }
                     }
 
                     HifiControls.Button {
diff --git a/interface/resources/qml/hifi/tablet/EditToolsTabView.qml b/interface/resources/qml/hifi/tablet/EditToolsTabView.qml
index 8da2e839ce..6b64520feb 100644
--- a/interface/resources/qml/hifi/tablet/EditToolsTabView.qml
+++ b/interface/resources/qml/hifi/tablet/EditToolsTabView.qml
@@ -196,18 +196,6 @@ TabBar {
                                 editTabView.currentIndex = tabIndex.properties
                             }
                         }
-                        
-                        NewEntityButton {
-                            icon: "icons/create-icons/142-grid-01.svg"
-                            text: "GRID"
-                            onClicked: {
-                                editRoot.sendToScript({
-                                    method: "newEntityButtonClicked",
-                                    params: { buttonName: "newGridButton" }
-                                });
-                                editTabView.currentIndex = tabIndex.properties
-                            }
-                        }
                     }
 
                     HifiControls.Button {
diff --git a/scripts/system/edit.js b/scripts/system/edit.js
index 2bbbd60c23..36f9af0ea7 100644
--- a/scripts/system/edit.js
+++ b/scripts/system/edit.js
@@ -892,12 +892,6 @@ var toolBar = (function () {
         });
 
         addButton("newMaterialButton", createNewEntityDialogButtonCallback("Material"));
-        
-        addButton("newGridButton", function () {
-            createNewEntity({
-                type: "Grid",
-            });
-        });
 
         var deactivateCreateIfDesktopWindowsHidden = function() {
             if (!shouldUseEditTabletApp() && !entityListTool.isVisible() && !createToolsWindow.isVisible()) {
diff --git a/scripts/system/html/js/entityProperties.js b/scripts/system/html/js/entityProperties.js
index 662d883bd2..b7d64e4009 100644
--- a/scripts/system/html/js/entityProperties.js
+++ b/scripts/system/html/js/entityProperties.js
@@ -653,7 +653,8 @@ const GROUPS = [
             {
                 label: "Color",
                 type: "color",
-                propertyID: "color",
+                propertyID: "gridColor",
+                propertyName: "color", // actual entity property name
             },
             {
                 label: "Follow Camera",