diff --git a/apps/api b/apps/api
index 63e0ca33..378cbf8f 160000
--- a/apps/api
+++ b/apps/api
@@ -1 +1 @@
-Subproject commit 63e0ca33e95583a5e2aae69195af052fd0d9aef8
+Subproject commit 378cbf8f3a67ea7877296f1da02edb2b6e3efbce
diff --git a/apps/web/components/team/TeamListItem.tsx b/apps/web/components/team/TeamListItem.tsx
index 13d72093..d951e2bc 100644
--- a/apps/web/components/team/TeamListItem.tsx
+++ b/apps/web/components/team/TeamListItem.tsx
@@ -1,5 +1,11 @@
-import { ExternalLinkIcon, TrashIcon, LogoutIcon, PencilIcon } from "@heroicons/react/outline";
-import { LinkIcon, DotsHorizontalIcon } from "@heroicons/react/solid";
+import { LogoutIcon } from "@heroicons/react/outline";
+import {
+  ExternalLinkIcon,
+  TrashIcon,
+  LinkIcon,
+  DotsHorizontalIcon,
+  PencilIcon,
+} from "@heroicons/react/solid";
 import Link from "next/link";
 
 import { useLocale } from "@calcom/lib/hooks/useLocale";
@@ -126,10 +132,9 @@ export default function TeamListItem(props: Props) {
                       <Link href={"/settings/teams/" + team.id}>
                         <a>
                           <Button
-                            type="button"
-                            size="lg"
                             color="minimal"
-                            className="w-full rounded-none font-normal"
+                            size="sm"
+                            className="w-full rounded-none font-medium"
                             StartIcon={PencilIcon}>
                             {t("edit_team")}
                           </Button>
@@ -141,12 +146,10 @@ export default function TeamListItem(props: Props) {
                     <Link href={`${process.env.NEXT_PUBLIC_APP_URL}/team/${team.slug}`} passHref={true}>
                       <a target="_blank">
                         <Button
-                          type="button"
-                          size="lg"
                           color="minimal"
-                          className="w-full rounded-none font-normal"
+                          size="sm"
+                          className="w-full rounded-none font-medium"
                           StartIcon={ExternalLinkIcon}>
-                          {" "}
                           {t("preview_team")}
                         </Button>
                       </a>
@@ -162,9 +165,9 @@ export default function TeamListItem(props: Props) {
                               e.stopPropagation();
                             }}
                             color="warn"
-                            size="lg"
-                            StartIcon={TrashIcon}
-                            className="w-full rounded-none font-normal">
+                            size="sm"
+                            className="w-full rounded-none font-medium"
+                            StartIcon={TrashIcon}>
                             {t("disband_team")}
                           </Button>
                         </DialogTrigger>
diff --git a/apps/web/pages/event-types/index.tsx b/apps/web/pages/event-types/index.tsx
index 1547811c..a44b1b69 100644
--- a/apps/web/pages/event-types/index.tsx
+++ b/apps/web/pages/event-types/index.tsx
@@ -258,9 +258,9 @@ export const EventTypeList = ({ group, readOnly, types }: EventTypeListProps): J
                           <Link href={"/event-types/" + type.id} passHref={true}>
                             <Button
                               type="button"
-                              size="lg"
+                              size="sm"
                               color="minimal"
-                              className="w-full rounded-none font-normal"
+                              className="w-full rounded-none"
                               StartIcon={PencilIcon}>
                               {" "}
                               {t("edit")}
@@ -271,8 +271,8 @@ export const EventTypeList = ({ group, readOnly, types }: EventTypeListProps): J
                           <Button
                             type="button"
                             color="minimal"
-                            size="lg"
-                            className="w-full rounded-none font-normal"
+                            size="sm"
+                            className="w-full rounded-none"
                             data-testid={"event-type-duplicate-" + type.id}
                             StartIcon={DuplicateIcon}
                             onClick={() => openModal(group, type)}>
@@ -288,9 +288,9 @@ export const EventTypeList = ({ group, readOnly, types }: EventTypeListProps): J
                                   e.stopPropagation();
                                 }}
                                 color="warn"
-                                size="lg"
+                                size="sm"
                                 StartIcon={TrashIcon}
-                                className="w-full rounded-none font-normal">
+                                className="w-full rounded-none">
                                 {t("delete")}
                               </Button>
                             </DialogTrigger>
@@ -322,9 +322,9 @@ export const EventTypeList = ({ group, readOnly, types }: EventTypeListProps): J
                         <a target="_blank">
                           <Button
                             color="minimal"
-                            size="lg"
+                            size="sm"
                             StartIcon={ExternalLinkIcon}
-                            className="w-full rounded-none font-normal">
+                            className="w-full rounded-none">
                             {t("preview")}
                           </Button>
                         </a>
@@ -334,8 +334,8 @@ export const EventTypeList = ({ group, readOnly, types }: EventTypeListProps): J
                       <Button
                         type="button"
                         color="minimal"
-                        size="lg"
-                        className="w-full rounded-none text-left font-normal"
+                        size="sm"
+                        className="w-full rounded-none text-left"
                         data-testid={"event-type-duplicate-" + type.id}
                         StartIcon={ClipboardCopyIcon}
                         onClick={() => {
@@ -352,8 +352,8 @@ export const EventTypeList = ({ group, readOnly, types }: EventTypeListProps): J
                         <Button
                           type="button"
                           color="minimal"
-                          size="lg"
-                          className="w-full rounded-none font-normal"
+                          size="sm"
+                          className="w-full rounded-none"
                           data-testid={"event-type-duplicate-" + type.id}
                           StartIcon={UploadIcon}
                           onClick={() => {
@@ -374,9 +374,9 @@ export const EventTypeList = ({ group, readOnly, types }: EventTypeListProps): J
                       <Link href={"/event-types/" + type.id} passHref={true}>
                         <Button
                           type="button"
-                          size="lg"
+                          size="sm"
                           color="minimal"
-                          className="w-full rounded-none font-normal"
+                          className="w-full rounded-none"
                           StartIcon={PencilIcon}>
                           {" "}
                           {t("edit")}
@@ -387,8 +387,8 @@ export const EventTypeList = ({ group, readOnly, types }: EventTypeListProps): J
                       <Button
                         type="button"
                         color="minimal"
-                        size="lg"
-                        className="w-full rounded-none font-normal"
+                        size="sm"
+                        className="w-full rounded-none"
                         data-testid={"event-type-duplicate-" + type.id}
                         StartIcon={DuplicateIcon}
                         onClick={() => openModal(group, type)}>
@@ -404,9 +404,9 @@ export const EventTypeList = ({ group, readOnly, types }: EventTypeListProps): J
                               e.stopPropagation();
                             }}
                             color="warn"
-                            size="lg"
+                            size="sm"
                             StartIcon={TrashIcon}
-                            className="w-full rounded-none font-normal">
+                            className="w-full rounded-none">
                             {t("delete")}
                           </Button>
                         </DialogTrigger>
diff --git a/apps/website b/apps/website
index c6c9c210..e54a7cc0 160000
--- a/apps/website
+++ b/apps/website
@@ -1 +1 @@
-Subproject commit c6c9c210a4041fedaeaf22bf34b788f83e523ef3
+Subproject commit e54a7cc0ecbb36a5a6838f77d8c19ec008c8849a