diff --git a/admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl
index d5c0a2d5c..51dd071f2 100644
--- a/admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl
@@ -239,12 +239,9 @@
 
 			{if !$product->active && $product->isAssociatedToShop()}
 			<div class="alert alert-info draft" >
-				<p>
-					<span >
-					{l s='Your product will be saved as a draft.'}</span>
-					<span style="float:right"><a href="#" class="button" style="display: block" onclick="submitAddProductAndPreview()" >{l s='Save and preview'}</a></span>
-					<input type="hidden" name="fakeSubmitAddProductAndPreview" id="fakeSubmitAddProductAndPreview" />
-				</p>
+				<span>{l s='Your product will be saved as a draft.'}</span>
+				<a href="#" class="btn btn-default pull-right" onclick="submitAddProductAndPreview()" ><i class="icon-external-link-sign"></i> {l s='Save and preview'}</a>
+				<input type="hidden" name="fakeSubmitAddProductAndPreview" id="fakeSubmitAddProductAndPreview" />
 			</div>
 			{/if}
 
diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php
index b65a49c8c..aba63e1c3 100644
--- a/controllers/admin/AdminProductsController.php
+++ b/controllers/admin/AdminProductsController.php
@@ -2419,14 +2419,9 @@ class AdminProductsControllerCore extends AdminController
 	protected function _displayDraftWarning($active)
 	{
 		$content = '<div class="warn draft" style="'.($active ? 'display:none' : '').'">
-				<p>
-				<span style="float: left">
-				'.$this->l('Your product will be saved as a draft.').'
-				</span>
-				<span style="float:right"><a href="#" class="button" style="display: block" onclick="submitAddProductAndPreview()" >'.$this->l('Save and preview').'</a></span>
+				<span>'.$this->l('Your product will be saved as a draft.').'</span>
+				<a href="#" class="btn btn-default pull-right" onclick="submitAddProductAndPreview()" ><i class="icon-external-link-sign"></i> '.$this->l('Save and preview').'</a>
 				<input type="hidden" name="fakeSubmitAddProductAndPreview" id="fakeSubmitAddProductAndPreview" />
-				<br class="clear" />
-				</p>
 	 		</div>';
 			$this->tpl_form_vars['draft_warning'] = $content;
 	}
@@ -4379,13 +4374,9 @@ class AdminProductsControllerCore extends AdminController
 	protected function _displayUnavailableProductWarning()
 	{
 		$content = '<div class="alert">
-				<p>
-				<span>
-				'.$this->l('Your product will be saved as a draft.').'
-				</span>
-				<span style="float:right"><a href="#" class="button" style="display: block" onclick="submitAddProductAndPreview()" >'.$this->l('Save and preview').'</a></span>
+			<span>'.$this->l('Your product will be saved as a draft.').'</span>
+				<a href="#" class="btn btn-default pull-right" onclick="submitAddProductAndPreview()" ><i class="icon-external-link-sign"></i> '.$this->l('Save and preview').'</a>
 				<input type="hidden" name="fakeSubmitAddProductAndPreview" id="fakeSubmitAddProductAndPreview" />
-				</p>
 			</div>';
 			$this->tpl_form_vars['warning_unavailable_product'] = $content;
 	}