diff --git a/admin-dev/themes/default/template/controllers/countries/helpers/list/list_footer.tpl b/admin-dev/themes/default/template/controllers/countries/helpers/list/list_footer.tpl
index 8a5c64fbd..04515e020 100644
--- a/admin-dev/themes/default/template/controllers/countries/helpers/list/list_footer.tpl
+++ b/admin-dev/themes/default/template/controllers/countries/helpers/list/list_footer.tpl
@@ -22,69 +22,129 @@
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
-
 			</table>
-			{if !$simple_header && $list_total > 20}
-				<div class="table-pagination pull-right">
-					<span>
-					{if $page > 1}
-						<input type="image" src="../img/admin/list-prev2.gif" onclick="getE('submitFilter{$table}').value=1"/>&nbsp;
-						<input type="image" src="../img/admin/list-prev.gif" onclick="getE('submitFilter{$table}').value={$page - 1}"/>
-					{/if}
-						{l s='Page'} <b>{$page}</b> / {$total_pages}
-					{if $page < $total_pages}
-						<input type="image" src="../img/admin/list-next.gif" onclick="getE('submitFilter{$table}').value={$page + 1}"/>&nbsp;
-						<input type="image" src="../img/admin/list-next2.gif" onclick="getE('submitFilter{$table}').value={$total_pages}"/>
-					{/if}
-					</span>
 
-					<span>
-						&nbsp;|&nbsp;
-						<label >{l s='Display'}</label>
-						<select class="filter fixed-width-xs" name="pagination" onchange="submit()">
-							{* Choose number of results per page *}
-							{foreach $pagination AS $value}
-								<option value="{$value|intval}"{if $selected_pagination == $value} selected="selected" {elseif $selected_pagination == NULL && $value == $pagination[1]} selected="selected2"{/if}>{$value|intval}</option>
-							{/foreach}
-						</select>
-					</span>
-					<span> / {$list_total} {l s='result(s)'}</span>
-				</div>
-			{/if}
-			{if $bulk_actions}
-				<div class="row">
-					{if $bulk_actions|count > 1}
-						<div class="col-lg-11">
-							<select id="select_submitBulk" name="select_submitBulk">
-								{foreach $bulk_actions as $key => $params}
-									<option value="{$key}">{$params.text}</option>
-								{/foreach}
-							</select>
-						</div>
-						<input type="submit" class="btn btn-primary" name="submitBulk" id="submitBulk" value="{l s='Apply'}" />
-					{else}
-						{foreach $bulk_actions as $key => $params}
-							{if $key == 'affectzone'}
-								<div class="col-lg-11">
+			{if !$simple_header && $list_total > 20}
+			<div class="row">
+				<div class="col-lg-8">
+					{if $bulk_actions}
+					<div>
+						{if $bulk_actions|count > 1}
+							<div class="form-group">
+								<div class="col-lg-6">
+									<select id="select_submitBulk" name="select_submitBulk">
+										{foreach $bulk_actions as $key => $params}
+										<option value="{$key}">{$params.text}</option>
+										{/foreach}
+									</select>
+								</div>
+								<div class="col-lg-6">
+									<input type="submit" class="btn btn-default" name="submitBulk" id="submitBulk" value="{l s='Apply'}" />
+								</div>
+							</div>
+						{else}
+							{foreach $bulk_actions as $key => $params}
+							<div class="form-group">
+								<div class="col-lg-6">
+								{if $key == 'affectzone'}
 									<select id="zone_to_affect" name="zone_to_affect">
 										{foreach $zones as $z}
 											<option value="{$z['id_zone']}">{$z['name']}</option>
 										{/foreach}
 									</select>
+								{/if}
 								</div>
