diff --git a/e107_admin/auth.php b/e107_admin/auth.php
index 7b82bedc65..1a2f87e9b5 100644
--- a/e107_admin/auth.php
+++ b/e107_admin/auth.php
@@ -27,7 +27,7 @@
 // Required for a clean v1.x -> v2 upgrade. 
 $core = e107::getConfig();
 $adminTheme = $core->get('admintheme');
-if($adminTheme !== 'bootstrap3'/* && $adminTheme !== 'bootstrap5'*/)
+if($adminTheme !== 'bootstrap3' && $adminTheme !== 'bootstrap5')
 {
 	$core->update('admintheme','bootstrap3');
 	$core->update('adminstyle','infopanel');
diff --git a/e107_handlers/theme_handler.php b/e107_handlers/theme_handler.php
index 16e65934b8..50dcb834dd 100644
--- a/e107_handlers/theme_handler.php
+++ b/e107_handlers/theme_handler.php
@@ -2599,17 +2599,17 @@ function renderTheme($mode = 0, $theme = array())
 		$text .= "
         
         <ul class='nav nav-tabs'>
-        <li class='active'><a data-toggle='tab' data-bs-toggle='tab' href='#core-thememanager-configure'>".LAN_CONFIGURE."</a></li>";
+        <li class='nav-item active'><a class='nav-link active' data-toggle='tab' data-bs-toggle='tab' href='#core-thememanager-configure'>".LAN_CONFIGURE."</a></li>";
 		
 
 		if($this->themeConfigObj && call_user_func(array(&$this->themeConfigObj, 'config')) && $mode == self::RENDER_SITEPREFS)
 		{
-			$text .= "<li><a data-toggle='tab' data-bs-toggle='tab' href='#core-thememanager-customconfig'>".LAN_PREFS."</a></li>\n";
+			$text .= "<li class='nav-item'><a class='nav-link' data-toggle='tab' data-bs-toggle='tab' href='#core-thememanager-customconfig'>".LAN_PREFS."</a></li>\n";
 		}
 		
 		if($this->themeConfigObj && call_user_func(array(&$this->themeConfigObj, 'help')))
 		{
-			$text .= "<li><a data-toggle='tab' data-bs-toggle='tab' href='#core-thememanager-help'>".LAN_HELP."</a></li>\n";
+			$text .= "<li class='nav-item'><a class='nav-link' data-toggle='tab' data-bs-toggle='tab' href='#core-thememanager-help'>".LAN_HELP."</a></li>\n";
 		}
 		
 		$text .= "</ul>
diff --git a/e107_web/lib/font-awesome/6/webfonts/fa-regular-400.woff2 b/e107_web/lib/font-awesome/6/webfonts/fa-regular-400.woff2
index a865b2f586..18400d7fad 100644
Binary files a/e107_web/lib/font-awesome/6/webfonts/fa-regular-400.woff2 and b/e107_web/lib/font-awesome/6/webfonts/fa-regular-400.woff2 differ
diff --git a/e107_web/lib/font-awesome/6/webfonts/fa-solid-900.woff2 b/e107_web/lib/font-awesome/6/webfonts/fa-solid-900.woff2
index 021d33fb65..16721020f0 100644
Binary files a/e107_web/lib/font-awesome/6/webfonts/fa-solid-900.woff2 and b/e107_web/lib/font-awesome/6/webfonts/fa-solid-900.woff2 differ