diff --git a/admin-dev/themes/default/template/controllers/modules/favorites.tpl b/admin-dev/themes/default/template/controllers/modules/favorites.tpl
index 13efe0e73..66edfdf48 100755
--- a/admin-dev/themes/default/template/controllers/modules/favorites.tpl
+++ b/admin-dev/themes/default/template/controllers/modules/favorites.tpl
@@ -1,33 +1,42 @@
 <div id="productBox">
 	{include file='controllers/modules/header.tpl'}
-	<ul class="view-modules">
-		<li class="button normal-view"><a href="index.php?controller={$smarty.get.controller|htmlentities}&token={$smarty.get.token|htmlentities}"><img src="themes/default/img/modules_view_layout_sidebar.png" alt="{l s='Normal view'}" border="0" /><span>{l s='Normal view'}</span></a></li>
-		<li class="button favorites-view-disabled"><img src="themes/default/img/modules_view_table_select_row.png" alt="{l s='Favorites view'}" border="0" /><span>{l s='Favorites view'}</span></li>
-	</ul>
+	<div class="row">
+		<div class="col-lg-12">
+			<span class="pull-right">
+				<a class="btn btn-default" href="index.php?controller={$smarty.get.controller|htmlentities}&token={$smarty.get.token|htmlentities}">
+					<i class="icon-list"></i>
+					{l s='Normal view'} 
+				</a>
+				<a class="btn btn-default" href="index.php?controller={$smarty.get.controller|htmlentities}&token={$smarty.get.token|htmlentities}&select=favorites">
+					<i class="icon-star"></i> 
+					{l s='Favorites view'}
+				</a>
+			</span>
+		</div>
+		<div class="col-lg-12">&nbsp;</div>
+		<div id="container" class="col-lg-12">
 
-	<div id="container">
-
-		<div id="moduleContainer" style="padding:0px;margin:0px;padding-top:15px">
-
-			<table cellspacing="0" cellpadding="0" style="width: 100%; margin-bottom:10px;" class="table" id="">
-				<col width="30px">
-				<col width="240px">
-				<col width="">
-				<col width="140px">
-				<col width="250px">
-				<col width="180px">
-				<col width="70px">
-				<col width="70px">
-				<col width="130px">
+		<div id="moduleContainer">
+			<table class="table table-striped table-hover" cellspacing="0" cellpadding="0" id="">
+				<colgroup>
+					<col width="5%">
+					<col width="10%">
+					<col width="20%">
+					<col width="5%">
+					<col width="20%">
+					<col width="5%">
+					<col width="7%">
+					<col width="7%">
+					<col width="7%">
 				</colgroup>
 				<thead>
 					<tr class="nodrag nodrop">
 						<th class="center">{l s='Logo'}</th>
-						<th>{l s='Module Name'}</th>
+						<th class="center">{l s='Module Name'}</th>
 						<th>{l s='Description'}</th>
-						<th>{l s='Status'}</th>
+						<th class="center">{l s='Status'}</th>
 						<th>{l s='Tab'}</th>
-						<th>{l s='Categories'}</th>
+						<th class="center">{l s='Categories'}</th>
 						<th>{l s='Interest'}</th>
 						<th>{l s='Favorite'}</th>
 						<th>&nbsp;</th>
@@ -36,13 +45,25 @@
 				<tbody>
 				{foreach from=$modules key=km item=module}
 					<tr height="32" {if $km % 2 eq 0} class="alt_row"{/if}>
-						<td><img src="{if isset($module->image)}{$module->image}{else}../modules/{$module->name}/{$module->logo}{/if}" width="16" height="16" /></td>
-						<td><span class="moduleName">{$module->displayName}</span></td>
-						<td><span class="moduleFavDesc">{$module->description|truncate:80:'...'}</span></td>
-						<td>{if isset($module->id) && $module->id gt 0}<span class="setup">{l s='Installed'}</span>{else}<span class="setup non-install">{l s='Not Installed'}</span>{/if}</td>
+						<td class="center">
+							<img src="{if isset($module->image)}{$module->image}{else}../modules/{$module->name}/{$module->logo}{/if}" width="57" height="57" />
+						</td>
+						<td class="center moduleName">
+							<h5>{$module->displayName}</h5>
+						</td>
+						<td>
+							<span class="moduleFavDesc">{$module->description|truncate:80:'...'}</span>
+						</td>
+						<td class="center setup">
+							{if isset($module->id) && $module->id gt 0}
+								<span class="label label-success">{l s='Installed'}</span>
+							{else}
+								<span class="label label-warning">{l s='Not Installed'}</span>
+							{/if}
+						</td>
 						<td>
 							{assign var="module_name" value=$module->name}
