diff --git a/app/assets/css/app.css b/app/assets/css/app.css
index ffbe4a6b5..aa4749814 100644
--- a/app/assets/css/app.css
+++ b/app/assets/css/app.css
@@ -216,6 +216,14 @@ input[type='checkbox'] {
   color: var(--text-blocklist-item-selected-color);
 }
 
+.blocklist-item:not(.blocklist-item-not-interactive):hover {
+  @apply border border-blue-7;
+  cursor: pointer;
+
+  background-color: var(--bg-blocklist-hover-color);
+  color: var(--text-blocklist-hover-color);
+}
+
 .blocklist-item-box {
   display: flex;
 }
diff --git a/app/react/components/datatables/TableFooter.tsx b/app/react/components/datatables/TableFooter.tsx
index 1f97148ea..e398e786b 100644
--- a/app/react/components/datatables/TableFooter.tsx
+++ b/app/react/components/datatables/TableFooter.tsx
@@ -1,5 +1,9 @@
+import clsx from 'clsx';
 import { PropsWithChildren } from 'react';
 
-export function TableFooter({ children }: PropsWithChildren<unknown>) {
-  return <footer className="footer">{children}</footer>;
+export function TableFooter({
+  children,
+  className,
+}: PropsWithChildren<unknown> & { className?: string }) {
+  return <footer className={clsx('footer', className)}>{children}</footer>;
 }
diff --git a/app/react/portainer/HomeView/EnvironmentList/EnvironmentItem/EditButtons.tsx b/app/react/portainer/HomeView/EnvironmentList/EnvironmentItem/EditButtons.tsx
index e15eefc57..9df77f597 100644
--- a/app/react/portainer/HomeView/EnvironmentList/EnvironmentItem/EditButtons.tsx
+++ b/app/react/portainer/HomeView/EnvironmentList/EnvironmentItem/EditButtons.tsx
@@ -23,7 +23,9 @@ export function EditButtons({ environment }: { environment: Environment }) {
 
   const buttonsClasses = clsx(
     'w-full h-full !ml-0 !rounded-none',
-    'hover:bg-gray-3 th-dark:hover:bg-gray-9 th-highcontrast:hover:bg-white'
+    'hover:bg-gray-3',
+    'th-dark:hover:bg-gray-9',
+    'th-highcontrast:hover:bg-white th-highcontrast:hover:text-black'
   );
 
   return (
@@ -85,8 +87,13 @@ function ButtonsGrid({
   return (
     <div
       className={clsx(
-        'grid rounded-r-lg border border-solid',
-        'border-gray-5 th-highcontrast:border-white th-dark:border-gray-9',
+        'grid',
+        // trace borders but make them transparent so
+        // * hovering the env item won't make env box borders clip with the grid borders
+        // * hovering the buttons won't make the button's icon flicker
+        'rounded-r-lg border border-solid',
+        'border-y-transparent border-r-transparent',
+        'border-l-gray-5 th-highcontrast:border-l-white th-dark:border-l-gray-9',
         'overflow-hidden',
         className
       )}
@@ -95,7 +102,7 @@ function ButtonsGrid({
         <div
           key={index}
           className={clsx({
-            'border-0 border-b border-solid border-b-inherit':
+            'border-0 border-b border-solid border-b-gray-5 th-highcontrast:border-b-white th-dark:border-b-gray-9':
               index < children.length - 1,
           })}
         >
diff --git a/app/react/portainer/HomeView/EnvironmentList/EnvironmentList.tsx b/app/react/portainer/HomeView/EnvironmentList/EnvironmentList.tsx
index 655ae0116..770c4652e 100644
--- a/app/react/portainer/HomeView/EnvironmentList/EnvironmentList.tsx
+++ b/app/react/portainer/HomeView/EnvironmentList/EnvironmentList.tsx
@@ -229,7 +229,7 @@ export function EnvironmentList({ onClickBrowse, onRefresh }: Props) {
               ))
             )}
           </div>
-          <TableFooter>
+          <TableFooter className="!border-t-0">
             <PaginationControls
               className="!mr-0"
               showAll={totalCount <= 100}