diff --git a/index.html b/index.html
index 915fc9a30..df14556df 100644
--- a/index.html
+++ b/index.html
@@ -838,15 +838,15 @@
                 <h3 class="card-title">Direct Chat</h3>
 
                 <div class="card-tools">
-                  <span data-toggle="tooltip" title="3 New Messages" class="badge badge-primary">3</span>
+                  <span title="3 New Messages" class="badge badge-primary">3</span>
                   <button type="button" class="btn btn-tool" data-card-widget="collapse">
                     <i class="fas fa-minus"></i>
                   </button>
-                  <button type="button" class="btn btn-tool" data-toggle="tooltip" title="Contacts"
-                          data-widget="chat-pane-toggle">
+                  <button type="button" class="btn btn-tool" title="Contacts" data-widget="chat-pane-toggle">
                     <i class="fas fa-comments"></i>
                   </button>
-                  <button type="button" class="btn btn-tool" data-card-widget="remove"><i class="fas fa-times"></i>
+                  <button type="button" class="btn btn-tool" data-card-widget="remove">
+                    <i class="fas fa-times"></i>
                   </button>
                 </div>
               </div>
@@ -1178,17 +1178,10 @@
                 </h3>
                 <!-- card tools -->
                 <div class="card-tools">
-                  <button type="button"
-                          class="btn btn-primary btn-sm daterange"
-                          data-toggle="tooltip"
-                          title="Date range">
+                  <button type="button" class="btn btn-primary btn-sm daterange" title="Date range">
                     <i class="far fa-calendar-alt"></i>
                   </button>
-                  <button type="button"
-                          class="btn btn-primary btn-sm"
-                          data-card-widget="collapse"
-                          data-toggle="tooltip"
-                          title="Collapse">
+                  <button type="button" class="btn btn-primary btn-sm" data-card-widget="collapse" title="Collapse">
                     <i class="fas fa-minus"></i>
                   </button>
                 </div>
@@ -1285,7 +1278,8 @@
                   <!-- button with a dropdown -->
                   <div class="btn-group">
                     <button type="button" class="btn btn-success btn-sm dropdown-toggle" data-toggle="dropdown" data-offset="-52">
-                      <i class="fas fa-bars"></i></button>
+                      <i class="fas fa-bars"></i>
+                    </button>
                     <div class="dropdown-menu" role="menu">
                       <a href="#" class="dropdown-item">Add new event</a>
                       <a href="#" class="dropdown-item">Clear events</a>
diff --git a/index2.html b/index2.html
index 17e3d99ac..137e0c8ba 100644
--- a/index2.html
+++ b/index2.html
@@ -131,8 +131,9 @@
         </div>
       </li>
       <li class="nav-item">
-        <a class="nav-link" data-widget="control-sidebar" data-slide="true" href="#" role="button"><i
-            class="fas fa-th-large"></i></a>
+        <a class="nav-link" data-widget="control-sidebar" data-slide="true" href="#" role="button">
+          <i class="fas fa-th-large"></i>
+        </a>
       </li>
     </ul>
   </nav>
@@ -977,13 +978,15 @@
                     <h3 class="card-title">Direct Chat</h3>
 
                     <div class="card-tools">
-                      <span data-toggle="tooltip" title="3 New Messages" class="badge badge-warning">3</span>
-                      <button type="button" class="btn btn-tool" data-card-widget="collapse"><i class="fas fa-minus"></i>
+                      <span title="3 New Messages" class="badge badge-warning">3</span>
+                      <button type="button" class="btn btn-tool" data-card-widget="collapse">
+                        <i class="fas fa-minus"></i>
                       </button>
-                      <button type="button" class="btn btn-tool" data-toggle="tooltip" title="Contacts"
-                              data-widget="chat-pane-toggle">
-                        <i class="fas fa-comments"></i></button>
-                      <button type="button" class="btn btn-tool" data-card-widget="remove"><i class="fas fa-times"></i>
+                      <button type="button" class="btn btn-tool" title="Contacts" data-widget="chat-pane-toggle">
+                        <i class="fas fa-comments"></i>
+                      </button>
+                      <button type="button" class="btn btn-tool" data-card-widget="remove">
+                        <i class="fas fa-times"></i>
                       </button>
                     </div>
                   </div>
@@ -1181,9 +1184,11 @@
 
                     <div class="card-tools">
                       <span class="badge badge-danger">8 New Members</span>
-                      <button type="button" class="btn btn-tool" data-card-widget="collapse"><i class="fas fa-minus"></i>
+                      <button type="button" class="btn btn-tool" data-card-widget="collapse">
+                        <i class="fas fa-minus"></i>
                       </button>
-                      <button type="button" class="btn btn-tool" data-card-widget="remove"><i class="fas fa-times"></i>
+                      <button type="button" class="btn btn-tool" data-card-widget="remove">
+                        <i class="fas fa-times"></i>
                       </button>
                     </div>
                   </div>
@@ -1392,9 +1397,11 @@
                 <h3 class="card-title">Browser Usage</h3>
 
                 <div class="card-tools">
-                  <button type="button" class="btn btn-tool" data-card-widget="collapse"><i class="fas fa-minus"></i>
+                  <button type="button" class="btn btn-tool" data-card-widget="collapse">
+                    <i class="fas fa-minus"></i>
                   </button>
-                  <button type="button" class="btn btn-tool" data-card-widget="remove"><i class="fas fa-times"></i>
+                  <button type="button" class="btn btn-tool" data-card-widget="remove">
+                    <i class="fas fa-times"></i>
                   </button>
                 </div>
               </div>
diff --git a/index3.html b/index3.html
index ad7792ba6..254199880 100644
--- a/index3.html
+++ b/index3.html
@@ -140,8 +140,9 @@
         </div>
       </li>
       <li class="nav-item">
-        <a class="nav-link" data-widget="control-sidebar" data-slide="true" href="#" role="button"><i
-            class="fas fa-th-large"></i></a>
+        <a class="nav-link" data-widget="control-sidebar" data-slide="true" href="#" role="button">
+          <i class="fas fa-th-large"></i>
+        </a>
       </li>
     </ul>
   </nav>
diff --git a/pages/UI/buttons.html b/pages/UI/buttons.html
index b6f538854..eb3503984 100644
--- a/pages/UI/buttons.html
+++ b/pages/UI/buttons.html
@@ -1225,17 +1225,27 @@
                     </td>
                     <td>
                       <div class="btn-group">
-                        <button type="button" class="btn btn-default"><i class="fas fa-align-left"></i></button>
-                        <button type="button" class="btn btn-default"><i class="fas fa-align-center"></i></button>
-                        <button type="button" class="btn btn-default"><i class="fas fa-align-right"></i></button>
+                        <button type="button" class="btn btn-default">
+                          <i class="fas fa-align-left"></i>
+                        </button>
+                        <button type="button" class="btn btn-default">
+                          <i class="fas fa-align-center"></i>
+                        </button>
+                        <button type="button" class="btn btn-default">
+                          <i class="fas fa-align-right"></i>
+                        </button>
                       </div>
                     </td>
                     <td>
                       <div class="btn-group">
-                        <button type="button" class="btn btn-default btn-flat"><i class="fas fa-align-left"></i></button>
-                        <button type="button" class="btn btn-default btn-flat"><i class="fas fa-align-center"></i>
+                        <button type="button" class="btn btn-default btn-flat">
+                          <i class="fas fa-align-left"></i>
                         </button>
-                        <button type="button" class="btn btn-default btn-flat"><i class="fas fa-align-right"></i>
+                        <button type="button" class="btn btn-default btn-flat">
+                          <i class="fas fa-align-center"></i>
+                        </button>
+                        <button type="button" class="btn btn-default btn-flat">
+                          <i class="fas fa-align-right"></i>
                         </button>
                       </div>
                     </td>
@@ -1267,16 +1277,28 @@
                     </td>
                     <td>
                       <div class="btn-group">
-                        <button type="button" class="btn btn-info"><i class="fas fa-align-left"></i></button>
-                        <button type="button" class="btn btn-info"><i class="fas fa-align-center"></i></button>
-                        <button type="button" class="btn btn-info"><i class="fas fa-align-right"></i></button>
+                        <button type="button" class="btn btn-info">
+                          <i class="fas fa-align-left"></i>
+                        </button>
+                        <button type="button" class="btn btn-info">
+                          <i class="fas fa-align-center"></i>
+                        </button>
+                        <button type="button" class="btn btn-info">
+                          <i class="fas fa-align-right"></i>
+                        </button>
                       </div>
                     </td>
                     <td>
                       <div class="btn-group">
-                        <button type="button" class="btn btn-info btn-flat"><i class="fas fa-align-left"></i></button>
-                        <button type="button" class="btn btn-info btn-flat"><i class="fas fa-align-center"></i></button>
-                        <button type="button" class="btn btn-info btn-flat"><i class="fas fa-align-right"></i></button>
+                        <button type="button" class="btn btn-info btn-flat">
+                          <i class="fas fa-align-left"></i>
+                        </button>
+                        <button type="button" class="btn btn-info btn-flat">
+                          <i class="fas fa-align-center"></i>
+                        </button>
+                        <button type="button" class="btn btn-info btn-flat">
+                          <i class="fas fa-align-right"></i>
+                        </button>
                       </div>
                     </td>
                     <td>
@@ -1307,17 +1329,28 @@
                     </td>
                     <td>
                       <div class="btn-group">
-                        <button type="button" class="btn btn-danger"><i class="fas fa-align-left"></i></button>
-                        <button type="button" class="btn btn-danger"><i class="fas fa-align-center"></i></button>
-                        <button type="button" class="btn btn-danger"><i class="fas fa-align-right"></i></button>
+                        <button type="button" class="btn btn-danger">
+                          <i class="fas fa-align-left"></i>
+                        </button>
+                        <button type="button" class="btn btn-danger">
+                          <i class="fas fa-align-center"></i>
+                        </button>
+                        <button type="button" class="btn btn-danger">
+                          <i class="fas fa-align-right"></i>
+                        </button>
                       </div>
                     </td>
                     <td>
                       <div class="btn-group">
