diff --git a/src/Presentation/Nop.Web/Themes/DefaultClean/Content/css/styles.css b/src/Presentation/Nop.Web/Themes/DefaultClean/Content/css/styles.css
index 7582c41ec74..3afb5fabdf4 100644
--- a/src/Presentation/Nop.Web/Themes/DefaultClean/Content/css/styles.css
+++ b/src/Presentation/Nop.Web/Themes/DefaultClean/Content/css/styles.css
@@ -3619,9 +3619,9 @@ label, label + * {
 	font-size: 16px;
 }
 
-.order-review-data ul,
+.order-review-data > div,
 .order-details-area > div,
-.shipment-details-area ul {
+.shipment-details-area > div {
 	width: 350px;
 	max-width: 100%;
 	margin: 0 auto 40px;
@@ -3647,7 +3647,14 @@ label, label + * {
 .shipment-details-area .title:first-child {
 	margin-top: 0;
 }
-.order-details-area .side-list-wrap {
+.order-review-data .title strong,
+.order-details-area .title strong,
+.shipment-details-area .title strong{
+    font-weight: 700;
+}
+.order-review-data .side-list-wrap,
+.order-details-area .side-list-wrap,
+.shipment-details-area .side-list-wrap {
     margin-top: 20px;
 }
 .order-completed .details {
@@ -5665,9 +5672,9 @@ pre {
 .shipment-details-area {
 	overflow: hidden;
 }
-.order-review-data ul,
+.order-review-data > div,
 .order-details-area > div,
-.shipment-details-area ul {
+.shipment-details-area > div {
 	float: left;
 	width: 48%;
 	margin: 0 1% 40px;
diff --git a/src/Presentation/Nop.Web/Themes/DefaultClean/Content/css/styles.rtl.css b/src/Presentation/Nop.Web/Themes/DefaultClean/Content/css/styles.rtl.css
index 353bfbb5d01..02e27815c36 100644
--- a/src/Presentation/Nop.Web/Themes/DefaultClean/Content/css/styles.rtl.css
+++ b/src/Presentation/Nop.Web/Themes/DefaultClean/Content/css/styles.rtl.css
@@ -3646,9 +3646,9 @@ label, label + * {
 	font-size: 16px;
 }
 
-.order-review-data ul,
+.order-review-data > div,
 .order-details-area > div,
-.shipment-details-area ul {
+.shipment-details-area > div {
 	width: 350px;
 	max-width: 100%;
 	margin: 0 auto 40px;
@@ -3674,7 +3674,14 @@ label, label + * {
 .shipment-details-area .title:first-child {
 	margin-top: 0;
 }
-.order-details-area .side-list-wrap {
+.order-review-data .title strong,
+.order-details-area .title strong,
+.shipment-details-area .title strong{
+    font-weight: 700;
+}
+.order-review-data .side-list-wrap,
+.order-details-area .side-list-wrap,
+.shipment-details-area .side-list-wrap {
     margin-top: 20px;
 }
 .order-completed .details {
@@ -5734,9 +5741,9 @@ pre {
 .shipment-details-area {
 	overflow: hidden;
 }
-.order-review-data ul,
+.order-review-data > div,
 .order-details-area > div,
-.shipment-details-area ul {
+.shipment-details-area > div {
 	float: right;
 	width: 48%;
 	margin: 0 1% 40px;
diff --git a/src/Presentation/Nop.Web/Views/Order/ShipmentDetails.cshtml b/src/Presentation/Nop.Web/Views/Order/ShipmentDetails.cshtml
index d6b36db8995..40c70cd7eb8 100644
--- a/src/Presentation/Nop.Web/Views/Order/ShipmentDetails.cshtml
+++ b/src/Presentation/Nop.Web/Views/Order/ShipmentDetails.cshtml
@@ -13,113 +13,125 @@
         <h1>@string.Format(T("Order.Shipments.Information").Text, Model.Id)</h1>
     </div>
     <div class="page-body">
-
         <div class="shipment-details-area">
-            <ul class="shipping-details">
-                <li class="title">
-                    @T("Order.Shipments.Order#")@Model.Order.Id
-                </li>
-                <li class="shipping-method">
-                    @T("Order.Shipments.ShippingMethod"): @Model.Order.ShippingMethod
-                </li>
-                <li class="shipped-date">
-                    @T("Order.Shipments.ShippedDate"):
-                    @if (Model.ShippedDate.HasValue)
-                    {
-                        @Model.ShippedDate.Value.ToString("D")
-                    }
-                    else
-                    {
-                        @T("Order.Shipments.ShippedDate.NotYet")
-                    }
-                </li>
-                <li class="delivery-date">
-                    @T("Order.Shipments.DeliveryDate"):
-                    @if (Model.DeliveryDate.HasValue)
-                    {
-                        @Model.DeliveryDate.Value.ToString("D")
-                    }
-                    else
-                    {
-                        @T("Order.Shipments.DeliveryDate.NotYet")
-                    }
-                </li>
-                @if (!String.IsNullOrEmpty(Model.TrackingNumber))
-                {
-                    <li class="tracking-number">@T("Order.Shipments.TrackingNumber"):
-                        @if (!string.IsNullOrEmpty(Model.TrackingNumberUrl))
+            <div class="shipping-info-wrap">
+                <div class="title">
+                    <strong>@T("Order.Shipments.Order#")@Model.Order.Id</strong>
+                </div>
+                <div class="info-content">
+                    <ul class="shipping-info">
+                        <li class="shipping-method">
+                            @T("Order.Shipments.ShippingMethod"): @Model.Order.ShippingMethod
+                        </li>
+                        <li class="shipped-date">
+                            @T("Order.Shipments.ShippedDate"):
+                            @if (Model.ShippedDate.HasValue)
+                            {
+                                @Model.ShippedDate.Value.ToString("D")
+                            }
+                            else
+                            {
+                                @T("Order.Shipments.ShippedDate.NotYet")
+                            }
+                        </li>
+                        <li class="delivery-date">
+                            @T("Order.Shipments.DeliveryDate"):
+                            @if (Model.DeliveryDate.HasValue)
+                            {
+                                @Model.DeliveryDate.Value.ToString("D")
+                            }
+                            else
+                            {
+                                @T("Order.Shipments.DeliveryDate.NotYet")
+                            }
+                        </li>
+                        @if (!String.IsNullOrEmpty(Model.TrackingNumber))
                         {
-                            <a href="@Model.TrackingNumberUrl" target="_blank" class="tracking-url">@Model.TrackingNumber</a>
+                            <li class="tracking-number">
+                                @T("Order.Shipments.TrackingNumber"):
+                                @if (!string.IsNullOrEmpty(Model.TrackingNumberUrl))
+                                {
+                                    <a href="@Model.TrackingNumberUrl" target="_blank" class="tracking-url">@Model.TrackingNumber</a>
+                                }
+                                else
+                                {
+                                    @Model.TrackingNumber
+                                }
+                            </li>
+                        }
+                    </ul>
+                </div>
+            </div>
+            <div class="shipping-info-wrap">
+                <div class="title">
+                    <strong>@T("Order.Shipments.ShippingAddress")</strong>
+                </div>
+                <div class="info-content">
+                    <ul class="shipping-address">
+                        @if (!Model.Order.PickUpInStore)
+                        {
+                            <li class="name">
+                                @Model.Order.ShippingAddress.FirstName @Model.Order.ShippingAddress.LastName
+                            </li>
+                            <li class="email">
+                                @T("Order.Shipments.Email"): @Model.Order.ShippingAddress.Email
+                            </li>
+                            <li class="phone">
+                                @T("Order.Shipments.Phone"): @Model.Order.ShippingAddress.PhoneNumber
+                            </li>
+                            <li class="fax">
+                                @T("Order.Shipments.Fax"): @Model.Order.ShippingAddress.FaxNumber
+                            </li>
+                            if (!String.IsNullOrEmpty(Model.Order.ShippingAddress.Company))
+                            {
+                                <li class="company">
+                                    @Model.Order.ShippingAddress.Company
+                                </li>
+                            }
+                            <li class="address1">
+                                @Model.Order.ShippingAddress.Address1
+                            </li>
+                            if (!String.IsNullOrEmpty(Model.Order.ShippingAddress.Address2))
+                            {
+                                <li class="address2">
+                                    @Model.Order.ShippingAddress.Address2
+                                </li>
+                            }
+                            <li class="city-state-zip">
+                                @Model.Order.ShippingAddress.City, @Model.Order.ShippingAddress.StateProvinceName
+                                @Model.Order.ShippingAddress.ZipPostalCode
+                            </li>
+                            if (!String.IsNullOrEmpty(Model.Order.ShippingAddress.CountryName))
+                            {
+                                <li class="country">
+                                    @Model.Order.ShippingAddress.CountryName
+                                </li>
+                            }
                         }
                         else
                         {
-                            @Model.TrackingNumber
+                            <li class="title">
+                                @T("Order.Shipments.PickupAddress")
+                            </li>
+                            <li class="address1">
+                                @Model.Order.PickupAddress.Address1
+                            </li>
+                            <li class="city-state-zip">
+                                @Model.Order.PickupAddress.City,
+                                @Model.Order.PickupAddress.ZipPostalCode
+                            </li>
+                            if (!string.IsNullOrEmpty(Model.Order.PickupAddress.CountryName))
+                            {
+                                <li class="country">
+                                    @Model.Order.PickupAddress.CountryName
+                                </li>
+                            }
                         }
-                    </li>
-                }
-            </ul>
-            <ul class="shipping-address">
-                @if (!Model.Order.PickUpInStore)
-                {
-                    <li class="title">
-                        @T("Order.Shipments.ShippingAddress")
-                    </li>
-                    <li class="name">
-                        @Model.Order.ShippingAddress.FirstName @Model.Order.ShippingAddress.LastName
-                    </li>
-                    <li class="email">
-                        @T("Order.Shipments.Email"): @Model.Order.ShippingAddress.Email
-                    </li>
-                    <li class="phone">
-                        @T("Order.Shipments.Phone"): @Model.Order.ShippingAddress.PhoneNumber
-                    </li>
-                    <li class="fax">
-                        @T("Order.Shipments.Fax"): @Model.Order.ShippingAddress.FaxNumber</li>
-                    if (!String.IsNullOrEmpty(Model.Order.ShippingAddress.Company))
-                    {
-                        <li class="company">
-                            @Model.Order.ShippingAddress.Company
-                        </li>
-                    }
-                    <li class="address1">
-                        @Model.Order.ShippingAddress.Address1</li>
-                    if (!String.IsNullOrEmpty(Model.Order.ShippingAddress.Address2))
-                    {
-                        <li class="address2">
-                            @Model.Order.ShippingAddress.Address2
-                        </li>
-                    }
-                    <li class="city-state-zip">
-                        @Model.Order.ShippingAddress.City, @Model.Order.ShippingAddress.StateProvinceName
-                        @Model.Order.ShippingAddress.ZipPostalCode</li>
-                    if (!String.IsNullOrEmpty(Model.Order.ShippingAddress.CountryName))
-                    {
-                        <li class="country">
-                            @Model.Order.ShippingAddress.CountryName
-                        </li>
-                    }
-                }
-                else
-                {
-                    <li class="title">
-                        @T("Order.Shipments.PickupAddress")
-                    </li>
-                    <li class="address1">
-                        @Model.Order.PickupAddress.Address1
-                    </li>
-                    <li class="city-state-zip">
-                        @Model.Order.PickupAddress.City, 
-                        @Model.Order.PickupAddress.ZipPostalCode
-                    </li>
-                    if (!string.IsNullOrEmpty(Model.Order.PickupAddress.CountryName))
-                    {
-                        <li class="country">
-                            @Model.Order.PickupAddress.CountryName
-                        </li>
-                    }
-                }
-            </ul>
+                    </ul>
+                </div>
+            </div>
         </div>
+
         @if (Model.Items.Count > 0)
         {
             <div class="section products">
diff --git a/src/Presentation/Nop.Web/Views/ShoppingCart/_OrderReviewData.cshtml b/src/Presentation/Nop.Web/Views/ShoppingCart/_OrderReviewData.cshtml
index 3bae0554b3c..73b72ee6db6 100644
--- a/src/Presentation/Nop.Web/Views/ShoppingCart/_OrderReviewData.cshtml
+++ b/src/Presentation/Nop.Web/Views/ShoppingCart/_OrderReviewData.cshtml
@@ -3,234 +3,248 @@
 @if (Model.Display)
 {
     <div class="order-review-data">
-        <ul class="billing-info">
-            <li class="title">
-                @T("Order.BillingAddress")
-            </li>
-            <li class="name">
-                @Model.BillingAddress.FirstName @Model.BillingAddress.LastName
-            </li>
-            <li class="email">
-                @T("Order.Email"): @Model.BillingAddress.Email
-            </li>
-            @if (Model.BillingAddress.PhoneEnabled)
-            {
-                <li class="phone">
-                    @T("Order.Phone"): @Model.BillingAddress.PhoneNumber
-                </li>
-            }
-            @if (Model.BillingAddress.FaxEnabled)
-            {
-                <li class="fax">
-                    @T("Order.Fax"): @Model.BillingAddress.FaxNumber
-                </li>
-            }
-            @if (Model.BillingAddress.CompanyEnabled && !String.IsNullOrEmpty(Model.BillingAddress.Company))
-            {
-                <li class="company">
-                    @Model.BillingAddress.Company
-                </li>
-            }
-            @if (Model.BillingAddress.StreetAddressEnabled)
-            {
-                <li class="address1">
-                    @Model.BillingAddress.Address1
-                </li>
-            }
-            @if (Model.BillingAddress.StreetAddress2Enabled && !String.IsNullOrEmpty(Model.BillingAddress.Address2))
-            {
-                <li class="address2">
-                    @Model.BillingAddress.Address2
-                </li>
-            }
-            @if (Model.BillingAddress.CityEnabled ||
-                Model.BillingAddress.StateProvinceEnabled ||
-                Model.BillingAddress.ZipPostalCodeEnabled)
-            {
-                <li class="city-state-zip">
-                    @if (Model.BillingAddress.CityEnabled)
-                    {
-                        @Model.BillingAddress.City
-                    }
-                    @if (Model.BillingAddress.CityEnabled && (Model.BillingAddress.StateProvinceEnabled || Model.BillingAddress.ZipPostalCodeEnabled))
-                    {
-                        <text>,</text>
-                    }
-                    @if (Model.BillingAddress.StateProvinceEnabled)
-                    {
-                        @Model.BillingAddress.StateProvinceName
-                    }
-                    @if (Model.BillingAddress.ZipPostalCodeEnabled)
-                    {
-                        @Model.BillingAddress.ZipPostalCode
-                    }
-                </li>
-            }
-            @if (Model.BillingAddress.CountryEnabled && !String.IsNullOrEmpty(Model.BillingAddress.CountryName))
-            {
-                <li class="country">
-                    @Model.BillingAddress.CountryName
-                </li>
-            }
-            @if (!String.IsNullOrEmpty(Model.BillingAddress.FormattedCustomAddressAttributes))
-            {
-                <li class="custom-attributes-view">
-                    @Html.Raw(Model.BillingAddress.FormattedCustomAddressAttributes)
-                </li>
-            }
-            @if (!String.IsNullOrEmpty(Model.PaymentMethod))
-            {
-                <li class="title">
-                    @T("Order.Payment")
-                </li>
-                <li class="payment-method">
-                    <span class="label">
-                        @T("Order.Payment.Method"):
-                    </span>
-                    <span class="value">
-                        @Model.PaymentMethod
-                    </span>
-                </li>
-            }
-            @if (Model.CustomValues != null)
-            {
-                foreach (var item in Model.CustomValues)
-                {
-                    <li class="custom-value">
-                        <span class="label">
-                            @item.Key:
-                        </span>
-                        <span class="value">
-                            @(item.Value != null ? item.Value.ToString() : "")
-                        </span>
-                    </li>
-                }
-            }
-        </ul>
-        @if (Model.IsShippable)
-        {
-            <ul class="shipping-info">
-                @if (!Model.SelectedPickUpInStore)
-                {
-                    <li class="title">
-                        @T("Order.ShippingAddress")
-                    </li>
+        <div class="billing-info-wrap">
+            <div class="title">
+                <strong>@T("Order.BillingAddress")</strong>
+            </div>
+            <div class="info-content">
+                <ul class="billing-info">
                     <li class="name">
-                        @Model.ShippingAddress.FirstName @Model.ShippingAddress.LastName
+                        @Model.BillingAddress.FirstName @Model.BillingAddress.LastName
                     </li>
                     <li class="email">
-                        @T("Order.Email"): @Model.ShippingAddress.Email
+                        @T("Order.Email"): @Model.BillingAddress.Email
                     </li>
-                    if (Model.ShippingAddress.PhoneEnabled)
+                    @if (Model.BillingAddress.PhoneEnabled)
                     {
                         <li class="phone">
-                            @T("Order.Phone"): @Model.ShippingAddress.PhoneNumber
+                            @T("Order.Phone"): @Model.BillingAddress.PhoneNumber
                         </li>
                     }
-                    if (Model.ShippingAddress.FaxEnabled)
+                    @if (Model.BillingAddress.FaxEnabled)
                     {
                         <li class="fax">
-                            @T("Order.Fax"): @Model.ShippingAddress.FaxNumber
+                            @T("Order.Fax"): @Model.BillingAddress.FaxNumber
                         </li>
                     }
-                    if (Model.ShippingAddress.CompanyEnabled && !String.IsNullOrEmpty(Model.ShippingAddress.Company))
+                    @if (Model.BillingAddress.CompanyEnabled && !String.IsNullOrEmpty(Model.BillingAddress.Company))
                     {
                         <li class="company">
-                            @Model.ShippingAddress.Company
+                            @Model.BillingAddress.Company
                         </li>
                     }
-                    if (Model.ShippingAddress.StreetAddressEnabled)
+                    @if (Model.BillingAddress.StreetAddressEnabled)
                     {
                         <li class="address1">
-                            @Model.ShippingAddress.Address1
+                            @Model.BillingAddress.Address1
                         </li>
                     }
-                    if (Model.ShippingAddress.StreetAddress2Enabled && !String.IsNullOrEmpty(Model.ShippingAddress.Address2))
+                    @if (Model.BillingAddress.StreetAddress2Enabled && !String.IsNullOrEmpty(Model.BillingAddress.Address2))
                     {
                         <li class="address2">
-                            @Model.ShippingAddress.Address2
+                            @Model.BillingAddress.Address2
                         </li>
                     }
-                    if (Model.ShippingAddress.CityEnabled ||
-                        Model.ShippingAddress.StateProvinceEnabled ||
-                        Model.ShippingAddress.ZipPostalCodeEnabled)
+                    @if (Model.BillingAddress.CityEnabled ||
+                         Model.BillingAddress.StateProvinceEnabled ||
+                         Model.BillingAddress.ZipPostalCodeEnabled)
                     {
                         <li class="city-state-zip">
-                            @if (Model.ShippingAddress.CityEnabled)
+                            @if (Model.BillingAddress.CityEnabled)
                             {
-                                @Model.ShippingAddress.City
+                                @Model.BillingAddress.City
                             }
-                            @if (Model.ShippingAddress.CityEnabled && (Model.ShippingAddress.StateProvinceEnabled || Model.ShippingAddress.ZipPostalCodeEnabled))
+                            @if (Model.BillingAddress.CityEnabled && (Model.BillingAddress.StateProvinceEnabled || Model.BillingAddress.ZipPostalCodeEnabled))
                             {
                                 <text>,</text>
                             }
-                            @if (Model.ShippingAddress.StateProvinceEnabled)
+                            @if (Model.BillingAddress.StateProvinceEnabled)
                             {
-                                @Model.ShippingAddress.StateProvinceName
+                                @Model.BillingAddress.StateProvinceName
                             }
-                            @if (Model.ShippingAddress.ZipPostalCodeEnabled)
+                            @if (Model.BillingAddress.ZipPostalCodeEnabled)
                             {
-                                @Model.ShippingAddress.ZipPostalCode
+                                @Model.BillingAddress.ZipPostalCode
                             }
                         </li>
                     }
-                    if (Model.ShippingAddress.CountryEnabled && !String.IsNullOrEmpty(Model.ShippingAddress.CountryName))
+                    @if (Model.BillingAddress.CountryEnabled && !String.IsNullOrEmpty(Model.BillingAddress.CountryName))
                     {
                         <li class="country">
-                            @Model.ShippingAddress.CountryName
+                            @Model.BillingAddress.CountryName
                         </li>
                     }
-                    if (!String.IsNullOrEmpty(Model.ShippingAddress.FormattedCustomAddressAttributes))
+                    @if (!String.IsNullOrEmpty(Model.BillingAddress.FormattedCustomAddressAttributes))
                     {
                         <li class="custom-attributes-view">
-                            @Html.Raw(Model.ShippingAddress.FormattedCustomAddressAttributes)
+                            @Html.Raw(Model.BillingAddress.FormattedCustomAddressAttributes)
                         </li>
                     }
-                }
-                else
-                {
-                     <li class="title">
-                        @T("Order.PickupAddress")
-                    </li>
-                    if (!string.IsNullOrEmpty(Model.PickupAddress.Address1))
+                    @if (Model.CustomValues != null)
                     {
-                        <li class="address1">
-                            @Model.PickupAddress.Address1
-                        </li>
+                        foreach (var item in Model.CustomValues)
+                        {
+                            <li class="custom-value">
+                                <span class="label">
+                                    @item.Key:
+                                </span>
+                                <span class="value">
+                                    @(item.Value != null ? item.Value.ToString() : "")
+                                </span>
+                            </li>
+                        }
                     }
-                    if (!string.IsNullOrEmpty(Model.PickupAddress.City) || !string.IsNullOrEmpty(Model.PickupAddress.ZipPostalCode))
-                    {
-                        <li class="city-state-zip">
-                            @if (!string.IsNullOrEmpty(Model.PickupAddress.City))
+                </ul>
+                @if (!String.IsNullOrEmpty(Model.PaymentMethod))
+                {
+                    <div class="side-list-wrap">
+                        <ul class="side-list">
+                            <li class="title">
+                                @T("Order.Payment")
+                            </li>
+                            <li class="payment-method">
+                                <span class="label">
+                                    @T("Order.Payment.Method"):
+                                </span>
+                                <span class="value">
+                                    @Model.PaymentMethod
+                                </span>
+                            </li>
+                        </ul>
+                    </div>
+                }
+            </div>
+        </div>
+
+        @if (Model.IsShippable)
+        {
+            <div class="shipping-info-wrap">
+                <div class="title">
+                    <strong>@(Model.SelectedPickUpInStore ? T("Order.PickupAddress") : T("Order.ShippingAddress"))</strong>
+                </div>
+                <div class="info-content">
+                    <ul class="shipping-info">
+                        @if (!Model.SelectedPickUpInStore)
+                        {
+                            <li class="name">
+                                @Model.ShippingAddress.FirstName @Model.ShippingAddress.LastName
+                            </li>
+                            <li class="email">
+                                @T("Order.Email"): @Model.ShippingAddress.Email
+                            </li>
+                            if (Model.ShippingAddress.PhoneEnabled)
                             {
-                                @Model.PickupAddress.City
+                                <li class="phone">
+                                    @T("Order.Phone"): @Model.ShippingAddress.PhoneNumber
+                                </li>
                             }
-                            @if (!string.IsNullOrEmpty(Model.PickupAddress.ZipPostalCode))
+                            if (Model.ShippingAddress.FaxEnabled)
                             {
-                                <text>,</text>
-                                @Model.PickupAddress.ZipPostalCode
+                                <li class="fax">
+                                    @T("Order.Fax"): @Model.ShippingAddress.FaxNumber
+                                </li>
                             }
-                        </li>
-                    }
-                    if (!string.IsNullOrEmpty(Model.PickupAddress.CountryName))
-                    {
-                        <li class="country">
-                            @Model.PickupAddress.CountryName
-                        </li>
-                    }
-                }
-                <li class="title">
-                    @T("Order.Shipping")
-                </li>
-                <li class="shipping-method">
-                    <span class="label">
-                        @T("Order.Shipping.Name"):
-                    </span>
-                    <span class="value">
-                        @Model.ShippingMethod
-                    </span>
-                </li>
-            </ul>
+                            if (Model.ShippingAddress.CompanyEnabled && !String.IsNullOrEmpty(Model.ShippingAddress.Company))
+                            {
+                                <li class="company">
+                                    @Model.ShippingAddress.Company
+                                </li>
+                            }
+                            if (Model.ShippingAddress.StreetAddressEnabled)
+                            {
+                                <li class="address1">
+                                    @Model.ShippingAddress.Address1
+                                </li>
+                            }
+                            if (Model.ShippingAddress.StreetAddress2Enabled && !String.IsNullOrEmpty(Model.ShippingAddress.Address2))
+                            {
+                                <li class="address2">
+                                    @Model.ShippingAddress.Address2
+                                </li>
+                            }
+                            if (Model.ShippingAddress.CityEnabled ||
+                                Model.ShippingAddress.StateProvinceEnabled ||
+                                Model.ShippingAddress.ZipPostalCodeEnabled)
+                            {
+                                <li class="city-state-zip">
+                                    @if (Model.ShippingAddress.CityEnabled)
+                                    {
+                                        @Model.ShippingAddress.City
+                                    }
+                                    @if (Model.ShippingAddress.CityEnabled && (Model.ShippingAddress.StateProvinceEnabled || Model.ShippingAddress.ZipPostalCodeEnabled))
+                                    {
+                                        <text>,</text>
+                                    }
+                                    @if (Model.ShippingAddress.StateProvinceEnabled)
+                                    {
+                                        @Model.ShippingAddress.StateProvinceName
+                                    }
+                                    @if (Model.ShippingAddress.ZipPostalCodeEnabled)
+                                    {
+                                        @Model.ShippingAddress.ZipPostalCode
+                                    }
+                                </li>
+                            }
+                            if (Model.ShippingAddress.CountryEnabled && !String.IsNullOrEmpty(Model.ShippingAddress.CountryName))
+                            {
+                                <li class="country">
+                                    @Model.ShippingAddress.CountryName
+                                </li>
+                            }
+                            if (!String.IsNullOrEmpty(Model.ShippingAddress.FormattedCustomAddressAttributes))
+                            {
+                                <li class="custom-attributes-view">
+                                    @Html.Raw(Model.ShippingAddress.FormattedCustomAddressAttributes)
+                                </li>
+                            }
+                        }
+                        else
+                        {
+                            if (!string.IsNullOrEmpty(Model.PickupAddress.Address1))
+                            {
+                                <li class="address1">
+                                    @Model.PickupAddress.Address1
+                                </li>
+                            }
+                            if (!string.IsNullOrEmpty(Model.PickupAddress.City) || !string.IsNullOrEmpty(Model.PickupAddress.ZipPostalCode))
+                            {
+                                <li class="city-state-zip">
+                                    @if (!string.IsNullOrEmpty(Model.PickupAddress.City))
+                                    {
+                                        @Model.PickupAddress.City
+                                    }
+                                    @if (!string.IsNullOrEmpty(Model.PickupAddress.ZipPostalCode))
+                                    {
+                                        <text>,</text>
+                                        @Model.PickupAddress.ZipPostalCode
+                                    }
+                                </li>
+                            }
+                            if (!string.IsNullOrEmpty(Model.PickupAddress.CountryName))
+                            {
+                                <li class="country">
+                                    @Model.PickupAddress.CountryName
+                                </li>
+                            }
+                        }
+                    </ul>
+                    <div class="side-list-wrap">
+                        <ul class="side-list">
+                            <li class="title">
+                                @T("Order.Shipping")
+                            </li>
+                            <li class="shipping-method">
+                                <span class="label">
+                                    @T("Order.Shipping.Name"):
+                                </span>
+                                <span class="value">
+                                    @Model.ShippingMethod
+                                </span>
+                            </li>
+                        </ul>
+                    </div>
+                </div>
+            </div>
         }
     </div>
 }
\ No newline at end of file