-							<select class="chosen moduleTabPreferencesChoise" name="t_{$module->name}" multiple="multiple">
+							<select name="t_{$module->name}" multiple="multiple">
 								{foreach $tabs AS $t}
 									{if $t.active}
 										<option {if isset($tab_modules_preferences.$module_name) && in_array($t.id_tab, $tab_modules_preferences.$module_name)} selected="selected" {/if} class="group" value="{$t.id_tab}">{if $t.name eq ''}{$t.class_name}{else}{$t.name}{/if}</option>
@@ -56,27 +77,31 @@
 								{/foreach}
 							</select>
 						</td>
-						<td>{$module->categoryName}</td>
-						<td>
-						<select name="i_{$module->name}" class="moduleFavorite" style="width:50px">
-							<option value="" selected="selected">---</option>
-							<option value="1" {if isset($module->preferences.interest) && $module->preferences.interest eq '1'}selected="selected"{/if}>{l s='Yes'}</option>
-							<option value="0" {if isset($module->preferences.interest) && $module->preferences.interest eq '0'}selected="selected"{/if}>{l s='No'}</option>
-						</select>
+						<td class="center">
+							<span>{$module->categoryName}</span>
 						</td>
 						<td>
-						<select name="f_{$module->name}" class="moduleFavorite" style="width:50px">
-							<option value="" selected="selected">---</option>
-							<option value="1" {if isset($module->preferences.favorite) && $module->preferences.favorite eq '1'}selected="selected"{/if}>{l s='Yes'}</option>
-							<option value="0" {if isset($module->preferences.favorite) && $module->preferences.favorite eq '0'}selected="selected"{/if}>{l s='No'}</option>
-						</select>
+							<select name="i_{$module->name}" class="moduleFavorite">
+								<option value="" selected="selected">---</option>
+								<option value="1" {if isset($module->preferences.interest) && $module->preferences.interest eq '1'}selected="selected"{/if}>{l s='Yes'}</option>
+								<option value="0" {if isset($module->preferences.interest) && $module->preferences.interest eq '0'}selected="selected"{/if}>{l s='No'}</option>
+							</select>
+						</td>
+						<td>
+							<select name="f_{$module->name}" class="moduleFavorite">
+								<option value="" selected="selected">---</option>
+								<option value="1" {if isset($module->preferences.favorite) && $module->preferences.favorite eq '1'}selected="selected"{/if}>{l s='Yes'}</option>
+								<option value="0" {if isset($module->preferences.favorite) && $module->preferences.favorite eq '0'}selected="selected"{/if}>{l s='No'}</option>
+							</select>
+						</td>
+						<td class="center" id="r_{$module->name}">
+							<span>&nbsp;</span>
 						</td>
-						<td id="r_{$module->name}">&nbsp;</td>
 					</tr>
 				{/foreach}
 				</tbody>
 			</table>
-
+			</div>
 		</div>
 	</div>
 </div>
\ No newline at end of file
diff --git a/admin-dev/themes/default/template/controllers/modules/header.tpl b/admin-dev/themes/default/template/controllers/modules/header.tpl
index 048183a4c..b7fa07a9a 100644
--- a/admin-dev/themes/default/template/controllers/modules/header.tpl
+++ b/admin-dev/themes/default/template/controllers/modules/header.tpl
@@ -44,24 +44,31 @@
 </div>
 
 {if $add_permission eq '1'}
