diff --git a/net/l2tp/src/www/vpn_l2tp_log.inc b/net/l2tp/src/www/vpn_l2tp_log.inc
index 7fba93a2d..e900d3e16 100644
--- a/net/l2tp/src/www/vpn_l2tp_log.inc
+++ b/net/l2tp/src/www/vpn_l2tp_log.inc
@@ -60,12 +60,12 @@ function dump_clog_vpn($file, $tail, $type)
         }
 
         echo "<tr>\n";
-        echo "<td class=\"listlr nowrap\">" . htmlspecialchars(join(" ", array_slice($logent, 0, 3))) . "</td>\n";
+        echo "<td>" . htmlspecialchars(join(" ", array_slice($logent, 0, 3))) . "</td>\n";
 
         if ($llent[0] == "login") {
-            echo "<td class=\"listr\"><span class=\"glyphicon glyphicon-arrow-right\" aria-hidden=\"true\" alt=\"in\"></span></td>\n";
+            echo "<td><span class=\"fa fa-arrow-right fa-fw\" aria-hidden=\"true\" alt=\"in\"></span></td>\n";
         } else {
-            echo "<td class=\"listr\"><span class=\"glyphicon glyphicon-arrow-left\" aria-hidden=\"true\" alt=\"out\"></span></td>\n";
+            echo "<td><span class=\"fa fa-arrow-left fa-fw\" aria-hidden=\"true\" alt=\"out\"></span></td>\n";
         }
 
         echo "<td class=\"listr\">" . htmlspecialchars($llent[3]) . "</td>\n";
@@ -88,10 +88,10 @@ include("head.inc");
           <div class="table-responsive">
             <table class="table table-striped table-sort">
               <tr>
-                <td class="listhdrr"><?=gettext("Time");?></td>
-                <td class="listhdrr"><?=gettext("Action");?></td>
-                <td class="listhdrr"><?=gettext("User");?></td>
-                <td class="listhdrr"><?=gettext("IP address");?></td>
+                <td><?=gettext("Time");?></td>
+                <td><?=gettext("Action");?></td>
+                <td><?=gettext("User");?></td>
+                <td><?=gettext("IP address");?></td>
               </tr>
               <tr>
                 <td colspan="4">
diff --git a/net/l2tp/src/www/vpn_l2tp_users.php b/net/l2tp/src/www/vpn_l2tp_users.php
index 7b9682325..66b6f512f 100644
--- a/net/l2tp/src/www/vpn_l2tp_users.php
+++ b/net/l2tp/src/www/vpn_l2tp_users.php
@@ -54,7 +54,7 @@ $service_hook = 'l2tpd';
 
 include("head.inc");
 $main_buttons = array(
-    array('label'=>gettext("add user"), 'href'=>'vpn_l2tp_users_edit.php'),
+    array('label' => gettext('Add'), 'href' => 'vpn_l2tp_users_edit.php'),
 );
 
 ?>
@@ -109,7 +109,7 @@ $main_buttons = array(
                   <tr>
                     <td><?=gettext("Username");?></td>
                     <td><?=gettext("IP address");?></td>
-                    <td></td>
+                    <td class="text-nowrap"></td>
                   </tr>
 <?php
                   $i = 0;
@@ -123,9 +123,9 @@ $main_buttons = array(
                       } ?>
                       <?=htmlspecialchars($secretent['ip']);?>&nbsp;
                     </td>
-                    <td>
-                      <a href="vpn_l2tp_users_edit.php?id=<?=$i;?>" class="btn btn-xs btn-default"><span class="glyphicon glyphicon-edit"></span></a>
-                      <button data-id="<?=$i;?>" type="button" class="act_delete_user btn btn-xs btn-default"><span class="fa fa-trash text-muted"></span></button>
+                    <td class="text-nowrap">
+                      <a href="vpn_l2tp_users_edit.php?id=<?=$i;?>" class="btn btn-xs btn-default"><i class="fa fa-pencil fa-fw"></i></a>
+                      <button data-id="<?=$i;?>" type="button" class="act_delete_user btn btn-xs btn-default"><i class="fa fa-trash fa-fw"></i></button>
                     </td>
                   </tr>
 <?php