-                        <button type="button" class="btn btn-danger btn-flat"><i class="fas fa-align-left"></i></button>
-                        <button type="button" class="btn btn-danger btn-flat"><i class="fas fa-align-center"></i>
+                        <button type="button" class="btn btn-danger btn-flat">
+                          <i class="fas fa-align-left"></i>
+                        </button>
+                        <button type="button" class="btn btn-danger btn-flat">
+                          <i class="fas fa-align-center"></i>
+                        </button>
+                        <button type="button" class="btn btn-danger btn-flat">
+                          <i class="fas fa-align-right"></i>
                         </button>
-                        <button type="button" class="btn btn-danger btn-flat"><i class="fas fa-align-right"></i></button>
                       </div>
                     </td>
                     <td>
@@ -1348,17 +1381,27 @@
                     </td>
                     <td>
                       <div class="btn-group">
-                        <button type="button" class="btn btn-warning"><i class="fas fa-align-left"></i></button>
-                        <button type="button" class="btn btn-warning"><i class="fas fa-align-center"></i></button>
-                        <button type="button" class="btn btn-warning"><i class="fas fa-align-right"></i></button>
+                        <button type="button" class="btn btn-warning">
+                          <i class="fas fa-align-left"></i>
+                        </button>
+                        <button type="button" class="btn btn-warning">
+                          <i class="fas fa-align-center"></i>
+                        </button>
+                        <button type="button" class="btn btn-warning">
+                          <i class="fas fa-align-right"></i>
+                        </button>
                       </div>
                     </td>
                     <td>
                       <div class="btn-group">
-                        <button type="button" class="btn btn-warning btn-flat"><i class="fas fa-align-left"></i></button>
-                        <button type="button" class="btn btn-warning btn-flat"><i class="fas fa-align-center"></i>
+                        <button type="button" class="btn btn-warning btn-flat">
+                          <i class="fas fa-align-left"></i>
                         </button>
-                        <button type="button" class="btn btn-warning btn-flat"><i class="fas fa-align-right"></i>
+                        <button type="button" class="btn btn-warning btn-flat">
+                          <i class="fas fa-align-center"></i>
+                        </button>
+                        <button type="button" class="btn btn-warning btn-flat">
+                          <i class="fas fa-align-right"></i>
                         </button>
                       </div>
                     </td>
@@ -1390,17 +1433,27 @@
                     </td>
                     <td>
                       <div class="btn-group">
-                        <button type="button" class="btn btn-success"><i class="fas fa-align-left"></i></button>
-                        <button type="button" class="btn btn-success"><i class="fas fa-align-center"></i></button>
-                        <button type="button" class="btn btn-success"><i class="fas fa-align-right"></i></button>
+                        <button type="button" class="btn btn-success">
+                          <i class="fas fa-align-left"></i>
+                        </button>
+                        <button type="button" class="btn btn-success">
+                          <i class="fas fa-align-center"></i>
+                        </button>
+                        <button type="button" class="btn btn-success">
+                          <i class="fas fa-align-right"></i>
+                        </button>
                       </div>
                     </td>
                     <td>
                       <div class="btn-group">
-                        <button type="button" class="btn btn-success btn-flat"><i class="fas fa-align-left"></i></button>
-                        <button type="button" class="btn btn-success btn-flat"><i class="fas fa-align-center"></i>
+                        <button type="button" class="btn btn-success btn-flat">
+                          <i class="fas fa-align-left"></i>
                         </button>
-                        <button type="button" class="btn btn-success btn-flat"><i class="fas fa-align-right"></i>
+                        <button type="button" class="btn btn-success btn-flat">
+                          <i class="fas fa-align-center"></i>
+                        </button>
+                        <button type="button" class="btn btn-success btn-flat">
+                          <i class="fas fa-align-right"></i>
                         </button>
                       </div>
                     </td>
@@ -1773,17 +1826,27 @@
                     </td>
                     <td>
                       <div class="btn-group-vertical">
-                        <button type="button" class="btn btn-default"><i class="fas fa-align-left"></i></button>
-                        <button type="button" class="btn btn-default"><i class="fas fa-align-center"></i></button>
-                        <button type="button" class="btn btn-default"><i class="fas fa-align-right"></i></button>
+                        <button type="button" class="btn btn-default">
+                          <i class="fas fa-align-left"></i>
+                        </button>
+                        <button type="button" class="btn btn-default">
+                          <i class="fas fa-align-center"></i>
+                        </button>
+                        <button type="button" class="btn btn-default">
+                          <i class="fas fa-align-right"></i>
+                        </button>
                       </div>
                     </td>
                     <td>
                       <div class="btn-group-vertical">
-                        <button type="button" class="btn btn-default btn-flat"><i class="fas fa-align-left"></i></button>
-                        <button type="button" class="btn btn-default btn-flat"><i class="fas fa-align-center"></i>
+                        <button type="button" class="btn btn-default btn-flat">
+                          <i class="fas fa-align-left"></i>
                         </button>
-                        <button type="button" class="btn btn-default btn-flat"><i class="fas fa-align-right"></i>
+                        <button type="button" class="btn btn-default btn-flat">
+                          <i class="fas fa-align-center"></i>
+                        </button>
+                        <button type="button" class="btn btn-default btn-flat">
+                          <i class="fas fa-align-right"></i>
                         </button>
                       </div>
                     </td>
@@ -1815,16 +1878,28 @@
                     </td>
                     <td>
                       <div class="btn-group-vertical">
-                        <button type="button" class="btn btn-info"><i class="fas fa-align-left"></i></button>
-                        <button type="button" class="btn btn-info"><i class="fas fa-align-center"></i></button>
-                        <button type="button" class="btn btn-info"><i class="fas fa-align-right"></i></button>
+                        <button type="button" class="btn btn-info">
+                          <i class="fas fa-align-left"></i>
+                        </button>
+                        <button type="button" class="btn btn-info">
+                          <i class="fas fa-align-center"></i>
+                        </button>
+                        <button type="button" class="btn btn-info">
+                          <i class="fas fa-align-right"></i>
+                        </button>
                       </div>
                     </td>
                     <td>
                       <div class="btn-group-vertical">
-                        <button type="button" class="btn btn-info btn-flat"><i class="fas fa-align-left"></i></button>
-                        <button type="button" class="btn btn-info btn-flat"><i class="fas fa-align-center"></i></button>
-                        <button type="button" class="btn btn-info btn-flat"><i class="fas fa-align-right"></i></button>
+                        <button type="button" class="btn btn-info btn-flat">
+                          <i class="fas fa-align-left"></i>
+                        </button>
+                        <button type="button" class="btn btn-info btn-flat">
+                          <i class="fas fa-align-center"></i>
+                        </button>
+                        <button type="button" class="btn btn-info btn-flat">
+                          <i class="fas fa-align-right"></i>
+                        </button>
                       </div>
                     </td>
                     <td>
@@ -1855,17 +1930,28 @@
                     </td>
                     <td>
                       <div class="btn-group-vertical">
-                        <button type="button" class="btn btn-danger"><i class="fas fa-align-left"></i></button>
-                        <button type="button" class="btn btn-danger"><i class="fas fa-align-center"></i></button>
-                        <button type="button" class="btn btn-danger"><i class="fas fa-align-right"></i></button>
+                        <button type="button" class="btn btn-danger">
+                          <i class="fas fa-align-left"></i>
+                        </button>
+                        <button type="button" class="btn btn-danger">
+                          <i class="fas fa-align-center"></i>
+                        </button>
+                        <button type="button" class="btn btn-danger">
+                          <i class="fas fa-align-right"></i>
+                        </button>
                       </div>
                     </td>
                     <td>
                       <div class="btn-group-vertical">
-                        <button type="button" class="btn btn-danger btn-flat"><i class="fas fa-align-left"></i></button>
-                        <button type="button" class="btn btn-danger btn-flat"><i class="fas fa-align-center"></i>
+                        <button type="button" class="btn btn-danger btn-flat">
+                          <i class="fas fa-align-left"></i>
+                        </button>
+                        <button type="button" class="btn btn-danger btn-flat">
+                          <i class="fas fa-align-center"></i>
+                        </button>
+                        <button type="button" class="btn btn-danger btn-flat">
+                          <i class="fas fa-align-right"></i>
                         </button>
-                        <button type="button" class="btn btn-danger btn-flat"><i class="fas fa-align-right"></i></button>
                       </div>
                     </td>
                     <td>
@@ -1896,17 +1982,27 @@
                     </td>
                     <td>
                       <div class="btn-group-vertical">
-                        <button type="button" class="btn btn-warning"><i class="fas fa-align-left"></i></button>
-                        <button type="button" class="btn btn-warning"><i class="fas fa-align-center"></i></button>
-                        <button type="button" class="btn btn-warning"><i class="fas fa-align-right"></i></button>
+                        <button type="button" class="btn btn-warning">
+                          <i class="fas fa-align-left"></i>
+                        </button>
+                        <button type="button" class="btn btn-warning">
+                          <i class="fas fa-align-center"></i>
+                        </button>
+                        <button type="button" class="btn btn-warning">
+                          <i class="fas fa-align-right"></i>
+                        </button>
                       </div>
                     </td>
                     <td>
                       <div class="btn-group-vertical">
-                        <button type="button" class="btn btn-warning btn-flat"><i class="fas fa-align-left"></i></button>
-                        <button type="button" class="btn btn-warning btn-flat"><i class="fas fa-align-center"></i>
+                        <button type="button" class="btn btn-warning btn-flat">
+                          <i class="fas fa-align-left"></i>
                         </button>
-                        <button type="button" class="btn btn-warning btn-flat"><i class="fas fa-align-right"></i>
+                        <button type="button" class="btn btn-warning btn-flat">
+                          <i class="fas fa-align-center"></i>
+                        </button>
+                        <button type="button" class="btn btn-warning btn-flat">
+                          <i class="fas fa-align-right"></i>
                         </button>
                       </div>
                     </td>
@@ -1938,17 +2034,27 @@
                     </td>
                     <td>
                       <div class="btn-group-vertical">
