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 04515e020..9c397bd5e 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
@@ -23,48 +23,43 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 			</table>
-
-			{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>
+				{if $bulk_actions}
+					{if $bulk_actions|count > 1}
+						<div class="form-group bulk-actions">
+							<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>
-						{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>
-								<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 class="col-lg-6">
+								<input type="submit" class="btn btn-default" name="submitBulk" id="submitBulk" value="{l s='Apply'}" />
 							</div>
-							{/foreach}
-						{/if}
-					</div>
+						</div>
+					{else}
+						{foreach $bulk_actions as $key => $params}
+						<div class="form-group bulk-actions">
+							<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>
+							<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}
+				{/if}
 				</div>
-
-
+				{if !$simple_header && $list_total > 20}
 				<div class="col-lg-4">
 					{* Choose number of results per page *}
 					<span class="pagination">
@@ -136,9 +131,8 @@
 						});
 					</script>
 				</div>
+				{/if}
 			</div>
-			{/if}
-
 		</td>
 	</tr>
 </table>
diff --git a/admin-dev/themes/default/template/controllers/states/helpers/list/list_footer.tpl b/admin-dev/themes/default/template/controllers/states/helpers/list/list_footer.tpl
index 84f7fb5ca..9bd8862f9 100644
--- a/admin-dev/themes/default/template/controllers/states/helpers/list/list_footer.tpl
+++ b/admin-dev/themes/default/template/controllers/states/helpers/list/list_footer.tpl
@@ -24,58 +24,116 @@
 *}
 
 			</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}
-				{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 class="row">
+				<div class="col-lg-8">
+				{if $bulk_actions}
+					{if $bulk_actions|count > 1}
+					<div class="form-group bulk-actions">
+						<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-primary" name="submitBulk" id="submitBulk" value="{l s='Apply'}" />
+						</div>
 					</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">
+					{else}
+						{foreach $bulk_actions as $key => $params}
+						<div class="form-group bulk-actions">
+							<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>
+								</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-primary" name="submitBulk{$key}{$table}" value="{$params.text}" {if isset($params.confirm)}onclick="return confirm('{$params.confirm}');"{/if} />
+							</div>
+						</div>
+						{/foreach}
+					{/if}
 				{/if}
-			{/if}
+				</div>			
+				{if !$simple_header && $list_total > 20}
+				<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>
+				{/if}
+			</div>
 		</td>
 	</tr>
 </table>
diff --git a/admin-dev/themes/default/template/helpers/list/list_footer.tpl b/admin-dev/themes/default/template/helpers/list/list_footer.tpl
index b0f9585be..d0d8bd7eb 100644
--- a/admin-dev/themes/default/template/helpers/list/list_footer.tpl
+++ b/admin-dev/themes/default/template/helpers/list/list_footer.tpl
@@ -25,8 +25,8 @@
 	</table>
 </div>
 <div class="row">
-	{if $bulk_actions}
 	<div class="col-lg-8">
+		{if $bulk_actions}
 		<div class="btn-group bulk-actions">
 			<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
 				{l s='Bulk actions'} <span class="caret"></span>
@@ -54,9 +54,8 @@
 			{/foreach}
 			</ul>
 		</div>
+		{/if}
 	</div>
-	{/if}
-
 	{if !$simple_header && $list_total > 20}
 	<div class="col-lg-4">
 		{* Choose number of results per page *}