diff --git a/docs/src/doc/docs/user_guide/base-specific/frontend.md b/docs/src/doc/docs/user_guide/base-specific/frontend.md
index ecbd696460..f2dd31b05b 100644
--- a/docs/src/doc/docs/user_guide/base-specific/frontend.md
+++ b/docs/src/doc/docs/user_guide/base-specific/frontend.md
@@ -85,15 +85,15 @@ Currently, there is only one template file with predefined name `base.ftl`. It d
 If `templatesDir` is defined, Dokka will find the `base.ftl` file there.
 
 Variables given below are available to the template:
-  - `${pageName}` - the page name
-  - `${footerMessage}` - text that is set by the `footerMessage` property
-  - `${sourceSets}` - a nullable list of source sets, only for multi-platform pages. Each source set has `name`, `platfrom` and `filter` properties.
+  * `${pageName}` - the page name
+  * `${footerMessage}` - text that is set by the `footerMessage` property
+  * `${sourceSets}` - a nullable list of source sets, only for multi-platform pages. Each source set has `name`, `platfrom` and `filter` properties.
 
 Also, Dokka-defined [directives](https://freemarker.apache.org/docs/ref_directive_userDefined.html) can be used:
-  - `<@content/>` - main content
-  - `<@resources/>` - scripts, stylesheets 
-  - `<@version/>` - version ([versioning-plugin](https://kotlin.github.io/dokka/1.6.10/user_guide/versioning/versioning/) will replace this with a version navigator)
-  - `<@template_cmd name="...""> ...</@template_cmd>` - is used for variables that depend on the root project (such `pathToRoot`, `projectName`). They are available only inside the directive. This is processed by a multi-module task that assembles partial outputs from modules. 
+  * `<@content/>` - main content
+  * `<@resources/>` - scripts, stylesheets 
+  * `<@version/>` - version ([versioning-plugin](https://kotlin.github.io/dokka/1.6.10/user_guide/versioning/versioning/) will replace this with a version navigator)
+  * `<@template_cmd name="...""> ...</@template_cmd>` - is used for variables that depend on the root project (such `pathToRoot`, `projectName`). They are available only inside the directive. This is processed by a multi-module task that assembles partial outputs from modules. 
      Example:
     ```
     <@template_cmd name="projectName">
diff --git a/plugins/base/frontend/src/main/components/search/search.scss b/plugins/base/frontend/src/main/components/search/search.scss
index b18af04e5a..24ad509fb5 100644
--- a/plugins/base/frontend/src/main/components/search/search.scss
+++ b/plugins/base/frontend/src/main/components/search/search.scss
@@ -3,7 +3,7 @@ $secondary-font-color: hsla(0, 0%, 100%, 0.6);
 
 .search {
   button {
-    margin-top: 3px;
+    margin-top: 10px;
 
     cursor: pointer;
 
diff --git a/plugins/base/src/main/resources/dokka/templates/base.ftl b/plugins/base/src/main/resources/dokka/templates/base.ftl
index 853d1ca2cf..fb8fabd90b 100644
--- a/plugins/base/src/main/resources/dokka/templates/base.ftl
+++ b/plugins/base/src/main/resources/dokka/templates/base.ftl
@@ -35,8 +35,6 @@ if(savedDarkMode === true){
         <@version/>
     </div>
     <div class="pull-right d-flex">
-        <button id="theme-toggle-button"><span id="theme-toggle"></span></button>
-        <div id="searchBar"></div>
         <#if sourceSets??>
             <div class="filter-section" id="filter-section">
                 <#list sourceSets as ss>
@@ -44,6 +42,8 @@ if(savedDarkMode === true){
                 </#list>
             </div>
         </#if>
+        <button id="theme-toggle-button"><span id="theme-toggle"></span></button>
+        <div id="searchBar"></div>
     </div>
 </div>
 <div id="container">