diff --git a/themes/default-bootstrap/css/global.css b/themes/default-bootstrap/css/global.css
index b3554f0f1..af30d7cfd 100644
--- a/themes/default-bootstrap/css/global.css
+++ b/themes/default-bootstrap/css/global.css
@@ -1,4 +1,4 @@
-@charset "CP850";
+@charset "UTF-8";
 /* ##################################################################################################
 	PRESTASHOP SCSS
 ################################################################################################## */
@@ -2535,19 +2535,19 @@ table#cart_summary .gift-icon {
 
 /* step 4 - paiement ************************************************************************** */
 /* line 2421, ../sass/global.scss */
-#order .delivery_option label, #order-opc .delivery_option label {
+#order .delivery_option > div, #order-opc .delivery_option > div {
   display: block;
   margin-bottom: 20px;
   font-weight: normal; }
   /* line 2425, ../sass/global.scss */
-  #order .delivery_option label > table, #order-opc .delivery_option label > table {
+  #order .delivery_option > div > table, #order-opc .delivery_option > div > table {
     background: white;
     margin-bottom: 0; }
     /* line 2428, ../sass/global.scss */
-    #order .delivery_option label > table.resume, #order-opc .delivery_option label > table.resume {
+    #order .delivery_option > div > table.resume, #order-opc .delivery_option > div > table.resume {
       height: 53px; }
     /* line 2431, ../sass/global.scss */
-    #order .delivery_option label > table.delivery_option_carrier, #order-opc .delivery_option label > table.delivery_option_carrier {
+    #order .delivery_option > div > table.delivery_option_carrier, #order-opc .delivery_option > div > table.delivery_option_carrier {
       margin-top: 10px;
       width: 100%;
       background: #5192f3;
@@ -2555,25 +2555,25 @@ table#cart_summary .gift-icon {
       border: 1px solid #4b80c3;
       font-weight: bold; }
       /* line 2438, ../sass/global.scss */
-      #order .delivery_option label > table.delivery_option_carrier td, #order-opc .delivery_option label > table.delivery_option_carrier td {
+      #order .delivery_option > div > table.delivery_option_carrier td, #order-opc .delivery_option > div > table.delivery_option_carrier td {
         padding: 8px 11px 7px 11px; }
         /* line 2440, ../sass/global.scss */
-        #order .delivery_option label > table.delivery_option_carrier td i, #order-opc .delivery_option label > table.delivery_option_carrier td i {
+        #order .delivery_option > div > table.delivery_option_carrier td i, #order-opc .delivery_option > div > table.delivery_option_carrier td i {
           font-size: 20px;
           margin-right: 7px;
           vertical-align: -2px; }
     /* line 2448, ../sass/global.scss */
-    #order .delivery_option label > table td.delivery_option_radio, #order-opc .delivery_option label > table td.delivery_option_radio {
+    #order .delivery_option > div > table td.delivery_option_radio, #order-opc .delivery_option > div > table td.delivery_option_radio {
       width: 54px;
       padding-left: 0;
       padding-right: 0;
       text-align: center; }
     /* line 2454, ../sass/global.scss */
-    #order .delivery_option label > table td.delivery_option_logo, #order-opc .delivery_option label > table td.delivery_option_logo {
+    #order .delivery_option > div > table td.delivery_option_logo, #order-opc .delivery_option > div > table td.delivery_option_logo {
       width: 97px;
       padding-left: 21px; }
     /* line 2458, ../sass/global.scss */
-    #order .delivery_option label > table td.delivery_option_price, #order-opc .delivery_option label > table td.delivery_option_price {
+    #order .delivery_option > div > table td.delivery_option_price, #order-opc .delivery_option > div > table td.delivery_option_price {
       width: 162px; }
 
 /* line 2463, ../sass/global.scss */
diff --git a/themes/default-bootstrap/order-carrier.tpl b/themes/default-bootstrap/order-carrier.tpl
index b7f8f31c0..528e76353 100644
--- a/themes/default-bootstrap/order-carrier.tpl
+++ b/themes/default-bootstrap/order-carrier.tpl
@@ -126,7 +126,7 @@
 									<div class="delivery_options">
 										{foreach $option_list as $key => $option}
 											<div class="delivery_option {if ($option@index % 2)}alternate_{/if}item">
-												<label for="delivery_option_{$id_address}_{$option@index}">
+												<div>
 													<table class="resume table table-bordered">
 														<tr>
 															<td class="delivery_option_radio">
@@ -199,7 +199,7 @@
 																		{$carrier.instance->name}
 																	</td>
 																{/if}
-																<td {if $option.unique_carrier}class="first_item" colspan="2"{/if}>
+																<td {if $option.unique_carrier}class="first_item" {/if}>
 																	<input type="hidden" value="{$carrier.instance->id}" name="id_carrier" />
 																	{if isset($carrier.instance->delay[$cookie->id_lang])}
 																		<i class="icon-info-sign"></i>{$carrier.instance->delay[$cookie->id_lang]}
@@ -234,7 +234,7 @@
 															</tr>
 														{/foreach}
 													</table>
-												</label>
+												</div>
 											</div> <!-- end delivery_option -->
 										{/foreach}
 									</div> <!-- end delivery_options -->
@@ -298,7 +298,7 @@
 							<p class="checkbox">
 								<input type="checkbox" name="cgv" id="cgv" value="1" {if $checkedTOS}checked="checked"{/if} />
 								<label for="cgv">{l s='I agree to the terms of service and will adhere to them unconditionally.'}</label>
-								<a href="{$link_conditions}" class="iframe" rel="nofollow">{l s='(Read the Terms of Service)'}</a>
+								<a href="{$link_conditions|escape:'html':'UTF-8'}" class="iframe" rel="nofollow">{l s='(Read the Terms of Service)'}</a>
 							</p>
 							<script type="text/javascript">
 								$(document).ready(function() {
diff --git a/themes/default-bootstrap/sass/global.scss b/themes/default-bootstrap/sass/global.scss
index f17a7b2ca..78b79dd2d 100644
--- a/themes/default-bootstrap/sass/global.scss
+++ b/themes/default-bootstrap/sass/global.scss
@@ -2418,7 +2418,7 @@ table#cart_summary .gift-icon {
 }
 /* step 4 - paiement ************************************************************************** */
 #order .delivery_option, #order-opc .delivery_option {
-	label {
+	>div {
 		display: block;
 		margin-bottom:20px;
 		font-weight:normal;