diff --git a/packages/docusaurus-theme-classic/src/theme/BlogListPage/index.tsx b/packages/docusaurus-theme-classic/src/theme/BlogListPage/index.tsx
index a4efc873f844..76bcedd21850 100644
--- a/packages/docusaurus-theme-classic/src/theme/BlogListPage/index.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/BlogListPage/index.tsx
@@ -33,10 +33,10 @@ function BlogListPage(props: Props): JSX.Element {
       }}>
       <div className="container margin-vert--lg">
         <div className="row">
-          <div className="col col--2">
+          <div className="col col--3">
             <BlogSidebar sidebar={sidebar} />
           </div>
-          <main className="col col--8">
+          <main className="col col--7">
             {items.map(({content: BlogPostContent}) => (
               <BlogPostItem
                 key={BlogPostContent.metadata.permalink}
diff --git a/packages/docusaurus-theme-classic/src/theme/BlogPostPage/index.tsx b/packages/docusaurus-theme-classic/src/theme/BlogPostPage/index.tsx
index f78986875094..f8e0e51933a6 100644
--- a/packages/docusaurus-theme-classic/src/theme/BlogPostPage/index.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/BlogPostPage/index.tsx
@@ -28,10 +28,10 @@ function BlogPostPage(props: Props): JSX.Element {
       {BlogPostContents && (
         <div className="container margin-vert--lg">
           <div className="row">
-            <div className="col col--2">
+            <div className="col col--3">
               <BlogSidebar sidebar={sidebar} />
             </div>
-            <main className="col col--8">
+            <main className="col col--7">
               <BlogPostItem
                 frontMatter={frontMatter}
                 metadata={metadata}
diff --git a/packages/docusaurus-theme-classic/src/theme/BlogTagsListPage/index.tsx b/packages/docusaurus-theme-classic/src/theme/BlogTagsListPage/index.tsx
index 59458cd8edd7..8ce584d97588 100644
--- a/packages/docusaurus-theme-classic/src/theme/BlogTagsListPage/index.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/BlogTagsListPage/index.tsx
@@ -61,10 +61,10 @@ function BlogTagsListPage(props: Props): JSX.Element {
       }}>
       <div className="container margin-vert--lg">
         <div className="row">
-          <div className="col col--2">
+          <div className="col col--3">
             <BlogSidebar sidebar={sidebar} />
           </div>
-          <main className="col col--8">
+          <main className="col col--7">
             <h1>
               <Translate
                 id="theme.tags.tagsPageTitle"
diff --git a/packages/docusaurus-theme-classic/src/theme/BlogTagsPostsPage/index.tsx b/packages/docusaurus-theme-classic/src/theme/BlogTagsPostsPage/index.tsx
index 527e89dc0b3c..2832432a11d7 100644
--- a/packages/docusaurus-theme-classic/src/theme/BlogTagsPostsPage/index.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/BlogTagsPostsPage/index.tsx
@@ -66,10 +66,10 @@ function BlogTagsPostPage(props: Props): JSX.Element {
       }}>
       <div className="container margin-vert--lg">
         <div className="row">
-          <div className="col col--2">
+          <div className="col col--3">
             <BlogSidebar sidebar={sidebar} />
           </div>
-          <main className="col col--8">
+          <main className="col col--7">
             <h1>
               <BlogTagsPostPageTitle count={count} tagName={tagName} />
             </h1>
diff --git a/packages/docusaurus-theme-classic/src/theme/Navbar/index.tsx b/packages/docusaurus-theme-classic/src/theme/Navbar/index.tsx
index 7b85bb996497..d0a3aa9d7aaa 100644
--- a/packages/docusaurus-theme-classic/src/theme/Navbar/index.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/Navbar/index.tsx
@@ -86,15 +86,15 @@ function Navbar(): JSX.Element {
       <div className="navbar__inner">
         <div className="navbar__items">
           {items != null && items.length !== 0 && (
-            <div
+            <button
               aria-label="Navigation bar toggle"
               className="navbar__toggle"
-              role="button"
+              type="button"
               tabIndex={0}
               onClick={showSidebar}
               onKeyDown={showSidebar}>
               <IconMenu />
-            </div>
+            </button>
           )}
           <Logo
             className="navbar__brand"
diff --git a/packages/docusaurus-theme-classic/src/theme/Navbar/styles.module.css b/packages/docusaurus-theme-classic/src/theme/Navbar/styles.module.css
index 760d9b46fdef..d24507563982 100644
--- a/packages/docusaurus-theme-classic/src/theme/Navbar/styles.module.css
+++ b/packages/docusaurus-theme-classic/src/theme/Navbar/styles.module.css
@@ -18,3 +18,8 @@
 .navbarHidden {
   transform: translate3d(0, calc(var(--ifm-navbar-height) * -1), 0);
 }
+
+/* Fix it in new version of Infima */
+:global(.navbar__toggle) {
+  color: inherit;
+}