diff --git a/src/webapp/features/cards/components/urlCardActions/UrlCardActions.tsx b/src/webapp/features/cards/components/urlCardActions/UrlCardActions.tsx
index 54111c44..cb006800 100644
--- a/src/webapp/features/cards/components/urlCardActions/UrlCardActions.tsx
+++ b/src/webapp/features/cards/components/urlCardActions/UrlCardActions.tsx
@@ -6,7 +6,15 @@ import {
   type User,
   CollectionAccessType,
 } from '@/api-client';
-import { ActionIcon, Button, Collapse, CopyButton, Group, Menu } from '@mantine/core';
+import {
+  ActionIcon,
+  Button,
+  Collapse,
+  CopyButton,
+  Group,
+  Menu,
+  Tooltip,
+} from '@mantine/core';
 import { Fragment, useState } from 'react';
 import { FiPlus } from 'react-icons/fi';
 import { BsThreeDots, BsTrash2Fill } from 'react-icons/bs';
@@ -92,78 +100,84 @@ export default function UrlCardActions(props: Props) {
       )}
       <Group justify="space-between">
         <Group gap={'xs'}>
-          <Button
-            variant="light"
-            color={'gray'}
-            size="xs"
-            radius={'xl'}
-            leftSection={
-              props.urlLibraryCount > 0 ? (
-                props.urlIsInLibrary ? (
-                  <IoMdCheckmark size={18} />
-                ) : (
-                  <FiPlus size={18} />
-                )
-              ) : undefined
-            }
-            onClick={(e) => {
-              e.stopPropagation();
-              if (!isAuthenticated) {
-                router.push('/login');
-                return;
-              }
-              trigger();
-              setShowAddToModal(true);
-            }}
-          >
-            {props.urlLibraryCount ? (
-              props.urlLibraryCount
-            ) : props.urlIsInLibrary ? (
-              <IoMdCheckmark size={18} />
-            ) : (
-              <FiPlus size={18} />
-            )}
-          </Button>
-          <Button
-            variant="light"
-            color="gray"
-            c={props.urlIsConnected ? 'green' : 'gray'}
-            size="xs"
-            radius={'xl'}
-            leftSection={
-              props.urlConnectionCount > 0 ? (
-                <TbPlugConnected size={15} />
-              ) : undefined
-            }
-            onClick={(e) => {
-              e.stopPropagation();
-              if (!isAuthenticated) {
-                router.push('/login');
-                return;
+          <Tooltip label="Save or update" withArrow>
+            <Button
+              variant="light"
+              color={'gray'}
+              size="xs"
+              radius={'xl'}
+              leftSection={
+                props.urlLibraryCount > 0 ? (
+                  props.urlIsInLibrary ? (
+                    <IoMdCheckmark size={18} />
+                  ) : (
+                    <FiPlus size={18} />
+                  )
+                ) : undefined
               }
-              trigger();
-              setShowAddConnectionModal(true);
-            }}
-          >
-            {props.urlConnectionCount ? (
-              props.urlConnectionCount
-            ) : (
-              <TbPlugConnected size={15} />
-            )}
-          </Button>
-
-          {props.note && (
-            <ActionIcon
+              onClick={(e) => {
+                e.stopPropagation();
+                if (!isAuthenticated) {
+                  router.push('/login');
+                  return;
+                }
+                trigger();
+                setShowAddToModal(true);
+              }}
+            >
+              {props.urlLibraryCount ? (
+                props.urlLibraryCount
+              ) : props.urlIsInLibrary ? (
+                <IoMdCheckmark size={18} />
+              ) : (
+                <FiPlus size={18} />
+              )}
+            </Button>
+          </Tooltip>
+          <Tooltip label="Connect to another card" withArrow>
+            <Button
               variant="light"
               color="gray"
+              c={props.urlIsConnected ? 'green' : 'gray'}
+              size="xs"
               radius={'xl'}
+              leftSection={
+                props.urlConnectionCount > 0 ? (
+                  <TbPlugConnected size={15} />
+                ) : undefined
+              }
               onClick={(e) => {
                 e.stopPropagation();
-                setShowNote((prev) => !prev);
+                if (!isAuthenticated) {
+                  router.push('/login');
+                  return;
+                }
+                trigger();
+                setShowAddConnectionModal(true);
               }}
             >
-              <MdOutlineStickyNote2 />
-            </ActionIcon>
+              {props.urlConnectionCount ? (
+                props.urlConnectionCount
+              ) : (
+                <TbPlugConnected size={15} />
+              )}
+            </Button>
+          </Tooltip>
+
+          {props.note && (
+            <Tooltip label="View note" withArrow>
+              <ActionIcon
+                variant="light"
+                color="gray"
+                radius={'xl'}
+                onClick={(e) => {
+                  e.stopPropagation();
+                  setShowNote((prev) => !prev);
+                }}
+              >
+                <MdOutlineStickyNote2 />
+              </ActionIcon>
+            </Tooltip>
           )}
         </Group>
 
diff --git a/src/webapp/next-env.d.ts b/src/webapp/next-env.d.ts
index c4b7818f..9edff1c7 100644
--- a/src/webapp/next-env.d.ts
+++ b/src/webapp/next-env.d.ts
@@ -1,6 +1,6 @@
 /// <reference types="next" />
 /// <reference types="next/image-types/global" />
-import "./.next/dev/types/routes.d.ts";
+import "./.next/types/routes.d.ts";
 
 // NOTE: This file should not be edited
 // see https://nextjs.org/docs/app/api-reference/config/typescript for more information.
diff --git a/src/webapp/styles/theme.tsx b/src/webapp/styles/theme.tsx
index b218fc2e..174d3908 100644
--- a/src/webapp/styles/theme.tsx
+++ b/src/webapp/styles/theme.tsx
@@ -148,6 +148,7 @@ export const theme = createTheme({
     Tooltip: Tooltip.extend({
       defaultProps: {
         position: 'top-start',
+        openDelay: 500,
       },
     }),
     Title: Text.extend({