-                        <button type="button" class="btn btn-success"><i class="fas fa-align-left"></i></button>
-                        <button type="button" class="btn btn-success"><i class="fas fa-align-center"></i></button>
-                        <button type="button" class="btn btn-success"><i class="fas fa-align-right"></i></button>
+                        <button type="button" class="btn btn-success">
+                          <i class="fas fa-align-left"></i>
+                        </button>
+                        <button type="button" class="btn btn-success">
+                          <i class="fas fa-align-center"></i>
+                        </button>
+                        <button type="button" class="btn btn-success">
+                          <i class="fas fa-align-right"></i>
+                        </button>
                       </div>
                     </td>
                     <td>
                       <div class="btn-group-vertical">
-                        <button type="button" class="btn btn-success btn-flat"><i class="fas fa-align-left"></i></button>
-                        <button type="button" class="btn btn-success btn-flat"><i class="fas fa-align-center"></i>
+                        <button type="button" class="btn btn-success btn-flat">
+                          <i class="fas fa-align-left"></i>
                         </button>
-                        <button type="button" class="btn btn-success btn-flat"><i class="fas fa-align-right"></i>
+                        <button type="button" class="btn btn-success btn-flat">
+                          <i class="fas fa-align-center"></i>
+                        </button>
+                        <button type="button" class="btn btn-success btn-flat">
+                          <i class="fas fa-align-right"></i>
                         </button>
                       </div>
                     </td>
diff --git a/pages/UI/modals.html b/pages/UI/modals.html
index 0386f716d..a257aef9b 100644
--- a/pages/UI/modals.html
+++ b/pages/UI/modals.html
@@ -951,7 +951,8 @@
             <div class="modal-header">
               <h4 class="modal-title">Primary Modal</h4>
               <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                <span aria-hidden="true">&times;</span></button>
+                <span aria-hidden="true">&times;</span>
+              </button>
             </div>
             <div class="modal-body">
               <p>One fine body&hellip;</p>
@@ -973,7 +974,8 @@
             <div class="modal-header">
               <h4 class="modal-title">Secondary Modal</h4>
               <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                <span aria-hidden="true">&times;</span></button>
+                <span aria-hidden="true">&times;</span>
+              </button>
             </div>
             <div class="modal-body">
               <p>One fine body&hellip;</p>
@@ -995,7 +997,8 @@
             <div class="modal-header">
               <h4 class="modal-title">Info Modal</h4>
               <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                <span aria-hidden="true">&times;</span></button>
+                <span aria-hidden="true">&times;</span>
+              </button>
             </div>
             <div class="modal-body">
               <p>One fine body&hellip;</p>
@@ -1017,7 +1020,8 @@
             <div class="modal-header">
               <h4 class="modal-title">Warning Modal</h4>
               <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                <span aria-hidden="true">&times;</span></button>
+                <span aria-hidden="true">&times;</span>
+              </button>
             </div>
             <div class="modal-body">
               <p>One fine body&hellip;</p>
@@ -1039,7 +1043,8 @@
             <div class="modal-header">
               <h4 class="modal-title">Success Modal</h4>
               <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                <span aria-hidden="true">&times;</span></button>
+                <span aria-hidden="true">&times;</span>
+              </button>
             </div>
             <div class="modal-body">
               <p>One fine body&hellip;</p>
diff --git a/pages/calendar.html b/pages/calendar.html
index e17f3ff9a..b6961f838 100644
--- a/pages/calendar.html
+++ b/pages/calendar.html
@@ -752,7 +752,6 @@
                 </div>
                 <div class="card-body">
                   <div class="btn-group" style="width: 100%; margin-bottom: 10px;">
-                    <!--<button type="button" id="color-chooser-btn" class="btn btn-info btn-block dropdown-toggle" data-toggle="dropdown">Color <span class="caret"></span></button>-->
                     <ul class="fc-color-picker" id="color-chooser">
                       <li><a class="text-primary" href="#"><i class="fas fa-square"></i></a></li>
                       <li><a class="text-warning" href="#"><i class="fas fa-square"></i></a></li>
diff --git a/pages/charts/chartjs.html b/pages/charts/chartjs.html
index 144db9dc9..428dd6efc 100644
--- a/pages/charts/chartjs.html
+++ b/pages/charts/chartjs.html
@@ -724,9 +724,12 @@
                 <h3 class="card-title">Area Chart</h3>
 
                 <div class="card-tools">
-                  <button type="button" class="btn btn-tool" data-card-widget="collapse"><i class="fas fa-minus"></i>
+                  <button type="button" class="btn btn-tool" data-card-widget="collapse">
+                    <i class="fas fa-minus"></i>
+                  </button>
+                  <button type="button" class="btn btn-tool" data-card-widget="remove">
+                    <i class="fas fa-times"></i>
                   </button>
-                  <button type="button" class="btn btn-tool" data-card-widget="remove"><i class="fas fa-times"></i></button>
                 </div>
               </div>
               <div class="card-body">
@@ -744,9 +747,12 @@
                 <h3 class="card-title">Donut Chart</h3>
 
                 <div class="card-tools">
-                  <button type="button" class="btn btn-tool" data-card-widget="collapse"><i class="fas fa-minus"></i>
+                  <button type="button" class="btn btn-tool" data-card-widget="collapse">
+                    <i class="fas fa-minus"></i>
+                  </button>
+                  <button type="button" class="btn btn-tool" data-card-widget="remove">
+                    <i class="fas fa-times"></i>
                   </button>
-                  <button type="button" class="btn btn-tool" data-card-widget="remove"><i class="fas fa-times"></i></button>
                 </div>
               </div>
               <div class="card-body">
@@ -762,9 +768,12 @@
                 <h3 class="card-title">Pie Chart</h3>
 
                 <div class="card-tools">
-                  <button type="button" class="btn btn-tool" data-card-widget="collapse"><i class="fas fa-minus"></i>
+                  <button type="button" class="btn btn-tool" data-card-widget="collapse">
+                    <i class="fas fa-minus"></i>
+                  </button>
+                  <button type="button" class="btn btn-tool" data-card-widget="remove">
+                    <i class="fas fa-times"></i>
                   </button>
-                  <button type="button" class="btn btn-tool" data-card-widget="remove"><i class="fas fa-times"></i></button>
                 </div>
               </div>
               <div class="card-body">
@@ -783,9 +792,12 @@
                 <h3 class="card-title">Line Chart</h3>
 
                 <div class="card-tools">
-                  <button type="button" class="btn btn-tool" data-card-widget="collapse"><i class="fas fa-minus"></i>
+                  <button type="button" class="btn btn-tool" data-card-widget="collapse">
+                    <i class="fas fa-minus"></i>
+                  </button>
+                  <button type="button" class="btn btn-tool" data-card-widget="remove">
+                    <i class="fas fa-times"></i>
                   </button>
-                  <button type="button" class="btn btn-tool" data-card-widget="remove"><i class="fas fa-times"></i></button>
                 </div>
               </div>
               <div class="card-body">
@@ -803,9 +815,12 @@
                 <h3 class="card-title">Bar Chart</h3>
 
                 <div class="card-tools">
-                  <button type="button" class="btn btn-tool" data-card-widget="collapse"><i class="fas fa-minus"></i>
+                  <button type="button" class="btn btn-tool" data-card-widget="collapse">
+                    <i class="fas fa-minus"></i>
+                  </button>
+                  <button type="button" class="btn btn-tool" data-card-widget="remove">
+                    <i class="fas fa-times"></i>
                   </button>
-                  <button type="button" class="btn btn-tool" data-card-widget="remove"><i class="fas fa-times"></i></button>
                 </div>
               </div>
               <div class="card-body">
@@ -823,9 +838,12 @@
                 <h3 class="card-title">Stacked Bar Chart</h3>
 
                 <div class="card-tools">
-                  <button type="button" class="btn btn-tool" data-card-widget="collapse"><i class="fas fa-minus"></i>
+                  <button type="button" class="btn btn-tool" data-card-widget="collapse">
+                    <i class="fas fa-minus"></i>
+                  </button>
+                  <button type="button" class="btn btn-tool" data-card-widget="remove">
+                    <i class="fas fa-times"></i>
                   </button>
-                  <button type="button" class="btn btn-tool" data-card-widget="remove"><i class="fas fa-times"></i></button>
                 </div>
               </div>
               <div class="card-body">
diff --git a/pages/charts/flot.html b/pages/charts/flot.html
index 54d963a66..afbdbc3a8 100644
--- a/pages/charts/flot.html
+++ b/pages/charts/flot.html
@@ -756,9 +756,11 @@
                 </h3>
 
                 <div class="card-tools">
-                  <button type="button" class="btn btn-tool" data-card-widget="collapse"><i class="fas fa-minus"></i>
+                  <button type="button" class="btn btn-tool" data-card-widget="collapse">
+                    <i class="fas fa-minus"></i>
                   </button>
-                  <button type="button" class="btn btn-tool" data-card-widget="remove"><i class="fas fa-times"></i>
+                  <button type="button" class="btn btn-tool" data-card-widget="remove">
+                    <i class="fas fa-times"></i>
                   </button>
                 </div>
               </div>
@@ -778,9 +780,11 @@
                 </h3>
 
                 <div class="card-tools">
-                  <button type="button" class="btn btn-tool" data-card-widget="collapse"><i class="fas fa-minus"></i>
+                  <button type="button" class="btn btn-tool" data-card-widget="collapse">
+                    <i class="fas fa-minus"></i>
                   </button>
-                  <button type="button" class="btn btn-tool" data-card-widget="remove"><i class="fas fa-times"></i>
+                  <button type="button" class="btn btn-tool" data-card-widget="remove">
+                    <i class="fas fa-times"></i>
                   </button>
                 </div>
               </div>
@@ -828,9 +832,11 @@
                 </h3>
 
                 <div class="card-tools">
-                  <button type="button" class="btn btn-tool" data-card-widget="collapse"><i class="fas fa-minus"></i>
+                  <button type="button" class="btn btn-tool" data-card-widget="collapse">
+                    <i class="fas fa-minus"></i>
                   </button>
