diff --git a/packages/docusaurus-theme-classic/package.json b/packages/docusaurus-theme-classic/package.json
index 62ff5fb5ee..9fd3d3e52a 100644
--- a/packages/docusaurus-theme-classic/package.json
+++ b/packages/docusaurus-theme-classic/package.json
@@ -39,7 +39,7 @@
     "copy-text-to-clipboard": "^3.0.1",
     "fs-extra": "^10.0.0",
     "globby": "^11.0.2",
-    "infima": "0.2.0-alpha.24",
+    "infima": "0.2.0-alpha.26",
     "lodash": "^4.17.20",
     "parse-numeric-range": "^1.2.0",
     "postcss": "^8.2.15",
diff --git a/packages/docusaurus-theme-classic/src/theme/AnnouncementBar/index.tsx b/packages/docusaurus-theme-classic/src/theme/AnnouncementBar/index.tsx
index d5a7ffd15c..68d5dfc951 100644
--- a/packages/docusaurus-theme-classic/src/theme/AnnouncementBar/index.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/AnnouncementBar/index.tsx
@@ -45,7 +45,7 @@ function AnnouncementBar(): JSX.Element | null {
       {isCloseable ? (
         <button
           type="button"
-          className={styles.announcementBarClose}
+          className={clsx(styles.announcementBarClose, 'clean-btn')}
           onClick={closeAnnouncementBar}
           aria-label={translate({
             id: 'theme.AnnouncementBar.closeButtonAriaLabel',
diff --git a/packages/docusaurus-theme-classic/src/theme/AnnouncementBar/styles.module.css b/packages/docusaurus-theme-classic/src/theme/AnnouncementBar/styles.module.css
index 10c2198b2b..9543e414c4 100644
--- a/packages/docusaurus-theme-classic/src/theme/AnnouncementBar/styles.module.css
+++ b/packages/docusaurus-theme-classic/src/theme/AnnouncementBar/styles.module.css
@@ -36,11 +36,6 @@
   top: 0;
   width: 55px;
   font-size: 1.25rem;
-  padding: 0;
-  border: none;
-  cursor: pointer;
-  background: none;
-  color: inherit;
   height: 100%;
 }
 
diff --git a/packages/docusaurus-theme-classic/src/theme/BlogPostItem/index.tsx b/packages/docusaurus-theme-classic/src/theme/BlogPostItem/index.tsx
index dcd14d75b3..d5abe7a300 100644
--- a/packages/docusaurus-theme-classic/src/theme/BlogPostItem/index.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/BlogPostItem/index.tsx
@@ -90,9 +90,9 @@ function BlogPostItem(props: Props): JSX.Element {
           <div className="avatar__intro">
             {author && (
               <>
-                <h4 className="avatar__name">
+                <div className="avatar__name">
                   <Link href={authorURL}>{author}</Link>
-                </h4>
+                </div>
                 <small className="avatar__subtitle">{authorTitle}</small>
               </>
             )}
diff --git a/packages/docusaurus-theme-classic/src/theme/CodeBlock/index.tsx b/packages/docusaurus-theme-classic/src/theme/CodeBlock/index.tsx
index a0534e6ae6..365c37fc4a 100644
--- a/packages/docusaurus-theme-classic/src/theme/CodeBlock/index.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/CodeBlock/index.tsx
@@ -245,7 +245,7 @@ export default function CodeBlock({
                 message: 'Copy code to clipboard',
                 description: 'The ARIA label for copy code blocks button',
               })}
-              className={clsx(styles.copyButton)}
+              className={clsx(styles.copyButton, 'clean-btn')}
               onClick={handleCopyCode}>
               {showCopied ? (
                 <Translate
diff --git a/packages/docusaurus-theme-classic/src/theme/CodeBlock/styles.module.css b/packages/docusaurus-theme-classic/src/theme/CodeBlock/styles.module.css
index d7e70077d8..d44cd65fed 100644
--- a/packages/docusaurus-theme-classic/src/theme/CodeBlock/styles.module.css
+++ b/packages/docusaurus-theme-classic/src/theme/CodeBlock/styles.module.css
@@ -35,10 +35,8 @@
 
 .copyButton {
   background: rgba(0, 0, 0, 0.3);
-  border: none;
   border-radius: var(--ifm-global-radius);
   color: var(--ifm-color-white);
-  cursor: pointer;
   opacity: 0;
   user-select: none;
   padding: 0.4rem 0.5rem;
diff --git a/packages/docusaurus-theme-classic/src/theme/Navbar/index.tsx b/packages/docusaurus-theme-classic/src/theme/Navbar/index.tsx
index 5aca53a38d..2b6d45c4f1 100644
--- a/packages/docusaurus-theme-classic/src/theme/Navbar/index.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/Navbar/index.tsx
@@ -88,7 +88,7 @@ function Navbar(): JSX.Element {
           {items != null && items.length !== 0 && (
             <button
               aria-label="Navigation bar toggle"
-              className="navbar__toggle"
+              className="navbar__toggle clean-btn"
               type="button"
               tabIndex={0}
               onClick={showSidebar}
diff --git a/packages/docusaurus-theme-classic/src/theme/SkipToContent/index.tsx b/packages/docusaurus-theme-classic/src/theme/SkipToContent/index.tsx
index 2fc122a332..082cd76bb7 100644
--- a/packages/docusaurus-theme-classic/src/theme/SkipToContent/index.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/SkipToContent/index.tsx
@@ -6,6 +6,7 @@
  */
 
 import React, {useRef} from 'react';
+import clsx from 'clsx';
 import Translate from '@docusaurus/Translate';
 import {useChangeRoute} from '@docusaurus/theme-common';
 
@@ -39,7 +40,10 @@ function SkipToContent(): JSX.Element {
 
   return (
     <div ref={containerRef}>
-      <a href="#main" className={styles.skipToContent} onClick={handleSkip}>
+      <a
+        href="#main"
+        className={clsx(styles.skipToContent, 'shadow--md')}
+        onClick={handleSkip}>
         <Translate
           id="theme.common.skipToMainContent"
           description="The skip to content label used for accessibility, allowing to rapidly navigate to main content with keyboard tab/enter navigation">
diff --git a/packages/docusaurus-theme-classic/src/theme/SkipToContent/styles.module.css b/packages/docusaurus-theme-classic/src/theme/SkipToContent/styles.module.css
index 916f6e54ac..d17508a7b7 100644
--- a/packages/docusaurus-theme-classic/src/theme/SkipToContent/styles.module.css
+++ b/packages/docusaurus-theme-classic/src/theme/SkipToContent/styles.module.css
@@ -6,9 +6,6 @@
   padding: calc(var(--ifm-global-spacing) / 2) var(--ifm-global-spacing);
   color: var(--ifm-color-emphasis-900);
   background-color: var(--ifm-background-surface-color);
-  border-radius: var(--ifm-global-radius);
-  font: inherit;
-  border: none;
 }
 
 .skipToContent:focus {
diff --git a/website/src/components/showcase/ShowcaseCard/index.js b/website/src/components/showcase/ShowcaseCard/index.js
index bbe54bb1a8..ea8a98133e 100644
--- a/website/src/components/showcase/ShowcaseCard/index.js
+++ b/website/src/components/showcase/ShowcaseCard/index.js
@@ -51,7 +51,7 @@ const ShowcaseCard = memo(function ({user}) {
             <div className="avatar__intro margin-left--none">
               <div className={styles.titleIconsRow}>
                 <div className={styles.titleIconsRowTitle}>
-                  <h4 className="avatar__name">{user.title}</h4>
+                  <div className="avatar__name">{user.title}</div>
                 </div>
                 <div className={styles.titleIconsRowIcons}>
                   <ShowcaseCardTagIcons tags={user.tags} />
diff --git a/website/src/pages/index.js b/website/src/pages/index.js
index 275ac128b7..1660d871e6 100644
--- a/website/src/pages/index.js
+++ b/website/src/pages/index.js
@@ -255,7 +255,7 @@ function Home() {
                       style={{overflow: 'hidden'}}
                     />
                     <div className="avatar__intro padding-top--sm">
-                      <h4 className="avatar__name">{quote.name}</h4>
+                      <div className="avatar__name">{quote.name}</div>
                       <small className="avatar__subtitle">{quote.title}</small>
                     </div>
                   </div>
diff --git a/yarn.lock b/yarn.lock
index 9f9054ca4b..d9fa44282b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10470,10 +10470,10 @@ infer-owner@^1.0.3, infer-owner@^1.0.4:
   resolved "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz#c4cefcaa8e51051c2a40ba2ce8a3d27295af9467"
   integrity sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==
 
-infima@0.2.0-alpha.24:
-  version "0.2.0-alpha.24"
-  resolved "https://registry.yarnpkg.com/infima/-/infima-0.2.0-alpha.24.tgz#95fd25d9eb825a2844bae768704385c95548c15d"
-  integrity sha512-2GX1Qcj2yQOOfs6y9ie788Njroo9MbY2Mkm+QxaEzgrAE7AqGjhF6dMyjMvzhl+NS1JqoJHn3N5kM0P3AOHvuA==
+infima@0.2.0-alpha.26:
+  version "0.2.0-alpha.26"
+  resolved "https://registry.yarnpkg.com/infima/-/infima-0.2.0-alpha.26.tgz#8582d40ef01a09dbbde8f0e574f8c61d6bc0992b"
+  integrity sha512-0/Dt+89mf8xW+9/hKGmynK+WOAsiy0QydVJL0qie6WK57yGIQv+SjJrhMybKndnmkZBQ+Vlt0tWPnTakx8X2Qw==
 
 inflight@^1.0.4:
   version "1.0.6"