diff --git a/packages/ibm-products/src/components/Datagrid/Datagrid/DatagridExpandedRow.tsx b/packages/ibm-products/src/components/Datagrid/Datagrid/DatagridExpandedRow.tsx
index c44f4c74c2..68f69e580e 100644
--- a/packages/ibm-products/src/components/Datagrid/Datagrid/DatagridExpandedRow.tsx
+++ b/packages/ibm-products/src/components/Datagrid/Datagrid/DatagridExpandedRow.tsx
@@ -44,8 +44,10 @@ const DatagridExpandedRow =
         <td className={`${blockClass}__expanded-row-cell-wrapper`}>
           <div
             className={`${blockClass}__expanded-row-content`}
-            style={{
-              height: expandedContentHeight && expandedContentHeight,
+            ref={(el) => {
+              if (el && el.style && expandedContentHeight) {
+                el.style.height = `${expandedContentHeight}px`;
+              }
             }}
           >
             <ExpandedRowContentComponent key={key} {..._state} />
diff --git a/packages/ibm-products/src/components/Datagrid/utils/DatagridActions.js b/packages/ibm-products/src/components/Datagrid/utils/DatagridActions.js
index 19828751ab..1bc016dc5c 100644
--- a/packages/ibm-products/src/components/Datagrid/utils/DatagridActions.js
+++ b/packages/ibm-products/src/components/Datagrid/utils/DatagridActions.js
@@ -57,11 +57,6 @@ export const DatagridActions = (datagridState) => {
 
   const searchForAColumn = 'Search';
   const isNothingSelected = selectedFlatRows.length === 0;
-  const style = {
-    'button:nthChild(1) > span:nthChild(1)': {
-      bottom: '-37px',
-    },
-  };
 
   const renderFilterFlyout = () =>
     filterProps?.variation === 'flyout' && (
@@ -101,24 +96,18 @@ export const DatagridActions = (datagridState) => {
         {!mobileToolbar ? (
           <>
             {renderFilterPanelButton()}
-            <div style={style}>
-              <Button
-                kind="ghost"
-                hasIconOnly
-                tooltipPosition="bottom"
-                renderIcon={Download}
-                iconDescription={'Download CSV'}
-                onClick={downloadCsv}
-              />
-            </div>
+            <Button
+              kind="ghost"
+              hasIconOnly
+              tooltipPosition="bottom"
+              renderIcon={Download}
+              iconDescription={'Download CSV'}
+              onClick={downloadCsv}
+            />
             {renderFilterFlyout()}
-            {CustomizeColumnsButton && (
-              <div style={style}>
-                <CustomizeColumnsButton />
-              </div>
-            )}
+            {CustomizeColumnsButton && <CustomizeColumnsButton />}
             <RowSizeDropdown {...rowSizeDropdownProps} />
-            <div style={style} className={`${blockClass}__toolbar-divider`}>
+            <div className={`${blockClass}__toolbar-divider`}>
               <Button kind="ghost" renderIcon={Add} iconDescription={'Action'}>
                 Ghost button
               </Button>
@@ -150,31 +139,26 @@ export const DatagridActions = (datagridState) => {
           onChange={(e) => setGlobalFilter(e.target.value)}
         />
         {renderFilterFlyout()}
-        <div style={style}>
-          <Button
-            kind="ghost"
-            hasIconOnly
-            tooltipPosition="bottom"
-            renderIcon={Restart}
-            iconDescription={'Refresh'}
-            onClick={refreshColumns}
-          />
-        </div>
-        <div style={style}>
-          <Button
-            kind="ghost"
-            hasIconOnly
-            tooltipPosition="bottom"
-            renderIcon={Download}
-            iconDescription={'Download CSV'}
-            onClick={downloadCsv}
-          />
-        </div>
-        {CustomizeColumnsButton && (
-          <div style={style}>
-            <CustomizeColumnsButton />
-          </div>
-        )}
+
+        <Button
+          kind="ghost"
+          hasIconOnly
+          tooltipPosition="bottom"
+          renderIcon={Restart}
+          iconDescription={'Refresh'}
+          onClick={refreshColumns}
+        />
+
+        <Button
+          kind="ghost"
+          hasIconOnly
+          tooltipPosition="bottom"
+          renderIcon={Download}
+          iconDescription={'Download CSV'}
+          onClick={downloadCsv}
+        />
+
+        {CustomizeColumnsButton && <CustomizeColumnsButton />}
         <RowSizeDropdown {...rowSizeDropdownProps} />
         <MenuButton
           label="Primary button"