-                  <button type="button" class="btn btn-tool" data-card-widget="remove"><i class="fas fa-times"></i>
+                  <button type="button" class="btn btn-tool" data-card-widget="remove">
+                    <i class="fas fa-times"></i>
                   </button>
                 </div>
               </div>
diff --git a/pages/charts/inline.html b/pages/charts/inline.html
index f31e2282f..ae260b293 100644
--- a/pages/charts/inline.html
+++ b/pages/charts/inline.html
@@ -727,10 +727,11 @@
                 </h3>
 
                 <div class="card-tools">
-                  <button type="button" class="btn btn-tool" data-card-widget="collapse"><i
-                      class="fas fa-minus"></i>
+                  <button type="button" class="btn btn-tool" data-card-widget="collapse">
+                    <i class="fas fa-minus"></i>
                   </button>
-                  <button type="button" class="btn btn-tool" data-card-widget="remove"><i class="fas fa-times"></i>
+                  <button type="button" class="btn btn-tool" data-card-widget="remove">
+                    <i class="fas fa-times"></i>
                   </button>
                 </div>
               </div>
@@ -799,10 +800,11 @@
                 </h3>
 
                 <div class="card-tools">
-                  <button type="button" class="btn btn-tool" data-card-widget="collapse"><i
-                      class="fas fa-minus"></i>
+                  <button type="button" class="btn btn-tool" data-card-widget="collapse">
+                    <i class="fas fa-minus"></i>
                   </button>
-                  <button type="button" class="btn btn-tool" data-card-widget="remove"><i class="fas fa-times"></i>
+                  <button type="button" class="btn btn-tool" data-card-widget="remove">
+                    <i class="fas fa-times"></i>
                   </button>
                 </div>
               </div>
@@ -858,10 +860,11 @@
                 </h3>
 
                 <div class="card-tools">
-                  <button type="button" class="btn btn-tool" data-card-widget="collapse"><i
-                      class="fas fa-minus"></i>
+                  <button type="button" class="btn btn-tool" data-card-widget="collapse">
+                    <i class="fas fa-minus"></i>
                   </button>
-                  <button type="button" class="btn btn-tool" data-card-widget="remove"><i class="fas fa-times"></i>
+                  <button type="button" class="btn btn-tool" data-card-widget="remove">
+                    <i class="fas fa-times"></i>
                   </button>
                 </div>
               </div>
diff --git a/pages/examples/blank.html b/pages/examples/blank.html
index e5efe3338..ed21f4de4 100644
--- a/pages/examples/blank.html
+++ b/pages/examples/blank.html
@@ -722,10 +722,12 @@
           <h3 class="card-title">Title</h3>
 
           <div class="card-tools">
-            <button type="button" class="btn btn-tool" data-card-widget="collapse" data-toggle="tooltip" title="Collapse">
-              <i class="fas fa-minus"></i></button>
-            <button type="button" class="btn btn-tool" data-card-widget="remove" data-toggle="tooltip" title="Remove">
-              <i class="fas fa-times"></i></button>
+            <button type="button" class="btn btn-tool" data-card-widget="collapse" title="Collapse">
+              <i class="fas fa-minus"></i>
+            </button>
+            <button type="button" class="btn btn-tool" data-card-widget="remove" title="Remove">
+              <i class="fas fa-times"></i>
+            </button>
           </div>
         </div>
         <div class="card-body">
diff --git a/pages/examples/language-menu.html b/pages/examples/language-menu.html
index 580578a28..0f90cf679 100644
--- a/pages/examples/language-menu.html
+++ b/pages/examples/language-menu.html
@@ -734,10 +734,12 @@
           <h3 class="card-title">Title</h3>
 
           <div class="card-tools">
-            <button type="button" class="btn btn-tool" data-card-widget="collapse" data-toggle="tooltip" title="Collapse">
-              <i class="fas fa-minus"></i></button>
-            <button type="button" class="btn btn-tool" data-card-widget="remove" data-toggle="tooltip" title="Remove">
-              <i class="fas fa-times"></i></button>
+            <button type="button" class="btn btn-tool" data-card-widget="collapse" title="Collapse">
+              <i class="fas fa-minus"></i>
+            </button>
+            <button type="button" class="btn btn-tool" data-card-widget="remove" title="Remove">
+              <i class="fas fa-times"></i>
+            </button>
           </div>
         </div>
         <div class="card-body">
diff --git a/pages/examples/legacy-user-menu.html b/pages/examples/legacy-user-menu.html
index 22e3006e6..b1865b48d 100644
--- a/pages/examples/legacy-user-menu.html
+++ b/pages/examples/legacy-user-menu.html
@@ -749,10 +749,12 @@
           <h3 class="card-title">Title</h3>
 
           <div class="card-tools">
-            <button type="button" class="btn btn-tool" data-card-widget="collapse" data-toggle="tooltip" title="Collapse">
-              <i class="fas fa-minus"></i></button>
-            <button type="button" class="btn btn-tool" data-card-widget="remove" data-toggle="tooltip" title="Remove">
-              <i class="fas fa-times"></i></button>
+            <button type="button" class="btn btn-tool" data-card-widget="collapse" title="Collapse">
+              <i class="fas fa-minus"></i>
+            </button>
+            <button type="button" class="btn btn-tool" data-card-widget="remove" title="Remove">
+              <i class="fas fa-times"></i>
+            </button>
           </div>
         </div>
         <div class="card-body">
diff --git a/pages/examples/lockscreen.html b/pages/examples/lockscreen.html
index e176cf075..a98ef65e4 100644
--- a/pages/examples/lockscreen.html
+++ b/pages/examples/lockscreen.html
@@ -35,7 +35,9 @@
         <input type="password" class="form-control" placeholder="password">
 
         <div class="input-group-append">
-          <button type="button" class="btn"><i class="fas fa-arrow-right text-muted"></i></button>
+          <button type="button" class="btn">
+            <i class="fas fa-arrow-right text-muted"></i>
+          </button>
         </div>
       </div>
     </form>
diff --git a/pages/examples/pace.html b/pages/examples/pace.html
index eb3a6c031..6fa71571b 100644
--- a/pages/examples/pace.html
+++ b/pages/examples/pace.html
@@ -724,10 +724,12 @@
           <h3 class="card-title">Title</h3>
 
           <div class="card-tools">
-            <button type="button" class="btn btn-tool" data-card-widget="collapse" data-toggle="tooltip" title="Collapse">
-              <i class="fas fa-minus"></i></button>
-            <button type="button" class="btn btn-tool" data-card-widget="remove" data-toggle="tooltip" title="Remove">
-              <i class="fas fa-times"></i></button>
+            <button type="button" class="btn btn-tool" data-card-widget="collapse" title="Collapse">
+              <i class="fas fa-minus"></i>
+            </button>
+            <button type="button" class="btn btn-tool" data-card-widget="remove" title="Remove">
+              <i class="fas fa-times"></i>
+            </button>
           </div>
         </div>
         <div class="card-body">
diff --git a/pages/examples/project-add.html b/pages/examples/project-add.html
index 8701d48f5..a6b541e7f 100644
--- a/pages/examples/project-add.html
+++ b/pages/examples/project-add.html
@@ -721,8 +721,9 @@
               <h3 class="card-title">General</h3>
 
               <div class="card-tools">
-                <button type="button" class="btn btn-tool" data-card-widget="collapse" data-toggle="tooltip" title="Collapse">
-                  <i class="fas fa-minus"></i></button>
+                <button type="button" class="btn btn-tool" data-card-widget="collapse" title="Collapse">
+                  <i class="fas fa-minus"></i>
+                </button>
               </div>
             </div>
             <div class="card-body">
@@ -762,8 +763,9 @@
               <h3 class="card-title">Budget</h3>
 
               <div class="card-tools">
-                <button type="button" class="btn btn-tool" data-card-widget="collapse" data-toggle="tooltip" title="Collapse">
-                  <i class="fas fa-minus"></i></button>
+                <button type="button" class="btn btn-tool" data-card-widget="collapse" title="Collapse">
+                  <i class="fas fa-minus"></i>
+                </button>
               </div>
             </div>
             <div class="card-body">
diff --git a/pages/examples/project-detail.html b/pages/examples/project-detail.html
index ef2b2e750..23f3a9c78 100644
--- a/pages/examples/project-detail.html
+++ b/pages/examples/project-detail.html
@@ -723,10 +723,12 @@
           <h3 class="card-title">Projects Detail</h3>
 
           <div class="card-tools">
-            <button type="button" class="btn btn-tool" data-card-widget="collapse" data-toggle="tooltip" title="Collapse">
-              <i class="fas fa-minus"></i></button>
-            <button type="button" class="btn btn-tool" data-card-widget="remove" data-toggle="tooltip" title="Remove">
-              <i class="fas fa-times"></i></button>
+            <button type="button" class="btn btn-tool" data-card-widget="collapse" title="Collapse">
+              <i class="fas fa-minus"></i>
+            </button>
+            <button type="button" class="btn btn-tool" data-card-widget="remove" title="Remove">
+              <i class="fas fa-times"></i>
+            </button>
           </div>
         </div>
         <div class="card-body">
diff --git a/pages/examples/project-edit.html b/pages/examples/project-edit.html
index 51beed81f..d30509b62 100644
--- a/pages/examples/project-edit.html
+++ b/pages/examples/project-edit.html
@@ -722,8 +722,9 @@
               <h3 class="card-title">General</h3>
 
               <div class="card-tools">
-                <button type="button" class="btn btn-tool" data-card-widget="collapse" data-toggle="tooltip" title="Collapse">
-                  <i class="fas fa-minus"></i></button>
+                <button type="button" class="btn btn-tool" data-card-widget="collapse" title="Collapse">
+                  <i class="fas fa-minus"></i>
+                </button>
               </div>
             </div>
             <div class="card-body">
@@ -763,8 +764,9 @@
               <h3 class="card-title">Budget</h3>
 
               <div class="card-tools">
-                <button type="button" class="btn btn-tool" data-card-widget="collapse" data-toggle="tooltip" title="Collapse">
-                  <i class="fas fa-minus"></i></button>
+                <button type="button" class="btn btn-tool" data-card-widget="collapse" title="Collapse">
+                  <i class="fas fa-minus"></i>
+                </button>
               </div>
             </div>
             <div class="card-body">
