diff --git a/net/igmp-proxy/src/www/services_igmpproxy.php b/net/igmp-proxy/src/www/services_igmpproxy.php
index b840e183f..e2575be89 100644
--- a/net/igmp-proxy/src/www/services_igmpproxy.php
+++ b/net/igmp-proxy/src/www/services_igmpproxy.php
@@ -55,7 +55,7 @@ include("head.inc");
 legacy_html_escape_form_data($a_igmpproxy);
 
 $main_buttons = array(
-    array('label' => gettext('Add a new IGMP entry'), 'href' => 'services_igmpproxy_edit.php'),
+    array('label' => gettext('Add'), 'href' => 'services_igmpproxy_edit.php'),
 );
 
 ?>
@@ -103,7 +103,7 @@ $main_buttons = array(
                       <td><?=gettext("Type");?></td>
                       <td><?=gettext("Values");?></td>
                       <td><?=gettext("Description");?></td>
-                      <td></td>
+                      <td class="text-nowrap"></td>
                     </tr>
                   </thead>
                   <tbody>
@@ -121,9 +121,9 @@ $main_buttons = array(
                         <?=$addresses;?> <?=count($addresses) < 10 ? "" : "...";?>
                       </td>
                       <td><?=$igmpentry['descr'];?></td>
-                      <td>
-                         <a href="services_igmpproxy_edit.php?id=<?=$i;?>" title="<?=gettext("Edit this IGMP entry"); ?>" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-pencil"></span></a>
-                         <a href="#" data-id="<?=$i;?>" class="act_delete_entry btn btn-xs btn-default"><i class="fa fa-trash text-muted"></i></a>
+                      <td class="text-nowrap">
+                         <a href="services_igmpproxy_edit.php?id=<?=$i;?>" title="<?=gettext("Edit this IGMP entry"); ?>" class="btn btn-default btn-xs"><i class="fa fa-pencil fa-fw"></i></a>
+                         <a href="#" data-id="<?=$i;?>" class="act_delete_entry btn btn-xs btn-default"><i class="fa fa-trash fa-fw"></i></a>
                       </td>
                     </tr>
 <?php
diff --git a/net/igmp-proxy/src/www/services_igmpproxy_edit.php b/net/igmp-proxy/src/www/services_igmpproxy_edit.php
index 5cfeb8c93..e8452813d 100644
--- a/net/igmp-proxy/src/www/services_igmpproxy_edit.php
+++ b/net/igmp-proxy/src/www/services_igmpproxy_edit.php
@@ -157,7 +157,8 @@ include("head.inc");
                     </tr>
                     <tr>
                       <td><i class="fa fa-info-circle text-muted"></i> <?=gettext("Interface");?></td>
-                      <td> <select name="ifname" id="ifname" >
+                      <td>
+                        <select class="selectpicker" name="ifname" id="ifname" >
 <?php
                         foreach (get_configured_interface_with_descr() as $ifnam => $ifdescr):?>
                           <option value="<?=$ifnam;?>" <?=$ifnam == $pconfig['ifname'] ? "selected=\"selected\"" :"";?>>
@@ -181,7 +182,7 @@ include("head.inc");
                     <tr>
                       <td><a id="help_for_type" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Type");?></td>
                       <td>
-                        <select name="type" class="formselect" id="type" >
+                        <select class="selectpicker" name="type" id="type">
                           <option value="upstream" <?=$pconfig['type'] == "upstream" ?  "selected=\"selected\"" : ""; ?>><?=gettext("Upstream Interface");?></option>
                           <option value="downstream" <?= $pconfig['type'] == "downstream" ? "selected=\"selected\"" : ""; ?>><?=gettext("Downstream Interface");?></option>
                         </select>
@@ -227,13 +228,13 @@ include("head.inc");
                         foreach($pconfig['networks_network'] as $item_idx => $network):?>
                           <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="networks_network[]" type="text" id="network_<?=$item_idx;?>" value="<?=$network;?>" />
                             </td>
                             <td>
-                              <select name="networks_mask[]" data-network-id="network_<?=$item_idx;?>" class="ipv4v6net" id="mask<?=$item_idx;?>">
+                              <select name="networks_mask[]" data-network-id="network_<?=$item_idx;?>" class="selectpicker ipv4v6net" id="mask<?=$item_idx;?>" data-length="3" data-width="auto">
 <?php
                                 for ($i = 128; $i > 0; $i--):?>
                                 <option value="<?=$i;?>" <?= $pconfig['networks_mask'][$item_idx] == $i ?  "selected=\"selected\"" : ""?>>
@@ -250,7 +251,7 @@ include("head.inc");
                         <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>