-	<div id="module_install" style="width:500px;margin-top:5px;{if !isset($smarty.post.downloadflag)}display: none;{/if}">
-		<fieldset>
-			<legend><img src="../img/admin/add.gif" alt="{l s='Add a new module'}" class="middle" /> {l s='Add a new module'}</legend>
-			<p>{l s='The module must either be a zip file or a tarball.'}</p>
-			<div style="float:left;margin-right:50px">
-				<form action="{$currentIndex}&token={$token}" method="post" enctype="multipart/form-data">
-					<label style="width: 100px">{l s='Module file'}</label>
-					<div class="margin-form" style="padding-left: 140px">
-						<input type="file" name="file" />
-						<p>{l s='Upload a module from your computer.'}</p>
-					</div>
-					<div class="margin-form" style="padding-left: 140px">
-						<input type="submit" name="download" value="{l s='Upload this module'}" class="button" />
+	<div id="module_install" class="row" style="{if !isset($smarty.post.downloadflag)}display: none;{/if}">
+		<div class="col-lg-12">
+			<div class="row-fluid">
+				<form action="{$currentIndex}&token={$token}" method="post" enctype="multipart/form-data" class="form-horizontal">
+					<legend>{l s='Add a new module'}</legend>
+					<p>{l s='The module must either be a zip file or a tarball.'}</p>
+					<label class="control-label col-lg-3">
+						<span class="label-tooltip" data-toggle="tooltip" title="{l s='Upload a module from your computer.'}">
+							{l s='Module file'}
+						</span>
+					</label>
+					<div class="col-lg-9">
+						<p>
+							<input type="file" name="file" />
+						</p>
+						<p>
+							<button class="btn btn-default" type="submit" name="download">
+								<i class="icon-upload-alt" ></i>
+								{l s='Upload this module'}
+							</button>
+						</p>
 					</div>
 				</form>
 			</div>
-		</fieldset>
-		<br />
+		</div>
 	</div>
 {/if}
 
diff --git a/admin-dev/themes/default/template/controllers/modules/list.tpl b/admin-dev/themes/default/template/controllers/modules/list.tpl
index 639f5e7ba..94add7de7 100644
--- a/admin-dev/themes/default/template/controllers/modules/list.tpl
+++ b/admin-dev/themes/default/template/controllers/modules/list.tpl
@@ -24,6 +24,18 @@
 *}
 
 {if count($modules)}
+	<div class="row-fluid">
+		<span class="pull-right">
+			<button type="button" class="btn btn-default" onclick="modules_management('install')">
+				<i class="icon-plus-sign-alt"></i>
+				{l s='Install the selection'}
+			</button>
+			<button type="button" class="btn btn-default" onclick="modules_management('uninstall')">
+				<i class="icon-minus-sign-alt"></i>
+				{l s='Uninstall the selection'}
+			</button>
+		</span>
+	</div>
 	<table cellspacing="0" cellpadding="0" class="table table-striped table-hover">
 		<thead>
 			<tr class="nodrag nodrop">
@@ -84,7 +96,7 @@
 						<div class="row-fluid">
 							{if !isset($module->not_on_disk)}
 								{$module->optionsHtml}
-								{if isset($module->preferences) && $module->preferences['favorite'] == 1}
+								{if isset($module->preferences) && isset($module->preferences['favorite']) && $module->preferences['favorite'] == 1}
 									<a class="btn btn-default btn-small action_module action_unfavorite toggle_favorite" data-module="{$module->name}" data-value="0" href="#">
 										<i class="icon-star"></i> {l s='Remove from Favorites'}
 									</a>
@@ -152,9 +164,17 @@
 		</tbody>
 	</table>
 
-	<div style="margin-top: 12px;">
-		<input type="button" class="button big" value="{l s='Install the selection'}" onclick="modules_management('install')"/>
-		<input type="button" class="button big" value="{l s='Uninstall the selection'}" onclick="modules_management('uninstall')" />
+	<div class="row-fluid">
+		<span class="pull-right">
+			<button type="button" class="btn btn-default" onclick="modules_management('install')">
+				<i class="icon-plus-sign-alt"></i>
+				{l s='Install the selection'}
+			</button>
+			<button type="button" class="btn btn-default" onclick="modules_management('uninstall')">
+				<i class="icon-minus-sign-alt"></i>
+				{l s='Uninstall the selection'}
+			</button>
+		</span>
 	</div>
 {else}
 	<p class="help-block">{l s='No modules available in this section.'}</p>
