diff --git a/packages/docusaurus-theme-classic/package.json b/packages/docusaurus-theme-classic/package.json
index 659eea950e..70b99e0a66 100644
--- a/packages/docusaurus-theme-classic/package.json
+++ b/packages/docusaurus-theme-classic/package.json
@@ -12,12 +12,12 @@
     "@mdx-js/react": "^1.5.1",
     "classnames": "^2.2.6",
     "clipboard": "^2.0.4",
-    "infima": "0.2.0-alpha.4",
+    "infima": "0.2.0-alpha.5",
     "parse-numeric-range": "^0.0.2",
     "prism-react-renderer": "^1.0.2",
     "react-router-dom": "^5.1.2",
     "react-toggle": "^4.1.1",
-    "remark-admonitions": "^1.1.0"
+    "remark-admonitions": "^1.2.0"
   },
   "peerDependencies": {
     "@docusaurus/core": "^2.0.0",
diff --git a/packages/docusaurus-theme-classic/src/theme/Layout/styles.css b/packages/docusaurus-theme-classic/src/theme/Layout/styles.css
index 03fd4b3552..a22555524a 100644
--- a/packages/docusaurus-theme-classic/src/theme/Layout/styles.css
+++ b/packages/docusaurus-theme-classic/src/theme/Layout/styles.css
@@ -15,13 +15,12 @@ body {
   transition: var(--ifm-transition-fast) ease color;
 }
 
-body > #__docusaurus {
-  height: 100%;
+#__docusaurus {
+  min-height: 100%;
   display: flex;
   flex-direction: column;
 }
 
 .main-wrapper {
   flex: 1 0 auto;
-  margin-top: var(--ifm-navbar-height);
 }
diff --git a/packages/docusaurus-theme-classic/src/theme/Navbar/index.js b/packages/docusaurus-theme-classic/src/theme/Navbar/index.js
index b4a2e3c3ed..64055ec799 100644
--- a/packages/docusaurus-theme-classic/src/theme/Navbar/index.js
+++ b/packages/docusaurus-theme-classic/src/theme/Navbar/index.js
@@ -137,7 +137,9 @@ function Navbar() {
             )}
             {title != null && (
               <strong
-                className={isSearchBarExpanded ? styles.hideLogoText : ''}>
+                className={classnames('navbar__title', {
+                  [styles.hideLogoText]: isSearchBarExpanded,
+                })}>
                 {title}
               </strong>
             )}
@@ -188,7 +190,9 @@ function Navbar() {
                 alt={logo.alt}
               />
             )}
-            {title != null && <strong>{title}</strong>}
+            {title != null && (
+              <strong className="navbar__title">{title}</strong>
+            )}
           </Link>
           {!disableDarkMode && sidebarShown && (
             <Toggle
diff --git a/packages/docusaurus-theme-search-algolia/src/theme/SearchBar/algolia.css b/packages/docusaurus-theme-search-algolia/src/theme/SearchBar/algolia.css
index a25cd361a7..9a92921ac1 100644
--- a/packages/docusaurus-theme-search-algolia/src/theme/SearchBar/algolia.css
+++ b/packages/docusaurus-theme-search-algolia/src/theme/SearchBar/algolia.css
@@ -234,6 +234,11 @@
   }
 }
 
+.algolia-autocomplete pre {
+  padding: 0;
+  right: 0;
+}
+
 .algolia-autocomplete .ds-dropdown-menu:before {
   display: block;
   position: absolute;
diff --git a/yarn.lock b/yarn.lock
index eb1959622d..c38e157a9a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8391,10 +8391,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.4:
-  version "0.2.0-alpha.4"
-  resolved "https://registry.yarnpkg.com/infima/-/infima-0.2.0-alpha.4.tgz#0817cd5e74ff45aa5c3ba7b6352dfcb088f07143"
-  integrity sha512-b2uwUMI40IAyGRG0IHZpQOPPEKB41y5U+ZKHZxhtLjLJ90FCCcUiMYUbNAf7gRXvNSmotymTeydLj10Et+X3sQ==
+infima@0.2.0-alpha.5:
+  version "0.2.0-alpha.5"
+  resolved "https://registry.yarnpkg.com/infima/-/infima-0.2.0-alpha.5.tgz#1b5c9c63b90c4b5449c481c6e12a72c0cbe64585"
+  integrity sha512-kG8ivgCIlV4aFU7kaq1IlSybLETN2dkQaFNwcJIr2uOY6ojz7qgc9RT+TRVx6a48VYNJTz821wHVtj22XukVYw==
 
 inflight@^1.0.4:
   version "1.0.6"
@@ -13847,6 +13847,15 @@ remark-admonitions@^1.1.0:
     unified "^8.4.2"
     unist-util-visit "^2.0.1"
 
+remark-admonitions@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/remark-admonitions/-/remark-admonitions-1.2.0.tgz#0c8ba565c018357afb5f4f89efe4e543d71bd216"
+  integrity sha512-h7P99HNMuSeA3HBw+RIF4PoTEI2knjPqBIfmYSgavXvA5PHgP3oHo0XKfDmmPpUZY6vBWKzcLXRZcYHNnNcJaw==
+  dependencies:
+    rehype-parse "^6.0.2"
+    unified "^8.4.2"
+    unist-util-visit "^2.0.1"
+
 remark-emoji@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/remark-emoji/-/remark-emoji-2.0.2.tgz#49c134021132c192ee4cceed1988ec9b8ced7eb8"