diff --git a/src/core/components/DataTable/head/TableHeadCell.js b/src/core/components/DataTable/head/TableHeadCell.js
index 7a7498b..046f833 100644
--- a/src/core/components/DataTable/head/TableHeadCell.js
+++ b/src/core/components/DataTable/head/TableHeadCell.js
@@ -218,14 +218,18 @@ const DataTable_TableHeadCell = ({ columnVirtualizer, header, staticColumnIndex,
                                 textAlign: "start",
                                 color: "#fff",
                                 fontWeight: "400",
-                                whiteSpace: (columnDef.header?.length ?? 0) < 20 ? "nowrap" : "normal",
+                                whiteSpace: "nowrap"
                             }}
                         >
                             {HeaderElement}
                         </Box>
                         {column.getCanSort() && columnDefType !== "group" && (
                             <MRT_TableHeadCellSortLabel
-                                sx={{ width: 20, color: "#fff" }}
+                                sx={{
+                                    width: 20, '& .MuiTableSortLabel-icon': {
+                                        color: `#fff !important`,
+                                    }
+                                }}
                                 header={header}
                                 table={table}
                             />
diff --git a/src/core/components/DataTable/toolbar/TopToolbar.js b/src/core/components/DataTable/toolbar/TopToolbar.js
index 81bc84a..88ad219 100644
--- a/src/core/components/DataTable/toolbar/TopToolbar.js
+++ b/src/core/components/DataTable/toolbar/TopToolbar.js
@@ -51,7 +51,7 @@ const DataTable_TopToolbar = ({ mutate, need_filter, table, columns, table_url,
                     display: "flex",
                     gap: "0.5rem",
                     justifyContent: "space-between",
-                    p: "0.5rem",
+                    py: "0.5rem",
                     position: stackAlertBanner ? "relative" : "absolute",
                     right: 0,
                     top: 0,