@@ -789,8 +791,9 @@
               <h3 class="card-title">Files</h3>
 
               <div class="card-tools">
-                <button type="button" class="btn btn-tool" data-card-widget="collapse" data-toggle="tooltip" title="Collapse">
-                  <i class="fas fa-minus"></i></button>
+                <button type="button" class="btn btn-tool" data-card-widget="collapse" title="Collapse">
+                  <i class="fas fa-minus"></i>
+                </button>
               </div>
             </div>
             <div class="card-body p-0">
diff --git a/pages/examples/projects.html b/pages/examples/projects.html
index 3e5b44e66..a8932636e 100644
--- a/pages/examples/projects.html
+++ b/pages/examples/projects.html
@@ -722,10 +722,12 @@
           <h3 class="card-title">Projects</h3>
 
           <div class="card-tools">
-            <button type="button" class="btn btn-tool" data-card-widget="collapse" data-toggle="tooltip" title="Collapse">
-              <i class="fas fa-minus"></i></button>
-            <button type="button" class="btn btn-tool" data-card-widget="remove" data-toggle="tooltip" title="Remove">
-              <i class="fas fa-times"></i></button>
+            <button type="button" class="btn btn-tool" data-card-widget="collapse" title="Collapse">
+              <i class="fas fa-minus"></i>
+            </button>
+            <button type="button" class="btn btn-tool" data-card-widget="remove" title="Remove">
+              <i class="fas fa-times"></i>
+            </button>
           </div>
         </div>
         <div class="card-body p-0">
diff --git a/pages/forms/advanced.html b/pages/forms/advanced.html
index 404148353..4bc417c52 100644
--- a/pages/forms/advanced.html
+++ b/pages/forms/advanced.html
@@ -734,8 +734,12 @@
             <h3 class="card-title">Select2 (Default Theme)</h3>
 
             <div class="card-tools">
-              <button type="button" class="btn btn-tool" data-card-widget="collapse"><i class="fas fa-minus"></i></button>
-              <button type="button" class="btn btn-tool" data-card-widget="remove"><i class="fas fa-times"></i></button>
+              <button type="button" class="btn btn-tool" data-card-widget="collapse">
+                <i class="fas fa-minus"></i>
+              </button>
+              <button type="button" class="btn btn-tool" data-card-widget="remove">
+                <i class="fas fa-times"></i>
+              </button>
             </div>
           </div>
           <!-- /.card-header -->
@@ -855,8 +859,12 @@
             <h3 class="card-title">Select2 (Bootstrap4 Theme)</h3>
 
             <div class="card-tools">
-              <button type="button" class="btn btn-tool" data-card-widget="collapse"><i class="fas fa-minus"></i></button>
-              <button type="button" class="btn btn-tool" data-card-widget="remove"><i class="fas fa-times"></i></button>
+              <button type="button" class="btn btn-tool" data-card-widget="collapse">
+                <i class="fas fa-minus"></i>
+              </button>
+              <button type="button" class="btn btn-tool" data-card-widget="remove">
+                <i class="fas fa-times"></i>
+              </button>
             </div>
           </div>
           <!-- /.card-header -->
@@ -937,8 +945,12 @@
             <h3 class="card-title">Bootstrap Duallistbox</h3>
 
             <div class="card-tools">
-              <button type="button" class="btn btn-tool" data-card-widget="collapse"><i class="fas fa-minus"></i></button>
-              <button type="button" class="btn btn-tool" data-card-widget="remove"><i class="fas fa-times"></i></button>
+              <button type="button" class="btn btn-tool" data-card-widget="collapse">
+                <i class="fas fa-minus"></i>
+              </button>
+              <button type="button" class="btn btn-tool" data-card-widget="remove">
+                <i class="fas fa-times"></i>
+              </button>
             </div>
           </div>
           <!-- /.card-header -->
diff --git a/pages/forms/editors.html b/pages/forms/editors.html
index b2dff65af..43ea54c26 100644
--- a/pages/forms/editors.html
+++ b/pages/forms/editors.html
@@ -726,12 +726,12 @@
               </h3>
               <!-- tools box -->
               <div class="card-tools">
-                <button type="button" class="btn btn-tool btn-sm" data-card-widget="collapse" data-toggle="tooltip"
-                        title="Collapse">
-                  <i class="fas fa-minus"></i></button>
-                <button type="button" class="btn btn-tool btn-sm" data-card-widget="remove" data-toggle="tooltip"
-                        title="Remove">
-                  <i class="fas fa-times"></i></button>
+                <button type="button" class="btn btn-tool btn-sm" data-card-widget="collapse" title="Collapse">
+                  <i class="fas fa-minus"></i>
+                </button>
+                <button type="button" class="btn btn-tool btn-sm" data-card-widget="remove" title="Remove">
+                  <i class="fas fa-times"></i>
+                </button>
               </div>
               <!-- /. tools -->
             </div>
diff --git a/pages/layout/boxed.html b/pages/layout/boxed.html
index efc7019db..66307080d 100644
--- a/pages/layout/boxed.html
+++ b/pages/layout/boxed.html
@@ -725,10 +725,12 @@
                 <h3 class="card-title">Title</h3>
 
                 <div class="card-tools">
-                  <button type="button" class="btn btn-tool" data-card-widget="collapse" data-toggle="tooltip" title="Collapse">
-                    <i class="fas fa-minus"></i></button>
-                  <button type="button" class="btn btn-tool" data-card-widget="remove" data-toggle="tooltip" title="Remove">
-                    <i class="fas fa-times"></i></button>
+                  <button type="button" class="btn btn-tool" data-card-widget="collapse" title="Collapse">
+                    <i class="fas fa-minus"></i>
+                  </button>
+                  <button type="button" class="btn btn-tool" data-card-widget="remove" title="Remove">
+                    <i class="fas fa-times"></i>
+                  </button>
                 </div>
               </div>
               <div class="card-body">
diff --git a/pages/layout/collapsed-sidebar.html b/pages/layout/collapsed-sidebar.html
index 780bccfe2..336a92715 100644
--- a/pages/layout/collapsed-sidebar.html
+++ b/pages/layout/collapsed-sidebar.html
@@ -725,10 +725,12 @@
                 <h3 class="card-title">Title</h3>
 
                 <div class="card-tools">
-                  <button type="button" class="btn btn-tool" data-card-widget="collapse" data-toggle="tooltip" title="Collapse">
-                    <i class="fas fa-minus"></i></button>
-                  <button type="button" class="btn btn-tool" data-card-widget="remove" data-toggle="tooltip" title="Remove">
-                    <i class="fas fa-times"></i></button>
+                  <button type="button" class="btn btn-tool" data-card-widget="collapse" title="Collapse">
+                    <i class="fas fa-minus"></i>
+                  </button>
+                  <button type="button" class="btn btn-tool" data-card-widget="remove" title="Remove">
+                    <i class="fas fa-times"></i>
+                  </button>
                 </div>
               </div>
               <div class="card-body">
diff --git a/pages/layout/fixed-footer.html b/pages/layout/fixed-footer.html
index f9b532f25..c3ca55977 100644
--- a/pages/layout/fixed-footer.html
+++ b/pages/layout/fixed-footer.html
@@ -725,10 +725,12 @@
                 <h3 class="card-title">Title</h3>
 
                 <div class="card-tools">
-                  <button type="button" class="btn btn-tool" data-card-widget="collapse" data-toggle="tooltip" title="Collapse">
-                    <i class="fas fa-minus"></i></button>
-                  <button type="button" class="btn btn-tool" data-card-widget="remove" data-toggle="tooltip" title="Remove">
-                    <i class="fas fa-times"></i></button>
+                  <button type="button" class="btn btn-tool" data-card-widget="collapse" title="Collapse">
+                    <i class="fas fa-minus"></i>
+                  </button>
+                  <button type="button" class="btn btn-tool" data-card-widget="remove" title="Remove">
+                    <i class="fas fa-times"></i>
+                  </button>
                 </div>
               </div>
               <div class="card-body">
diff --git a/pages/layout/fixed-sidebar.html b/pages/layout/fixed-sidebar.html
index 00686fbf7..b60cd2838 100644
--- a/pages/layout/fixed-sidebar.html
+++ b/pages/layout/fixed-sidebar.html
@@ -728,10 +728,12 @@
                 <h3 class="card-title">Title</h3>
 
                 <div class="card-tools">
-                  <button type="button" class="btn btn-tool" data-card-widget="collapse" data-toggle="tooltip" title="Collapse">
-                    <i class="fas fa-minus"></i></button>
-                  <button type="button" class="btn btn-tool" data-card-widget="remove" data-toggle="tooltip" title="Remove">
-                    <i class="fas fa-times"></i></button>
+                  <button type="button" class="btn btn-tool" data-card-widget="collapse" title="Collapse">
+                    <i class="fas fa-minus"></i>
+                  </button>
+                  <button type="button" class="btn btn-tool" data-card-widget="remove" title="Remove">
+                    <i class="fas fa-times"></i>
+                  </button>
                 </div>
               </div>
               <div class="card-body">
diff --git a/pages/layout/fixed-topnav.html b/pages/layout/fixed-topnav.html
index 60b19e742..bf132af32 100644
--- a/pages/layout/fixed-topnav.html
+++ b/pages/layout/fixed-topnav.html
@@ -725,10 +725,12 @@
                 <h3 class="card-title">Title</h3>
 
                 <div class="card-tools">
-                  <button type="button" class="btn btn-tool" data-card-widget="collapse" data-toggle="tooltip" title="Collapse">
-                    <i class="fas fa-minus"></i></button>
-                  <button type="button" class="btn btn-tool" data-card-widget="remove" data-toggle="tooltip" title="Remove">
-                    <i class="fas fa-times"></i></button>
+                  <button type="button" class="btn btn-tool" data-card-widget="collapse" title="Collapse">
+                    <i class="fas fa-minus"></i>
+                  </button>
+                  <button type="button" class="btn btn-tool" data-card-widget="remove" title="Remove">
+                    <i class="fas fa-times"></i>
+                  </button>
                 </div>
               </div>
               <div class="card-body">