diff --git a/admin-dev/themes/default/template/controllers/modules/page.tpl b/admin-dev/themes/default/template/controllers/modules/page.tpl
index c3c27d071..f86a5b1e1 100644
--- a/admin-dev/themes/default/template/controllers/modules/page.tpl
+++ b/admin-dev/themes/default/template/controllers/modules/page.tpl
@@ -49,38 +49,38 @@
 					{l s='Favorites view'}
 				</a>
 			</span>
-		</span>
-	</div>
+		</div>
 	
-	<div id="container">
-		<!--start sidebar module-->
-		<div class="row-fluid">
-			<div class="categorieTitle col-lg-3">
-				<legend>{l s='Categories'}</legend>
-				<ul class="tab nav nav-pills nav-stacked">
-					<li class="tab-row {if isset($categoryFiltered.favorites)}active{/if}">
-						<a class="tab-page" href="{$currentIndex}&token={$token}&filterCategory=favorites">
-							{l s='Favorites'} <span class="badge pull-right">{$nb_modules_favorites}</span>
-						</a>
-					</li>
-					<li class="tab-row {if count($categoryFiltered) lte 0}active{/if}">
-						<a class="tab-page" href="{$currentIndex}&token={$token}&unfilterCategory=yes">
-							{l s='Total'} <span class="badge pull-right">{$nb_modules}</span>
-						</a>
-					</li>
-					{foreach from=$list_modules_categories item=module_category key=module_category_key}
-						<li class="tab-row {if isset($categoryFiltered[$module_category_key])}active{/if}">
-							<a class="tab-page" href="{$currentIndex}&token={$token}&{if isset($categoryFiltered[$module_category_key])}un{/if}filterCategory={$module_category_key}">
-								{$module_category.name} <span class="badge pull-right">{$module_category.nb}</span>
+		<div id="container">
+			<!--start sidebar module-->
+			<div class="row-fluid">
+				<div class="categorieTitle col-lg-3">
+					<legend>{l s='Categories'}</legend>
+					<ul class="tab nav nav-pills nav-stacked">
+						<li class="tab-row {if isset($categoryFiltered.favorites)}active{/if}">
+							<a class="tab-page" href="{$currentIndex}&token={$token}&filterCategory=favorites">
+								{l s='Favorites'} <span class="badge pull-right">{$nb_modules_favorites}</span>
 							</a>
 						</li>
-					{/foreach}
-				</ul>
+						<li class="tab-row {if count($categoryFiltered) lte 0}active{/if}">
+							<a class="tab-page" href="{$currentIndex}&token={$token}&unfilterCategory=yes">
+								{l s='Total'} <span class="badge pull-right">{$nb_modules}</span>
+							</a>
+						</li>
+						{foreach from=$list_modules_categories item=module_category key=module_category_key}
+							<li class="tab-row {if isset($categoryFiltered[$module_category_key])}active{/if}">
+								<a class="tab-page" href="{$currentIndex}&token={$token}&{if isset($categoryFiltered[$module_category_key])}un{/if}filterCategory={$module_category_key}">
+									{$module_category.name} <span class="badge pull-right">{$module_category.nb}</span>
+								</a>
+							</li>
+						{/foreach}
+					</ul>
+				</div>
+			</div>
+			<div id="moduleContainer" class="col-lg-9">
+				<legend>{l s='Modules list'}</legend>
+				{include file='controllers/modules/list.tpl'}
 			</div>
-		</div>
-		<div id="moduleContainer" class="col-lg-9">
-			<legend>{l s='Modules list'}</legend>
-			{include file='controllers/modules/list.tpl'}
 		</div>
 	</div>
 </div>
diff --git a/admin-dev/themes/default/template/controllers/modules/tab_module_line.tpl b/admin-dev/themes/default/template/controllers/modules/tab_module_line.tpl
index 8c860d2e8..c0d2e37e0 100644
--- a/admin-dev/themes/default/template/controllers/modules/tab_module_line.tpl
+++ b/admin-dev/themes/default/template/controllers/modules/tab_module_line.tpl
@@ -29,28 +29,28 @@
 		<table border="0" cellpadding="0" cellspacing="5">
 			<tr>
 				<td valign="top" width="32" align="center">
