diff --git a/src/app/features/dvnt-account/config/account.config.ts b/src/app/features/dvnt-account/config/account.config.ts
index e861ce2..5bdc696 100644
--- a/src/app/features/dvnt-account/config/account.config.ts
+++ b/src/app/features/dvnt-account/config/account.config.ts
@@ -5,6 +5,7 @@ import {
 } from '@spartacus/core';
 import { LayoutConfig } from '@spartacus/storefront';
 
+import { DvntAddressBookComponent } from '../dvnt-address-book/dvnt-address-book.component';
 import { DvntConsentManagementComponent } from '../dvnt-consent-management/dvnt-consent-management.component';
 import { DvntForgotPasswordComponent } from '../dvnt-forgot-password/dvnt-forgot-password.component';
 import { DvntLoginCustomerComponent } from '../dvnt-login-customer/dvnt-login-customer.component';
@@ -36,6 +37,9 @@ export const accountCmsConfig = <CmsConfig>{
     ConsentManagementComponent: {
       component: DvntConsentManagementComponent,
     },
+    AccountAddressBookComponent: {
+      component: DvntAddressBookComponent,
+    },
   },
 };
 
@@ -67,6 +71,11 @@ export const staticComponents: {
     flexType: 'DvntConsentManagementComponent',
     uid: 'DvntConsentManagementComponent',
   },
+  DvntAddressBookComponent: {
+    typeCode: 'DvntAddressBookComponent',
+    flexType: 'DvntAddressBookComponent',
+    uid: 'DvntAddressBookComponent',
+  },
 };
 
 export function cmsStructureConfig(): CmsStructureConfig {
@@ -87,6 +96,14 @@ const accountTranslationOverwrites = {
           'I want to create an account and I am confirming that I have read and agreed with the',
       },
     },
+    address: {
+      addressBook: {
+        header: {
+          manage: `Manage all the shipping addresses you want (work place, home address ...)`,
+          manually: `This way you won't have to enter the shipping address manually with each order.`,
+        },
+      },
+    },
   },
 };
 
diff --git a/src/app/features/dvnt-account/dvnt-account.module.ts b/src/app/features/dvnt-account/dvnt-account.module.ts
index d6eccfa..00e76b6 100644
--- a/src/app/features/dvnt-account/dvnt-account.module.ts
+++ b/src/app/features/dvnt-account/dvnt-account.module.ts
@@ -12,6 +12,7 @@ import {
   accountTranslationsConfig,
   cmsStructureConfig,
 } from './config/account.config';
+import { DvntAddressBookComponent } from './dvnt-address-book/dvnt-address-book.component';
 import { DvntConsentFormComponent } from './dvnt-consent-management/dvnt-consent-form/dvnt-consent-form.component';
 import { DvntConsentManagementComponent } from './dvnt-consent-management/dvnt-consent-management.component';
 import { DvntForgotPasswordComponent } from './dvnt-forgot-password/dvnt-forgot-password.component';