-							{/if}
-							<input type="submit" class="btn btn-primary" name="submitBulk{$key}{$table}" value="{$params.text}" {if isset($params.confirm)}onclick="return confirm('{$params.confirm}');"{/if} />
-						{/foreach}
+								<div class="col-lg-6">
+									<input type="submit" class="btn btn-default" name="submitBulk{$key}{$table}" value="{$params.text}" {if isset($params.confirm)}onclick="return confirm('{$params.confirm}');"{/if} />
+								</div>
+							</div>
+							{/foreach}
+						{/if}
+					</div>
 					{/if}
 				</div>
+
+
+				<div class="col-lg-4">
+					{* Choose number of results per page *}
+					<span class="pagination">
+						{l s='Display'}: 
+						<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
+							{$selected_pagination}
+							<i class="icon-caret-down"></i>
+						</button>
+						<ul class="dropdown-menu">
+						{foreach $pagination AS $value}
+							<li>
+								<a href="javascript:void(0);" class="pagination-items-page" data-items="{$value|intval}">{$value}</a>
+							</li>
+						{/foreach}
+						</ul>
+						/ {$list_total} {l s='result(s)'}
+						<input type="hidden" id="pagination-items-page" name="{$table}_pagination" value="{$selected_pagination|intval}" />
+					</span>
+					<script type="text/javascript">
+						$('.pagination-items-page').on('click',function(e){
+							e.preventDefault();
+							$('#pagination-items-page').val($(this).data("items")).closest("form").submit();
+						});
+					</script>
+					<ul class="pagination pull-right">
+						<li {if $page <= 1}class="disabled"{/if}>
+							<a href="javascript:void(0);" class="pagination-link" data-page="1">
+								<i class="icon-double-angle-left"></i>
+							</a>
+						</li>
+						<li {if $page <= 1}class="disabled"{/if}>
+							<a href="javascript:void(0);" class="pagination-link" data-page="{$page - 1}">
+								<i class="icon-angle-left"></i>
+							</a>
+						</li>
+						{assign p 0}
+						{while $p++ < $total_pages}
+							{if $p < $page-2}
+								<li class="disabled">
+									<a href="javascript:void(0);">&hellip;</a>
+								</li>
+								{assign p $page-3}
+							{else if $p > $page+2}
+								<li class="disabled">
+									<a href="javascript:void(0);">&hellip;</a>
+								</li>
+								{assign p $total_pages}
+							{else}
+								<li {if $p == $page}class="active"{/if}>
+									<a href="javascript:void(0);" class="pagination-link" data-page="{$p}">{$p}</a>
+								</li>
+							{/if}
+						{/while}
+						<li {if $page > $total_pages}class="disabled"{/if}>
+							<a href="javascript:void(0);" class="pagination-link" data-page="{$page + 1}">
+								<i class="icon-angle-right"></i>
+							</a>
+						</li>
+						<li {if $page > $total_pages}class="disabled"{/if}>
+							<a href="javascript:void(0);" class="pagination-link" data-page="{$total_pages}">
+								<i class="icon-double-angle-right"></i>
+							</a>
+						</li>
+					</ul>
+					<script type="text/javascript">
+						$('.pagination-link').on('click',function(e){
+							e.preventDefault();
+							$('#submitFilter'+'{$table}').val($(this).data("page")).closest("form").submit();
+						});
+					</script>
+				</div>
+			</div>
 			{/if}
+
 		</td>
 	</tr>
 </table>
 <input type="hidden" name="token" value="{$token}" />
 </fieldset>
 </form>
-
 <script type="text/javascript">
 	var confirmation = new Array();
 	{foreach $bulk_actions as $key => $params}
diff --git a/admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
index b573ed582..62050e6cf 100755
--- a/admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
+++ b/admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
@@ -105,52 +105,56 @@
 				</h3>
 				<!-- Orders Actions -->
 				<div class="well">
