diff --git a/packages/builder/src/components/design/PropertiesPanel/SettingsView.svelte b/packages/builder/src/components/design/PropertiesPanel/SettingsView.svelte
index 0939876270..a53740935a 100644
--- a/packages/builder/src/components/design/PropertiesPanel/SettingsView.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/SettingsView.svelte
@@ -54,7 +54,10 @@
     number: Input,
     event: EventsEditor,
     table: TableSelect,
+    color: ColorPicker,
+    icon: IconSelect,
   }
+
   const getControl = type => {
     return controlMap[type]
   }
diff --git a/packages/standard-components/manifest.json b/packages/standard-components/manifest.json
index 954d4ba0b3..49fdd3f2e8 100644
--- a/packages/standard-components/manifest.json
+++ b/packages/standard-components/manifest.json
@@ -29,10 +29,9 @@
       }
     ]
   },
-  "grid": {
+  "datagrid": {
     "name": "Grid",
-    "description":
-      "A datagrid component with functionality to add, remove and edit rows.",
+    "description": "A datagrid component with functionality to add, remove and edit rows.",
     "icon": "ri-grid-line",
     "styleable": true,
     "settings": [
@@ -73,6 +72,7 @@
   },
   "screenslot": {
     "name": "Screenslot",
+    "icon": "ri-artboard-2-line",
     "description": "Contains your app screens",
     "styleable": true
   },
@@ -344,6 +344,7 @@
     ]
   },
   "login": {
+    "name": "Login Form",
     "description": "A component that automatically generates a login screen for your app.",
     "icon": "ri-login-box-line",
     "styleable": true,
diff --git a/packages/standard-components/src/index.js b/packages/standard-components/src/index.js
index be2fbf7878..c506b08564 100644
--- a/packages/standard-components/src/index.js
+++ b/packages/standard-components/src/index.js
@@ -2,7 +2,7 @@ import "@budibase/bbui/dist/bbui.css"
 import "flatpickr/dist/flatpickr.css"
 
 export { default as container } from "./Container.svelte"
-export { default as grid } from "./grid/Component.svelte"
+export { default as datagrid } from "./grid/Component.svelte"
 export { default as screenslot } from "./ScreenSlot.svelte"
 export { default as button } from "./Button.svelte"
 export { default as input } from "./Input.svelte"