@@ -23,6 +24,7 @@ import { DvntSharedModule } from '../dvnt-shared/dvnt-shared.module';
 
 @NgModule({
   declarations: [
+    DvntAddressBookComponent,
     DvntConsentFormComponent,
     DvntConsentManagementComponent,
     DvntForgotPasswordComponent,
@@ -47,6 +49,7 @@ import { DvntSharedModule } from '../dvnt-shared/dvnt-shared.module';
     ConfigModule.withConfig(accountLayoutConfig),
   ],
   entryComponents: [
+    DvntAddressBookComponent,
     DvntConsentManagementComponent,
     DvntForgotPasswordComponent,
     DvntLoginCustomerComponent,
diff --git a/src/app/features/dvnt-account/dvnt-address-book/dvnt-address-book.component.html b/src/app/features/dvnt-account/dvnt-address-book/dvnt-address-book.component.html
new file mode 100644
index 0000000..db3de0a
--- /dev/null
+++ b/src/app/features/dvnt-account/dvnt-address-book/dvnt-address-book.component.html
@@ -0,0 +1,64 @@
+<div>
+  <p
+    *ngIf="!(showAddAddressForm || showEditAddressForm)"
+    class="address-book-header-label"
+  >
+    {{ 'addressBook.header.manage' | cxTranslate }}
+    {{ 'addressBook.header.manually' | cxTranslate }}
+  </p>
+
+  <ng-container
+    *ngIf="
+      (addresses$ | async).length &&
+      !(showAddAddressForm || showEditAddressForm)
+    "
+  >
+    <div *ngIf="!(addressesStateLoading$ | async); else loading">
+      <div *ngFor="let address of addresses$ | async">
+        <app-dvnt-address-card
+          (editEvent)="editAddressButtonHandle(address)"
+          [address]="address"
+        ></app-dvnt-address-card>
+      </div>
+    </div>
+
+    <div class="add-new-address">
+      <button (click)="addAddressButtonHandle()" class="btn btn-primary">
+        {{ 'addressBook.addNewAddress' | cxTranslate }}
+      </button>
+    </div>
+  </ng-container>
+
+  <ng-container *ngIf="!(addresses$ | async).length || showAddAddressForm">
+    <p class="address-book-header-label">
+      {{ 'addressBook.addNewShippingAddress' | cxTranslate }}
+    </p>
+    <app-dvnt-address-form
+      (backToAddress)="addAddressCancel()"
+      (submitAddress)="addAddressSubmit($event)"
+      [setAsDefaultField]="!((addresses$ | async).length === 0)"
+      [showCancelBtn]="!((addresses$ | async).length === 0)"
+      actionBtnLabel="{{ 'addressBook.addAddress' | cxTranslate }}"
+      cancelBtnLabel="{{ 'addressBook.backToAddressList' | cxTranslate }}"
+      showTitleCode="true"
+    ></app-dvnt-address-form>
+  </ng-container>
+
+  <ng-container *ngIf="showEditAddressForm">
+    <p class="address-book-header-label">
+      {{ 'addressBook.editShippingAddress' | cxTranslate }}
+    </p>
+    <app-dvnt-address-form
+      (backToAddress)="editAddressCancel()"
+      (submitAddress)="editAddressSubmit($event)"
+      [addressData]="currentAddress"
+      actionBtnLabel="{{ 'addressBook.updateAddress' | cxTranslate }}"
+      cancelBtnLabel="{{ 'addressBook.backToAddressList' | cxTranslate }}"
+      showTitleCode="true"
+    ></app-dvnt-address-form>
+  </ng-container>
+</div>
+
+<ng-template #loading>
+  <cx-spinner></cx-spinner>
+</ng-template>
diff --git a/src/app/features/dvnt-account/dvnt-address-book/dvnt-address-book.component.scss b/src/app/features/dvnt-account/dvnt-address-book/dvnt-address-book.component.scss
new file mode 100644
index 0000000..8d650da
--- /dev/null
+++ b/src/app/features/dvnt-account/dvnt-address-book/dvnt-address-book.component.scss
@@ -0,0 +1,9 @@
+.address-book-header-label {
+  border-bottom: 1px solid var(--ssf-light-primary);
+  margin: 0 0 40px;
+  padding: 0 0 20px;
+}
+
+.add-new-address {
+  margin-top: 40px;
+}
diff --git a/src/app/features/dvnt-account/dvnt-address-book/dvnt-address-book.component.ts b/src/app/features/dvnt-account/dvnt-address-book/dvnt-address-book.component.ts
new file mode 100644
index 0000000..cd42c49
--- /dev/null
+++ b/src/app/features/dvnt-account/dvnt-address-book/dvnt-address-book.component.ts
@@ -0,0 +1,9 @@
+import { Component } from '@angular/core';
+import { AddressBookComponent } from '@spartacus/storefront';
+
+@Component({
+  selector: 'app-dvnt-address-book',
+  templateUrl: './dvnt-address-book.component.html',
+  styleUrls: ['./dvnt-address-book.component.scss'],
+})
+export class DvntAddressBookComponent extends AddressBookComponent {}
diff --git a/src/app/features/dvnt-checkout/dvnt-checkout.module.ts b/src/app/features/dvnt-checkout/dvnt-checkout.module.ts
index 8b06d5a..e832ae6 100644
--- a/src/app/features/dvnt-checkout/dvnt-checkout.module.ts
+++ b/src/app/features/dvnt-checkout/dvnt-checkout.module.ts
@@ -1,17 +1,7 @@
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
-import { DvntShippingAddressComponent } from './dvnt-shipping/dvnt-shipping-address.component';
 import { ConfigModule, FeaturesConfigModule } from '@spartacus/core';
-import { DvntCheckoutProgressComponent } from './dvnt-checkout-progress/dvnt-checkout-progress.component';
-import {
-  checkoutCmsConfig,
-  checkoutLayoutConfig,
-  checkoutTranslationsConfig,
-  staticCmsConfigFactory,
-} from './config/checkout.config';
-import { SharedModule } from '../../shared/shared.module';
 import {
-  AddressFormModule,
   CardModule,
   CartCouponModule,
   CartSharedModule,
@@ -19,13 +9,23 @@ import {
   PromotionsModule,
   SpinnerModule,
 } from '@spartacus/storefront';
-import { DvntSharedModule } from '../dvnt-shared/dvnt-shared.module';
+
+import {
+  checkoutCmsConfig,
+  checkoutLayoutConfig,
+  checkoutTranslationsConfig,
+  staticCmsConfigFactory,
+} from './config/checkout.config';
+import { CheckoutReviewPageLayoutHandler } from './CheckoutReviewPageLayoutHandler';
 import { DvntCheckoutOrderSummaryComponent } from './dvnt-order-summary/dvnt-checkout-order-summary.component';
+import { DvntCheckoutProgressComponent } from './dvnt-checkout-progress/dvnt-checkout-progress.component';
 import { DvntDeliveryModeComponent } from './dvnt-delivery-mode/dvnt-delivery-mode.component';
-import { DvntPaymentMethodModule } from './dvnt-payment-method/dvnt-payment-method.module';
-import { DvntOrderReviewModule } from './dvnt-order-review/dvnt-order-review.module';
 import { DvntOrderConfirmationModule } from './dvnt-order-confirmation/dvnt-order-confirmation.module';
-import { CheckoutReviewPageLayoutHandler } from './CheckoutReviewPageLayoutHandler';
+import { DvntOrderReviewModule } from './dvnt-order-review/dvnt-order-review.module';
+import { DvntPaymentMethodModule } from './dvnt-payment-method/dvnt-payment-method.module';
+import { DvntSharedModule } from '../dvnt-shared/dvnt-shared.module';
+import { DvntShippingAddressComponent } from './dvnt-shipping/dvnt-shipping-address.component';
+import { SharedModule } from '../../shared/shared.module';
 
 @NgModule({
   declarations: [
@@ -37,21 +37,20 @@ import { CheckoutReviewPageLayoutHandler } from './CheckoutReviewPageLayoutHandl
   imports: [
     CommonModule,
     SharedModule,
-    ConfigModule.withConfig(checkoutTranslationsConfig),
-    ConfigModule.withConfig(checkoutCmsConfig),
-    ConfigModule.withConfig(checkoutLayoutConfig),
-    ConfigModule.withConfigFactory(staticCmsConfigFactory),
     CardModule,
-    AddressFormModule,
-    SpinnerModule,
-    DvntSharedModule,
     CartCouponModule,
-    FeaturesConfigModule,
     CartSharedModule,
+    FeaturesConfigModule,
+    SpinnerModule,
     PromotionsModule,
-    DvntPaymentMethodModule,
-    DvntOrderReviewModule,
     DvntOrderConfirmationModule,
+    DvntOrderReviewModule,
+    DvntPaymentMethodModule,
+    DvntSharedModule,
+    ConfigModule.withConfig(checkoutTranslationsConfig),
+    ConfigModule.withConfig(checkoutCmsConfig),
+    ConfigModule.withConfig(checkoutLayoutConfig),
+    ConfigModule.withConfigFactory(staticCmsConfigFactory),
   ],
   providers: [
     {
diff --git a/src/app/features/dvnt-checkout/dvnt-shipping/dvnt-shipping-address.component.html b/src/app/features/dvnt-checkout/dvnt-shipping/dvnt-shipping-address.component.html
index cdce4b4..56ebb6a 100644
--- a/src/app/features/dvnt-checkout/dvnt-shipping/dvnt-shipping-address.component.html
+++ b/src/app/features/dvnt-checkout/dvnt-shipping/dvnt-shipping-address.component.html
@@ -21,10 +21,10 @@ <h2 class="checkout-step-header">
           >
             <div (click)="selectAddress(card.address)">
               <app-dvnt-card
-                color="secondary"
-                [fitToContainer]="true"
-                [content]="card.card"
                 (sendCard)="selectAddress(card.address)"
+                [content]="card.card"
+                [fitToContainer]="true"
+                color="secondary"
               ></app-dvnt-card>
             </div>
           </div>
@@ -42,12 +42,12 @@ <h2 class="checkout-step-header">
           {{ 'checkout.backToCart' | cxTranslate }}
         </button>
         <button
-          class="btn btn-primary"
+          (click)="next()"
           [disabled]="
             (!selectedAddress || !selectedAddress.id) &&
             !(selectedAddress$ | async)?.shippingAddress
           "
-          (click)="next()"
+          class="btn btn-primary"
         >
           {{ 'common.continue' | cxTranslate }}
         </button>
@@ -56,21 +56,21 @@ <h2 class="checkout-step-header">
 
     <ng-template #newAddressForm>
       <ng-container *ngIf="cards.length; else initialAddressForm">
-        <cx-address-form
-          [showTitleCode]="true"
+        <app-dvnt-address-form
           (backToAddress)="hideNewAddressForm(false)"
           (submitAddress)="addAddress($event)"
-        ></cx-address-form>
+          [showTitleCode]="true"
+        ></app-dvnt-address-form>
       </ng-container>
       <ng-template #initialAddressForm>
-        <cx-address-form
-          [showTitleCode]="true"
-          [setAsDefaultField]="!isGuestCheckout"
-          [addressData]="setAddress"
-          cancelBtnLabel="{{ 'checkout.backToCart' | cxTranslate }}"
+        <app-dvnt-address-form
           (backToAddress)="hideNewAddressForm(true)"
           (submitAddress)="addAddress($event)"
-        ></cx-address-form>
+          [addressData]="setAddress"
+          [setAsDefaultField]="!isGuestCheckout"
+          [showTitleCode]="true"
+          cancelBtnLabel="{{ 'checkout.backToCart' | cxTranslate }}"
+        ></app-dvnt-address-form>
       </ng-template>
     </ng-template>
   </ng-container>
diff --git a/src/app/features/dvnt-shared/components/dvnt-address-card/dvnt-address-card.component.html b/src/app/features/dvnt-shared/components/dvnt-address-card/dvnt-address-card.component.html
new file mode 100644
index 0000000..16e2234
--- /dev/null
+++ b/src/app/features/dvnt-shared/components/dvnt-address-card/dvnt-address-card.component.html
@@ -0,0 +1,60 @@
+<div class="address-card-container">
+  <div class="left-container">
+    <p class="address-card-label-name">
+      {{ address?.firstName }} {{ address?.lastName }}
+    </p>
+    <p class="address-card-label">
+      {{ address?.line1 }}
+    </p>
+    <p class="address-card-label">
+      {{ address?.line2 }}
+    </p>
+    <p class="address-card-label">
+      {{ address?.town }},
+      <span *ngIf="!address?.region?.isocode">{{
+        address?.country?.isocode
+      }}</span
+      ><span>{{ address?.region?.isocode }}</span>
+    </p>
+    <p class="address-card-label">
+      {{ address?.postalCode }}
+    </p>
+    <p class="address-card-label-phone">
+      {{ address?.phone }}
+    </p>
+  </div>
+
+  <div [ngClass]="{ 'align-center': editMode }" class="right-container">
+    <ng-container *ngIf="editMode">
+      <span>
+        {{ 'addressBook.areYouSureToDeleteAddress' | cxTranslate }}
+      </span>
+
+      <div class="address-card-action-buttons">
+        <button (click)="deleteAddress(address.id)" class="btn btn-primary">
+          {{ 'common.delete' | cxTranslate }}
+        </button>
+        <button (click)="cancelEdit()" class="btn btn-secondary">
+          {{ 'common.cancel' | cxTranslate }}
+        </button>
+      </div>
+    </ng-container>
+    <ng-container *ngIf="!editMode">
+      <button
+        *ngIf="!address?.defaultAddress"
+        (click)="setAddressAsDefault(address.id)"
+        class="btn btn-outline address-card-set-default-button"
+      >
+        {{ 'addressCard.setAsDefault' | cxTranslate }}
+      </button>
+      <div class="address-card-action-buttons">
+        <button (click)="openEditFormEvent(address.id)" class="btn btn-primary">
+          {{ 'common.edit' | cxTranslate }}
+        </button>
+        <button (click)="setEditMode(address.id)" class="btn btn-clear">
+          {{ 'common.delete' | cxTranslate }}
+        </button>
+      </div>
+    </ng-container>
+  </div>
+</div>
diff --git a/src/app/features/dvnt-shared/components/dvnt-address-card/dvnt-address-card.component.scss b/src/app/features/dvnt-shared/components/dvnt-address-card/dvnt-address-card.component.scss
new file mode 100644
index 0000000..5af0b35
--- /dev/null
+++ b/src/app/features/dvnt-shared/components/dvnt-address-card/dvnt-address-card.component.scss
@@ -0,0 +1,51 @@
+.address-card-container {
+  align-items: center;
+  border-bottom: 1px solid var(--ssf-light-primary);
+  display: flex;
+  justify-content: space-between;
+  padding: 20px 0;
+
+  .column {
+    display: flex;
+    flex-direction: column;
+  }
+
+  .left-container {
+    @extend .column;
+
+    .address-card-label {
+      margin: 0;
+    }
+
+    .address-card-label-name {
+      @extend .address-card-label;
+
+      font-weight: bold;
+    }
+
+    .address-card-label-phone {
+      @extend .address-card-label;
+
+      margin-top: 20px;
+    }
+  }
+
+  .right-container {
+    @extend .column;
+
+    .address-card-action-buttons {
+      display: flex;
+      margin-top: 20px;
+
+      button {
+        &:last-of-type {
+          margin-left: 20px;
+        }
+      }
+    }
+  }
+
+  .align-center {
+    align-items: center;
+  }
+}
diff --git a/src/app/features/dvnt-shared/components/dvnt-address-card/dvnt-address-card.component.ts b/src/app/features/dvnt-shared/components/dvnt-address-card/dvnt-address-card.component.ts
new file mode 100644
index 0000000..eb673a1
--- /dev/null
+++ b/src/app/features/dvnt-shared/components/dvnt-address-card/dvnt-address-card.component.ts
@@ -0,0 +1,9 @@
+import { Component } from '@angular/core';
+import { AddressCardComponent } from '@spartacus/storefront';
+
+@Component({
+  selector: 'app-dvnt-address-card',
+  templateUrl: './dvnt-address-card.component.html',
+  styleUrls: ['./dvnt-address-card.component.scss'],
+})
+export class DvntAddressCardComponent extends AddressCardComponent {}
diff --git a/src/app/features/dvnt-shared/components/dvnt-address-form/dvnt-address-form.component.html b/src/app/features/dvnt-shared/components/dvnt-address-form/dvnt-address-form.component.html
new file mode 100644
index 0000000..5c7f84f
--- /dev/null
+++ b/src/app/features/dvnt-shared/components/dvnt-address-form/dvnt-address-form.component.html
@@ -0,0 +1,213 @@
+<div [formGroup]="address">
+  <div class="row">
+    <div class="form-group col-sm-12 col-md-12" *ngIf="showTitleCode">
+      <ng-container *ngIf="titles$ | async as titles">
+        <div *ngIf="titles.length !== 0">
+          <label aria-required="true">
+            <span class="label-content required">{{
+              'addressForm.title' | cxTranslate
+            }}</span>
+            <ng-select
+              (change)="titleSelected($event)"
+              [clearable]="false"
+              [items]="titles"
+              [searchable]="false"
+              bindLabel="name"
+              bindValue="code"
+              formControlName="titleCode"
+            >
+            </ng-select>
+          </label>
+        </div>
+      </ng-container>
+    </div>
+
+    <div class="form-group col-sm-12 col-md-6">
+      <label>
+        <span class="label-content required">{{
+          'addressForm.firstName.label' | cxTranslate
+        }}</span>
+        <input
+          class="form-control"
+          formControlName="firstName"
+          placeholder="{{ 'addressForm.firstName.placeholder' | cxTranslate }}"
+          required
+          type="text"
+        />
+      </label>
+    </div>
+
+    <div class="form-group col-sm-12 col-md-6">
+      <label>
+        <span class="label-content required">{{
+          'addressForm.lastName.label' | cxTranslate
+        }}</span>
+        <input
+          class="form-control"
+          formControlName="lastName"
+          placeholder="{{ 'addressForm.lastName.placeholder' | cxTranslate }}"
+          required
+          type="text"
+        />
+      </label>
+    </div>
+
+    <div class="form-group col-sm-12 col-md-6">
+      <label>
+        <span class="label-content required">{{
+          'addressForm.address1' | cxTranslate
+        }}</span>
+        <input
+          class="form-control"
+          formControlName="line1"
+          placeholder="{{ 'addressForm.streetAddress' | cxTranslate }}"
+          required
+          type="text"
+        />
+      </label>
+    </div>
+
+    <div class="form-group col-sm-12 col-md-6">
+      <label>
+        <span class="label-content">{{
+          'addressForm.address2' | cxTranslate
+        }}</span>
+        <input
+          class="form-control"
+          formControlName="line2"
+          placeholder="{{ 'addressForm.aptSuite' | cxTranslate }}"
+          type="text"
+        />
+      </label>
+    </div>
+
+    <div class="form-group col-sm-12 col-md-6">
+      <label>
+        <span class="label-content required">{{
+          'addressForm.city.label' | cxTranslate
+        }}</span>
+        <input
+          class="form-control"
+          formControlName="town"
+          placeholder="{{ 'addressForm.city.placeholder' | cxTranslate }}"
+          required
+          type="text"
+        />
+      </label>
+    </div>
+
+    <ng-container *ngIf="regions$ | async as regions">
+      <div
+        *ngIf="regions.length !== 0"
+        class="form-group col-sm-12 col-md-6"
+        formGroupName="region"
+      >
+        <label aria-required="true">
+          <span class="label-content required">{{
+            'addressForm.state' | cxTranslate
+          }}</span>
+          <ng-select
+            (change)="regionSelected($event)"
+            [clearable]="false"
+            [items]="regions"
+            [searchable]="true"
+            bindLabel="{{ regions[0].name ? 'name' : 'isocode' }}"
+            bindValue="{{ regions[0].name ? 'isocode' : 'region' }}"
+            class="region-select"
+            formControlName="isocode"
+            placeholder="{{ 'addressForm.selectOne' | cxTranslate }}"
+          >
+          </ng-select>
+        </label>
+      </div>
+    </ng-container>
+
+    <div class="form-group col-sm-12 col-md-6">
+      <label>
+        <span class="label-content required">{{
+          'addressForm.zipCode.label' | cxTranslate
+        }}</span>
+        <input
+          class="form-control"
+          formControlName="postalCode"
+          placeholder="{{ 'addressForm.zipCode.placeholder' | cxTranslate }}"
+          required
+          type="text"
+        />
+      </label>
+    </div>
+
+    <div class="form-group col-sm-12 col-md-6" formGroupName="country">
+      <ng-container *ngIf="countries$ | async as countries">
+        <div *ngIf="countries.length !== 0">
+          <label aria-required="true">
+            <span class="label-content required">{{
+              'addressForm.country' | cxTranslate
+            }}</span>
+            <ng-select
+              (change)="countrySelected($event)"
+              [clearable]="false"
+              [items]="countries"
+              [searchable]="true"
+              bindLabel="name"
+              bindValue="isocode"
+              class="country-select"
+              formControlName="isocode"
+              placeholder="{{ 'addressForm.selectOne' | cxTranslate }}"
+            >
+            </ng-select>
+          </label>
+        </div>
+      </ng-container>
+    </div>
+
+    <div class="form-group col-sm-12 col-md-6">
+      <label>
+        <span class="label-content">{{
+          'addressForm.phoneNumber.label' | cxTranslate
+        }}</span>
+        <input
+          class="form-control"
+          formControlName="phone"
+          placeholder="{{
+            'addressForm.phoneNumber.placeholder' | cxTranslate
+          }}"
+          type="text"
+        />
+      </label>
+    </div>
+
+    <div class="form-group col-sm-12 col-md-6" *ngIf="setAsDefaultField">
+      <div class="form-check">
+        <label>
+          <input
+            (change)="toggleDefaultAddress()"
+            class="form-check-input"
+            formControlName="defaultAddress"
+            type="checkbox"
+          />
+          <span class="form-check-label">{{
+            'addressForm.setAsDefault' | cxTranslate
+          }}</span>
+        </label>
+      </div>
+    </div>
+  </div>
+
+  <div class="address-form-action-buttons row">
+    <div *ngIf="showCancelBtn" class="col-sm-12 col-md-6">
+      <button (click)="back()" class="btn btn-block btn-secondary">
+        {{ cancelBtnLabel || ('addressForm.chooseAddress' | cxTranslate) }}
+      </button>
+    </div>
+    <div class="col-sm-12 col-md-6">
+      <button
+        (click)="verifyAddress()"
+        [disabled]="address.invalid"
+        class="btn btn-block btn-primary"
+      >
+        {{ actionBtnLabel || ('common.continue' | cxTranslate) }}
+      </button>
+    </div>
+  </div>
+</div>
diff --git a/src/app/features/dvnt-shared/components/dvnt-address-form/dvnt-address-form.component.scss b/src/app/features/dvnt-shared/components/dvnt-address-form/dvnt-address-form.component.scss
new file mode 100644
index 0000000..e69de29
diff --git a/src/app/features/dvnt-shared/components/dvnt-address-form/dvnt-address-form.component.ts b/src/app/features/dvnt-shared/components/dvnt-address-form/dvnt-address-form.component.ts
new file mode 100644
index 0000000..98318b7
--- /dev/null
+++ b/src/app/features/dvnt-shared/components/dvnt-address-form/dvnt-address-form.component.ts
@@ -0,0 +1,9 @@
+import { Component } from '@angular/core';
+import { AddressFormComponent } from '@spartacus/storefront';
+
+@Component({
+  selector: 'app-dvnt-address-form',
+  templateUrl: './dvnt-address-form.component.html',
+  styleUrls: ['./dvnt-address-form.component.scss'],
+})
+export class DvntAddressFormComponent extends AddressFormComponent {}
diff --git a/src/app/features/dvnt-shared/dvnt-shared.module.ts b/src/app/features/dvnt-shared/dvnt-shared.module.ts
index cbc3b14..d55a1bd 100644
--- a/src/app/features/dvnt-shared/dvnt-shared.module.ts
+++ b/src/app/features/dvnt-shared/dvnt-shared.module.ts
@@ -14,10 +14,12 @@ import {
   ItemCounterModule,
 } from '@spartacus/storefront';
 
+import { NgSelectModule } from '@ng-select/ng-select';
 import { SwiperModule } from 'ngx-swiper-wrapper';
 import { SWIPER_CONFIG } from 'ngx-swiper-wrapper';
 import { SwiperConfigInterface } from 'ngx-swiper-wrapper';
 
+import { DvntAddressCardComponent } from './components/dvnt-address-card/dvnt-address-card.component';
 import { DvntAppliedCouponsComponent } from './components/dvnt-applied-coupons/dvnt-applied-coupons.component';
 import { DvntCardComponent } from './components/dvnt-card/dvnt-card.component';
 import { DvntCarouselProductsComponent } from './components/dvnt-carousel-products/dvnt-carousel-products.component';
@@ -31,6 +33,7 @@ import { DvntIconComponent } from './components/dvnt-icon/dvnt-icon.component';
 import { DvntPaginationComponent } from './components/dvnt-pagination/dvnt-pagination.component';
 import { SharedModule } from '../../shared/shared.module';
 import { sharedTranslationsConfig } from './config/shared.config';
+import { DvntAddressFormComponent } from './components/dvnt-address-form/dvnt-address-form.component';
 
 const DEFAULT_SWIPER_CONFIG: SwiperConfigInterface = {
   a11y: true,
@@ -42,6 +45,8 @@ const DEFAULT_SWIPER_CONFIG: SwiperConfigInterface = {
 
 @NgModule({
   declarations: [
+    DvntAddressCardComponent,
+    DvntAddressFormComponent,
     DvntAppliedCouponsComponent,
     DvntCardComponent,
     DvntCarouselProductsComponent,
@@ -66,9 +71,12 @@ const DEFAULT_SWIPER_CONFIG: SwiperConfigInterface = {
     SharedModule,
     FeaturesConfigModule,
     ItemCounterModule,
+    NgSelectModule,
     ConfigModule.withConfig(sharedTranslationsConfig),
   ],
   exports: [
+    DvntAddressCardComponent,
+    DvntAddressFormComponent,
     DvntAppliedCouponsComponent,
     DvntCardComponent,
     DvntCarouselProductsComponent,
diff --git a/src/styles/base/_buttons.scss b/src/styles/base/_buttons.scss
index f9ec377..afd5bc9 100644
--- a/src/styles/base/_buttons.scss
+++ b/src/styles/base/_buttons.scss
@@ -116,7 +116,7 @@
     }
 
     &:hover {
-      color: var(--ssf-dark-primary-lighten);
+      color: var(--ssf-color-primary);
     }
   }
 }