diff --git a/frontend/src/Components/ProviderCard.tsx b/frontend/src/Components/ProviderCard.tsx
index fa242c88..7741ec9e 100644
--- a/frontend/src/Components/ProviderCard.tsx
+++ b/frontend/src/Components/ProviderCard.tsx
@@ -30,7 +30,7 @@ export default function ProviderCard({
     openEditProvider: (prov: ProviderPlatform) => void;
     oidcClient: (prov: ProviderPlatform) => void;
     showAuthorizationInfo: (prov: ProviderPlatform) => void;
-    refreshToken: (prov: ProviderPlatform) => void; 
+    refreshToken: (prov: ProviderPlatform) => void;
     archiveProvider: (prov: ProviderPlatform) => void;
 }) {
     const navigate = useNavigate();
@@ -38,7 +38,8 @@ export default function ProviderCard({
         <tr className="bg-base-teal card p-4 w-full grid-cols-4 justify-items-center">
             <td className="justify-self-start">{provider.name}</td>
             <td>
-                {provider.oidc_id !== 0 || provider.type === ProviderPlatformType.BRIGHTSPACE ? (
+                {provider.oidc_id !== 0 ||
+                provider.type === ProviderPlatformType.BRIGHTSPACE ? (
                     <CheckCircleIcon className="w-4" />
                 ) : (
                     <div className="w-4"></div>
@@ -59,27 +60,31 @@ export default function ProviderCard({
             <td className="flex flex-row gap-3 justify-self-end">
                 {provider.state !== ProviderPlatformState.ARCHIVED ? (
                     <>
-                        {provider.oidc_id !== 0 || provider.type === ProviderPlatformType.BRIGHTSPACE ? (
+                        {provider.oidc_id !== 0 ||
+                        provider.type === ProviderPlatformType.BRIGHTSPACE ? (
                             <>
-                                {provider.type === ProviderPlatformType.BRIGHTSPACE ? (
+                                {provider.type ===
+                                ProviderPlatformType.BRIGHTSPACE ? (
                                     <ULIComponent
-                                    dataTip={'Refresh Token'}
-                                    icon={ArrowPathIcon}
-                                    onClick={() =>
-                                        refreshToken(provider)
-                                    }
-                                />
-                                ) : ( <ULIComponent
-                                    dataTip={'Auth Info'}
-                                    icon={InformationCircleIcon}
-                                    onClick={() =>
-                                        showAuthorizationInfo(provider)
-                                    }
-                                />)
-                                }
+                                        tooltipClassName="cursor-pointer"
+                                        dataTip={'Refresh Token'}
+                                        icon={ArrowPathIcon}
+                                        onClick={() => refreshToken(provider)}
+                                    />
+                                ) : (
+                                    <ULIComponent
+                                        tooltipClassName="cursor-pointer"
+                                        dataTip={'Auth Info'}
+                                        icon={InformationCircleIcon}
+                                        onClick={() =>
+                                            showAuthorizationInfo(provider)
+                                        }
+                                    />
+                                )}
                                 {provider.type !==
                                     ProviderPlatformType.KOLIBRI && (
                                     <ULIComponent
+                                        tooltipClassName="cursor-pointer"
                                         dataTip={'Manage Users'}
                                         icon={UserGroupIcon}
                                         onClick={() =>
@@ -92,17 +97,20 @@ export default function ProviderCard({
                             </>
                         ) : (
                             <ULIComponent
+                                tooltipClassName="cursor-pointer"
                                 dataTip={'Register Provider'}
                                 icon={LinkIcon}
                                 onClick={() => oidcClient(provider)}
                             />
                         )}
                         <ULIComponent
+                            tooltipClassName="cursor-pointer"
                             dataTip={'Edit Provider'}
                             icon={PencilSquareIcon}
                             onClick={() => openEditProvider(provider)}
                         />
                         <ULIComponent
+                            tooltipClassName="w-4 h-4 self-start cursor-pointer"
                             dataTip={'Disable'}
                             icon={XMarkIcon}
                             onClick={() => archiveProvider(provider)}
@@ -110,6 +118,7 @@ export default function ProviderCard({
                     </>
                 ) : (
                     <ULIComponent
+                        tooltipClassName="cursor-pointer"
                         dataTip={'Enable Provider'}
                         icon={CheckCircleIcon}
                         onClick={() => archiveProvider(provider)}
diff --git a/frontend/src/Pages/AdminManagement.tsx b/frontend/src/Pages/AdminManagement.tsx
index d6135555..a6bdec1b 100644
--- a/frontend/src/Pages/AdminManagement.tsx
+++ b/frontend/src/Pages/AdminManagement.tsx
@@ -235,7 +235,7 @@ export default function AdminManagement() {
                                                 <div className="flex space-x-4">
                                                     <ULIComponent
                                                         dataTip={'Edit Admin'}
-                                                        tooltipClassName="tooltip-left"
+                                                        tooltipClassName="tooltip-left cursor-pointer"
                                                         onClick={() => {
                                                             setTargetUser(user);
                                                             editUserModal.current?.showModal();
@@ -246,7 +246,7 @@ export default function AdminManagement() {
                                                         dataTip={
                                                             'Reset Password'
                                                         }
-                                                        tooltipClassName="tooltip-left"
+                                                        tooltipClassName="tooltip-left cursor-pointer"
                                                         onClick={() => {
                                                             setTargetUser(user);
                                                             resetUserPasswordModal.current?.showModal();
@@ -259,7 +259,7 @@ export default function AdminManagement() {
                                                         dataTip={getUserIconData[
                                                             'data-tip'
                                                         ](user)}
-                                                        tooltipClassName="tooltip-left"
+                                                        tooltipClassName="tooltip-left cursor-pointer"
                                                         onClick={getUserIconData.onClick(
                                                             user
                                                         )}
diff --git a/frontend/src/Pages/StudentManagement.tsx b/frontend/src/Pages/StudentManagement.tsx
index 4a2def58..74080e17 100644
--- a/frontend/src/Pages/StudentManagement.tsx
+++ b/frontend/src/Pages/StudentManagement.tsx
@@ -216,7 +216,7 @@ export default function StudentManagement() {
                                                 <div className="flex space-x-4">
                                                     <ULIComponent
                                                         dataTip={'Edit Student'}
-                                                        tooltipClassName="tooltip-left"
+                                                        tooltipClassName="tooltip-left cursor-pointer"
                                                         icon={PencilSquareIcon}
                                                         onClick={() => {
                                                             setTargetUser(user);
@@ -228,7 +228,7 @@ export default function StudentManagement() {
                                                         dataTip={
                                                             'Reset Password'
                                                         }
-                                                        tooltipClassName="tooltip-left"
+                                                        tooltipClassName="tooltip-left cursor-pointer"
                                                         icon={
                                                             ArrowPathRoundedSquareIcon
                                                         }
@@ -242,7 +242,7 @@ export default function StudentManagement() {
                                                         dataTip={
                                                             'Delete Student'
                                                         }
-                                                        tooltipClassName="tooltip-left"
+                                                        tooltipClassName="tooltip-left cursor-pointer"
                                                         icon={TrashIcon}
                                                         onClick={() => {
                                                             setTargetUser(user);