diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/views/indexes/create.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/views/indexes/create.svelte
index ae49e46d5d..c3d236045d 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/views/indexes/create.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/views/indexes/create.svelte
@@ -57,7 +57,12 @@
             .map((field) => ({
                 value: field.key,
                 label: field.key,
-                leadingIcon: baseColumnOptions.find((option) => option.type === field.type)?.icon
+                leadingIcon: baseColumnOptions.find(
+                    (option) =>
+                        option.type === field.type &&
+                        option.format ===
+                            ('format' in field && field.format ? field.format : undefined)
+                )?.icon
             }))
     );
 
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/+page.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/+page.svelte
index 5c457edce1..3f54139a63 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/+page.svelte
@@ -515,26 +515,30 @@
                         {columnType.toLowerCase()}
                     </Spreadsheet.Cell>
                     <Spreadsheet.Cell column="indexed" {root} isEditable={false}>
-                        <!-- $id is always indexed internally -->
-                        {@const isActuallyIndexed =
-                            isId || $indexes.some((index) => index.columns.includes(column.key))}
-
-                        <!-- $id is always indexed internally -->
-                        {@const checked = isId || isActuallyIndexed || !!columnIndexMap[column.key]}
-
-                        <Selector.Checkbox
-                            size="s"
-                            {checked}
-                            disabled={isActuallyIndexed}
-                            on:change={(e) => {
-                                if (!isActuallyIndexed) {
-                                    if (e.detail) {
-                                        columnIndexMap[column.key] = true;
-                                        $showCreateIndexSheet.show = true;
-                                        $showCreateIndexSheet.column = column.key;
+                        {#if !isRelationship(column)}
+                            <!-- $id is always indexed internally -->
+                            {@const isActuallyIndexed =
+                                isId ||
+                                $indexes.some((index) => index.columns.includes(column.key))}
+
+                            <!-- $id is always indexed internally -->
+                            {@const checked =
+                                isId || isActuallyIndexed || !!columnIndexMap[column.key]}
+
+                            <Selector.Checkbox
+                                size="s"
+                                {checked}
+                                disabled={isActuallyIndexed}
+                                on:change={(e) => {
+                                    if (!isActuallyIndexed) {
+                                        if (e.detail) {
+                                            columnIndexMap[column.key] = true;
+                                            $showCreateIndexSheet.show = true;
+                                            $showCreateIndexSheet.column = column.key;
+                                        }
                                     }
-                                }
-                            }} />
+                                }} />
+                        {/if}
                     </Spreadsheet.Cell>
                     <Spreadsheet.Cell column="default" {root} isEditable={false}>
                         {@const _default = column.required