diff --git a/css/style.css b/css/style.css
index a5fc2f8..0557302 100644
--- a/css/style.css
+++ b/css/style.css
@@ -44,14 +44,6 @@ a {
     float: right
 }
 
-.serverstatus .fa-signal {
-    margin-right: 3px
-}
-
-.serverstatus .fa-bolt {
-    margin-right: 11px
-}
-
 .serverstatus span {
     float: right
 }
diff --git a/include/header.php b/include/header.php
index 2d36eae..0f67245 100644
--- a/include/header.php
+++ b/include/header.php
@@ -116,7 +116,7 @@ require_once __DIR__ . "/../include/adminlist.php";
                     <div class="panel-heading"><i class="fa fa-bar-chart" aria-hidden="true"></i> <?php tl($lang["serverstatus"]["title"]); ?></div>
                     <div class="panel-body">
                         <div class="serverstatus">
-                            <p><i class="fa fa-globe" aria-hidden="true"></i> <?php tl($lang["serverstatus"]["address"]); ?>: <a href="ts3server://<?php echo $config['teamspeak']['displayip']; ?>"><?php echo $config['teamspeak']['displayip']; ?></a></p>
+                            <p><i class="fa fa-globe fa-fw" aria-hidden="true"></i> <?php tl($lang["serverstatus"]["address"]); ?>: <a href="ts3server://<?php echo $config['teamspeak']['displayip']; ?>"><?php echo $config['teamspeak']['displayip']; ?></a></p>
                             <div id="serverstatus">
                                 <div class="text-center">
                                     <i class="fa fa-refresh fa-spin fa-3x fa-fw"></i>
diff --git a/js/status.js b/js/status.js
index bc38342..fa85c78 100644
--- a/js/status.js
+++ b/js/status.js
@@ -28,19 +28,19 @@ function checkStatus() {
                 var averagePing = Math.round(json.averagePing * 100) / 100;
 
                 result =
-                    '<p><i class="fa fa-power-off" aria-hidden="true"></i> ' + statusOnline + ': <span class="label label-success">' + clientsonline + ' / ' + maxclients + ' (' + clientsprecent + '%)</span></p>' +
-                    '<p><i class="fa fa-clock-o" aria-hidden="true"></i> ' + statusUptime + ': <span class="label label-success">' + uptime + '</span></p>' +
-                    '<p><i class="fa fa-info-circle" aria-hidden="true"></i> ' + statusVersion + ': <span class="label label-success">' + version + ' @ ' + platform + '</span></p>' +
-                    '<p><i class="fa fa-signal" aria-hidden="true"></i> ' + statusAvgping + ': <span class="label label-success">' + averagePing + ' ms</span></p>' +
-                    '<p><i class="fa fa-bolt" aria-hidden="true"></i> ' + statusAvgpl + ': <span class="label label-success">' + averagePacketloss + '%</span></p>';
+                    '<p><i class="fa fa-power-off fa-fw" aria-hidden="true"></i> ' + statusOnline + ': <span class="label label-success">' + clientsonline + ' / ' + maxclients + ' (' + clientsprecent + '%)</span></p>' +
+                    '<p><i class="fa fa-clock-o fa-fw" aria-hidden="true"></i> ' + statusUptime + ': <span class="label label-success">' + uptime + '</span></p>' +
+                    '<p><i class="fa fa-info-circle fa-fw" aria-hidden="true"></i> ' + statusVersion + ': <span class="label label-success">' + version + ' @ ' + platform + '</span></p>' +
+                    '<p><i class="fa fa-signal fa-fw" aria-hidden="true"></i> ' + statusAvgping + ': <span class="label label-success">' + averagePing + ' ms</span></p>' +
+                    '<p><i class="fa fa-bolt fa-fw" aria-hidden="true"></i> ' + statusAvgpl + ': <span class="label label-success">' + averagePacketloss + '%</span></p>';
             } else {
-                result = '<p><i class="fa fa-power-off" aria-hidden="true"></i> Online: <span class="label label-danger">' + statusOffline + '</span></p>';
+                result = '<p><i class="fa fa-power-off fa-fw" aria-hidden="true"></i> Online: <span class="label label-danger">' + statusOffline + '</span></p>';
             }
 
             $("#serverstatus").html(result);
         },
         error: function (result) {
-            $("#serverstatus").html('<p><i class="fa fa-power-off" aria-hidden="true"></i> ' + statusOnline + ': <span class="label label-danger">ERROR</span></p>');
+            $("#serverstatus").html('<p><i class="fa fa-power-off fa-fw" aria-hidden="true"></i> ' + statusOnline + ': <span class="label label-danger">ERROR</span></p>');
         }
     })
 }