diff --git a/html/pages/device/edit/alerts.inc.php b/html/pages/device/edit/alerts.inc.php
index 1e089ab058..00cdf6db71 100644
--- a/html/pages/device/edit/alerts.inc.php
+++ b/html/pages/device/edit/alerts.inc.php
@@ -92,10 +92,13 @@ if ($disable_notify) {
  />
     </div>
   </div>
-  <button class="btn btn-default btn-sm" type="submit" name="Submit">Save</button>
+  <div class="col-sm-3"></div>
+    <button type="submit" name="Submit"  class="btn btn-default"><i class="fa fa-check"></i> Save</button>
 </form>
 
 <?php
 require_once 'includes/modal/new_alert_rule.inc.php';
 ?>
-<button type="button" class="btn btn-primary btn-sm" data-toggle="modal" data-target="#create-alert" data-device_id="<?php echo $device['device_id']; ?>">Create new alert rule</button>
+<br>
+<div class="col-sm-3"></div>
+<button type="button" class="btn btn-primary btn-sm" data-toggle="modal" data-target="#create-alert" data-device_id="<?php echo $device['device_id']; ?>"><i class="fa fa-plus"></i> Create new alert rule</button>
\ No newline at end of file
diff --git a/html/pages/device/edit/ipmi.inc.php b/html/pages/device/edit/ipmi.inc.php
index 0aff50bdd7..680e71e537 100644
--- a/html/pages/device/edit/ipmi.inc.php
+++ b/html/pages/device/edit/ipmi.inc.php
@@ -66,6 +66,10 @@ else if ($update_message) {
       <input id="ipmi_password" name="ipmi_password" type="password" class="form-control" value="<?php echo get_dev_attrib($device, 'ipmi_password'); ?>" />
     </div>
   </div>
-  <button class="btn btn-default btn-sm" type="submit" name="Submit">Save</button>
+  <div class="col-sm-2"></div>
+  <button type="submit" name="Submit"  class="btn btn-default"><i class="fa fa-check"></i> Save</button>
+  <br><br>
+  <div class="alert alert-info" role="alert">
+    <p>To disable IPMI polling, please clear the setting fields and click <b>Save</b>.</p>
+  </div>
 </form>
-<p>To disable IPMI polling, please clear the setting fields and click <b>Save</b>.</p>