diff --git a/net/pppoe/src/www/vpn_pppoe.php b/net/pppoe/src/www/vpn_pppoe.php
index c63afd8aa..b6b0d2dfb 100644
--- a/net/pppoe/src/www/vpn_pppoe.php
+++ b/net/pppoe/src/www/vpn_pppoe.php
@@ -72,7 +72,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
 include("head.inc");
 legacy_html_escape_form_data($a_pppoes);
 $main_buttons = array(
-    array('label'=>gettext("add a new pppoe instance"), 'href'=>'vpn_pppoe_edit.php'),
+    array('label' => gettext('Add'), 'href' => 'vpn_pppoe_edit.php'),
 );
 
 ?>
@@ -122,8 +122,7 @@ $main_buttons = array(
                     <td><?=gettext("Local IP");?></td>
                     <td><?=gettext("Number of users");?></td>
                     <td><?=gettext("Description");?></td>
-                    <td>
-                    </td>
+                    <td class="text-nowrap"></td>
                   </tr>
 <?php
                   $i = 0;
@@ -133,11 +132,11 @@ $main_buttons = array(
                     <td><?=$pppoe['localip'];?></td>
                     <td><?=$pppoe['n_pppoe_units'];?></td>
                     <td><?=$pppoe['descr'];?></td>
-                    <td>
+                    <td class="text-nowrap">
                       <a href="vpn_pppoe_edit.php?id=<?=$i;?>" title="<?=gettext("edit pppoe instance"); ?>" class="btn btn-default btn-xs">
-                        <span class="glyphicon glyphicon-pencil"></span>
+                        <i class="fa fa-pencil fa-fw"></i>
                       </a>
-                      <button data-id="<?=$i;?>" type="button" class="act_delete_pppoe btn btn-xs btn-default"><span class="fa fa-trash text-muted"></span></button>
+                      <button data-id="<?=$i;?>" type="button" class="act_delete_pppoe btn btn-xs btn-default"><i class="fa fa-trash fa-fw"></i></button>
                     </td>
                   </tr>
 <?php
diff --git a/net/pppoe/src/www/vpn_pppoe_edit.php b/net/pppoe/src/www/vpn_pppoe_edit.php
index 32bf57f87..d99cfaad4 100644
--- a/net/pppoe/src/www/vpn_pppoe_edit.php
+++ b/net/pppoe/src/www/vpn_pppoe_edit.php
@@ -504,7 +504,7 @@ legacy_html_escape_form_data($pconfig);
                         foreach($pconfig['users_username'] as $item_idx => $user):?>
                           <tr>
                             <td>
-                              <div style="cursor:pointer;" class="act-removerow btn btn-default btn-xs" alt="remove"><span class="glyphicon glyphicon-minus"></span></div>
+                              <div style="cursor:pointer;" class="act-removerow btn btn-default btn-xs" alt="remove"><i class="fa fa-minus fa-fw"></i></div>
                             </td>
                             <td>
                               <input name="users_username[]" type="text" value="<?=$user;?>" />
@@ -522,7 +522,7 @@ legacy_html_escape_form_data($pconfig);
                         <tfoot>
                           <tr>
                             <td colspan="4">
-                              <div id="addNew" style="cursor:pointer;" class="btn btn-default btn-xs" alt="add"><span class="glyphicon glyphicon-plus"></span></div>
+                              <div id="addNew" style="cursor:pointer;" class="btn btn-default btn-xs" alt="add"><i class="fa fa-plus fa-fw"></i></div>
                             </td>
                           </tr>
                         </tfoot>
diff --git a/net/pppoe/src/www/vpn_pppoe_log.inc b/net/pppoe/src/www/vpn_pppoe_log.inc
index 7fba93a2d..e900d3e16 100644
--- a/net/pppoe/src/www/vpn_pppoe_log.inc
+++ b/net/pppoe/src/www/vpn_pppoe_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">