diff --git a/frontend/src/components/basic/InputField.tsx b/frontend/src/components/basic/InputField.tsx
index e6eef1354..65ae8d21f 100644
--- a/frontend/src/components/basic/InputField.tsx
+++ b/frontend/src/components/basic/InputField.tsx
@@ -101,7 +101,7 @@ const InputField = ({
           </button>
         )}
         {blurred && (
-          <div className="peer absolute flex h-10 w-fit max-w-xl items-center overflow-hidden text-clip rounded-md text-gray-400/50 group-hover:hidden peer-hover:hidden peer-focus:hidden peer-active:invisible">
+          <div className="peer absolute flex h-10 w-fit max-w-xl items-center overflow-hidden text-clip rounded-md text-gray-400/50 group-hover:!hidden peer-hover:hidden peer-focus:hidden peer-active:invisible">
             <p className="ml-2" />
             {value
               .split("")
diff --git a/frontend/src/components/notifications/Notifications.tsx b/frontend/src/components/notifications/Notifications.tsx
index 8c180306f..84aad65bb 100644
--- a/frontend/src/components/notifications/Notifications.tsx
+++ b/frontend/src/components/notifications/Notifications.tsx
@@ -73,6 +73,7 @@ export const createNotification = (
 export const NotificationContainer = () => (
   <ToastContainer
     pauseOnHover
+    className="[&>svg]:top-1"
     toastClassName="border border-mineshaft-500"
     style={{ width: "400px" }}
   />
diff --git a/frontend/src/components/v2/Button/Button.tsx b/frontend/src/components/v2/Button/Button.tsx
index c0b268847..01eb26e3e 100644
--- a/frontend/src/components/v2/Button/Button.tsx
+++ b/frontend/src/components/v2/Button/Button.tsx
@@ -116,7 +116,7 @@ const buttonVariants = cva(
         colorSchema: "danger",
         variant: "outline_bg",
         className:
-          "bg-mineshaft-600 border border-red-500 hover:bg-red/15 bg-red/10 hover:border-red/40 text-red-500"
+          "bg-mineshaft-600 border border-red-500/40 hover:bg-red/15 bg-red/10 hover:border-red text-red-500"
       },
       {
         colorSchema: "primary",
diff --git a/frontend/src/index.css b/frontend/src/index.css
index 80645676d..b29b5bf54 100644
--- a/frontend/src/index.css
+++ b/frontend/src/index.css
@@ -401,18 +401,16 @@
   }
 }
 
-@layer components {
-  .Toastify__toast {
+.Toastify__toast {
     @apply rounded-md;
-  }
+}
 
-  .Toastify__toast-body {
+.Toastify__toast-body {
     @apply items-start;
-  }
+}
 
-  .Toastify__toast-icon {
+.Toastify__toast-icon {
     @apply w-4 pt-1;
-  }
 }
 
 .tags-conic-bg {
diff --git a/frontend/src/pages/secret-manager/OverviewPage/components/SecretOverviewFolderRow/SecretOverviewFolderRow.tsx b/frontend/src/pages/secret-manager/OverviewPage/components/SecretOverviewFolderRow/SecretOverviewFolderRow.tsx
index ea6ccb673..5464e6ed3 100644
--- a/frontend/src/pages/secret-manager/OverviewPage/components/SecretOverviewFolderRow/SecretOverviewFolderRow.tsx
+++ b/frontend/src/pages/secret-manager/OverviewPage/components/SecretOverviewFolderRow/SecretOverviewFolderRow.tsx
@@ -49,7 +49,7 @@ export const SecretOverviewFolderRow = ({
               className={twMerge("hidden group-hover:flex", isSelected && "flex")}
             />
             <FontAwesomeIcon
-              className={twMerge("block group-hover:hidden", isSelected && "hidden")}
+              className={twMerge("block group-hover:!hidden", isSelected && "!hidden")}
               icon={faFolder}
             />
           </div>
diff --git a/frontend/src/pages/secret-manager/OverviewPage/components/SecretOverviewTableRow/SecretOverviewTableRow.tsx b/frontend/src/pages/secret-manager/OverviewPage/components/SecretOverviewTableRow/SecretOverviewTableRow.tsx
index 495ec2e89..165af35dd 100644
--- a/frontend/src/pages/secret-manager/OverviewPage/components/SecretOverviewTableRow/SecretOverviewTableRow.tsx
+++ b/frontend/src/pages/secret-manager/OverviewPage/components/SecretOverviewTableRow/SecretOverviewTableRow.tsx
@@ -133,7 +133,7 @@ export const SecretOverviewTableRow = ({
                   className={twMerge("hidden group-hover:flex", isSelected && "flex")}
                 />
                 <FontAwesomeIcon
-                  className={twMerge("block group-hover:hidden", isSelected && "hidden")}
+                  className={twMerge("block group-hover:!hidden", isSelected && "!hidden")}
                   icon={isFormExpanded ? faAngleDown : faKey}
                 />
               </div>
diff --git a/frontend/src/pages/secret-manager/OverviewPage/components/SecretSearchInput/components/QuickSearchSecretItem.tsx b/frontend/src/pages/secret-manager/OverviewPage/components/SecretSearchInput/components/QuickSearchSecretItem.tsx
index 4d6c9cbcd..d9e757c9e 100644
--- a/frontend/src/pages/secret-manager/OverviewPage/components/SecretSearchInput/components/QuickSearchSecretItem.tsx
+++ b/frontend/src/pages/secret-manager/OverviewPage/components/SecretSearchInput/components/QuickSearchSecretItem.tsx
@@ -253,7 +253,9 @@ export const QuickSearchSecretItem = ({
                       >
                         {secret.value || "EMPTY"}
                       </p>
-                      <p className="w-48 text-sm group-hover:hidden">***************************</p>
+                      <p className="w-48 text-sm group-hover:!hidden">
+                        ***************************
+                      </p>
                     </div>
                   </Tooltip>
                 </DropdownMenuItem>
diff --git a/frontend/src/pages/secret-manager/SecretDashboardPage/components/SecretListView/SecretItem.tsx b/frontend/src/pages/secret-manager/SecretDashboardPage/components/SecretListView/SecretItem.tsx
index 04a750ffc..e606340b0 100644
--- a/frontend/src/pages/secret-manager/SecretDashboardPage/components/SecretListView/SecretItem.tsx
+++ b/frontend/src/pages/secret-manager/SecretDashboardPage/components/SecretListView/SecretItem.tsx
@@ -462,8 +462,8 @@ export const SecretItem = memo(
                   />
                   <FontAwesomeSymbol
                     className={twMerge(
-                      "ml-3 block h-3.5 w-3.5 group-hover:hidden",
-                      isSelected && "hidden"
+                      "ml-3 block h-3.5 w-3.5 group-hover:!hidden",
+                      isSelected && "!hidden"
                     )}
                     symbolName={FontAwesomeSpriteName.SecretKey}
                   />