diff --git a/themes/default/css/addresses.css b/themes/default/css/addresses.css
index e17861ea1..58ff8a421 100644
--- a/themes/default/css/addresses.css
+++ b/themes/default/css/addresses.css
@@ -31,7 +31,10 @@ ul.address li.address_title {
     text-shadow:0 1px 0 #666;
    background:url(../img/bg_table_th.png) repeat-x 0 -10px #999
 }
-
+ul.address .address_alias {
+	font-weight: normal;
+	text-transform: none;
+}
 ul.address li.address_firstname,
 ul.address li.address_company {
 	margin-top:8px
@@ -45,11 +48,9 @@ ul.address li.address_delete {
 	font-size:11px;
    text-transform:none
 }
-
 .address_add {
    padding:20px 0
 }
-
 .address_select {
 	border:1px solid #ccc;
 	width: 200px;
@@ -68,7 +69,6 @@ label[for=id_address_delivery], label[for=id_address_invoice] {
 p.address_delivery, p.addressesAreEquals {
 	padding-bottom: 14px
 }
-
 /* PAGE ADRESSES ******************************************************************************* */
 .addresses ul.address {
    list-style-type:none;
diff --git a/themes/default/shopping-cart.tpl b/themes/default/shopping-cart.tpl
index 35ed0229e..8a54749bc 100644
--- a/themes/default/shopping-cart.tpl
+++ b/themes/default/shopping-cart.tpl
@@ -360,10 +360,10 @@
 
 {if ((!empty($delivery_option) AND !isset($virtualCart)) OR $delivery->id OR $invoice->id) AND !$opc}
 <div class="order_delivery clearfix">
-	{if !isset($formattedAddresses)}
+	{if !isset($formattedAddresses) || (count($formattedAddresses.invoice.formated) == 0 && count($formattedAddresses.delivery.formated) == 0)}
 	{if $delivery->id}
 	<ul id="delivery_address" class="address item">
-		<li class="address_title">{l s='Delivery address'}</li>
+		<li class="address_title">{l s='Delivery address'}&nbsp;<span class="address_alias">({$delivery->alias})</span></li>
 		{if $delivery->company}<li class="address_company">{$delivery->company|escape:'htmlall':'UTF-8'}</li>{/if}
 		<li class="address_name">{$delivery->firstname|escape:'htmlall':'UTF-8'} {$delivery->lastname|escape:'htmlall':'UTF-8'}</li>
 		<li class="address_address1">{$delivery->address1|escape:'htmlall':'UTF-8'}</li>
@@ -374,7 +374,7 @@
 	{/if}
 	{if $invoice->id}
 	<ul id="invoice_address" class="address alternate_item">
-		<li class="address_title">{l s='Invoice address'}</li>
+		<li class="address_title">{l s='Invoice address'}&nbsp;<span class="address_alias">({$invoice->alias})</span></li>
 		{if $invoice->company}<li class="address_company">{$invoice->company|escape:'htmlall':'UTF-8'}</li>{/if}
 		<li class="address_name">{$invoice->firstname|escape:'htmlall':'UTF-8'} {$invoice->lastname|escape:'htmlall':'UTF-8'}</li>
 		<li class="address_address1">{$invoice->address1|escape:'htmlall':'UTF-8'}</li>
@@ -384,9 +384,9 @@
 	</ul>
 	{/if}
 	{else}
-		{foreach $formattedAddresses as $address}
+		{foreach from=$formattedAddresses key=k item=address}
 			<ul class="address {if $address@last}last_item{elseif $address@first}first_item{/if} {if $address@index % 2}alternate_item{else}item{/if}">
-				<li class="address_title">{$address.object.alias}</li>
+				<li class="address_title">{if $k eq 'invoice'}{l s='Invoice address'}{elseif $k eq 'delivery'}{l s='Delivery address'}{/if}&nbsp;<span class="address_alias">({$address.object.alias})</span></li>
 				{foreach $address.ordered as $pattern}
 					{assign var=addressKey value=" "|explode:$pattern}
 					<li>