diff --git a/admin-dev/themes/default/template/helpers/form/form.tpl b/admin-dev/themes/default/template/helpers/form/form.tpl
index b54caccd3..ebff4fcad 100644
--- a/admin-dev/themes/default/template/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/helpers/form/form.tpl
@@ -44,7 +44,7 @@
 				{elseif $key == 'input'}
 					{foreach $field as $input}
 						{block name="input_row"}
-						<div class="row {if $input.type == 'hidden'}hide{/if}" {if $input.name == 'id_state'}id="contains_states"{if !$contains_states}style="display:none;"{/if}{/if}>
+						<div class="form-group {if $input.type == 'hidden'}hide{/if}" {if $input.name == 'id_state'}id="contains_states"{if !$contains_states}style="display:none;"{/if}{/if}>
 						{if $input.type == 'hidden'}
 							<input type="hidden" name="{$input.name}" id="{$input.name}" value="{$fields_value[$input.name]|escape:'htmlall':'UTF-8'}" />
 						{else}
@@ -81,7 +81,7 @@
 								{if $input.type == 'text' || $input.type == 'tags'}
 									{if isset($input.lang) AND $input.lang}
 									{if $languages|count > 1}
-									<div class="row">
+									<div class="form-group">
 									{/if}
 									{foreach $languages as $language}
 										{assign var='value_text' value=$fields_value[$input.name][$language.id_lang]}
@@ -239,7 +239,7 @@
 									{/if}
 								{elseif $input.type == 'textbutton'}
 									{assign var='value_text' value=$fields_value[$input.name]}
-									<div class="row">
+									<div class="form-group">
 										<div class="col-lg-9">
 										{if isset($input.maxchar)}
 										<div class="input-group">
@@ -371,7 +371,7 @@
 										{if isset($value.p) && $value.p}<p class="help-block">{$value.p}</p>{/if}
 									{/foreach}
 								{elseif $input.type == 'switch'}
-									<div class="row">
+									<div class="form-group">
 										<div class="input-group col-lg-2">
 											<span class="switch prestashop-switch">
 												{foreach $input.values as $value}
@@ -413,7 +413,7 @@
 									{if isset($input.lang) AND $input.lang}
 									{foreach $languages as $language}
 									{if $languages|count > 1}
-									<div class="row translatable-field lang-{$language.id_lang}"  {if $language.id_lang != $defaultFormLanguage}style="display:none;"{/if}>
+									<div class="form-group translatable-field lang-{$language.id_lang}"  {if $language.id_lang != $defaultFormLanguage}style="display:none;"{/if}>
 
 										<div class="col-lg-9">
 									{/if}
@@ -511,7 +511,7 @@
 											value=""
 											{if isset($input.autocomplete) && !$input.autocomplete}autocomplete="off"{/if} />
 								{elseif $input.type == 'birthday'}
-								<div class="row">
+								<div class="form-group">
 									{foreach $input.options as $key => $select}
 									<div class="col-lg-4">
 										<select name="{$key}" class="{if isset($input.class)}{$input.class}{/if}">
@@ -621,7 +621,7 @@
 						{hook h=$hookName fieldset=$f}
 					{/if}
 				{elseif $key == 'submit'}
-					<div class="row">
+					<div class="form-group">
 						<div class="col-lg-9 col-lg-offset-3">
 							<button
 								type="submit"
diff --git a/admin-dev/themes/default/template/helpers/form/form_group.tpl b/admin-dev/themes/default/template/helpers/form/form_group.tpl
index b0c5d25dc..c6b46b156 100644
--- a/admin-dev/themes/default/template/helpers/form/form_group.tpl
+++ b/admin-dev/themes/default/template/helpers/form/form_group.tpl
@@ -34,7 +34,7 @@
 	</thead>
 	<tbody>
 	{foreach $groups as $key => $group}
-		<tr {if $key %2}class="alt_row"{/if}>
+		<tr>
 			<td>
 				{assign var=id_checkbox value=groupBox|cat:'_'|cat:$group['id_group']}
 				<input type="checkbox" name="groupBox[]" class="groupBox" id="{$id_checkbox}" value="{$group['id_group']}" {if $fields_value[$id_checkbox]}checked="checked"{/if} />
diff --git a/admin-dev/themes/default/template/helpers/list/list_header.tpl b/admin-dev/themes/default/template/helpers/list/list_header.tpl
index 94d650a99..adaa77c08 100644
--- a/admin-dev/themes/default/template/helpers/list/list_header.tpl
+++ b/admin-dev/themes/default/template/helpers/list/list_header.tpl
@@ -243,7 +243,7 @@
 				</tr>
 			{if !$simple_header && $show_filters}
 				<tr class="nodrag nodrop filter {if $row_hover}row_hover{/if}">
-					<td class="center">
+					<td class="text-center">
 						{if $has_bulk_actions}
 							--
 						{/if}
@@ -263,7 +263,7 @@
 								</select>
 							{elseif $params.type == 'date' || $params.type == 'datetime'}
 								<div class="date_range row">
-									<div class="input-group fixed-width-xl">
+									<div class="input-group fixed-width-xl row-margin-bottom">
 										<span class="input-group-addon">{l s='From'}</span>
 										<input type="text" class="filter datepicker date-input form-control" id="{$params.id_date}_0" name="{$params.name_date}[0]" value="{if isset($params.value.0)}{$params.value.0}{/if}"/>
 										<span class="input-group-addon">
diff --git a/admin-dev/themes/default/template/helpers/options/options.tpl b/admin-dev/themes/default/template/helpers/options/options.tpl
index 546687b79..dc1badf7a 100644
--- a/admin-dev/themes/default/template/helpers/options/options.tpl
+++ b/admin-dev/themes/default/template/helpers/options/options.tpl
@@ -87,7 +87,7 @@
 					{if $field['type'] == 'hidden'}
 						<input type="hidden" name="{$key}" value="{$field['value']}" />
 					{else}
-						<div class="row">
+						<div class="form-group">
 							<div id="conf_id_{$key}" {if $field['is_invisible']} class="isInvisible"{/if}>								
 								{block name="label"}
 									{if isset($field['title']) && isset($field['hint'])}
@@ -357,7 +357,7 @@
 				{/if}
 			{/foreach}
 			{if isset($categoryData['submit'])}
-				<div class="row">
+				<div class="form-group">
 					<div class="col-lg-9 col-lg-offset-3">
 						<button
 							type="submit"