diff --git a/layouts/partials/footer/feature-callout.html b/layouts/partials/footer/feature-callout.html
index eaad8657f..4509200f9 100644
--- a/layouts/partials/footer/feature-callout.html
+++ b/layouts/partials/footer/feature-callout.html
@@ -1,3 +1,3 @@
 <div class="feature-callout start-position" id="callout-url-selector">
-  <p><span class="new">New!</span> Cloud or OSS? <a href="#" class="close"><span class="icon-ui-remove"></span></a></p>
+  <p><span class="new">New!</span> Cloud or OSS? <a href="#" class="close"><span class="icon-remove"></span></a></p>
 </div>
diff --git a/layouts/partials/footer/influxdb-url-modal.html b/layouts/partials/footer/influxdb-url-modal.html
index 8d36347f6..17446e0d9 100644
--- a/layouts/partials/footer/influxdb-url-modal.html
+++ b/layouts/partials/footer/influxdb-url-modal.html
@@ -3,7 +3,7 @@
   <div class="modal-overlay"></div>
   <div class="modal-wrapper">
     <div id="influxdb-url-list" class="modal-body">
-      <a id="modal-close"href="#"><span class="icon-ui-remove"></span></a>
+      <a id="modal-close"href="#"><span class="icon-remove"></span></a>
       <div class="modal-content">
         <h3>Where are you running InfluxDB?</h3>
         <p>Select where you're using <strong>InfluxDB Cloud</strong> or <strong>InfluxDB OSS</strong> and we'll customize code examples with your <strong>InfluxDB URL</strong>.</p>
diff --git a/layouts/partials/footer/notifications.html b/layouts/partials/footer/notifications.html
index 8e302e8a7..4332350d9 100644
--- a/layouts/partials/footer/notifications.html
+++ b/layouts/partials/footer/notifications.html
@@ -4,7 +4,7 @@
       <div class="notification-content">
         {{ .message | markdownify }}
       </div>
-      <div class="close-notification"><span class="icon-ui-remove"></span></div>
+      <div class="close-notification"><span class="icon-remove"></span></div>
     </div>
   {{ end }}
 </div>
diff --git a/layouts/partials/topnav.html b/layouts/partials/topnav.html
index d836c6275..41e4168a8 100644
--- a/layouts/partials/topnav.html
+++ b/layouts/partials/topnav.html
@@ -17,7 +17,7 @@
       <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>
       </div>
-      <button class="url-trigger" href="#"><span class="icon-ui-cog-thick"></span></button>
+      <button class="url-trigger" href="#"><span class="icon-cog-thick"></span></button>
       <button class="theme-switcher" id="theme-switch-light" onclick="switch_style('light-theme');return false;"><span class="icon-sun1"></span></button>
       <button class="theme-switcher" id="theme-switch-dark" onclick="switch_style('dark-theme');return false;"><span class="icon-moon1"></span></button>
     </div>