diff --git a/src/components/Button.tsx b/src/components/Button.tsx
index a83c005..ce98213 100644
--- a/src/components/Button.tsx
+++ b/src/components/Button.tsx
@@ -1,30 +1,29 @@
 'use client';
 
-import React, { forwardRef } from 'react';
 import { AiOutlineLoading3Quarters as LoadingIcon } from '@react-icons/all-files/ai/AiOutlineLoading3Quarters';
-import clsx from 'clsx';
 import { VariantProps, cva } from 'class-variance-authority';
+import clsx from 'clsx';
+import React, { forwardRef } from 'react';
 
 const buttonVariants = cva(
   'rounded-md font-semibold focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 flex items-center justify-center gap-2 cursor-pointer',
   {
     variants: {
       variant: {
-        default:
-          'ring-1 shadow-sm bg-violet-600 hover:bg-violet-700 text-white ring-violet-600',
+        default: 'shadow-sm bg-violet-600 hover:bg-violet-700 text-white',
         outline:
-          'ring-1 shadow-sm bg-transparent hover:bg-violet-700 text-violet-700 ring-1 ring-violet-600 hover:bg-violet-100 hover:text-white',
+          'border border-1 shadow-sm bg-transparent hover:bg-violet-700 text-violet-700 border-violet-600 hover:text-white box-border',
         destructive:
-          'ring-1 shadow-sm bg-red-700 hover:bg-red-600 text-white ring-red-700',
+          'border-1 shadow-sm bg-red-700 hover:bg-red-600 text-white border-red-700',
         destructiveOutline:
-          'ring-1 shadow-sm bg-transparent hover:bg-red-700 text-red-700 ring-1 ring-red-700 hover:bg-red-100 hover:text-white',
+          'border-1 shadow-sm bg-transparent text-red-700 border-1 border-red-700 hover:bg-red-100 hover:text-white',
         success:
-          'ring-1 shadow-sm bg-[#4ade80] hover:bg-[#3dba6b] text-white ring-[#4ade80] hover:ring-[#3dba6b]',
+          'border-1 shadow-sm bg-[#4ade80] hover:bg-[#3dba6b] text-white border-[#4ade80] hover:border-[#3dba6b]',
         ghost:
-          'bg-transparent text-violet-700 ring-1 ring-transparent hover:bg-violet-100 hover:ring-violet-100',
+          'bg-transparent text-violet-700 border-1 border-transparent hover:bg-violet-100 hover:border-violet-100',
         destructiveGhost:
-          'bg-transparent text-red-700 ring-1 ring-transparent hover:bg-red-100 hover:ring-red-100',
-        link: 'ring-0 text-gray-700 text-sm underline hover:text-gray-400 font-light !px-0 !font-normal',
+          'bg-transparent text-red-700 border-1 border-transparent hover:bg-red-100 hover:border-red-100',
+        link: 'border-0 text-gray-700 text-sm underline hover:text-gray-400 !px-0 !font-normal',
       },
       size: {
         sm: 'py-1 px-4 text-sm',
@@ -82,7 +81,7 @@ const Button = forwardRef<HTMLButtonElement, ButtonProps>((props, ref) => {
           [disabledClass]: disabled,
         },
         {
-          'w-full': fullWidth,
+          'w-full box-border': fullWidth,
         },
         className
       )}
diff --git a/src/components/auth/LoginForm.tsx b/src/components/auth/LoginForm.tsx
index 4551cb6..32b7c5c 100644
--- a/src/components/auth/LoginForm.tsx
+++ b/src/components/auth/LoginForm.tsx
@@ -1,15 +1,15 @@
 'use client';
 import { routes } from '@/core/constants';
+import message from '@/messages/en';
 import { EmailProvider, getEmailProvider } from '@/utils/getEmailProvider';
 import { CheckCircleIcon } from '@heroicons/react/24/solid';
-import Link from 'next/link';
 import { signIn } from 'next-auth/react';
+import Link from 'next/link';
 import { useSearchParams } from 'next/navigation';
 import { useState } from 'react';
 import { useMutation } from 'react-query';
 import Button from '../Button';
 import { Input } from '../Input';
-import message from '@/messages/en';
 
 const LoginForm = () => {
   const searchParams = useSearchParams();
@@ -37,7 +37,7 @@ const LoginForm = () => {
   );
 
   return (
-    <div className="flex flex-col space-y-6 items-stretch">
+    <div className="flex flex-col space-y-6 items-stretch box-border">
       {isSuccess ? (
         <>
           <div className="text-center flex justify-center">
diff --git a/src/components/bookmark/BookmarksTeamList.tsx b/src/components/bookmark/BookmarksTeamList.tsx
index a102493..aac9f28 100644
--- a/src/components/bookmark/BookmarksTeamList.tsx
+++ b/src/components/bookmark/BookmarksTeamList.tsx
@@ -1,22 +1,31 @@
 'use client';
 
+import { TeamLinks } from '@/services/database/link';
+import { Team } from '@prisma/client';
 import { BsFillBookmarkFill } from '@react-icons/all-files/bs/BsFillBookmarkFill';
-import NoContent from '../layout/NoContent';
-import { BookmarkItem } from './BookmarkItem';
 import Link from 'next/link';
 import SearchInput from '../digests/SearchInput';
-import { TeamLinks } from '@/services/database/link';
+import NoContent from '../layout/NoContent';
+import { BookmarkItem } from './BookmarkItem';
+import CreateBookmarkButton from './CreateBookmarkButton';
 
 type Props = {
   teamLinks: TeamLinks;
-  teamId: string;
-  teamSlug: string;
+  team: Team;
 };
 
-export const BookmarksTeamList = ({ teamLinks, teamId, teamSlug }: Props) => {
+export const BookmarksTeamList = ({ teamLinks, team }: Props) => {
   return (
     <div className="w-full">
-      <SearchInput className="mb-4" />
+      <div className="flex w-full justify-between items-center gap-4 mb-4">
+        <div className="flex-1 ">
+          <SearchInput />
+        </div>
+        <div className="flex">
+          <CreateBookmarkButton team={team} />
+        </div>
+      </div>
+
       {teamLinks.length < 1 ? (
         <NoContent
           icon={<BsFillBookmarkFill />}
@@ -34,8 +43,8 @@ export const BookmarksTeamList = ({ teamLinks, teamId, teamSlug }: Props) => {
             >
               <BookmarkItem
                 teamLink={teamLink}
-                teamSlug={teamSlug}
-                teamId={teamId}
+                teamSlug={team.slug}
+                teamId={team.id}
                 digestId={
                   teamLink.bookmark?.find(
                     (teamLink) => teamLink?.digestBlocks?.length
diff --git a/src/components/bookmark/BookmarkButton.tsx b/src/components/bookmark/CreateBookmarkButton.tsx
similarity index 55%
rename from src/components/bookmark/BookmarkButton.tsx
rename to src/components/bookmark/CreateBookmarkButton.tsx
index 549fca2..1256fa4 100644
--- a/src/components/bookmark/BookmarkButton.tsx
+++ b/src/components/bookmark/CreateBookmarkButton.tsx
@@ -1,28 +1,35 @@
+'use client';
+
+import { PlusIcon } from '@heroicons/react/24/solid';
 import { Team } from '@prisma/client';
-import { FaTelegramPlane } from '@react-icons/all-files/fa/FaTelegramPlane';
-import { BookmarkModal } from './BookmarkModal';
-import { Dialog, DialogContent, DialogTrigger } from '../Dialog';
 import { useState } from 'react';
+import Button from '../Button';
+import { Dialog, DialogContent, DialogTrigger } from '../Dialog';
+import { BookmarkModal } from './BookmarkModal';
 
-type Props = { team: Team };
+interface Props {
+  team: Team;
+}
 
-const BookmarkButton = ({ team }: Props) => {
+export default function CreateBookmarkButton({ team }: Props) {
   const [isDialogOpen, setIsDialogOpen] = useState(false);
   return (
     <Dialog open={isDialogOpen} onOpenChange={setIsDialogOpen}>
       <DialogTrigger asChild>
-        <button
-          className="btn-add-link"
-          aria-label="Add bookmark"
-          title="Add bookmark"
+        <Button
+          onClick={() => setIsDialogOpen(true)}
+          variant="default"
+          size="md"
+          icon={<PlusIcon className="h-4 w-4" aria-hidden="true" />}
+          title="Create a new bookmark"
+          className="px-0"
         >
-          <span className="hidden md:block">Add Bookmark</span>
-          <FaTelegramPlane />
-        </button>
+          New bookmark
+        </Button>
       </DialogTrigger>
       <DialogContent
         containerClassName="w-full sm:max-w-md"
-        title="New Bookmark"
+        title="New bookmark"
         description="Add a new link to your team feed"
         closeIcon
       >
@@ -30,6 +37,4 @@ const BookmarkButton = ({ team }: Props) => {
       </DialogContent>
     </Dialog>
   );
-};
-
-export default BookmarkButton;
+}
diff --git a/src/components/bookmark/HeaderCreateBookmarkButton.tsx b/src/components/bookmark/HeaderCreateBookmarkButton.tsx
new file mode 100644
index 0000000..b6afd56
--- /dev/null
+++ b/src/components/bookmark/HeaderCreateBookmarkButton.tsx
@@ -0,0 +1,51 @@
+import { PlusIcon } from '@heroicons/react/24/solid';
+import { Team } from '@prisma/client';
+import { useEffect, useState } from 'react';
+import { Dialog, DialogContent, DialogTrigger } from '../Dialog';
+import { BookmarkModal } from './BookmarkModal';
+
+type Props = { team: Team };
+
+const HeaderCreateBookmarkButton = ({ team }: Props) => {
+  const [isDialogOpen, setIsDialogOpen] = useState(false);
+
+  function onKeyDown(event: KeyboardEvent) {
+    if (event.key === 'b' && event.ctrlKey) {
+      setIsDialogOpen(true);
+    }
+  }
+
+  useEffect(() => {
+    window.addEventListener('keydown', onKeyDown);
+    return () => {
+      window.removeEventListener('keydown', onKeyDown);
+    };
+  }, []);
+
+  return (
+    <Dialog open={isDialogOpen} onOpenChange={setIsDialogOpen}>
+      <DialogTrigger asChild>
+        <button
+          className="btn-add-link"
+          aria-label="New bookmark"
+          title="New bookmark"
+        >
+          <span className="hidden md:block whitespace-nowrap">
+            New bookmark
+          </span>
+          <PlusIcon className="h-3.5 w-3.5" aria-hidden="true" />
+        </button>
+      </DialogTrigger>
+      <DialogContent
+        containerClassName="w-full sm:max-w-md"
+        title="New Bookmark"
+        description="Add a new link to your team feed"
+        closeIcon
+      >
+        <BookmarkModal onSuccess={() => setIsDialogOpen(false)} team={team} />
+      </DialogContent>
+    </Dialog>
+  );
+};
+
+export default HeaderCreateBookmarkButton;
diff --git a/src/components/digests/SearchInput.tsx b/src/components/digests/SearchInput.tsx
index 90dea4c..4d5ae25 100644
--- a/src/components/digests/SearchInput.tsx
+++ b/src/components/digests/SearchInput.tsx
@@ -1,10 +1,10 @@
 'use client';
 
-import { InputHTMLAttributes, useCallback, useTransition } from 'react';
 import { MagnifyingGlassIcon } from '@heroicons/react/24/outline';
 import { AiOutlineLoading3Quarters as LoadingIcon } from '@react-icons/all-files/ai/AiOutlineLoading3Quarters';
-import { usePathname, useRouter, useSearchParams } from 'next/navigation';
 import debounce from 'lodash/debounce';
+import { usePathname, useRouter, useSearchParams } from 'next/navigation';
+import { InputHTMLAttributes, useCallback, useTransition } from 'react';
 
 const SearchInput = ({
   className,
@@ -30,7 +30,7 @@ const SearchInput = ({
 
   return (
     <div className={className}>
-      <div className="mt-2 flex rounded-md shadow-sm">
+      <div className="flex rounded-md shadow-sm">
         <div className="relative flex flex-grow items-stretch focus-within:z-10">
           <div className="pointer-events-none absolute inset-y-0 left-0 flex items-center pl-3">
             {isPending ? (
@@ -49,7 +49,7 @@ const SearchInput = ({
             type="search"
             name="search"
             id="search"
-            className="block w-full rounded-md border-0 py-1.5 pl-10 text-gray-900 ring-1 ring-inset ring-gray-300 placeholder:text-gray-400 focus:ring-2 focus:ring-inset focus:ring-indigo-600 sm:text-sm sm:leading-6"
+            className="block w-full rounded-md border-0 py-1.5 pl-10 text-gray-900 ring-1 ring-inset ring-gray-300 placeholder:text-gray-400 focus:ring-2 focus:ring-inset focus:ring-violet-600 sm:text-sm sm:leading-6"
             placeholder="Search bookmarks"
             onInput={onSearch}
             defaultValue={searchParams?.get('search') || ''}
diff --git a/src/components/layout/NavMenu/NavMenu.tsx b/src/components/layout/NavMenu/NavMenu.tsx
index 72884c1..834f4f3 100644
--- a/src/components/layout/NavMenu/NavMenu.tsx
+++ b/src/components/layout/NavMenu/NavMenu.tsx
@@ -1,21 +1,21 @@
 'use client';
 
 import { routes } from '@/core/constants';
-import { Team } from '@prisma/client';
-import { HiChevronDown } from '@react-icons/all-files/hi/HiChevronDown';
-import * as NavigationMenu from '@radix-ui/react-navigation-menu';
-import { usePathname } from 'next/navigation';
-import BookmarkButton from '../../bookmark/BookmarkButton';
-import { signOut } from 'next-auth/react';
-import Divider from './Divider';
-import Item from './Item';
 import {
   AdjustmentsVerticalIcon,
-  CheckIcon,
-  UserIcon,
   ArrowLeftOnRectangleIcon,
+  CheckIcon,
   PlusIcon,
+  UserIcon,
 } from '@heroicons/react/24/solid';
+import { Team } from '@prisma/client';
+import * as NavigationMenu from '@radix-ui/react-navigation-menu';
+import { HiChevronDown } from '@react-icons/all-files/hi/HiChevronDown';
+import { signOut } from 'next-auth/react';
+import { usePathname } from 'next/navigation';
+import HeaderCreateBookmarkButton from '../../bookmark/HeaderCreateBookmarkButton';
+import Divider from './Divider';
+import Item from './Item';
 
 type Props = {
   teams?: Team[];
@@ -36,7 +36,7 @@ export const NavMenu = ({ teams }: Props) => {
         <div>
           {currentTeam && pathName !== '/' && (
             <>
-              <BookmarkButton team={currentTeam} />
+              <HeaderCreateBookmarkButton team={currentTeam} />
             </>
           )}
         </div>
diff --git a/src/components/pages/DigestEditPage.tsx b/src/components/pages/DigestEditPage.tsx
index 86fc622..0103a50 100644
--- a/src/components/pages/DigestEditPage.tsx
+++ b/src/components/pages/DigestEditPage.tsx
@@ -1,16 +1,21 @@
 'use client';
 
-import { useRouter } from 'next/navigation';
 import { routes } from '@/core/constants';
 import useCustomToast from '@/hooks/useCustomToast';
 import useTransitionRefresh from '@/hooks/useTransitionRefresh';
 import api from '@/lib/api';
+import { useRouter } from 'next/navigation';
 
 import useAddAndRemoveBlockOnDigest from '@/hooks/useAddAndRemoveBlockOnDigest';
 import { ApiDigestResponseSuccess } from '@/pages/api/teams/[teamId]/digests';
+import { getDigest } from '@/services/database/digest';
+import { TeamLinksData } from '@/services/database/link';
+import { getTeamBySlug } from '@/services/database/team';
 import { reorderList } from '@/utils/actionOnList';
 import { getRelativeDate } from '@/utils/date';
+import { digestBlockToTemplateBlocks } from '@/utils/template';
 import { EyeSlashIcon, RssIcon, TrashIcon } from '@heroicons/react/24/outline';
+import { EyeIcon } from '@heroicons/react/24/solid';
 import { DigestBlock, DigestBlockType } from '@prisma/client';
 import { BsFillBookmarkFill } from '@react-icons/all-files/bs/BsFillBookmarkFill';
 import { AxiosError, AxiosResponse } from 'axios';
@@ -26,22 +31,18 @@ import { useMutation } from 'react-query';
 import Button from '../Button';
 import { Input, TextArea } from '../Input';
 import { DeletePopover } from '../Popover';
-import { BlockListDnd } from '../digests/BlockListDnd';
 import BookmarkListDnd from '../bookmark/BookmarkListDnd';
+import CreateBookmarkButton from '../bookmark/CreateBookmarkButton';
+import { BlockListDnd } from '../digests/BlockListDnd';
 import SearchInput from '../digests/SearchInput';
+import CreateTemplateModal from '../digests/templates/CreateTemplateModal';
 import NoContent from '../layout/NoContent';
 import SectionContainer from '../layout/SectionContainer';
 import Pagination from '../list/Pagination';
 import { Breadcrumb } from '../teams/Breadcrumb';
-import DigestEditVisit from './DigestEditVisit';
-import DigestEditTypefully from './DigestEditTypefully';
 import DigestEditSendNewsletter from './DigestEditSendNewsletter';
-import { EyeIcon } from '@heroicons/react/24/solid';
-import CreateTemplateModal from '../digests/templates/CreateTemplateModal';
-import { digestBlockToTemplateBlocks } from '@/utils/template';
-import { TeamLinksData } from '@/services/database/link';
-import { getDigest } from '@/services/database/digest';
-import { getTeamBySlug } from '@/services/database/team';
+import DigestEditTypefully from './DigestEditTypefully';
+import DigestEditVisit from './DigestEditVisit';
 
 type Props = {
   teamLinksData: TeamLinksData;
@@ -285,7 +286,14 @@ export const DigestEditPage = ({
             </div>
 
             <SectionContainer title="Bookmarks" className="relative">
-              <SearchInput className="mb-4" />
+              <div className="flex w-full justify-between items-center gap-4 mb-4">
+                <div className="flex-1">
+                  <SearchInput />
+                </div>
+                <div className="flex">
+                  <CreateBookmarkButton team={team} />
+                </div>
+              </div>
               <div className="flex flex-col gap-2">
                 {teamLinks && teamLinks.length > 0 ? (
                   <BookmarkListDnd
diff --git a/src/components/pages/Team.tsx b/src/components/pages/Team.tsx
index c3289d8..69216c2 100644
--- a/src/components/pages/Team.tsx
+++ b/src/components/pages/Team.tsx
@@ -1,21 +1,21 @@
+import { TeamDigestsResult } from '@/services/database/digest';
+import { TeamLinks } from '@/services/database/link';
+import { getTeamBySlug } from '@/services/database/team';
 import { BsFillBookmarkFill } from '@react-icons/all-files/bs/BsFillBookmarkFill';
 import Link from 'next/link';
+import { Suspense } from 'react';
 import Card from '../Card';
 import { CounterTag } from '../CounterTag';
 import { BookmarksListControls } from '../bookmark/BookmarksListControls';
 import { BookmarksTeamList } from '../bookmark/BookmarksTeamList';
+import ChartsServer from '../charts/ChartsServer';
+import ChartsSkeleton from '../charts/ChartsSkeleton';
 import { DigestCreateInput } from '../digests/DigestCreateInput';
 import { Digests } from '../digests/Digests';
+import SelectTemplateModal from '../digests/templates/SelectTemplateModal';
 import NoContent from '../layout/NoContent';
 import PageContainer from '../layout/PageContainer';
 import Pagination from '../list/Pagination';
-import SelectTemplateModal from '../digests/templates/SelectTemplateModal';
-import ChartsServer from '../charts/ChartsServer';
-import { Suspense } from 'react';
-import ChartsSkeleton from '../charts/ChartsSkeleton';
-import { TeamDigestsResult } from '@/services/database/digest';
-import { TeamLinks } from '@/services/database/link';
-import { getTeamBySlug } from '@/services/database/team';
 
 type Props = {
   linkCount: number;
@@ -41,7 +41,7 @@ const Team = ({
       <div className="flex max-lg:flex-col gap-5 pb-4">
         <Card
           className="w-full lg:w-2/3"
-          contentClassName="sm:py-2 sm:px-6"
+          contentClassName="sm:py-5 sm:px-5"
           header={
             <>
               <div className="flex items-center justify-between gap-3 max-sm:flex-col max-sm:items-start">
@@ -70,11 +70,7 @@ const Team = ({
               subtitle="Start bookmarking links to share them with your team"
             />
           ) : (
-            <BookmarksTeamList
-              teamId={team.id}
-              teamSlug={team.slug}
-              teamLinks={teamLinks}
-            />
+            <BookmarksTeamList team={team} teamLinks={teamLinks} />
           )}
         </Card>
         <Card