diff --git a/src/app/[orgId]/settings/resources/[niceId]/proxy/page.tsx b/src/app/[orgId]/settings/resources/[niceId]/proxy/page.tsx
index 8621c749..db578bf2 100644
--- a/src/app/[orgId]/settings/resources/[niceId]/proxy/page.tsx
+++ b/src/app/[orgId]/settings/resources/[niceId]/proxy/page.tsx
@@ -1420,21 +1420,25 @@ export default function ReverseProxyTargets(props: {
                                             .map((headerGroup) => (
                                                 <TableRow key={headerGroup.id}>
                                                     {headerGroup.headers.map(
-                                                        (header) => (
-                                                            <TableHead
-                                                                key={header.id}
-                                                            >
-                                                                {header.isPlaceholder
-                                                                    ? null
-                                                                    : flexRender(
-                                                                        header
-                                                                            .column
-                                                                            .columnDef
-                                                                            .header,
-                                                                        header.getContext()
-                                                                    )}
-                                                            </TableHead>
-                                                        )
+                                                        (header) => {
+                                                            const isActionsColumn = header.column.id === "actions";
+                                                            return (
+                                                                <TableHead
+                                                                    key={header.id}
+                                                                    className={isActionsColumn ? "sticky right-0 z-10 w-auto min-w-fit bg-card" : ""}
+                                                                >
+                                                                    {header.isPlaceholder
+                                                                        ? null
+                                                                        : flexRender(
+                                                                            header
+                                                                                .column
+                                                                                .columnDef
+                                                                                .header,
+                                                                            header.getContext()
+                                                                        )}
+                                                                </TableHead>
+                                                            );
+                                                        }
                                                     )}
                                                 </TableRow>
                                             ))}
@@ -1447,21 +1451,25 @@ export default function ReverseProxyTargets(props: {
                                                     <TableRow key={row.id}>
                                                         {row
                                                             .getVisibleCells()
-                                                            .map((cell) => (
-                                                                <TableCell
-                                                                    key={
-                                                                        cell.id
-                                                                    }
-                                                                >
-                                                                    {flexRender(
-                                                                        cell
-                                                                            .column
-                                                                            .columnDef
-                                                                            .cell,
-                                                                        cell.getContext()
-                                                                    )}
-                                                                </TableCell>
-                                                            ))}
+                                                            .map((cell) => {
+                                                                const isActionsColumn = cell.column.id === "actions";
+                                                                return (
+                                                                    <TableCell
+                                                                        key={
+                                                                            cell.id
+                                                                        }
+                                                                        className={isActionsColumn ? "sticky right-0 z-10 w-auto min-w-fit bg-card" : ""}
+                                                                    >
+                                                                        {flexRender(
+                                                                            cell
+                                                                                .column
+                                                                                .columnDef
+                                                                                .cell,
+                                                                            cell.getContext()
+                                                                        )}
+                                                                    </TableCell>
+                                                                );
+                                                            })}
                                                     </TableRow>
                                                 ))
                                         ) : (
diff --git a/src/app/[orgId]/settings/resources/[niceId]/rules/page.tsx b/src/app/[orgId]/settings/resources/[niceId]/rules/page.tsx
index 0e8c1873..592424e0 100644
--- a/src/app/[orgId]/settings/resources/[niceId]/rules/page.tsx
+++ b/src/app/[orgId]/settings/resources/[niceId]/rules/page.tsx
@@ -832,7 +832,7 @@ export default function ResourceRules(props: {
                                     />
                                     <Button
                                         type="submit"
-                                        variant="secondary"
+                                        variant="outline"
                                         disabled={!rulesEnabled}
                                     >
                                         {t('ruleSubmit')}
@@ -844,17 +844,23 @@ export default function ResourceRules(props: {
                             <TableHeader>
                                 {table.getHeaderGroups().map((headerGroup) => (
                                     <TableRow key={headerGroup.id}>
-                                        {headerGroup.headers.map((header) => (
-                                            <TableHead key={header.id}>
-                                                {header.isPlaceholder
-                                                    ? null
-                                                    : flexRender(
-                                                          header.column.columnDef
-                                                              .header,
-                                                          header.getContext()
-                                                      )}
-                                            </TableHead>
-                                        ))}
+                                        {headerGroup.headers.map((header) => {
+                                            const isActionsColumn = header.column.id === "actions";
+                                            return (
+                                                <TableHead
+                                                    key={header.id}
+                                                    className={isActionsColumn ? "sticky right-0 z-10 w-auto min-w-fit bg-card" : ""}
+                                                >
+                                                    {header.isPlaceholder
+                                                        ? null
+                                                        : flexRender(
+                                                              header.column.columnDef
+                                                                  .header,
+                                                              header.getContext()
+                                                          )}
+                                                </TableHead>
+                                            );
+                                        })}
                                     </TableRow>
                                 ))}
                             </TableHeader>
@@ -862,14 +868,20 @@ export default function ResourceRules(props: {
                                 {table.getRowModel().rows?.length ? (
                                     table.getRowModel().rows.map((row) => (
                                         <TableRow key={row.id}>
-                                            {row.getVisibleCells().map((cell) => (
-                                                <TableCell key={cell.id}>
-                                                    {flexRender(
-                                                        cell.column.columnDef.cell,
-                                                        cell.getContext()
-                                                    )}
-                                                </TableCell>
-                                            ))}
+                                            {row.getVisibleCells().map((cell) => {
+                                                const isActionsColumn = cell.column.id === "actions";
+                                                return (
+                                                    <TableCell
+                                                        key={cell.id}
+                                                        className={isActionsColumn ? "sticky right-0 z-10 w-auto min-w-fit bg-card" : ""}
+                                                    >
+                                                        {flexRender(
+                                                            cell.column.columnDef.cell,
+                                                            cell.getContext()
+                                                        )}
+                                                    </TableCell>
+                                                );
+                                            })}
                                         </TableRow>
                                     ))
                                 ) : (
diff --git a/src/app/[orgId]/settings/resources/create/page.tsx b/src/app/[orgId]/settings/resources/create/page.tsx
index 1169cb6c..a098117f 100644
--- a/src/app/[orgId]/settings/resources/create/page.tsx
+++ b/src/app/[orgId]/settings/resources/create/page.tsx
@@ -1608,23 +1608,27 @@ export default function Page() {
                                                                         {headerGroup.headers.map(
                                                                             (
                                                                                 header
-                                                                            ) => (
-                                                                                <TableHead
-                                                                                    key={
-                                                                                        header.id
-                                                                                    }
-                                                                                >
-                                                                                    {header.isPlaceholder
-                                                                                        ? null
-                                                                                        : flexRender(
-                                                                                              header
-                                                                                                  .column
-                                                                                                  .columnDef
-                                                                                                  .header,
-                                                                                              header.getContext()
-                                                                                          )}
-                                                                                </TableHead>
-                                                                            )
+                                                                            ) => {
+                                                                                const isActionsColumn = header.column.id === "actions";
+                                                                                return (
+                                                                                    <TableHead
+                                                                                        key={
+                                                                                            header.id
+                                                                                        }
+                                                                                        className={isActionsColumn ? "sticky right-0 z-10 w-auto min-w-fit bg-card" : ""}
+                                                                                    >
+                                                                                        {header.isPlaceholder
+                                                                                            ? null
+                                                                                            : flexRender(
+                                                                                                  header
+                                                                                                      .column
+                                                                                                      .columnDef
+                                                                                                      .header,
+                                                                                                  header.getContext()
+                                                                                              )}
+                                                                                    </TableHead>
+                                                                                );
+                                                                            }
                                                                         )}
                                                                     </TableRow>
                                                                 )
@@ -1647,21 +1651,25 @@ export default function Page() {
                                                                                 .map(
                                                                                     (
                                                                                         cell
-                                                                                    ) => (
-                                                                                        <TableCell
-                                                                                            key={
-                                                                                                cell.id
-                                                                                            }
-                                                                                        >
-                                                                                            {flexRender(
-                                                                                                cell
-                                                                                                    .column
-                                                                                                    .columnDef
-                                                                                                    .cell,
-                                                                                                cell.getContext()
-                                                                                            )}
-                                                                                        </TableCell>
-                                                                                    )
+                                                                                    ) => {
+                                                                                        const isActionsColumn = cell.column.id === "actions";
+                                                                                        return (
+                                                                                            <TableCell
+                                                                                                key={
+                                                                                                    cell.id
+                                                                                                }
+                                                                                                className={isActionsColumn ? "sticky right-0 z-10 w-auto min-w-fit bg-card" : ""}
+                                                                                            >
+                                                                                                {flexRender(
+                                                                                                    cell
+                                                                                                        .column
+                                                                                                        .columnDef
+                                                                                                        .cell,
+                                                                                                    cell.getContext()
+                                                                                                )}
+                                                                                            </TableCell>
+                                                                                        );
+                                                                                    }
                                                                                 )}
                                                                         </TableRow>
                                                                     )
diff --git a/src/components/ClientsTable.tsx b/src/components/ClientsTable.tsx
index 418488d6..96f9430d 100644
--- a/src/components/ClientsTable.tsx
+++ b/src/components/ClientsTable.tsx
@@ -552,7 +552,7 @@ export default function ClientsTable({
                         <div className="flex flex-col items-end gap-1 p-3">
                             <DropdownMenu>
                                 <DropdownMenuTrigger asChild>
-                                    <Button variant="outline" size="sm" className="h-7 w-7 p-0">
+                                    <Button variant="ghost" size="sm" className="h-7 w-7 p-0">
                                         <Columns className="h-4 w-4" />
                                         <span className="sr-only">
                                             {t("columns") || "Columns"}
diff --git a/src/components/ResourcesTable.tsx b/src/components/ResourcesTable.tsx
index 994c710a..ef16f728 100644
--- a/src/components/ResourcesTable.tsx
+++ b/src/components/ResourcesTable.tsx
@@ -769,7 +769,7 @@ export default function ResourcesTable({
                     <div className="flex flex-col items-end gap-1 p-3">
                         <DropdownMenu>
                             <DropdownMenuTrigger asChild>
-                                <Button variant="outline" size="sm" className="h-7 w-7 p-0">
+                                <Button variant="ghost" size="sm" className="h-7 w-7 p-0">
                                     <Columns className="h-4 w-4" />
                                     <span className="sr-only">
                                         {t("columns") || "Columns"}
diff --git a/src/components/ui/data-table.tsx b/src/components/ui/data-table.tsx
index 5d12985c..36ec5105 100644
--- a/src/components/ui/data-table.tsx
+++ b/src/components/ui/data-table.tsx
@@ -417,7 +417,7 @@ export function DataTable<TData, TValue>({
                                                             <div className="flex flex-col items-end pr-3">
                                                                 <DropdownMenu>
                                                                     <DropdownMenuTrigger asChild>
-                                                                        <Button variant="outline" size="sm" className="h-7 w-7 p-0 mb-1">
+                                                                        <Button variant="ghost" size="sm" className="h-7 w-7 p-0 mb-1">
                                                                             <Columns className="h-4 w-4" />
                                                                             <span className="sr-only">
                                                                                 {t("columns") || "Columns"}