diff --git a/admin-dev/themes/default/template/controllers/maintenance/helpers/options/options.tpl b/admin-dev/themes/default/template/controllers/maintenance/helpers/options/options.tpl
index 2e1505738..a8a1f2d52 100644
--- a/admin-dev/themes/default/template/controllers/maintenance/helpers/options/options.tpl
+++ b/admin-dev/themes/default/template/controllers/maintenance/helpers/options/options.tpl
@@ -27,7 +27,9 @@
 {block name="input"}
 	{if $field['type'] == 'maintenance_ip'}
 		{$field['script_ip']}
-		<input type="text"{if isset($field['id'])} id="{$field['id']}"{/if} size="{if isset($field['size'])}{$field['size']|intval}{else} 5{/if}" name="{$key}" value="{$field['value']|escape:'htmlall':'UTF-8'}" />
+		<div class="col-lg-9 ">
+			<input type="text"{if isset($field['id'])} id="{$field['id']}"{/if} size="{if isset($field['size'])}{$field['size']|intval}{else} 5{/if}" name="{$key}" value="{$field['value']|escape:'htmlall':'UTF-8'}" />
+		</div>
 		{$field['link_remove_ip']}
 	{else}
 		{$smarty.block.parent}
diff --git a/classes/helper/HelperOptions.php b/classes/helper/HelperOptions.php
index 61010b381..2b5645bed 100644
--- a/classes/helper/HelperOptions.php
+++ b/classes/helper/HelperOptions.php
@@ -129,7 +129,7 @@ class HelperOptionsCore extends Helper
 									$(\'input[name=PS_MAINTENANCE_IP]\').attr(\'value\',\''.Tools::getRemoteAddr().'\');
 							}
 						</script>';
-					$field['link_remove_ip'] = ' &nbsp<a href="#" class="button" onclick="addRemoteAddr(); return false;">'.$this->l('Add my IP', 'Helper').'</a>';
+					$field['link_remove_ip'] = ' &nbsp<div class="col-lg-9 col-lg-offset-3"><a href="#" class="btn btn-default" onclick="addRemoteAddr(); return false;"><i class="icon-plus"></i> '.$this->l('Add my IP', 'Helper').'</a></div>';
 				}
 
 				// Multishop default value
diff --git a/controllers/admin/AdminEmailsController.php b/controllers/admin/AdminEmailsController.php
index 29c01a1c6..f9a6e8075 100644
--- a/controllers/admin/AdminEmailsController.php
+++ b/controllers/admin/AdminEmailsController.php
@@ -155,8 +155,8 @@ class AdminEmailsControllerCore extends AdminController
 						'id' => 'testEmail'
 						),
 				),
-				'bottom' => '<div class="row col-offset-3"><input type="button" class="btn btn-primary" name="btEmailTest" id="btEmailTest" value="'.$this->l('Send an email test').'" onclick="verifyMail();" /><br />
-					<p id="mailResultCheck" style="display:none;"></p></div>',
+				'bottom' => '<div class="row"> <div class="col-lg-9 col-lg-offset-3"><input type="button" class="btn btn-default" name="btEmailTest" id="btEmailTest" value="'.$this->l('Send an email test').'" onclick="verifyMail();" /><br /><br />
+					<p class="alert" id="mailResultCheck" style="display:none;"></p></div></div>',
 			)
 		);
 	}