diff --git a/pages/layout/top-nav-sidebar.html b/pages/layout/top-nav-sidebar.html
index 6062b2700..29926e41d 100644
--- a/pages/layout/top-nav-sidebar.html
+++ b/pages/layout/top-nav-sidebar.html
@@ -179,8 +179,9 @@ scratch. This page gets rid of all links and provides the needed markup only.
           </div>
         </li>
         <li class="nav-item">
-          <a class="nav-link" data-widget="control-sidebar" data-slide="true" href="#" role="button"><i
-              class="fas fa-th-large"></i></a>
+          <a class="nav-link" data-widget="control-sidebar" data-slide="true" href="#" role="button">
+            <i class="fas fa-th-large"></i>
+          </a>
         </li>
       </ul>
     </div>
diff --git a/pages/layout/top-nav.html b/pages/layout/top-nav.html
index 7ca441380..4dadea9ff 100644
--- a/pages/layout/top-nav.html
+++ b/pages/layout/top-nav.html
@@ -176,8 +176,9 @@ scratch. This page gets rid of all links and provides the needed markup only.
           </div>
         </li>
         <li class="nav-item">
-          <a class="nav-link" data-widget="control-sidebar" data-slide="true" href="#" role="button"><i
-              class="fas fa-th-large"></i></a>
+          <a class="nav-link" data-widget="control-sidebar" data-slide="true" href="#" role="button">
+            <i class="fas fa-th-large"></i>
+          </a>
         </li>
       </ul>
     </div>
diff --git a/pages/mailbox/compose.html b/pages/mailbox/compose.html
index f7fc11242..bf0bd8271 100644
--- a/pages/mailbox/compose.html
+++ b/pages/mailbox/compose.html
@@ -718,7 +718,8 @@
                 <h3 class="card-title">Folders</h3>
 
                 <div class="card-tools">
-                  <button type="button" class="btn btn-tool" data-card-widget="collapse"><i class="fas fa-minus"></i>
+                  <button type="button" class="btn btn-tool" data-card-widget="collapse">
+                    <i class="fas fa-minus"></i>
                   </button>
                 </div>
               </div>
@@ -761,7 +762,8 @@
                 <h3 class="card-title">Labels</h3>
 
                 <div class="card-tools">
-                  <button type="button" class="btn btn-tool" data-card-widget="collapse"><i class="fas fa-minus"></i>
+                  <button type="button" class="btn btn-tool" data-card-widget="collapse">
+                    <i class="fas fa-minus"></i>
                   </button>
                 </div>
               </div>
diff --git a/pages/mailbox/mailbox.html b/pages/mailbox/mailbox.html
index 8bea77a7d..d7bdab1e9 100644
--- a/pages/mailbox/mailbox.html
+++ b/pages/mailbox/mailbox.html
@@ -717,7 +717,8 @@
               <h3 class="card-title">Folders</h3>
 
               <div class="card-tools">
-                <button type="button" class="btn btn-tool" data-card-widget="collapse"><i class="fas fa-minus"></i>
+                <button type="button" class="btn btn-tool" data-card-widget="collapse">
+                  <i class="fas fa-minus"></i>
                 </button>
               </div>
             </div>
@@ -760,7 +761,8 @@
               <h3 class="card-title">Labels</h3>
 
               <div class="card-tools">
-                <button type="button" class="btn btn-tool" data-card-widget="collapse"><i class="fas fa-minus"></i>
+                <button type="button" class="btn btn-tool" data-card-widget="collapse">
+                  <i class="fas fa-minus"></i>
                 </button>
               </div>
             </div>
@@ -814,17 +816,29 @@
                 <button type="button" class="btn btn-default btn-sm checkbox-toggle"><i class="far fa-square"></i>
                 </button>
                 <div class="btn-group">
-                  <button type="button" class="btn btn-default btn-sm"><i class="far fa-trash-alt"></i></button>
-                  <button type="button" class="btn btn-default btn-sm"><i class="fas fa-reply"></i></button>
-                  <button type="button" class="btn btn-default btn-sm"><i class="fas fa-share"></i></button>
+                  <button type="button" class="btn btn-default btn-sm">
+                    <i class="far fa-trash-alt"></i>
+                  </button>
+                  <button type="button" class="btn btn-default btn-sm">
+                    <i class="fas fa-reply"></i>
+                  </button>
+                  <button type="button" class="btn btn-default btn-sm">
+                    <i class="fas fa-share"></i>
+                  </button>
                 </div>
                 <!-- /.btn-group -->
-                <button type="button" class="btn btn-default btn-sm"><i class="fas fa-sync-alt"></i></button>
+                <button type="button" class="btn btn-default btn-sm">
+                  <i class="fas fa-sync-alt"></i>
+                </button>
                 <div class="float-right">
                   1-50/200
                   <div class="btn-group">
-                    <button type="button" class="btn btn-default btn-sm"><i class="fas fa-chevron-left"></i></button>
-                    <button type="button" class="btn btn-default btn-sm"><i class="fas fa-chevron-right"></i></button>
+                    <button type="button" class="btn btn-default btn-sm">
+                      <i class="fas fa-chevron-left"></i>
+                    </button>
+                    <button type="button" class="btn btn-default btn-sm">
+                      <i class="fas fa-chevron-right"></i>
+                    </button>
                   </div>
                   <!-- /.btn-group -->
                 </div>
@@ -1053,20 +1067,33 @@
             <div class="card-footer p-0">
               <div class="mailbox-controls">
                 <!-- Check all button -->
-                <button type="button" class="btn btn-default btn-sm checkbox-toggle"><i class="far fa-square"></i>
+                <button type="button" class="btn btn-default btn-sm checkbox-toggle">
+                  <i class="far fa-square"></i>
                 </button>
                 <div class="btn-group">
-                  <button type="button" class="btn btn-default btn-sm"><i class="far fa-trash-alt"></i></button>
-                  <button type="button" class="btn btn-default btn-sm"><i class="fas fa-reply"></i></button>
-                  <button type="button" class="btn btn-default btn-sm"><i class="fas fa-share"></i></button>
+                  <button type="button" class="btn btn-default btn-sm">
+                    <i class="far fa-trash-alt"></i>
+                  </button>
+                  <button type="button" class="btn btn-default btn-sm">
+                    <i class="fas fa-reply"></i>
+                  </button>
+                  <button type="button" class="btn btn-default btn-sm">
+                    <i class="fas fa-share"></i>
+                  </button>
                 </div>
                 <!-- /.btn-group -->
-                <button type="button" class="btn btn-default btn-sm"><i class="fas fa-sync-alt"></i></button>
+                <button type="button" class="btn btn-default btn-sm">
+                  <i class="fas fa-sync-alt"></i>
+                </button>
                 <div class="float-right">
                   1-50/200
                   <div class="btn-group">
-                    <button type="button" class="btn btn-default btn-sm"><i class="fas fa-chevron-left"></i></button>
-                    <button type="button" class="btn btn-default btn-sm"><i class="fas fa-chevron-right"></i></button>
+                    <button type="button" class="btn btn-default btn-sm">
+                      <i class="fas fa-chevron-left"></i>
+                    </button>
+                    <button type="button" class="btn btn-default btn-sm">
+                      <i class="fas fa-chevron-right"></i>
+                    </button>
                   </div>
                   <!-- /.btn-group -->
                 </div>
diff --git a/pages/mailbox/read-mail.html b/pages/mailbox/read-mail.html
index b90678ff0..933d2090e 100644
--- a/pages/mailbox/read-mail.html
+++ b/pages/mailbox/read-mail.html
@@ -716,7 +716,8 @@
                 <h3 class="card-title">Folders</h3>
 
                 <div class="card-tools">
-                  <button type="button" class="btn btn-tool" data-card-widget="collapse"><i class="fas fa-minus"></i>
+                  <button type="button" class="btn btn-tool" data-card-widget="collapse">
+                    <i class="fas fa-minus"></i>
                   </button>
                 </div>
               </div>
@@ -759,7 +760,8 @@
                 <h3 class="card-title">Labels</h3>
 
                 <div class="card-tools">
-                  <button type="button" class="btn btn-tool" data-card-widget="collapse"><i class="fas fa-minus"></i>
+                  <button type="button" class="btn btn-tool" data-card-widget="collapse">
+                    <i class="fas fa-minus"></i>
                   </button>
                 </div>
               </div>
@@ -788,8 +790,8 @@
               <h3 class="card-title">Read Mail</h3>
 
               <div class="card-tools">
-                <a href="#" class="btn btn-tool" data-toggle="tooltip" title="Previous"><i class="fas fa-chevron-left"></i></a>
-                <a href="#" class="btn btn-tool" data-toggle="tooltip" title="Next"><i class="fas fa-chevron-right"></i></a>
+                <a href="#" class="btn btn-tool" title="Previous"><i class="fas fa-chevron-left"></i></a>
+                <a href="#" class="btn btn-tool" title="Next"><i class="fas fa-chevron-right"></i></a>
               </div>
             </div>
             <!-- /.card-header -->
@@ -802,16 +804,20 @@
               <!-- /.mailbox-read-info -->
               <div class="mailbox-controls with-border text-center">
                 <div class="btn-group">
-                  <button type="button" class="btn btn-default btn-sm" data-toggle="tooltip" data-container="body" title="Delete">
-                    <i class="far fa-trash-alt"></i></button>
-                  <button type="button" class="btn btn-default btn-sm" data-toggle="tooltip" data-container="body" title="Reply">
-                    <i class="fas fa-reply"></i></button>
-                  <button type="button" class="btn btn-default btn-sm" data-toggle="tooltip" data-container="body" title="Forward">
-                    <i class="fas fa-share"></i></button>
+                  <button type="button" class="btn btn-default btn-sm" data-container="body" title="Delete">
+                    <i class="far fa-trash-alt"></i>
+                  </button>
+                  <button type="button" class="btn btn-default btn-sm" data-container="body" title="Reply">
+                    <i class="fas fa-reply"></i>
+                  </button>
+                  <button type="button" class="btn btn-default btn-sm" data-container="body" title="Forward">
+                    <i class="fas fa-share"></i>
+                  </button>
                 </div>
                 <!-- /.btn-group -->
