diff --git a/assets/scss/styles.scss b/assets/scss/styles.scss
index fe29f54354b..22af812f0a6 100644
--- a/assets/scss/styles.scss
+++ b/assets/scss/styles.scss
@@ -30,7 +30,6 @@ $bootstrap-icons-font-dir: "../../../node_modules/bootstrap-icons/font/fonts"; /
 
 .btn-toggle-no-children .bi {
   color: rgba(var(--bs-emphasis-color-rgb), .85);
-  margin-right: 5px;
 }
 
 .btn-toggle::before {
diff --git a/layout.html b/layout.html
index e37ab58f84e..b0099720a91 100644
--- a/layout.html
+++ b/layout.html
@@ -87,15 +87,15 @@
 
             <ul class="list-unstyled ps-0">
                 <li class="mb-1" th:each="item : ${navigationItems}">
-                    <a class="btn btn-toggle-no-children d-inline-flex align-items-center rounded border-0"
+                    <a class="btn btn-toggle-no-children d-inline-flex align-items-center rounded border-0 gap-2"
                        th:if="${item.children == null}"
                        th:classappend="${item.active ? 'active' : ''}"
                        th:href="@{'./' + ${currentComponent.slug} + '/' + ${currentComponent.latest ? '' : currentComponent.version.friendlyName() + '/'} + ${item.url}}">
                         <i class="bi"
-                           th:if="${#strings.contains(item.icon, 'bi-')}"
+                           th:if="${item.icon != null && #strings.contains(item.icon, 'bi-')}"
                            th:classappend="${item.icon}"></i>
                         <img th:src="@{'./assets/' + ${currentComponent.slug} + '.' + ${currentComponent.version.friendlyName()} + '/' + ${item.icon}}"
-                             th:if="${!#strings.contains(item.icon, 'bi-')}"
+                             th:if="${item.icon != null && !#strings.contains(item.icon, 'bi-')}"
                              width="32"
                              height="32">
                         <span th:utext="${item.name}"></span>
diff --git a/page.html b/page.html
index 55c17514f2b..0cb6a7d5fdf 100644
--- a/page.html
+++ b/page.html
@@ -23,8 +23,7 @@
             </li>
         </ol>
     </nav>
-    <main class="main-content float-start" th:utext="${content}"></main>
-    <div class="clearfix"></div>
+    <main class="main-content" th:utext="${content}"></main>
 </div>
 </body>
 </html>
\ No newline at end of file