-					<img class="imgm" alt="" src="{if isset($module->image)}{$module->image}{else}../modules/{$module->name}/{$module->logo}{/if}">
+					<img width="57" alt="" src="{if isset($module->image)}{$module->image}{else}../modules/{$module->name}/{$module->logo}{/if}">
 				</td>
 				<td height="60" valign="top">
-					<div class="moduleDesc" id="anchor{$module->name|ucfirst}">
-						<h3>
+					<div id="anchor{$module->name|ucfirst}">
+						<h4>
 							{$module->displayName|truncate:40:'…'} {$module->version}
 							{if isset($module->id) && $module->id gt 0 }
 								{if $module->active}
-									<span class="setup">{l s='Enabled'}</span>
+									<span class="label label-success">{l s='Enabled'}</span>
 								{else}
-									<span class="setup off">{l s='Disabled'}</span>
+									<span class="label label-warning">{l s='Disabled'}</span>
 								{/if}
 							{else}
 								{if isset($module->type) && $module->type == 'addonsMustHave'}
-									<span class="setup must-have">{l s='Must Have'}</span>
+									<span class="label label-danger">{l s='Must Have'}</span>
 								{else}
-									<span class="setup off">{l s='Not installed'}</span>
+									<span class="label label-warning">{l s='Not installed'}</span>
 								{/if}
 								
 							{/if}
-						</h3>
-						<p class="desc">
+						</h4>
+						<p>
 							{if isset($module->description) && $module->description ne ''}
 								{$module->description|truncate:100:'…'}
 							{else}
@@ -60,16 +60,26 @@
 					</div>
 				</td>
 				<td border="0" valign="middle" align="right">
-					{if isset($module->type) && $module->type == 'addonsMustHave'}
-						<a href="{$module->addons_buy_url}" target="_blank" class="button updated">
-						<span><img src="../img/admin/cart_addons.png">&nbsp;&nbsp;{displayPrice price=$module->price currency=$module->id_currency}</span></a>
-					{else if !isset($module->not_on_disk)}
-						{$module->optionsHtml}
-						<div class="clear">&nbsp;</div>
-						<a href="#" class="button action_tab_module" data-option="select_{$module->name}" class="button">{l s='Submit'}</a>
-					{else}
-						<a href="{$module->options.install_url}" class="button">{l s='Install'}</a>
-					{/if}
+					<div id="list-action-button" class="row-light">
+						{if isset($module->type) && $module->type == 'addonsMustHave'}
+							<p>
+								<a href="{$module->addons_buy_url}" target="_blank" class="button updated">
+									<span class="btn btn-default">
+										<i class="icon-shopping-cart"></i> &nbsp;&nbsp;{displayPrice price=$module->price currency=$module->id_currency}
+									</span>
+								</a>
+							</p>
+						{else if !isset($module->not_on_disk)}
+							{$module->optionsHtml}
+							<p>
+								<a href="#" class="btn btn-default action_tab_module" data-option="select_{$module->name}">{l s='Submit'}</a>
+							</p>
+						{else}
+							<p>
+								<a href="{$module->options.install_url}" class="btn btn-default">{l s='Install'}</a>
+							</p>
+						{/if}
+					</div>
 				</td>
 			</tr>
 		</table>
diff --git a/admin-dev/themes/default/template/controllers/modules/tab_modules_list.tpl b/admin-dev/themes/default/template/controllers/modules/tab_modules_list.tpl
index a4945a592..3e89ff60f 100644
--- a/admin-dev/themes/default/template/controllers/modules/tab_modules_list.tpl
+++ b/admin-dev/themes/default/template/controllers/modules/tab_modules_list.tpl
@@ -83,4 +83,4 @@
 	{/if}
 	</div>
 {/if}
-<p style="text-align:right;text-decoration:underline;padding-right:10px"><a href="{$admin_module_favorites_view}" style="color:#666">{l s='More options'}</a></p>
\ No newline at end of file
+<p><a href="{$admin_module_favorites_view}">{l s='More options'}</a></p>
\ No newline at end of file