-                <button type="button" class="btn btn-default btn-sm" data-toggle="tooltip" title="Print">
-                  <i class="fas fa-print"></i></button>
+                <button type="button" class="btn btn-default btn-sm" title="Print">
+                  <i class="fas fa-print"></i>
+                </button>
               </div>
               <!-- /.mailbox-controls -->
               <div class="mailbox-read-message">
diff --git a/pages/tables/simple.html b/pages/tables/simple.html
index ed388a4a3..4eeccb0bf 100644
--- a/pages/tables/simple.html
+++ b/pages/tables/simple.html
@@ -1004,7 +1004,9 @@
                     <input type="text" name="table_search" class="form-control float-right" placeholder="Search">
 
                     <div class="input-group-append">
-                      <button type="submit" class="btn btn-default"><i class="fas fa-search"></i></button>
+                      <button type="submit" class="btn btn-default">
+                        <i class="fas fa-search"></i>
+                      </button>
                     </div>
                   </div>
                 </div>
@@ -1070,7 +1072,9 @@
                     <input type="text" name="table_search" class="form-control float-right" placeholder="Search">
 
                     <div class="input-group-append">
-                      <button type="submit" class="btn btn-default"><i class="fas fa-search"></i></button>
+                      <button type="submit" class="btn btn-default">
+                        <i class="fas fa-search"></i>
+                      </button>
                     </div>
                   </div>
                 </div>
diff --git a/pages/widgets.html b/pages/widgets.html
index 55e11cc72..7742bf5bb 100644
--- a/pages/widgets.html
+++ b/pages/widgets.html
@@ -1223,7 +1223,9 @@
                 <h3 class="card-title">Card Refresh</h3>
 
                 <div class="card-tools">
-                  <button type="button" class="btn btn-tool" data-card-widget="card-refresh" data-source="widgets.html" data-source-selector="#card-refresh-content"><i class="fas fa-sync-alt"></i></button>
+                  <button type="button" class="btn btn-tool" data-card-widget="card-refresh" data-source="widgets.html" data-source-selector="#card-refresh-content">
+                    <i class="fas fa-sync-alt"></i>
+                  </button>
                 </div>
                 <!-- /.card-tools -->
               </div>
@@ -1245,10 +1247,18 @@
                 <h3 class="card-title">All together</h3>
 
                 <div class="card-tools">
-                  <button type="button" class="btn btn-tool" data-card-widget="card-refresh" data-source="widgets.html" data-source-selector="#card-refresh-content" data-load-on-init="false"><i class="fas fa-sync-alt"></i></button>
-                  <button type="button" class="btn btn-tool" data-card-widget="maximize"><i class="fas fa-expand"></i></button>
-                  <button type="button" class="btn btn-tool" data-card-widget="collapse"><i class="fas fa-minus"></i></button>
-                  <button type="button" class="btn btn-tool" data-card-widget="remove"><i class="fas fa-times"></i></button>
+                  <button type="button" class="btn btn-tool" data-card-widget="card-refresh" data-source="widgets.html" data-source-selector="#card-refresh-content" data-load-on-init="false">
+                    <i class="fas fa-sync-alt"></i>
+                  </button>
+                  <button type="button" class="btn btn-tool" data-card-widget="maximize">
+                    <i class="fas fa-expand"></i>
+                  </button>
+                  <button type="button" class="btn btn-tool" data-card-widget="collapse">
+                    <i class="fas fa-minus"></i>
+                  </button>
+                  <button type="button" class="btn btn-tool" data-card-widget="remove">
+                    <i class="fas fa-times"></i>
+                  </button>
                 </div>
                 <!-- /.card-tools -->
               </div>
@@ -1309,7 +1319,8 @@
                 <h3 class="card-title">Shadow - None</h3>
 
                 <div class="card-tools">
-                  <button type="button" class="btn btn-tool" data-card-widget="collapse"><i class="fas fa-minus"></i>
+                  <button type="button" class="btn btn-tool" data-card-widget="collapse">
+                    <i class="fas fa-minus"></i>
                   </button>
                 </div>
                 <!-- /.card-tools -->
@@ -1329,7 +1340,8 @@
                 <h3 class="card-title">Shadow - Small</h3>
 
                 <div class="card-tools">
-                  <button type="button" class="btn btn-tool" data-card-widget="collapse"><i class="fas fa-minus"></i>
+                  <button type="button" class="btn btn-tool" data-card-widget="collapse">
+                    <i class="fas fa-minus"></i>
                   </button>
                 </div>
                 <!-- /.card-tools -->
@@ -1397,7 +1409,8 @@
                 <h3 class="card-title">Primary</h3>
 
                 <div class="card-tools">
-                  <button type="button" class="btn btn-tool" data-card-widget="collapse"><i class="fas fa-minus"></i>
+                  <button type="button" class="btn btn-tool" data-card-widget="collapse">
+                    <i class="fas fa-minus"></i>
                   </button>
                 </div>
                 <!-- /.card-tools -->
@@ -1437,7 +1450,8 @@
                 <h3 class="card-title">Warning</h3>
 
                 <div class="card-tools">
-                  <button type="button" class="btn btn-tool" data-card-widget="collapse"><i class="fas fa-minus"></i>
+                  <button type="button" class="btn btn-tool" data-card-widget="collapse">
+                    <i class="fas fa-minus"></i>
                   </button>
                 </div>
                 <!-- /.card-tools -->
@@ -1474,7 +1488,8 @@
                 <h3 class="card-title">Primary Outline</h3>
 
                 <div class="card-tools">
-                  <button type="button" class="btn btn-tool" data-card-widget="collapse"><i class="fas fa-minus"></i>
+                  <button type="button" class="btn btn-tool" data-card-widget="collapse">
+                    <i class="fas fa-minus"></i>
                   </button>
                 </div>
                 <!-- /.card-tools -->
@@ -1514,7 +1529,8 @@
                 <h3 class="card-title">Warning Outline</h3>
 
                 <div class="card-tools">
-                  <button type="button" class="btn btn-tool" data-card-widget="collapse"><i class="fas fa-minus"></i>
+                  <button type="button" class="btn btn-tool" data-card-widget="collapse">
+                    <i class="fas fa-minus"></i>
                   </button>
                 </div>
                 <!-- /.card-tools -->
@@ -1551,7 +1567,8 @@
                 <h3 class="card-title">Primary</h3>
 
                 <div class="card-tools">
-                  <button type="button" class="btn btn-tool" data-card-widget="collapse"><i class="fas fa-minus"></i>
+                  <button type="button" class="btn btn-tool" data-card-widget="collapse">
+                    <i class="fas fa-minus"></i>
                   </button>
                 </div>
                 <!-- /.card-tools -->
@@ -1591,7 +1608,8 @@
                 <h3 class="card-title">Warning</h3>
 
                 <div class="card-tools">
-                  <button type="button" class="btn btn-tool" data-card-widget="collapse"><i class="fas fa-minus"></i>
+                  <button type="button" class="btn btn-tool" data-card-widget="collapse">
+                    <i class="fas fa-minus"></i>
                   </button>
                 </div>
                 <!-- /.card-tools -->
@@ -1628,7 +1646,8 @@
                 <h3 class="card-title">Primary Gradient</h3>
 
                 <div class="card-tools">
-                  <button type="button" class="btn btn-tool" data-card-widget="collapse"><i class="fas fa-minus"></i>
+                  <button type="button" class="btn btn-tool" data-card-widget="collapse">
+                    <i class="fas fa-minus"></i>
                   </button>
                 </div>
                 <!-- /.card-tools -->
@@ -1668,7 +1687,8 @@
                 <h3 class="card-title">Warning Gradient</h3>
 
                 <div class="card-tools">
-                  <button type="button" class="btn btn-tool" data-card-widget="collapse"><i class="fas fa-minus"></i>
+                  <button type="button" class="btn btn-tool" data-card-widget="collapse">
+                    <i class="fas fa-minus"></i>
                   </button>
                 </div>
                 <!-- /.card-tools -->
@@ -1710,13 +1730,15 @@
                 <h3 class="card-title">Direct Chat</h3>
 
                 <div class="card-tools">
-                  <span data-toggle="tooltip" title="3 New Messages" class="badge bg-primary">3</span>
-                  <button type="button" class="btn btn-tool" data-card-widget="collapse"><i class="fas fa-minus"></i>
+                  <span title="3 New Messages" class="badge bg-primary">3</span>
+                  <button type="button" class="btn btn-tool" data-card-widget="collapse">
+                      <i class="fas fa-minus"></i>
                   </button>
-                  <button type="button" class="btn btn-tool" data-toggle="tooltip" title="Contacts"
-                          data-widget="chat-pane-toggle">
-                    <i class="fas fa-comments"></i></button>
-                  <button type="button" class="btn btn-tool" data-card-widget="remove"><i class="fas fa-times"></i>
+                  <button type="button" class="btn btn-tool" title="Contacts" data-widget="chat-pane-toggle">
+                    <i class="fas fa-comments"></i>
+                  </button>
+                  <button type="button" class="btn btn-tool" data-card-widget="remove">
+                    <i class="fas fa-times"></i>
                   </button>
                 </div>
               </div>
@@ -1805,13 +1827,15 @@
                 <h3 class="card-title">Direct Chat</h3>
 
                 <div class="card-tools">
-                  <span data-toggle="tooltip" title="3 New Messages" class="badge bg-success">3</span>
-                  <button type="button" class="btn btn-tool" data-card-widget="collapse"><i class="fas fa-minus"></i>
+                  <span title="3 New Messages" class="badge bg-success">3</span>
+                  <button type="button" class="btn btn-tool" data-card-widget="collapse">
+                    <i class="fas fa-minus"></i>
                   </button>
