diff --git a/py/examples/form.py b/py/examples/form.py
index eeabb695de..cebac51b38 100644
--- a/py/examples/form.py
+++ b/py/examples/form.py
@@ -85,7 +85,7 @@ async def serve(q: Q):
         ]),
         ui.file_upload(name='file_upload', label='File upload'),
         ui.table(name='table', columns=[
-            ui.table_column(name='col1', label='Column 1'),
+            ui.table_column(name='col1', label='Column 1', tooltip="This is a tooltip"),
             ui.table_column(name='col2', label='Column 2'),
         ], rows=[
             ui.table_row(name='row1', cells=['Text A', 'Text B']),
diff --git a/py/h2o_lightwave/h2o_lightwave/types.py b/py/h2o_lightwave/h2o_lightwave/types.py
index 75725e0c3b..4a781d43ca 100644
--- a/py/h2o_lightwave/h2o_lightwave/types.py
+++ b/py/h2o_lightwave/h2o_lightwave/types.py
@@ -3562,6 +3562,7 @@ def __init__(
             cell_overflow: Optional[str] = None,
             filters: Optional[List[str]] = None,
             align: Optional[str] = None,
+            tooltip: Optional[str] = None,
     ):
         _guard_scalar('TableColumn.name', name, (str,), True, False, False)
         _guard_scalar('TableColumn.label', label, (str,), False, False, False)
@@ -3576,6 +3577,7 @@ def __init__(
         _guard_enum('TableColumn.cell_overflow', cell_overflow, _TableColumnCellOverflow, True)
         _guard_vector('TableColumn.filters', filters, (str,), False, True, False)
         _guard_enum('TableColumn.align', align, _TableColumnAlign, True)
+        _guard_scalar('TableColumn.tooltip', tooltip, (str,), False, True, False)
         self.name = name
         """An identifying name for this column."""
         self.label = label
@@ -3602,6 +3604,8 @@ def __init__(
         """Explicit list of values to allow filtering by, needed when pagination is set or custom order is needed. Only applicable to filterable columns."""
         self.align = align
         """Defines how to align values in a column. One of 'left', 'center', 'right'. See enum h2o_wave.ui.TableColumnAlign."""
+        self.tooltip = tooltip
+        """Tooltip text."""
 
     def dump(self) -> Dict:
         """Returns the contents of this object as a dict."""
@@ -3618,6 +3622,7 @@ def dump(self) -> Dict:
         _guard_enum('TableColumn.cell_overflow', self.cell_overflow, _TableColumnCellOverflow, True)
         _guard_vector('TableColumn.filters', self.filters, (str,), False, True, False)
         _guard_enum('TableColumn.align', self.align, _TableColumnAlign, True)
+        _guard_scalar('TableColumn.tooltip', self.tooltip, (str,), False, True, False)
         return _dump(
             name=self.name,
             label=self.label,
@@ -3632,6 +3637,7 @@ def dump(self) -> Dict:
             cell_overflow=self.cell_overflow,
             filters=self.filters,
             align=self.align,
+            tooltip=self.tooltip,
         )
 
     @staticmethod
@@ -3663,6 +3669,8 @@ def load(__d: Dict) -> 'TableColumn':
         _guard_vector('TableColumn.filters', __d_filters, (str,), False, True, False)
         __d_align: Any = __d.get('align')
         _guard_enum('TableColumn.align', __d_align, _TableColumnAlign, True)
+        __d_tooltip: Any = __d.get('tooltip')
+        _guard_scalar('TableColumn.tooltip', __d_tooltip, (str,), False, True, False)
         name: str = __d_name
         label: str = __d_label
         min_width: Optional[str] = __d_min_width
@@ -3676,6 +3684,7 @@ def load(__d: Dict) -> 'TableColumn':
         cell_overflow: Optional[str] = __d_cell_overflow
         filters: Optional[List[str]] = __d_filters
         align: Optional[str] = __d_align
+        tooltip: Optional[str] = __d_tooltip
         return TableColumn(
             name,
             label,
@@ -3690,6 +3699,7 @@ def load(__d: Dict) -> 'TableColumn':
             cell_overflow,
             filters,
             align,
+            tooltip,
         )
 
 
diff --git a/py/h2o_lightwave/h2o_lightwave/ui.py b/py/h2o_lightwave/h2o_lightwave/ui.py
index c301fdd3a5..940da96ddc 100644
--- a/py/h2o_lightwave/h2o_lightwave/ui.py
+++ b/py/h2o_lightwave/h2o_lightwave/ui.py
@@ -1326,6 +1326,7 @@ def table_column(
         cell_overflow: Optional[str] = None,
         filters: Optional[List[str]] = None,
         align: Optional[str] = None,
+        tooltip: Optional[str] = None,
 ) -> TableColumn:
     """Create a table column.
 
@@ -1343,6 +1344,7 @@ def table_column(
         cell_overflow: Defines what to do with a cell's contents in case it does not fit inside the cell. One of 'tooltip', 'wrap'. See enum h2o_wave.ui.TableColumnCellOverflow.
         filters: Explicit list of values to allow filtering by, needed when pagination is set or custom order is needed. Only applicable to filterable columns.
         align: Defines how to align values in a column. One of 'left', 'center', 'right'. See enum h2o_wave.ui.TableColumnAlign.
+        tooltip: Tooltip text.
     Returns:
         A `h2o_wave.types.TableColumn` instance.
     """
@@ -1360,6 +1362,7 @@ def table_column(
         cell_overflow,
         filters,
         align,
+        tooltip,
     )
 
 
diff --git a/py/h2o_wave/h2o_wave/types.py b/py/h2o_wave/h2o_wave/types.py
index 75725e0c3b..4a781d43ca 100644
--- a/py/h2o_wave/h2o_wave/types.py
+++ b/py/h2o_wave/h2o_wave/types.py
@@ -3562,6 +3562,7 @@ def __init__(
             cell_overflow: Optional[str] = None,
             filters: Optional[List[str]] = None,
             align: Optional[str] = None,
+            tooltip: Optional[str] = None,
     ):
         _guard_scalar('TableColumn.name', name, (str,), True, False, False)
         _guard_scalar('TableColumn.label', label, (str,), False, False, False)
@@ -3576,6 +3577,7 @@ def __init__(
         _guard_enum('TableColumn.cell_overflow', cell_overflow, _TableColumnCellOverflow, True)
         _guard_vector('TableColumn.filters', filters, (str,), False, True, False)
         _guard_enum('TableColumn.align', align, _TableColumnAlign, True)
+        _guard_scalar('TableColumn.tooltip', tooltip, (str,), False, True, False)
         self.name = name
         """An identifying name for this column."""
         self.label = label
@@ -3602,6 +3604,8 @@ def __init__(
         """Explicit list of values to allow filtering by, needed when pagination is set or custom order is needed. Only applicable to filterable columns."""
         self.align = align
         """Defines how to align values in a column. One of 'left', 'center', 'right'. See enum h2o_wave.ui.TableColumnAlign."""
+        self.tooltip = tooltip
+        """Tooltip text."""
 
     def dump(self) -> Dict:
         """Returns the contents of this object as a dict."""
@@ -3618,6 +3622,7 @@ def dump(self) -> Dict:
         _guard_enum('TableColumn.cell_overflow', self.cell_overflow, _TableColumnCellOverflow, True)
         _guard_vector('TableColumn.filters', self.filters, (str,), False, True, False)
         _guard_enum('TableColumn.align', self.align, _TableColumnAlign, True)
+        _guard_scalar('TableColumn.tooltip', self.tooltip, (str,), False, True, False)
         return _dump(
             name=self.name,
             label=self.label,
@@ -3632,6 +3637,7 @@ def dump(self) -> Dict:
             cell_overflow=self.cell_overflow,
             filters=self.filters,
             align=self.align,
+            tooltip=self.tooltip,
         )
 
     @staticmethod
@@ -3663,6 +3669,8 @@ def load(__d: Dict) -> 'TableColumn':
         _guard_vector('TableColumn.filters', __d_filters, (str,), False, True, False)
         __d_align: Any = __d.get('align')
         _guard_enum('TableColumn.align', __d_align, _TableColumnAlign, True)
+        __d_tooltip: Any = __d.get('tooltip')
+        _guard_scalar('TableColumn.tooltip', __d_tooltip, (str,), False, True, False)
         name: str = __d_name
         label: str = __d_label
         min_width: Optional[str] = __d_min_width
@@ -3676,6 +3684,7 @@ def load(__d: Dict) -> 'TableColumn':
         cell_overflow: Optional[str] = __d_cell_overflow
         filters: Optional[List[str]] = __d_filters
         align: Optional[str] = __d_align
+        tooltip: Optional[str] = __d_tooltip
         return TableColumn(
             name,
             label,
@@ -3690,6 +3699,7 @@ def load(__d: Dict) -> 'TableColumn':
             cell_overflow,
             filters,
             align,
+            tooltip,
         )
 
 
diff --git a/py/h2o_wave/h2o_wave/ui.py b/py/h2o_wave/h2o_wave/ui.py
index c301fdd3a5..940da96ddc 100644
--- a/py/h2o_wave/h2o_wave/ui.py
+++ b/py/h2o_wave/h2o_wave/ui.py
@@ -1326,6 +1326,7 @@ def table_column(
         cell_overflow: Optional[str] = None,
         filters: Optional[List[str]] = None,
         align: Optional[str] = None,
+        tooltip: Optional[str] = None,
 ) -> TableColumn:
     """Create a table column.
 
@@ -1343,6 +1344,7 @@ def table_column(
         cell_overflow: Defines what to do with a cell's contents in case it does not fit inside the cell. One of 'tooltip', 'wrap'. See enum h2o_wave.ui.TableColumnCellOverflow.
         filters: Explicit list of values to allow filtering by, needed when pagination is set or custom order is needed. Only applicable to filterable columns.
         align: Defines how to align values in a column. One of 'left', 'center', 'right'. See enum h2o_wave.ui.TableColumnAlign.
+        tooltip: Tooltip text.
     Returns:
         A `h2o_wave.types.TableColumn` instance.
     """
@@ -1360,6 +1362,7 @@ def table_column(
         cell_overflow,
         filters,
         align,
+        tooltip,
     )
 
 
diff --git a/r/R/ui.R b/r/R/ui.R
index 34d9c72c5d..fb8d42dfdf 100644
--- a/r/R/ui.R
+++ b/r/R/ui.R
@@ -1560,6 +1560,7 @@ ui_markdown_table_cell_type <- function(
 #' @param filters Explicit list of values to allow filtering by, needed when pagination is set or custom order is needed. Only applicable to filterable columns.
 #' @param align Defines how to align values in a column.
 #'   One of 'left', 'center', 'right'. See enum h2o_wave.ui.TableColumnAlign.
+#' @param tooltip Tooltip text.
 #' @return A TableColumn instance.
 #' @export
 ui_table_column <- function(
@@ -1575,7 +1576,8 @@ ui_table_column <- function(
   cell_type = NULL,
   cell_overflow = NULL,
   filters = NULL,
-  align = NULL) {
+  align = NULL,
+  tooltip = NULL) {
   .guard_scalar("name", "character", name)
   .guard_scalar("label", "character", label)
   .guard_scalar("min_width", "character", min_width)
@@ -1589,6 +1591,7 @@ ui_table_column <- function(
   # TODO Validate cell_overflow
   .guard_vector("filters", "character", filters)
   # TODO Validate align
+  .guard_scalar("tooltip", "character", tooltip)
   .o <- list(
     name=name,
     label=label,
@@ -1602,7 +1605,8 @@ ui_table_column <- function(
     cell_type=cell_type,
     cell_overflow=cell_overflow,
     filters=filters,
-    align=align)
+    align=align,
+    tooltip=tooltip)
   class(.o) <- append(class(.o), c(.wave_obj, "WaveTableColumn"))
   return(.o)
 }
diff --git a/tools/intellij-plugin/src/main/resources/templates/wave-components.xml b/tools/intellij-plugin/src/main/resources/templates/wave-components.xml
index 67a5ba7b55..76032a73e1 100644
--- a/tools/intellij-plugin/src/main/resources/templates/wave-components.xml
+++ b/tools/intellij-plugin/src/main/resources/templates/wave-components.xml
@@ -2376,7 +2376,7 @@
       <option name="Python" value="true"/>
     </context>
   </template>
-  <template name="w_full_table_column" value="ui.table_column(name='$name$',label='$label$',min_width='$min_width$',max_width='$max_width$',sortable=$sortable$,searchable=$searchable$,filterable=$filterable$,link=$link$,data_type='$data_type$',cell_type=$cell_type$,cell_overflow='$cell_overflow$',align='$align$',filters=[&#10;	$filters$	&#10;]),$END$" description="Create Wave TableColumn with full attributes." toReformat="true" toShortenFQNames="true">
+  <template name="w_full_table_column" value="ui.table_column(name='$name$',label='$label$',min_width='$min_width$',max_width='$max_width$',sortable=$sortable$,searchable=$searchable$,filterable=$filterable$,link=$link$,data_type='$data_type$',cell_type=$cell_type$,cell_overflow='$cell_overflow$',align='$align$',tooltip='$tooltip$',filters=[&#10;	$filters$	&#10;]),$END$" description="Create Wave TableColumn with full attributes." toReformat="true" toShortenFQNames="true">
     <variable name="name" expression="" defaultValue="" alwaysStopAt="true"/>
     <variable name="label" expression="" defaultValue="" alwaysStopAt="true"/>
     <variable name="min_width" expression="" defaultValue="" alwaysStopAt="true"/>
@@ -2389,6 +2389,7 @@
     <variable name="cell_type" expression="" defaultValue="&quot;None&quot;" alwaysStopAt="true"/>
     <variable name="cell_overflow" expression="" defaultValue="" alwaysStopAt="true"/>
     <variable name="align" expression="" defaultValue="" alwaysStopAt="true"/>
+    <variable name="tooltip" expression="" defaultValue="" alwaysStopAt="true"/>
     <variable name="filters" expression="" defaultValue="" alwaysStopAt="true"/>
     <context>
       <option name="Python" value="true"/>
diff --git a/tools/vscode-extension/component-snippets.json b/tools/vscode-extension/component-snippets.json
index 70ec3c2a8b..531b08d9f1 100644
--- a/tools/vscode-extension/component-snippets.json
+++ b/tools/vscode-extension/component-snippets.json
@@ -1745,7 +1745,7 @@
   "Wave Full TableColumn": {
     "prefix": "w_full_table_column",
     "body": [
-      "ui.table_column(name='$1', label='$2', min_width='$3', max_width='$4', sortable=${5:False}, searchable=${6:False}, filterable=${7:False}, link=${8:False}, data_type='${9:string}', cell_type=${10:None}, cell_overflow='$11', align='$12', filters=[\n\t\t$13\t\t\n]),$0"
+      "ui.table_column(name='$1', label='$2', min_width='$3', max_width='$4', sortable=${5:False}, searchable=${6:False}, filterable=${7:False}, link=${8:False}, data_type='${9:string}', cell_type=${10:None}, cell_overflow='$11', align='$12', tooltip='$13', filters=[\n\t\t$14\t\t\n]),$0"
     ],
     "description": "Create a full Wave TableColumn."
   },
diff --git a/ui/src/table.test.tsx b/ui/src/table.test.tsx
index a234a4d931..9ffe2918f1 100644
--- a/ui/src/table.test.tsx
+++ b/ui/src/table.test.tsx
@@ -2114,4 +2114,38 @@ describe('Table.tsx', () => {
       expect(emitMock).toHaveBeenCalledTimes(1)
     })
   })
-})
\ No newline at end of file
+
+  describe('Tooltip', () => {
+    it('renders info icon only when tooltip prop is specified', () => {
+      tableProps = {
+        ...tableProps,
+        columns: [
+          { name: 'colname1', label: 'Col1', sortable: true, searchable: true, tooltip: 'Tooltip for Col1' },
+          { name: 'colname2', label: 'Col2', sortable: true, filterable: true },
+        ],
+        rows: [
+          { name: 'rowname1', cells: [cell11, '2'] },
+          { name: 'rowname2', cells: [cell21, '1'] },
+        ],
+      }
+      
+      const { container, getAllByRole } = render(<XTable model={tableProps} />)
+      const headers = getAllByRole('columnheader')
+      const infoIcons = container.querySelectorAll("[data-icon-name='info-icon']") as NodeListOf<HTMLElement>
+      expect(infoIcons).toHaveLength(1)
+  
+      const headerKey1 = headers[0].getAttribute('data-item-key')
+      if (headerKey1 === 'colname1') {
+        expect(headers[0]).toContainElement(infoIcons[0])
+      } else {
+        expect(headers[0]).not.toContainElement(infoIcons[0])
+      }
+      const headerKey2 = headers[1].getAttribute('data-item-key')
+      if (headerKey2 === 'colname1') {
+        expect(headers[1]).toContainElement(infoIcons[0])
+      } else {
+        expect(headers[1]).not.toContainElement(infoIcons[0])
+      }
+    })
+  })
+})
diff --git a/ui/src/table.tsx b/ui/src/table.tsx
index 04d343f820..c43f0d5ffd 100644
--- a/ui/src/table.tsx
+++ b/ui/src/table.tsx
@@ -76,6 +76,8 @@ interface TableColumn {
   filters?: S[]
   /** Defines how to align values in a column. */
   align?: 'left' | 'center' | 'right'
+  /** Tooltip text. */
+  tooltip?: S
 }
 
 /** Create a table row. */
@@ -167,6 +169,7 @@ type WaveColumn = Fluent.IColumn & {
   cellOverflow?: 'tooltip' | 'wrap'
   filters?: S[]
   align?: 'left' | 'center' | 'right'
+  tooltip?: S
 }
 
 type DataTable = {
@@ -434,18 +437,55 @@ const
           isResizable: true,
           isMultiline: c.cell_overflow === 'wrap',
           filters: c.filterable ? c.filters : undefined,
+          tooltip: c.tooltip ? c.tooltip : undefined,
         }
       }, [onColumnClick, onColumnContextMenu, selectedFilters, sortCols]),
       [columns, setColumns] = React.useState(m.columns.map(tableToWaveColumn)),
       primaryColumnKey = m.columns.find(c => c.link)?.name || (m.columns[0].link === false ? undefined : m.columns[0].name),
       onRenderDetailsHeader = React.useCallback((props?: Fluent.IDetailsHeaderProps) => {
         if (!props) return <span />
-
+        const renderColumnHeaderTooltip = (tooltipHostProps?: Fluent.IDetailsColumnRenderTooltipProps) => {
+            const column = props.columns.find(col => col.key === tooltipHostProps?.column?.key) as WaveColumn
+            if (!tooltipHostProps?.children) return null
+            return (
+              <div style={{ display: 'flex', alignItems: 'center' }}>
+                {tooltipHostProps.children}
+                {
+                  column?.tooltip && (
+                    <Fluent.TooltipHost
+                      content={column.tooltip}
+                      calloutProps={{
+                        gapSpace: -10,
+                        styles: {
+                          beakCurtain: { backgroundColor: cssVar('$neutralLighterAlt') },
+                          beak: { backgroundColor: cssVar('$neutralLighterAlt') },
+                          calloutMain: { backgroundColor: cssVar('$neutralLighterAlt') }
+                        }
+                      }}
+                    >
+                    <Fluent.Icon
+                      iconName="Info"
+                      data-icon-name="info-icon"
+                      styles={{
+                        root: {
+                          fontSize: '16px',
+                          fontWeight: 'bold',
+                          paddingLeft: '0px',
+                        }
+                      }}
+                    />
+                  </Fluent.TooltipHost>
+                  )
+                }
+              </div>
+            )
+        }
         return (
           <Fluent.Sticky stickyPosition={Fluent.StickyPositionType.Header} isScrollSynced>
             <Fluent.DetailsHeader
               {...props}
               isAllCollapsed={groups?.every(group => group.isCollapsed)}
+              onRenderColumnHeaderTooltip={renderColumnHeaderTooltip}
               styles={{
                 ...props.styles,
                 root: {
@@ -454,14 +494,19 @@ const
                   lineHeight: '48px',
                   background: cssVar('$neutralLight'),
                   borderBottom: 'none',
+                  selectors: {
+                    '.ms-DetailsHeader-cellTitle': {
+                        paddingLeft: '0px',
+                    },
+                  }
                 },
                 cellSizerEnd: {
                   marginLeft: -8,
                 },
                 cellIsGroupExpander: {
                   // HACK: fixed size of expand/collapse button in column header
-                  height: 48
-                }
+                  height: 48,
+                },
               }}
             />
           </Fluent.Sticky>