diff --git a/src/components/Credenza.tsx b/src/components/Credenza.tsx
index 2a59eca1..919ee495 100644
--- a/src/components/Credenza.tsx
+++ b/src/components/Credenza.tsx
@@ -84,7 +84,7 @@ const CredenzaContent = ({ className, children, ...props }: CredenzaProps) => {
     return (
         <CredenzaContent
             className={cn(
-                "overflow-y-auto max-h-[100dvh] md:max-h-screen",
+                "overflow-y-auto max-h-[100dvh] md:max-h-screen md:top-[200px] md:translate-y-0",
                 className
             )}
             {...props}
diff --git a/src/components/RolesTable.tsx b/src/components/RolesTable.tsx
index 0e029af2..24f3d809 100644
--- a/src/components/RolesTable.tsx
+++ b/src/components/RolesTable.tsx
@@ -103,45 +103,47 @@ export default function UsersTable({ roles }: RolesTableProps) {
             header: () => <span className="p-3"></span>,
             cell: ({ row }) => {
                 const roleRow = row.original;
+                const isAdmin = roleRow.isAdmin;
                 return (
-                    !roleRow.isAdmin && (
-                        <div className="flex items-center gap-2 justify-end">
-                            <DropdownMenu>
-                                <DropdownMenuTrigger asChild>
-                                    <Button
-                                        variant="ghost"
-                                        className="h-8 w-8 p-0"
-                                    >
-                                        <span className="sr-only">
-                                            {t("openMenu")}
-                                        </span>
-                                        <MoreHorizontal className="h-4 w-4" />
-                                    </Button>
-                                </DropdownMenuTrigger>
-                                <DropdownMenuContent align="end">
-                                    <DropdownMenuItem
-                                        onClick={() => {
-                                            setRoleToRemove(roleRow);
-                                            setIsDeleteModalOpen(true);
-                                        }}
-                                    >
-                                        <span className="text-red-500">
-                                            {t("delete")}
-                                        </span>
-                                    </DropdownMenuItem>
-                                </DropdownMenuContent>
-                            </DropdownMenu>
-                            <Button
-                                variant={"outline"}
-                                onClick={() => {
-                                    setEditingRole(roleRow);
-                                    setIsEditDialogOpen(true);
-                                }}
-                            >
-                                {t("edit")}
-                            </Button>
-                        </div>
-                    )
+                    <div className="flex items-center gap-2 justify-end">
+                        <DropdownMenu>
+                            <DropdownMenuTrigger asChild>
+                                <Button
+                                    variant="ghost"
+                                    className="h-8 w-8 p-0"
+                                    disabled={isAdmin}
+                                >
+                                    <span className="sr-only">
+                                        {t("openMenu")}
+                                    </span>
+                                    <MoreHorizontal className="h-4 w-4" />
+                                </Button>
+                            </DropdownMenuTrigger>
+                            <DropdownMenuContent align="end">
+                                <DropdownMenuItem
+                                    disabled={isAdmin}
+                                    onClick={() => {
+                                        setRoleToRemove(roleRow);
+                                        setIsDeleteModalOpen(true);
+                                    }}
+                                >
+                                    <span className="text-red-500">
+                                        {t("delete")}
+                                    </span>
+                                </DropdownMenuItem>
+                            </DropdownMenuContent>
+                        </DropdownMenu>
+                        <Button
+                            variant={"outline"}
+                            disabled={isAdmin}
+                            onClick={() => {
+                                setEditingRole(roleRow);
+                                setIsEditDialogOpen(true);
+                            }}
+                        >
+                            {t("edit")}
+                        </Button>
+                    </div>
                 );
             }
         }
diff --git a/src/components/SidebarNav.tsx b/src/components/SidebarNav.tsx
index dfb63b3e..087f510b 100644
--- a/src/components/SidebarNav.tsx
+++ b/src/components/SidebarNav.tsx
@@ -128,7 +128,7 @@ function CollapsibleNavItem({
                     disabled={isDisabled}
                 >
                     {item.icon && (
-                        <span className="flex-shrink-0 mr-3 w-5 h-5 flex items-center justify-center">
+                        <span className="flex-shrink-0 mr-3 w-5 h-5 flex items-center justify-center opacity-50">
                             {item.icon}
                         </span>
                     )}
@@ -306,7 +306,7 @@ export function SidebarNav({
                 {item.icon && level === 0 && (
                     <span
                         className={cn(
-                            "flex-shrink-0 w-5 h-5 flex items-center justify-center",
+                            "flex-shrink-0 w-5 h-5 flex items-center justify-center opacity-50",
                             !isCollapsed && "mr-3"
                         )}
                     >
@@ -366,7 +366,7 @@ export function SidebarNav({
                 )}
             >
                 {item.icon && level === 0 && (
-                    <span className="flex-shrink-0 mr-3 w-5 h-5 flex items-center justify-center">
+                    <span className="flex-shrink-0 mr-3 w-5 h-5 flex items-center justify-center opacity-50">
                         {item.icon}
                     </span>
                 )}
@@ -423,7 +423,7 @@ export function SidebarNav({
                                             disabled={isDisabled}
                                         >
                                             {item.icon && (
-                                                <span className="flex-shrink-0 w-5 h-5 flex items-center justify-center">
+                                                <span className="flex-shrink-0 w-5 h-5 flex items-center justify-center opacity-50">
                                                     {item.icon}
                                                 </span>
                                             )}