diff --git a/frontend/packages/erd-core/src/components/ERDRenderer/ERDContent/TableNode/TableNode.tsx b/frontend/packages/erd-core/src/components/ERDRenderer/ERDContent/TableNode/TableNode.tsx
index 4482ec9a7..b3a0d5edc 100644
--- a/frontend/packages/erd-core/src/components/ERDRenderer/ERDContent/TableNode/TableNode.tsx
+++ b/frontend/packages/erd-core/src/components/ERDRenderer/ERDContent/TableNode/TableNode.tsx
@@ -1,5 +1,7 @@
 import type { Table } from '@liam-hq/db-structure'
 import {
+  DiamondFillIcon,
+  DiamondIcon,
   DrawerClose,
   DrawerContent,
   DrawerPortal,
@@ -39,6 +41,25 @@ export const TableNode: FC<Props> = ({ data: { table } }) => {
                       />
                     )}
                   </span>
+                  {!column.primary && (
+                    <span>
+                      {column.notNull ? (
+                        <DiamondFillIcon
+                          width={16}
+                          height={16}
+                          role="img"
+                          aria-label="Not Null"
+                        />
+                      ) : (
+                        <DiamondIcon
+                          width={16}
+                          height={16}
+                          role="img"
+                          aria-label="Nullable"
+                        />
+                      )}
+                    </span>
+                  )}
                   <span> </span>
                   <span>{column.name}</span>
                   <span> </span>
diff --git a/frontend/packages/ui/src/icons/DiamondFillIcon.tsx b/frontend/packages/ui/src/icons/DiamondFillIcon.tsx
new file mode 100644
index 000000000..d90a302f4
--- /dev/null
+++ b/frontend/packages/ui/src/icons/DiamondFillIcon.tsx
@@ -0,0 +1,25 @@
+import type { ComponentPropsWithoutRef, FC } from 'react'
+
+type Props = ComponentPropsWithoutRef<'svg'>
+
+export const DiamondFillIcon: FC<Props> = (props) => {
+  return (
+    <svg
+      role="img"
+      aria-label="DiamondFill"
+      width="24"
+      height="24"
+      viewBox="0 0 24 24"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+      {...props}
+    >
+      <path
+        fill-rule="evenodd"
+        clip-rule="evenodd"
+        d="M3.39608 13.3961C2.62505 12.625 2.62505 11.375 3.39608 10.6039L10.5034 3.49659C11.2744 2.72555 12.5245 2.72555 13.2956 3.49659L20.4029 10.6039C21.1739 11.375 21.1739 12.625 20.4029 13.3961L13.2956 20.5034C12.5245 21.2744 11.2744 21.2744 10.5034 20.5034L3.39608 13.3961Z"
+        fill="black"
+      />
+    </svg>
+  )
+}
diff --git a/frontend/packages/ui/src/icons/DiamondIcon.tsx b/frontend/packages/ui/src/icons/DiamondIcon.tsx
new file mode 100644
index 000000000..e9cbc5466
--- /dev/null
+++ b/frontend/packages/ui/src/icons/DiamondIcon.tsx
@@ -0,0 +1,25 @@
+import type { ComponentPropsWithoutRef, FC } from 'react'
+
+type Props = ComponentPropsWithoutRef<'svg'>
+
+export const DiamondIcon: FC<Props> = (props) => {
+  return (
+    <svg
+      role="img"
+      aria-label="Diamond"
+      width="24"
+      height="24"
+      viewBox="0 0 24 24"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+      {...props}
+    >
+      <path
+        fill-rule="evenodd"
+        clip-rule="evenodd"
+        d="M4.15758 11.3654C3.80711 11.7159 3.80711 12.2841 4.15758 12.6346L11.2649 19.7419C11.6154 20.0924 12.1836 20.0924 12.5341 19.7419L19.6414 12.6346C19.9919 12.2841 19.9919 11.7159 19.6414 11.3654L12.5341 4.25809C12.1836 3.90762 11.6154 3.90762 11.2649 4.25809L4.15758 11.3654ZM3.39608 13.3961C2.62505 12.625 2.62505 11.375 3.39608 10.6039L10.5034 3.49659C11.2744 2.72555 12.5245 2.72555 13.2956 3.49659L20.4029 10.6039C21.1739 11.375 21.1739 12.625 20.4029 13.3961L13.2956 20.5034C12.5245 21.2744 11.2744 21.2744 10.5034 20.5034L3.39608 13.3961Z"
+        fill="black"
+      />
+    </svg>
+  )
+}
diff --git a/frontend/packages/ui/src/icons/index.ts b/frontend/packages/ui/src/icons/index.ts
index b76e136aa..d9295fb67 100644
--- a/frontend/packages/ui/src/icons/index.ts
+++ b/frontend/packages/ui/src/icons/index.ts
@@ -2,4 +2,6 @@ export * from './InfoIcon'
 export * from './XIcon'
 export * from './FacebookIcon'
 export * from './LinkedInIcon'
+export * from './DiamondIcon'
+export * from './DiamondFillIcon'
 export { KeyRound } from 'lucide-react'