-					{if (count($invoices_collection))}
-					<a class="btn btn-default" href="{$link->getAdminLink('AdminPdf')|escape:'htmlall':'UTF-8'}&submitAction=generateInvoicePDF&id_order={$order->id}" target="_blank">
-						<i class="icon-file"></i>
-						{l s='View invoice'}
-					</a>
-					{else}
-						<span class="icon-stack">
+					<div class="row row-margin-bottom">
+						{if (count($invoices_collection))}
+						<a class="btn btn-default" href="{$link->getAdminLink('AdminPdf')|escape:'htmlall':'UTF-8'}&submitAction=generateInvoicePDF&id_order={$order->id}" target="_blank">
 							<i class="icon-file"></i>
-							<i class="icon-ban-circle icon-stack-base text-danger"></i>
-						</span>
-						{l s='No invoice'}
-					{/if}
-					{if (($currentState && $currentState->delivery) || $order->delivery_number)}
-					<a class="btn btn-default"  href="{$link->getAdminLink('AdminPdf')|escape:'htmlall':'UTF-8'}&submitAction=generateDeliverySlipPDF&id_order={$order->id}" target="_blank">
-						<i class="icon-truck"></i>
-						{l s='View delivery slip'}
-					</a>
-					{else}
-						<span class="icon-stack">
-							<i class="icon-truck"></i>
-							<i class="icon-ban-circle icon-stack-base text-danger"></i>
-						</span>
-						{l s='No delivery slip'}
-					{/if}
-					<a class="btn btn-default" href="javascript:window.print()">
-						<i class="icon-print"></i>
-						{l s='Print order'}
-					</a>
-					{if Configuration::get('PS_ORDER_RETURN')}
-					<a class="btn btn-default" id="desc-order-standard_refund" href="">
-						<i class="icon-exchange"></i>
-						{if $order->hasBeenShipped()}
-							{l s='Return products'}
-						{elseif $order->hasBeenPaid()}
-							{l s='Standard refund'}
+							{l s='View invoice'}
+						</a>
 						{else}
-							{l s='Cancel products'}
+							<span class="icon-stack">
+								<i class="icon-file"></i>
+								<i class="icon-ban-circle icon-stack-base text-danger"></i>
+							</span>
+							{l s='No invoice'}
 						{/if}
-					</a>
-					{/if}
-					{if $order->hasInvoice()}
-					<a class="btn btn-default" id="desc-order-partial_refund" href="">
-						<i class="icon-exchange"></i>
-						{l s='Partial refund'}
-					</a>
-					{/if}
+						{if (($currentState && $currentState->delivery) || $order->delivery_number)}
+						<a class="btn btn-default"  href="{$link->getAdminLink('AdminPdf')|escape:'htmlall':'UTF-8'}&submitAction=generateDeliverySlipPDF&id_order={$order->id}" target="_blank">
+							<i class="icon-truck"></i>
+							{l s='View delivery slip'}
+						</a>
+						{else}
+							<span class="icon-stack">
+								<i class="icon-truck"></i>
+								<i class="icon-ban-circle icon-stack-base text-danger"></i>
+							</span>
+							{l s='No delivery slip'}
+						{/if}
+						<a class="btn btn-default" href="javascript:window.print()">
+							<i class="icon-print"></i>
+							{l s='Print order'}
+						</a>
+					</div>
+					<div class="row">
+						{if Configuration::get('PS_ORDER_RETURN')}
+						<a class="btn btn-default" id="desc-order-standard_refund" href="">
+							<i class="icon-exchange"></i>
+							{if $order->hasBeenShipped()}
+								{l s='Return products'}
+							{elseif $order->hasBeenPaid()}
+								{l s='Standard refund'}
+							{else}
+								{l s='Cancel products'}
+							{/if}
+						</a>
+						{/if}
+						{if $order->hasInvoice()}
+						<a class="btn btn-default" id="desc-order-partial_refund" href="">
+							<i class="icon-exchange"></i>
+							{l s='Partial refund'}
+						</a>
+						{/if}
+					</div>
 				</div>
 				<!-- Tab nav -->
 				<ul class="nav nav-tabs" id="tabOrder">