-                  <button type="button" class="btn btn-tool" data-toggle="tooltip" title="Contacts"
-                          data-widget="chat-pane-toggle">
-                    <i class="fas fa-comments"></i></button>
-                  <button type="button" class="btn btn-tool" data-card-widget="remove"><i class="fas fa-times"></i>
+                  <button type="button" class="btn btn-tool" title="Contacts" data-widget="chat-pane-toggle">
+                    <i class="fas fa-comments"></i>
+                  </button>
+                  <button type="button" class="btn btn-tool" data-card-widget="remove">
+                    <i class="fas fa-times"></i>
                   </button>
                 </div>
               </div>
@@ -1900,13 +1924,15 @@
                 <h3 class="card-title">Direct Chat</h3>
 
                 <div class="card-tools">
-                  <span data-toggle="tooltip" title="3 New Messages" class="badge bg-danger">3</span>
-                  <button type="button" class="btn btn-tool" data-card-widget="collapse"><i class="fas fa-minus"></i>
+                  <span title="3 New Messages" class="badge bg-danger">3</span>
+                  <button type="button" class="btn btn-tool" data-card-widget="collapse">
+                    <i class="fas fa-minus"></i>
                   </button>
-                  <button type="button" class="btn btn-tool" data-toggle="tooltip" title="Contacts"
-                          data-widget="chat-pane-toggle">
-                    <i class="fas fa-comments"></i></button>
-                  <button type="button" class="btn btn-tool" data-card-widget="remove"><i class="fas fa-times"></i>
+                  <button type="button" class="btn btn-tool" title="Contacts" data-widget="chat-pane-toggle">
+                    <i class="fas fa-comments"></i>
+                  </button>
+                  <button type="button" class="btn btn-tool" data-card-widget="remove">
+                    <i class="fas fa-times"></i>
                   </button>
                 </div>
               </div>
@@ -1995,13 +2021,15 @@
                 <h3 class="card-title">Direct Chat</h3>
 
                 <div class="card-tools">
-                  <span data-toggle="tooltip" title="3 New Messages" class="badge">3</span>
-                  <button type="button" class="btn btn-tool" data-card-widget="collapse"><i class="fas fa-minus"></i>
+                  <span title="3 New Messages" class="badge">3</span>
+                  <button type="button" class="btn btn-tool" data-card-widget="collapse">
+                    <i class="fas fa-minus"></i>
                   </button>
-                  <button type="button" class="btn btn-tool" data-toggle="tooltip" title="Contacts"
-                          data-widget="chat-pane-toggle">
-                    <i class="fas fa-comments"></i></button>
-                  <button type="button" class="btn btn-tool" data-card-widget="remove"><i class="fas fa-times"></i>
+                  <button type="button" class="btn btn-tool" title="Contacts" data-widget="chat-pane-toggle">
+                    <i class="fas fa-comments"></i>
+                  </button>
+                  <button type="button" class="btn btn-tool" data-card-widget="remove">
+                    <i class="fas fa-times"></i>
                   </button>
                 </div>
               </div>
@@ -2095,13 +2123,15 @@
                 <h3 class="card-title">Shadow - None</h3>
 
                 <div class="card-tools">
-                  <span data-toggle="tooltip" title="3 New Messages" class="badge bg-primary">3</span>
-                  <button type="button" class="btn btn-tool" data-card-widget="collapse"><i class="fas fa-minus"></i>
+                  <span title="3 New Messages" class="badge bg-primary">3</span>
+                  <button type="button" class="btn btn-tool" data-card-widget="collapse">
+                    <i class="fas fa-minus"></i>
                   </button>
-                  <button type="button" class="btn btn-tool" data-toggle="tooltip" title="Contacts"
-                          data-widget="chat-pane-toggle">
-                    <i class="fas fa-comments"></i></button>
-                  <button type="button" class="btn btn-tool" data-card-widget="remove"><i class="fas fa-times"></i>
+                  <button type="button" class="btn btn-tool" title="Contacts" data-widget="chat-pane-toggle">
+                    <i class="fas fa-comments"></i>
+                  </button>
+                  <button type="button" class="btn btn-tool" data-card-widget="remove">
+                    <i class="fas fa-times"></i>
                   </button>
                 </div>
               </div>
@@ -2190,13 +2220,15 @@
                 <h3 class="card-title">Shadow - Small</h3>
 
                 <div class="card-tools">
-                  <span data-toggle="tooltip" title="3 New Messages" class="badge bg-success">3</span>
-                  <button type="button" class="btn btn-tool" data-card-widget="collapse"><i class="fas fa-minus"></i>
+                  <span title="3 New Messages" class="badge bg-success">3</span>
+                  <button type="button" class="btn btn-tool" data-card-widget="collapse">
+                    <i class="fas fa-minus"></i>
                   </button>
-                  <button type="button" class="btn btn-tool" data-toggle="tooltip" title="Contacts"
-                          data-widget="chat-pane-toggle">
-                    <i class="fas fa-comments"></i></button>
-                  <button type="button" class="btn btn-tool" data-card-widget="remove"><i class="fas fa-times"></i>
+                  <button type="button" class="btn btn-tool" title="Contacts" data-widget="chat-pane-toggle">
+                    <i class="fas fa-comments"></i>
+                  </button>
+                  <button type="button" class="btn btn-tool" data-card-widget="remove">
+                    <i class="fas fa-times"></i>
                   </button>
                 </div>
               </div>
@@ -2285,13 +2317,15 @@
                 <h3 class="card-title">Shadow - Regular</h3>
 
                 <div class="card-tools">
-                  <span data-toggle="tooltip" title="3 New Messages" class="badge bg-danger">3</span>
-                  <button type="button" class="btn btn-tool" data-card-widget="collapse"><i class="fas fa-minus"></i>
+                  <span title="3 New Messages" class="badge bg-danger">3</span>
+                  <button type="button" class="btn btn-tool" data-card-widget="collapse">
+                    <i class="fas fa-minus"></i>
                   </button>
-                  <button type="button" class="btn btn-tool" data-toggle="tooltip" title="Contacts"
-                          data-widget="chat-pane-toggle">
-                    <i class="fas fa-comments"></i></button>
-                  <button type="button" class="btn btn-tool" data-card-widget="remove"><i class="fas fa-times"></i>
+                  <button type="button" class="btn btn-tool" title="Contacts" data-widget="chat-pane-toggle">
+                    <i class="fas fa-comments"></i>
+                  </button>
+                  <button type="button" class="btn btn-tool" data-card-widget="remove">
+                    <i class="fas fa-times"></i>
                   </button>
                 </div>
               </div>
@@ -2380,13 +2414,15 @@
                 <h3 class="card-title">Shadow - Large</h3>
 
                 <div class="card-tools">
-                  <span data-toggle="tooltip" title="3 New Messages" class="badge">3</span>
-                  <button type="button" class="btn btn-tool" data-card-widget="collapse"><i class="fas fa-minus"></i>
+                  <span title="3 New Messages" class="badge">3</span>
+                  <button type="button" class="btn btn-tool" data-card-widget="collapse">
+                    <i class="fas fa-minus"></i>
                   </button>
-                  <button type="button" class="btn btn-tool" data-toggle="tooltip" title="Contacts"
-                          data-widget="chat-pane-toggle">
-                    <i class="fas fa-comments"></i></button>
-                  <button type="button" class="btn btn-tool" data-card-widget="remove"><i class="fas fa-times"></i>
+                  <button type="button" class="btn btn-tool" title="Contacts" data-widget="chat-pane-toggle">
+                    <i class="fas fa-comments"></i>
+                  </button>
+                  <button type="button" class="btn btn-tool" data-card-widget="remove">
+                    <i class="fas fa-times"></i>
                   </button>
                 </div>
               </div>
@@ -2617,11 +2653,14 @@
                 </div>
                 <!-- /.user-block -->
                 <div class="card-tools">
-                  <button type="button" class="btn btn-tool" data-toggle="tooltip" title="Mark as read">
-                    <i class="far fa-circle"></i></button>
-                  <button type="button" class="btn btn-tool" data-card-widget="collapse"><i class="fas fa-minus"></i>
+                  <button type="button" class="btn btn-tool" title="Mark as read">
+                    <i class="far fa-circle"></i>
                   </button>
-                  <button type="button" class="btn btn-tool" data-card-widget="remove"><i class="fas fa-times"></i>
+                  <button type="button" class="btn btn-tool" data-card-widget="collapse">
+                    <i class="fas fa-minus"></i>
+                  </button>
+                  <button type="button" class="btn btn-tool" data-card-widget="remove">
+                    <i class="fas fa-times"></i>
                   </button>
                 </div>
                 <!-- /.card-tools -->
@@ -2694,11 +2733,14 @@
                 </div>
                 <!-- /.user-block -->
                 <div class="card-tools">
-                  <button type="button" class="btn btn-tool" data-toggle="tooltip" title="Mark as read">
-                    <i class="far fa-circle"></i></button>
-                  <button type="button" class="btn btn-tool" data-card-widget="collapse"><i class="fas fa-minus"></i>
+                  <button type="button" class="btn btn-tool" title="Mark as read">
+                    <i class="far fa-circle"></i>
                   </button>
-                  <button type="button" class="btn btn-tool" data-card-widget="remove"><i class="fas fa-times"></i>
+                  <button type="button" class="btn btn-tool" data-card-widget="collapse">
+                    <i class="fas fa-minus"></i>
+                  </button>
+                  <button type="button" class="btn btn-tool" data-card-widget="remove">
+                    <i class="fas fa-times"></i>
                   </button>
                 </div>
                 <!-- /.card-tools -->
diff --git a/starter.html b/starter.html
index 9dda19659..8a285dd9e 100644
--- a/starter.html
+++ b/starter.html
@@ -134,8 +134,9 @@ scratch. This page gets rid of all links and provides the needed markup only.
         </div>
       </li>
       <li class="nav-item">
-        <a class="nav-link" data-widget="control-sidebar" data-slide="true" href="#" role="button"><i
-            class="fas fa-th-large"></i></a>
+        <a class="nav-link" data-widget="control-sidebar" data-slide="true" href="#" role="button">
+          <i class="fas fa-th-large"></i>
+        </a>
       </li>
     </ul>
   </nav>