diff --git a/Projects/TensorFlow/Icons/configuration.png b/Projects/TensorFlow/Icons/configuration.png
new file mode 100644
index 000000000..b9edd20c9
Binary files /dev/null and b/Projects/TensorFlow/Icons/configuration.png differ
diff --git a/Projects/TensorFlow/Schemas/AppSchema.json b/Projects/TensorFlow/Schemas/AppSchema.json
index a9033d28f..9bd5d1e65 100644
--- a/Projects/TensorFlow/Schemas/AppSchema.json
+++ b/Projects/TensorFlow/Schemas/AppSchema.json
@@ -1457,6 +1457,14 @@
     {
         "type": "Input Layer",
         "menuItems": [
+            {
+                "action": "Add UI Object",
+                "disableIfPropertyIsDefined": true,
+                "propertyToCheckFor": "inputShape",
+                "label": "Add Input Shape",
+                "relatedUiObject": "Input Shape",
+                "actionFunction": "payload.executeAction"
+            },
             {
                 "action": "Delete UI Object",
                 "askConfirmation": true,
@@ -1479,6 +1487,47 @@
             "compatibleTypes": "->Secuential Model->"
         },
         "propertyNameAtParent": "inputLayer",
+        "childrenNodesProperties": [
+            {
+                "name": "inputShape",
+                "type": "node",
+                "childType": "Input Shape"
+            }
+        ],
+        "icon": "tensorflow"
+    },
+    {
+        "type": "Input Shape",
+        "menuItems": [
+            {
+                "action": "Configure",
+                "label": "Configure",
+                "iconPathOn": "configuration",
+                "iconPathOff": "configuration",
+                "actionFunction": "uiObject.configEditor.activate"
+            },
+            {
+                "action": "Delete UI Object",
+                "askConfirmation": true,
+                "confirmationLabel": "Confirm to Delete",
+                "label": "Delete",
+                "iconPathOn": "delete-entity",
+                "iconPathOff": "delete-entity",
+                "actionFunction": "payload.executeAction"
+            }
+        ],
+        "editors": {
+            "config": true
+        },
+        "initialValues": {
+            "config": "{ \n  \"value\": 1\n}"
+        },
+        "addLeftIcons": true,
+        "level": 3,
+        "attachingRules": {
+            "compatibleTypes": "->Input Layer->"
+        },
+        "propertyNameAtParent": "inputShape",
         "childrenNodesProperties": [],
         "icon": "tensorflow"
     },
diff --git a/Projects/TensorFlow/Schemas/Docs-Nodes/input-shape.json b/Projects/TensorFlow/Schemas/Docs-Nodes/input-shape.json
new file mode 100644
index 000000000..c6a6286ef
--- /dev/null
+++ b/Projects/TensorFlow/Schemas/Docs-Nodes/input-shape.json
@@ -0,0 +1,13 @@
+{
+    "type": "Input Shape",
+    "definition": {
+        "text": "The first layer in the model needs an inputShape. Make sure you exclude the batch size when providing the inputShape. For example, if you plan to feed the model tensors of shape [B, 784], where B can be any batch size, specify inputShape as [784] when creating the model.",
+        "updated": 1613220197721
+    },
+    "paragraphs": [
+        {
+            "style": "Text",
+            "text": "Left click and select the pencil button to enter edit mode."
+        }
+    ]
+}
\ No newline at end of file