diff --git a/templates/about.php b/templates/about.php
index 1605ed97..b8232a81 100755
--- a/templates/about.php
+++ b/templates/about.php
@@ -11,8 +11,8 @@
           with the contributions of our <a href="https://github.com/billz/raspap-webgui/graphs/contributors">community</a>.</p>
           <p><i class="fab fa-github"></i> <a href="https://github.com/billz/raspap-webgui">https://github.com/billz/raspap-webgui</a></p>
 
-      </div><!-- /.panel-body -->
+      </div><!-- /.card-body -->
       <div class="card-footer"></div>
-    </div><!-- /.panel-primary -->
+    </div><!-- /.card -->
   </div><!-- /.col-lg-12 -->
 </div><!-- /.row -->
diff --git a/templates/configure_client.php b/templates/configure_client.php
index d1489ce1..0af2cf6c 100755
--- a/templates/configure_client.php
+++ b/templates/configure_client.php
@@ -1,7 +1,7 @@
 <div class="row">
   <div class="col-lg-12">
     <div class="card">
-      <div class="card-header"><i class="fas fa-signal fa-fw"></i> <?php echo _("Configure client"); ?></div>
+      <div class="card-header"><i class="fas fa-wifi"></i> <?php echo _("Configure WiFi client"); ?></div>
       <!-- /.card-heading -->
       <div class="card-body">
         <?php $status->showMessages(); ?>
diff --git a/templates/data_usage.php b/templates/data_usage.php
index 9fa9f476..0d0c399a 100755
--- a/templates/data_usage.php
+++ b/templates/data_usage.php
@@ -1,7 +1,7 @@
 <div class="row">
   <div class="col-lg-12">
     <div class="card">
-      <div class="card-header"><i class="fas fa-bar-chart fa-fw"></i> <?php echo _("Data usage monitoring"); ?></div>
+      <div class="card-header"><i class="fas fa-chart-bar"></i> <?php echo _("Data usage monitoring"); ?></div>
         <div class="card-body">
 
           <ul id="tabbarBandwidth" class="nav nav-tabs" role="tablist">
diff --git a/templates/dhcp.php b/templates/dhcp.php
index 0a3cf9bb..e0bccc84 100755
--- a/templates/dhcp.php
+++ b/templates/dhcp.php
@@ -2,7 +2,7 @@
 <div class="col-lg-12">
   <div class="card">
   <div class="card-header">
-    <i class="fas fa-exchange"></i> <?php echo _("Configure DHCP"); ?>
+    <i class="fas fa-exchange-alt"></i> <?php echo _("Configure DHCP"); ?>
     <span class="label pull-right service-status-<?php echo $serviceStatus ?>">dnsmasq <?php echo _($serviceStatus) ?></span>
   </div>
     <!-- /.panel-heading -->
diff --git a/templates/themes.php b/templates/themes.php
index 42a7b906..d268f06d 100755
--- a/templates/themes.php
+++ b/templates/themes.php
@@ -1,7 +1,7 @@
 <div class="row">
   <div class="col-lg-12">
     <div class="card">
-      <div class="card-header"><i class="fa fa-wrench fa-fw"></i> <?php echo _("Change Theme"); ?></div>
+      <div class="card-header"><i class="fas fa-paint-brush"></i> <?php echo _("Change Theme"); ?></div>
       <div class="card-body">
 
         <h4><?php echo _("Theme settings"); ?></h4>