MAGETWO-63037: Additional Address Entries are aligned wrong on storefront

app/design/frontend/Magento/blank/Magento_Customer/web/css/source/_module.less

@@ -492,15 +492,23 @@
     .block-addresses-list {
         .items.addresses {
             &:extend(.abs-add-clearfix-desktop all);
+            font-size: 0;
 
             > .item {
-                &:extend(.abs-blocks-2columns all);
+                display: inline-block;
+                font-size: @font-size__base;
                 margin-bottom: @indent__base;
+                vertical-align: top;
+                width: 48.8%;
 
                 &:nth-last-child(1),
                 &:nth-last-child(2) {
                     margin-bottom: 0;
                 }
+
+                &:nth-child(even) {
+                    margin-left: 2.4%;
+                }
             }
         }
     }

app/design/frontend/Magento/luma/Magento_Customer/web/css/source/_module.less

@@ -106,6 +106,8 @@
 
     .box-billing-address,
     .box-shipping-address,
+    .box-address-billing,
+    .box-address-shipping,
     .box-information,
     .box-newsletter {
         .box-content {
@@ -437,15 +439,23 @@
     .block-addresses-list {
         .items.addresses {
             &:extend(.abs-add-clearfix-desktop all);
+            font-size: 0;
 
             > .item {
-                &:extend(.abs-blocks-2columns all);
+                display: inline-block;
+                font-size: @font-size__base;
                 margin-bottom: @indent__base;
+                vertical-align: top;
+                width: 48%;
 
                 &:nth-last-child(1),
                 &:nth-last-child(2) {
                     margin-bottom: 0;
                 }
+
+                &:nth-child(even) {
+                    margin-left: 4%;
+                }
             }
         }
 
@@ -479,6 +489,8 @@
 
     .box-billing-address,
     .box-shipping-address,
+    .box-address-billing,
+    .box-address-shipping,
     .box-information {
         .box-content {
             &:extend(.abs-account-block-font-size all);