diff --git a/views/bootstrap/class.AttributeGroupMgr.php b/views/bootstrap/class.AttributeGroupMgr.php
index 0390ffb3d..28544c219 100644
--- a/views/bootstrap/class.AttributeGroupMgr.php
+++ b/views/bootstrap/class.AttributeGroupMgr.php
@@ -146,7 +146,7 @@ $(document).ready( function() {
 				<?php echo createHiddenFieldWithKey('removegroup'); ?>
 				<input type="hidden" name="attrdefgroupid" value="<?php echo $selgroup->getID()?>">
 				<input type="hidden" name="action" value="removegroup">
-				<button type="submit" class="btn"><i class="icon-remove"></i> <?php echo getMLText("rm_attrdefgroup")?></button>
+				<button type="submit" class="btn"><i class="fa fa-remove"></i> <?php echo getMLText("rm_attrdefgroup")?></button>
 			</form>
 <?php
 		}
@@ -190,7 +190,7 @@ $(document).ready( function() {
 				'value'=>($group ? htmlspecialchars($group->getComment()) : '')
 			)
 		);
-		$this->formSubmit('<i class="icon-save"></i> '.getMLText('save'));
+		$this->formSubmit('<i class="fa fa-save"></i> '.getMLText('save'));
 ?>
 	</form>
 <?php
@@ -254,7 +254,7 @@ $(document).ready( function() {
 							break;
 					}
 					print "<tr>";
-					print "<td><i class=\"icon-tag\"></i></td>";
+					print "<td><i class=\"fa fa-tag\"></i></td>";
 					print "<td>" . htmlspecialchars($member->getName()) ." (".$ot.", ".$t.")"."</td>";
 					print "<td>";
 					$show = $group->getShow($member);
@@ -263,16 +263,18 @@ $(document).ready( function() {
 					foreach(SeedDMS_Core_AttributeDefinitionGroup::getShowValues() as $j=>$k)
 						echo "<option value=\"".$j."\"".(($show & $j) ? " selected" : "").">".getMLText('attrdefgrp_show_'.$k)."</option>";
 					echo "</select> ";
-					print "<button type=\"submit\" class=\"btn\"><i class=\"icon-save\"></i></button></form>";
+					print "</td>";
+					print "<td>";
+					print "<button type=\"submit\" class=\"btn\"><i class=\"fa fa-save\"></i></button></form>";
 					print "</td>";
 					print "<td>";
 					if($i != 0)
-						print "<form action=\"../op/op.AttributeGroupMgr.php\" method=\"post\" class=\"form-inline\" style=\"display: inline-block; margin-bottom: 0px;\"><input type=\"hidden\" name=\"attrdefgroupid\" value=\"".$group->getID()."\" /><input type=\"hidden\" name=\"action\" value=\"setsequence\" /><input type=\"hidden\" name=\"attrdefid\" value=\"".$member->getID()."\" /><input type=\"hidden\" name=\"sequence\" value=\"".($newupseq)."\" />".createHiddenFieldWithKey('setsequence')."<button type=\"submit\" class=\"btn btn-_mini\"><i class=\"icon-arrow-up\"></i></button></form>";
+						print "<form action=\"../op/op.AttributeGroupMgr.php\" method=\"post\" class=\"form-inline\" style=\"display: inline-block; margin-bottom: 0px;\"><input type=\"hidden\" name=\"attrdefgroupid\" value=\"".$group->getID()."\" /><input type=\"hidden\" name=\"action\" value=\"setsequence\" /><input type=\"hidden\" name=\"attrdefid\" value=\"".$member->getID()."\" /><input type=\"hidden\" name=\"sequence\" value=\"".($newupseq)."\" />".createHiddenFieldWithKey('setsequence')."<button type=\"submit\" class=\"btn btn-_mini\"><i class=\"fa fa-arrow-up\"></i></button></form>";
 					print "</td><td>";
 					if($i < count($members)-1)
-						print "<form action=\"../op/op.AttributeGroupMgr.php\" method=\"post\" class=\"form-inline\" style=\"display: inline-block; margin-bottom: 0px;\"><input type=\"hidden\" name=\"attrdefgroupid\" value=\"".$group->getID()."\" /><input type=\"hidden\" name=\"action\" value=\"setsequence\" /><input type=\"hidden\" name=\"attrdefid\" value=\"".$member->getID()."\" /><input type=\"hidden\" name=\"sequence\" value=\"".($newdownseq)."\" />".createHiddenFieldWithKey('setsequence')."<button type=\"submit\" class=\"btn btn-_mini\"><i class=\"icon-arrow-down\"></i></button></form>";
+						print "<form action=\"../op/op.AttributeGroupMgr.php\" method=\"post\" class=\"form-inline\" style=\"display: inline-block; margin-bottom: 0px;\"><input type=\"hidden\" name=\"attrdefgroupid\" value=\"".$group->getID()."\" /><input type=\"hidden\" name=\"action\" value=\"setsequence\" /><input type=\"hidden\" name=\"attrdefid\" value=\"".$member->getID()."\" /><input type=\"hidden\" name=\"sequence\" value=\"".($newdownseq)."\" />".createHiddenFieldWithKey('setsequence')."<button type=\"submit\" class=\"btn btn-_mini\"><i class=\"fa fa-arrow-down\"></i></button></form>";
 					print "</td><td>";
-					print "<form action=\"../op/op.AttributeGroupMgr.php\" method=\"post\" class=\"form-inline\" style=\"display: inline-block; margin-bottom: 0px;\"><input type=\"hidden\" name=\"action\" value=\"rmmember\" /><input type=\"hidden\" name=\"attrdefgroupid\" value=\"".$group->getID()."\" /><input type=\"hidden\" name=\"attrdefid\" value=\"".$member->getID()."\" />".createHiddenFieldWithKey('rmmember')."<button type=\"submit\" class=\"btn btn-_mini\"><i class=\"icon-remove\"></i> ".getMLText("delete")."</button></form>";
+					print "<form action=\"../op/op.AttributeGroupMgr.php\" method=\"post\" class=\"form-inline\" style=\"display: inline-block; margin-bottom: 0px;\"><input type=\"hidden\" name=\"action\" value=\"rmmember\" /><input type=\"hidden\" name=\"attrdefgroupid\" value=\"".$group->getID()."\" /><input type=\"hidden\" name=\"attrdefid\" value=\"".$member->getID()."\" />".createHiddenFieldWithKey('rmmember')."<button type=\"submit\" class=\"btn btn-_mini\"><i class=\"fa fa-remove\"></i> ".getMLText("delete")."</button></form>";
 					print "</td></tr>";
 					$i++;
 				}