diff --git a/assets/styles/layouts/_top-nav.scss b/assets/styles/layouts/_top-nav.scss
index fe2299ff3..c16fa7a5d 100644
--- a/assets/styles/layouts/_top-nav.scss
+++ b/assets/styles/layouts/_top-nav.scss
@@ -185,7 +185,6 @@
   }
 
   .search-btn {
-    margin-top: .15rem;
     width: 0;
     opacity: 0;
   }
diff --git a/assets/styles/layouts/article/_tabbed-content.scss b/assets/styles/layouts/article/_tabbed-content.scss
index 0695fc7b5..53b36d06e 100644
--- a/assets/styles/layouts/article/_tabbed-content.scss
+++ b/assets/styles/layouts/article/_tabbed-content.scss
@@ -70,7 +70,7 @@
       &:before {
         content: "\e97a";
         margin-right: 0.25em;
-        font-family: 'icomoon';
+        font-family: 'icomoon-v3';
         font-style: normal;
       }
     }
diff --git a/layouts/partials/sidebar.html b/layouts/partials/sidebar.html
index 5e063ce51..ad609f690 100644
--- a/layouts/partials/sidebar.html
+++ b/layouts/partials/sidebar.html
@@ -32,7 +32,7 @@
 {{ $searchPlaceholder := .Scratch.Get "searchPlaceholder" }}
 
 <aside class="sidebar">
-  {{ partial "sidebar/sidebar-toggle.html" (dict "state" "close") }}
+  {{ partial "sidebar/sidebar-toggle.html" (dict "state" "Close") }}
   <div class="search-and-nav-toggle">
     <div class="sidebar--search">
       <input  class="sidebar--search-field"
diff --git a/layouts/partials/sidebar/sidebar-toggle.html b/layouts/partials/sidebar/sidebar-toggle.html
index ee6b528cb..24baba6e5 100644
--- a/layouts/partials/sidebar/sidebar-toggle.html
+++ b/layouts/partials/sidebar/sidebar-toggle.html
@@ -1,3 +1,3 @@
-{{- $initialState := .state | default "open" -}}
-{{- $modifiedState := cond (eq $initialState "close") "closed" "open" -}}
-<div class="sidebar-toggle" onclick="toggle_sidebar('sidebar-{{ $modifiedState }}');return false;"><a href="#"><span class="cf-icon sidebar-{{ $initialState }}-new"></span></a></div>
\ No newline at end of file
+{{- $initialState := .state | default "Open" -}}
+{{- $modifiedState := cond (eq $initialState "Close") "closed" "open" -}}
+<div class="sidebar-toggle" onclick="toggle_sidebar('sidebar-{{ $modifiedState }}');return false;"><a href="#"><span class="cf-icon Sidebar{{ $initialState }}"></span></a></div>
\ No newline at end of file
diff --git a/layouts/partials/topnav.html b/layouts/partials/topnav.html
index 6ff7f019a..3477c5222 100644
--- a/layouts/partials/topnav.html
+++ b/layouts/partials/topnav.html
@@ -15,11 +15,11 @@
     </div>
     <div class="buttons">
       <div class="search-btn">
-        <button id="search-btn" onclick="toggle_sidebar('sidebar-open');document.getElementById('algolia-search-input').focus();return false;"><span class="icon-search"></span></button>
+        <button id="search-btn" onclick="toggle_sidebar('sidebar-open');document.getElementById('algolia-search-input').focus();return false;"><span class="cf-icon Search_New"></span></button>
       </div>
-      <button class="url-trigger" href="#"><span class="cf-icon cog-solid-new"></span></button>
-      <button class="theme-switcher" id="theme-switch-light" onclick="switch_style('light-theme');return false;"><span class="cf-icon light-mode-new"></span></button>
-      <button class="theme-switcher" id="theme-switch-dark" onclick="switch_style('dark-theme');return false;"><span class="cf-icon dark-mode-new"></span></button>
+      <button class="url-trigger" href="#"><span class="cf-icon CogSolid_New"></span></button>
+      <button class="theme-switcher" id="theme-switch-light" onclick="switch_style('light-theme');return false;"><span class="cf-icon Lightmode_New"></span></button>
+      <button class="theme-switcher" id="theme-switch-dark" onclick="switch_style('dark-theme');return false;"><span class="cf-icon Darkmode_New"></span></button>
     </div>
   </div>
 </div>