diff --git a/feature-libs/quote/assets/translations/en/quote.i18n.ts b/feature-libs/quote/assets/translations/en/quote.i18n.ts
index f7d1dada00a..29bbb354ed2 100644
--- a/feature-libs/quote/assets/translations/en/quote.i18n.ts
+++ b/feature-libs/quote/assets/translations/en/quote.i18n.ts
@@ -6,153 +6,127 @@
 
 export const quote = {
   quote: {
-    list: {
-      name: 'Name',
-      updated: 'Updated',
-      sortBy: 'Sort by',
-      sortOrders: 'Sort orders',
-      empty: 'We have no quote records for this account.',
-    },
-    states: {
-      BUYER_DRAFT: 'Draft',
-      BUYER_SUBMITTED: 'Submitted',
-      BUYER_ACCEPTED: 'Accepted',
-      BUYER_APPROVED: 'Approved',
-      BUYER_REJECTED: 'Rejected',
-      BUYER_OFFER: 'Vendor Quote',
-      BUYER_ORDERED: 'Ordered',
-      SELLER_DRAFT: 'Draft',
-      SELLER_REQUEST: 'Requested',
-      SELLER_SUBMITTED: 'Submitted',
-      SELLERAPPROVER_DRAFT: 'Draft',
-      SELLERAPPROVER_PENDING: 'Pending Approval',
-      SELLERAPPROVER_APPROVED: 'Approved',
-      SELLERAPPROVER_REJECTED: 'Rejected',
-      CREATED: 'Created',
-      CANCELLED: 'Cancelled',
-      EXPIRED: 'Expired',
-    },
     actions: {
-      VIEW: 'View Quote',
-      SUBMIT: 'Submit Quote',
-      SAVE: 'Save Quote',
-      EDIT: 'Edit Quote',
-      CANCEL: 'Cancel Quote',
-      CHECKOUT: 'Accept and Checkout',
-      APPROVE: 'Approve Quote',
-      REJECT: 'Reject Quote',
-      REQUOTE: 'Request new Quote',
-    },
-    commons: {
-      id: 'Quote ID',
-      status: 'Status',
-      creationSuccess: 'Quote #{{ code }} created successfully',
-      cart: 'Cart',
-    },
-    seller: {
-      apply: 'Apply',
-      placeholder: '0',
-      discount: 'Discount',
-      expiryDate: 'Expiry Date',
-      discountValidationText: 'Enter a valid absolute discount',
+      byRole: {
+        VIEW: 'View Quote',
+        SUBMIT: 'Submit Quote',
+        SAVE: 'Save Quote',
+        EDIT: 'Edit Quote',
+        CANCEL: 'Cancel Quote',
+        CHECKOUT: 'Accept and Checkout',
+        APPROVE: 'Approve Quote',
+        REJECT: 'Reject Quote',
+        REQUOTE: 'Request new Quote',
+      },
+      link: {
+        newCart: 'New Cart',
+        quotes: 'Quotes',
+      },
+      confirmDialog: {
+        name: 'Name:',
+        description: 'Description:',
+        validity: 'This quote is valid until {{ expirationTime }}',
+        option: { yes: 'Yes', no: 'No' },
+        buyer: {
+          submit: {
+            title: 'Submit Quote Request {{ code }}?',
+            confirmNote: 'Are you sure you want to submit this quote request?',
+            successMessage: 'Quote request submitted successfully',
+          },
+          cancel: {
+            title: 'Cancel Quote Request {{ code }}?',
+            confirmNote: 'Are you sure you want to cancel this quote request',
+            successMessage: 'Quote request cancelled',
+          },
+        },
+        buyer_offer: {
+          edit: {
+            title: 'Confirm Edit Quote {{ code }}?',
+            confirmNote: 'Are you sure you want to edit this approved quote?',
+            warningNote:
+              'This Quote has been Approved. Editing this Quote will prevent Checkout until new edits are approved.',
+          },
+          cancel: {
+            title: 'Cancel Quote {{ code }}?',
+            confirmNote: 'Are you sure you want to cancel this quote?',
+            successMessage: 'Quote cancelled',
+          },
+          checkout: {
+            title: 'Checkout Quote {{ code }}?',
+            confirmNote:
+              'Are you sure you want to accept and checkout this quote?',
+          },
+        },
+        expired: {
+          edit: {
+            title: 'Confirm Edit Quote {{ code }}?',
+            confirmNote: 'Are you sure you want to edit this expired quote?',
+            warningNote:
+              'This Quote is expired. Editing this quote will prevent checkout until new edits are approved.',
+          },
+          requote: {
+            title: 'Recreate Quote Request {{ code }}?',
+            confirmNote:
+              'Are you sure you want to recreate this quote request?',
+            warningNote:
+              'This Quote is expired. Re-quoting it will create a new quote request with same contents, which can be edited and submitted for approval afterwards.',
+          },
+        },
+        seller: {
+          submit: {
+            title: 'Submit Quote {{ code }}?',
+            confirmNote: 'Are you sure you want to submit this quote?',
+            warningNote:
+              'Depending on the total value of the quote, an additional approval might be required before the buyer can check out this quote.',
+            successMessage: 'Quote submitted successfully',
+          },
+        },
+        approver: {
+          approve: {
+            title: 'Approve Quote {{ code }}?',
+            confirmNote: 'Are you sure you want to approve this quote?',
+            successMessage: 'Quote approved successfully',
+          },
+          reject: {
+            title: 'Reject Quote {{ code }}?',
+            confirmNote: 'Are you sure you want to reject this quote?',
+            successMessage: 'Quote rejected',
+          },
+        },
+      },
     },
     comments: {
       title: 'Contact',
       invalidComment: 'Invalid Input - Please type again...',
       allProducts: 'All Products',
     },
-    details: {
-      information: 'Quote Information',
-      code: 'Quote ID',
-      name: 'Name',
-      created: 'Created',
-      lastUpdated: 'Last Updated',
-      estimatedTotal: 'Estimated Total',
-      total: 'Total',
-      description: 'Description',
-      estimateAndDate: 'Estimated & Date',
-      update: 'Update',
-      expirationTime: 'Expiry Date',
-      charactersLeft: 'characters left: {{count}}',
-    },
-    links: {
-      newCart: 'New Cart',
-      quotes: 'Quotes',
-    },
-    request: {
+    commons: {
+      requestQuote: 'Request Quote',
+      cart: 'Cart',
       minRequestInitiationNote:
         'Minimum ${{minValue}} subtotal is required to submit a quote ',
-      requestQuote: 'Request Quote',
     },
-    confirmActionDialog: {
-      name: 'Name:',
-      description: 'Description:',
-      validity: 'This quote is valid until {{ expirationTime }}',
-      confirmActionOption: { yes: 'Yes', no: 'No' },
-      buyer: {
-        submit: {
-          title: 'Submit Quote Request {{ code }}?',
-          confirmNote: 'Are you sure you want to submit this quote request?',
-          successMessage: 'Quote request submitted successfully',
-        },
-        cancel: {
-          title: 'Cancel Quote Request {{ code }}?',
-          confirmNote: 'Are you sure you want to cancel this quote request',
-          successMessage: 'Quote request cancelled',
-        },
+    header: {
+      overview: {
+        id: 'Quote ID',
+        status: 'Status',
+        information: 'Quote Information',
+        name: 'Name',
+        created: 'Created',
+        lastUpdated: 'Last Updated',
+        estimatedTotal: 'Estimated Total',
+        total: 'Total',
+        description: 'Description',
+        estimateAndDate: 'Estimated & Date',
+        update: 'Update',
+        expirationTime: 'Expiry Date',
+        charactersLeft: 'characters left: {{count}}',
       },
-      buyer_offer: {
-        edit: {
-          title: 'Confirm Edit Quote {{ code }}?',
-          confirmNote: 'Are you sure you want to edit this approved quote?',
-          warningNote:
-            'This Quote has been Approved. Editing this Quote will prevent Checkout until new edits are approved.',
-        },
-        cancel: {
-          title: 'Cancel Quote {{ code }}?',
-          confirmNote: 'Are you sure you want to cancel this quote?',
-          successMessage: 'Quote cancelled',
-        },
-        checkout: {
-          title: 'Checkout Quote {{ code }}?',
-          confirmNote:
-            'Are you sure you want to accept and checkout this quote?',
-        },
-      },
-      expired: {
-        edit: {
-          title: 'Confirm Edit Quote {{ code }}?',
-          confirmNote: 'Are you sure you want to edit this expired quote?',
-          warningNote:
-            'This Quote is expired. Editing this quote will prevent checkout until new edits are approved.',
-        },
-        requote: {
-          title: 'Recreate Quote Request {{ code }}?',
-          confirmNote: 'Are you sure you want to recreate this quote request?',
-          warningNote:
-            'This Quote is expired. Re-quoting it will create a new quote request with same contents, which can be edited and submitted for approval afterwards.',
-        },
-      },
-      seller: {
-        submit: {
-          title: 'Submit Quote {{ code }}?',
-          confirmNote: 'Are you sure you want to submit this quote?',
-          warningNote:
-            'Depending on the total value of the quote, an additional approval might be required before the buyer can check out this quote.',
-          successMessage: 'Quote submitted successfully',
-        },
-      },
-      approver: {
-        approve: {
-          title: 'Approve Quote {{ code }}?',
-          confirmNote: 'Are you sure you want to approve this quote?',
-          successMessage: 'Quote approved successfully',
-        },
-        reject: {
-          title: 'Reject Quote {{ code }}?',
-          confirmNote: 'Are you sure you want to reject this quote?',
-          successMessage: 'Quote rejected',
-        },
+      sellerEdit: {
+        apply: 'Apply',
+        discount: 'Discount',
+        expiryDate: 'Expiry Date',
+        discountValidationText: 'Enter a valid absolute discount',
       },
     },
     httpHandlers: {
@@ -170,5 +144,31 @@ export const quote = {
       expired:
         'This quote has expired. You must resubmit your quote request to receive another vendor quote.',
     },
+    list: {
+      name: 'Name',
+      updated: 'Updated',
+      sortBy: 'Sort by',
+      sortOrders: 'Sort orders',
+      empty: 'We have no quote records for this account.',
+    },
+    states: {
+      BUYER_DRAFT: 'Draft',
+      BUYER_SUBMITTED: 'Submitted',
+      BUYER_ACCEPTED: 'Accepted',
+      BUYER_APPROVED: 'Approved',
+      BUYER_REJECTED: 'Rejected',
+      BUYER_OFFER: 'Vendor Quote',
+      BUYER_ORDERED: 'Ordered',
+      SELLER_DRAFT: 'Draft',
+      SELLER_REQUEST: 'Requested',
+      SELLER_SUBMITTED: 'Submitted',
+      SELLERAPPROVER_DRAFT: 'Draft',
+      SELLERAPPROVER_PENDING: 'Pending Approval',
+      SELLERAPPROVER_APPROVED: 'Approved',
+      SELLERAPPROVER_REJECTED: 'Rejected',
+      CREATED: 'Created',
+      CANCELLED: 'Cancelled',
+      EXPIRED: 'Expired',
+    },
   },
 };
diff --git a/feature-libs/quote/components/actions/by-role/quote-actions-by-role.component.html b/feature-libs/quote/components/actions/by-role/quote-actions-by-role.component.html
index 8f82597cb5c..7039404a6b8 100644
--- a/feature-libs/quote/components/actions/by-role/quote-actions-by-role.component.html
+++ b/feature-libs/quote/components/actions/by-role/quote-actions-by-role.component.html
@@ -9,7 +9,7 @@
       [disabled]="mustDisableAction(action.type, quoteDetails)"
       (click)="onClick(action.type, quoteDetails)"
     >
-      {{ 'quote.actions.' + action.type | cxTranslate }}
+      {{ 'quote.actions.byRole.' + action.type | cxTranslate }}
     </button>
   </section>
 </ng-container>
diff --git a/feature-libs/quote/components/actions/by-role/quote-actions-by-role.component.spec.ts b/feature-libs/quote/components/actions/by-role/quote-actions-by-role.component.spec.ts
index c4b0533d2ff..adc783bfb0b 100644
--- a/feature-libs/quote/components/actions/by-role/quote-actions-by-role.component.spec.ts
+++ b/feature-libs/quote/components/actions/by-role/quote-actions-by-role.component.spec.ts
@@ -50,7 +50,7 @@ const mockQuote: Quote = {
 const testMappings: ConfirmActionDialogMappingConfig = {
   BUYER_OFFER: {
     EDIT: {
-      i18nKey: 'quote.confirmActionDialog.buyer_offer.edit',
+      i18nKey: 'quote.actions.confirmDialog.buyer_offer.edit',
       showWarningNote: true,
       showExpirationDate: true,
       showSuccessMessage: false,
@@ -58,7 +58,7 @@ const testMappings: ConfirmActionDialogMappingConfig = {
   },
   BUYER: {
     SUBMIT: {
-      i18nKey: 'quote.confirmActionDialog.buyer.submit',
+      i18nKey: 'quote.actions.confirmDialog.buyer.submit',
       showWarningNote: false,
       showExpirationDate: false,
       showSuccessMessage: true,
@@ -66,7 +66,7 @@ const testMappings: ConfirmActionDialogMappingConfig = {
   },
   EXPIRED: {
     REQUOTE: {
-      i18nKey: 'quote.confirmActionDialog.expired.requote',
+      i18nKey: 'quote.actions.confirmDialog.expired.requote',
       showWarningNote: true,
       showExpirationDate: false,
       showSuccessMessage: false,
@@ -201,9 +201,9 @@ describe('QuoteActionsByRoleComponent', () => {
     };
     const confirmationContextForSubmitAction: ConfirmationContext = {
       quote: quoteForSubmitAction,
-      title: 'quote.confirmActionDialog.buyer.submit.title',
-      confirmNote: 'quote.confirmActionDialog.buyer.submit.confirmNote',
-      successMessage: 'quote.confirmActionDialog.buyer.submit.successMessage',
+      title: 'quote.actions.confirmDialog.buyer.submit.title',
+      confirmNote: 'quote.actions.confirmDialog.buyer.submit.confirmNote',
+      successMessage: 'quote.actions.confirmDialog.buyer.submit.successMessage',
     };
     mockQuoteDetails$.next(quoteForSubmitAction);
     fixture.detectChanges();
@@ -229,10 +229,10 @@ describe('QuoteActionsByRoleComponent', () => {
     };
     const confirmationContextForEditAction: ConfirmationContext = {
       quote: quoteInBuyerOfferState,
-      title: 'quote.confirmActionDialog.buyer_offer.edit.title',
-      confirmNote: 'quote.confirmActionDialog.buyer_offer.edit.confirmNote',
-      warningNote: 'quote.confirmActionDialog.buyer_offer.edit.warningNote',
-      validity: 'quote.confirmActionDialog.validity',
+      title: 'quote.actions.confirmDialog.buyer_offer.edit.title',
+      confirmNote: 'quote.actions.confirmDialog.buyer_offer.edit.confirmNote',
+      warningNote: 'quote.actions.confirmDialog.buyer_offer.edit.warningNote',
+      validity: 'quote.actions.confirmDialog.validity',
     };
     mockQuoteDetails$.next(quoteInBuyerOfferState);
     fixture.detectChanges();
@@ -271,9 +271,9 @@ describe('QuoteActionsByRoleComponent', () => {
     };
     const confirmationContextForRequoteAction: ConfirmationContext = {
       quote: expiredQuote,
-      title: 'quote.confirmActionDialog.expired.requote.title',
-      confirmNote: 'quote.confirmActionDialog.expired.requote.confirmNote',
-      warningNote: 'quote.confirmActionDialog.expired.requote.warningNote',
+      title: 'quote.actions.confirmDialog.expired.requote.title',
+      confirmNote: 'quote.actions.confirmDialog.expired.requote.confirmNote',
+      warningNote: 'quote.actions.confirmDialog.expired.requote.warningNote',
     };
     mockQuoteDetails$.next(expiredQuote);
     fixture.detectChanges();
@@ -473,7 +473,7 @@ describe('QuoteActionsByRoleComponent', () => {
           QuoteState.BUYER_OFFER
         )
       ).toEqual({
-        i18nKey: 'quote.confirmActionDialog.buyer_offer.edit',
+        i18nKey: 'quote.actions.confirmDialog.buyer_offer.edit',
         showWarningNote: true,
         showExpirationDate: true,
         showSuccessMessage: false,
diff --git a/feature-libs/quote/components/actions/by-role/quote-actions-by-role.component.ts b/feature-libs/quote/components/actions/by-role/quote-actions-by-role.component.ts
index dd44b00a551..ed078e13e72 100644
--- a/feature-libs/quote/components/actions/by-role/quote-actions-by-role.component.ts
+++ b/feature-libs/quote/components/actions/by-role/quote-actions-by-role.component.ts
@@ -58,7 +58,7 @@ export class QuoteActionsByRoleComponent implements OnInit, OnDestroy {
       if (mustDisableAction) {
         this.globalMessageService.add(
           {
-            key: 'quote.request.minRequestInitiationNote',
+            key: 'quote.commons.minRequestInitiationNote',
             params: {
               minValue: quote.threshold,
             },
@@ -181,7 +181,7 @@ export class QuoteActionsByRoleComponent implements OnInit, OnDestroy {
       confirmationContext.warningNote = dialogConfig.i18nKey + '.warningNote';
     }
     if (dialogConfig.showExpirationDate) {
-      confirmationContext.validity = 'quote.confirmActionDialog.validity';
+      confirmationContext.validity = 'quote.actions.confirmDialog.validity';
     }
     if (dialogConfig.showSuccessMessage) {
       confirmationContext.successMessage =
diff --git a/feature-libs/quote/components/actions/confirm-dialog/quote-actions-confirm-dialog.component.html b/feature-libs/quote/components/actions/confirm-dialog/quote-actions-confirm-dialog.component.html
index e98f2a24c3b..411671c7076 100644
--- a/feature-libs/quote/components/actions/confirm-dialog/quote-actions-confirm-dialog.component.html
+++ b/feature-libs/quote/components/actions/confirm-dialog/quote-actions-confirm-dialog.component.html
@@ -33,7 +33,7 @@
       <div class="cx-content-container">
         <div class="cx-name">
           <div class="cx-heading">
-            {{ 'quote.confirmActionDialog.name' | cxTranslate }}
+            {{ 'quote.actions.confirmDialog.name' | cxTranslate }}
           </div>
           <div class="cx-content">
             {{ confirmationContext.quote.name }}
@@ -44,7 +44,7 @@
           *ngIf="confirmationContext.quote.description"
         >
           <div class="cx-heading">
-            {{ 'quote.confirmActionDialog.description' | cxTranslate }}
+            {{ 'quote.actions.confirmDialog.description' | cxTranslate }}
           </div>
           <div class="cx-content">
             {{ confirmationContext.quote.description }}
@@ -76,12 +76,10 @@
       </div>
       <div class="cx-buttons-container">
         <button class="btn btn-secondary" (click)="dismissModal('no')">
-          {{ 'quote.confirmActionDialog.confirmActionOption.no' | cxTranslate }}
+          {{ 'quote.actions.confirmDialog.option.no' | cxTranslate }}
         </button>
         <button class="btn btn-primary" (click)="dismissModal('yes')">
-          {{
-            'quote.confirmActionDialog.confirmActionOption.yes' | cxTranslate
-          }}
+          {{ 'quote.actions.confirmDialog.option.yes' | cxTranslate }}
         </button>
       </div>
     </div>
diff --git a/feature-libs/quote/components/actions/link/quote-actions-link.component.html b/feature-libs/quote/components/actions/link/quote-actions-link.component.html
index 2b0e1a6585e..956ff6dc244 100644
--- a/feature-libs/quote/components/actions/link/quote-actions-link.component.html
+++ b/feature-libs/quote/components/actions/link/quote-actions-link.component.html
@@ -3,7 +3,7 @@
     <ul>
       <li>
         <button (click)="goToNewCart()" class="link cx-action-link">
-          {{ 'quote.links.newCart' | cxTranslate }}
+          {{ 'quote.actions.link.newCart' | cxTranslate }}
         </button>
       </li>
       <li>
@@ -11,7 +11,7 @@
           [routerLink]="{ cxRoute: 'quotes' } | cxUrl"
           class="link cx-action-link"
         >
-          {{ 'quote.links.quotes' | cxTranslate }}
+          {{ 'quote.actions.link.quotes' | cxTranslate }}
         </button>
       </li>
     </ul>
diff --git a/feature-libs/quote/components/actions/link/quote-actions-link.component.spec.ts b/feature-libs/quote/components/actions/link/quote-actions-link.component.spec.ts
index 6591ff59a09..fb713eba35a 100644
--- a/feature-libs/quote/components/actions/link/quote-actions-link.component.spec.ts
+++ b/feature-libs/quote/components/actions/link/quote-actions-link.component.spec.ts
@@ -123,7 +123,7 @@ describe('QuoteActionsLinkComponent', () => {
       expect,
       htmlElem,
       'button.link',
-      'quote.links.newCart',
+      'quote.actions.link.newCart',
       0
     );
 
@@ -131,7 +131,7 @@ describe('QuoteActionsLinkComponent', () => {
       expect,
       htmlElem,
       'button.link',
-      'quote.links.quotes',
+      'quote.actions.link.quotes',
       1
     );
   });
diff --git a/feature-libs/quote/components/config/default-quote-ui.config.ts b/feature-libs/quote/components/config/default-quote-ui.config.ts
index 6b04036c3ec..6038b50a621 100644
--- a/feature-libs/quote/components/config/default-quote-ui.config.ts
+++ b/feature-libs/quote/components/config/default-quote-ui.config.ts
@@ -21,30 +21,30 @@ const defaultConfirmActionDialogConfig = {
 const defaultDialogMappings: ConfirmActionDialogMappingConfig = {
   BUYER_OFFER: {
     EDIT: {
-      i18nKey: 'quote.confirmActionDialog.buyer_offer.edit',
+      i18nKey: 'quote.actions.confirmDialog.buyer_offer.edit',
       showWarningNote: true,
       showExpirationDate: true,
       showSuccessMessage: false,
     },
     CANCEL: {
-      i18nKey: 'quote.confirmActionDialog.buyer_offer.cancel',
+      i18nKey: 'quote.actions.confirmDialog.buyer_offer.cancel',
       ...defaultConfirmActionDialogConfig,
     },
     CHECKOUT: {
-      i18nKey: 'quote.confirmActionDialog.buyer_offer.checkout',
+      i18nKey: 'quote.actions.confirmDialog.buyer_offer.checkout',
       ...defaultConfirmActionDialogConfig,
       showSuccessMessage: false,
     },
   },
   EXPIRED: {
     EDIT: {
-      i18nKey: 'quote.confirmActionDialog.expired.edit',
+      i18nKey: 'quote.actions.confirmDialog.expired.edit',
       showWarningNote: true,
       showExpirationDate: false,
       showSuccessMessage: false,
     },
     REQUOTE: {
-      i18nKey: 'quote.confirmActionDialog.expired.requote',
+      i18nKey: 'quote.actions.confirmDialog.expired.requote',
       showWarningNote: true,
       showExpirationDate: false,
       showSuccessMessage: false,
@@ -52,28 +52,28 @@ const defaultDialogMappings: ConfirmActionDialogMappingConfig = {
   },
   BUYER: {
     SUBMIT: {
-      i18nKey: 'quote.confirmActionDialog.buyer.submit',
+      i18nKey: 'quote.actions.confirmDialog.buyer.submit',
       ...defaultConfirmActionDialogConfig,
     },
     CANCEL: {
-      i18nKey: 'quote.confirmActionDialog.buyer.cancel',
+      i18nKey: 'quote.actions.confirmDialog.buyer.cancel',
       ...defaultConfirmActionDialogConfig,
     },
   },
   SELLER: {
     SUBMIT: {
-      i18nKey: 'quote.confirmActionDialog.seller.submit',
+      i18nKey: 'quote.actions.confirmDialog.seller.submit',
       ...defaultConfirmActionDialogConfig,
       showWarningNote: true,
     },
   },
   SELLERAPPROVER: {
     SUBMIT: {
-      i18nKey: 'quote.confirmActionDialog.sellerapprover.submit',
+      i18nKey: 'quote.actions.confirmDialog.sellerapprover.submit',
       ...defaultConfirmActionDialogConfig,
     },
     REJECT: {
-      i18nKey: 'quote.confirmActionDialog.sellerapprover.reject',
+      i18nKey: 'quote.actions.confirmDialog.sellerapprover.reject',
       ...defaultConfirmActionDialogConfig,
     },
   },
diff --git a/feature-libs/quote/components/header/buyer-edit/quote-header-buyer-edit.component.html b/feature-libs/quote/components/header/buyer-edit/quote-header-buyer-edit.component.html
index c1e21779e60..cdcdd7e6c43 100644
--- a/feature-libs/quote/components/header/buyer-edit/quote-header-buyer-edit.component.html
+++ b/feature-libs/quote/components/header/buyer-edit/quote-header-buyer-edit.component.html
@@ -3,7 +3,7 @@
   <div class="card-body cx-card-body cx-card-edit">
     <!-- Card title -->
     <span class="cx-card-title">
-      {{ 'quote.details.information' | cxTranslate }}
+      {{ 'quote.header.overview.information' | cxTranslate }}
     </span>
     <!-- Card Content -->
     <div class="cx-card-container">
@@ -12,7 +12,7 @@
         <form [formGroup]="editForm">
           <div class="cx-card-paragraph">
             <div class="cx-card-paragraph-title">
-              {{ 'quote.details.name' | cxTranslate }}
+              {{ 'quote.header.overview.name' | cxTranslate }}
             </div>
             <div class="form-group">
               <input
@@ -36,7 +36,7 @@
           </div>
           <div class="cx-card-paragraph">
             <div class="cx-card-paragraph-title">
-              {{ 'quote.details.description' | cxTranslate }}
+              {{ 'quote.header.overview.description' | cxTranslate }}
             </div>
             <div class="form-group">
               <textarea
@@ -80,7 +80,7 @@
 >
   <p *ngIf="charactersLimit" class="cx-info-text">
     {{
-      'quote.details.charactersLeft'
+      'quote.header.overview.charactersLeft'
         | cxTranslate
           : {
               count: getCharactersLeft(formControlName, charactersLimit)
diff --git a/feature-libs/quote/components/header/buyer-edit/quote-header-buyer-edit.component.spec.ts b/feature-libs/quote/components/header/buyer-edit/quote-header-buyer-edit.component.spec.ts
index 52085cd8fd9..5cf9276b43b 100644
--- a/feature-libs/quote/components/header/buyer-edit/quote-header-buyer-edit.component.spec.ts
+++ b/feature-libs/quote/components/header/buyer-edit/quote-header-buyer-edit.component.spec.ts
@@ -65,7 +65,7 @@ describe('QuoteHeaderBuyerEditComponent', () => {
       expect,
       htmlElem,
       '.cx-card-title',
-      'quote.details.information'
+      'quote.header.overview.information'
     );
 
     CommonQuoteTestUtilsService.expectElementPresent(
@@ -119,7 +119,7 @@ describe('QuoteHeaderBuyerEditComponent', () => {
       expect,
       htmlElem,
       '.cx-card-paragraph-title',
-      'quote.details.description',
+      'quote.header.overview.description',
       1
     );
 
@@ -127,7 +127,7 @@ describe('QuoteHeaderBuyerEditComponent', () => {
       expect,
       htmlElem,
       '.cx-info-text',
-      'quote.details.charactersLeft count:245',
+      'quote.header.overview.charactersLeft count:245',
       0
     );
 
@@ -135,7 +135,7 @@ describe('QuoteHeaderBuyerEditComponent', () => {
       expect,
       htmlElem,
       '.cx-info-text',
-      'quote.details.charactersLeft count:194',
+      'quote.header.overview.charactersLeft count:194',
       1
     );
 
diff --git a/feature-libs/quote/components/header/overview/quote-header-overview.component.html b/feature-libs/quote/components/header/overview/quote-header-overview.component.html
index 0424097992b..79932722048 100644
--- a/feature-libs/quote/components/header/overview/quote-header-overview.component.html
+++ b/feature-libs/quote/components/header/overview/quote-header-overview.component.html
@@ -1,11 +1,11 @@
 <ng-container *ngIf="quoteDetails$ | async as quoteDetails; else ghostDetails">
   <div class="cx-header-container">
     <h3 class="cx-header">
-      {{ 'quote.commons.id' | cxTranslate }}:
+      {{ 'quote.header.overview.id' | cxTranslate }}:
       {{ quoteDetails.code }}
     </h3>
     <h3 class="cx-status">
-      {{ 'quote.commons.status' | cxTranslate }}:
+      {{ 'quote.header.overview.status' | cxTranslate }}:
       {{ 'quote.states.' + quoteDetails.state | cxTranslate }}
     </h3>
   </div>
diff --git a/feature-libs/quote/components/header/overview/quote-header-overview.component.spec.ts b/feature-libs/quote/components/header/overview/quote-header-overview.component.spec.ts
index e57bfd5c567..a33bb04e44a 100644
--- a/feature-libs/quote/components/header/overview/quote-header-overview.component.spec.ts
+++ b/feature-libs/quote/components/header/overview/quote-header-overview.component.spec.ts
@@ -161,14 +161,14 @@ describe('QuoteHeaderOverviewComponent', () => {
         expect,
         htmlElem,
         '.cx-header',
-        'quote.commons.id: ' + mockQuote.code
+        'quote.header.overview.id: ' + mockQuote.code
       );
 
       CommonQuoteTestUtilsService.expectElementToContainText(
         expect,
         htmlElem,
         '.cx-status',
-        'quote.commons.status: quote.states.' + mockQuote.state
+        'quote.header.overview.status: quote.states.' + mockQuote.state
       );
 
       CommonQuoteTestUtilsService.expectElementPresent(
@@ -369,14 +369,14 @@ describe('QuoteHeaderOverviewComponent', () => {
       fixture.detectChanges();
 
       const expected = {
-        title: 'quote.details.information',
+        title: 'quote.header.overview.information',
         paragraphs: [
           {
-            title: 'quote.details.name',
+            title: 'quote.header.overview.name',
             text: ['-'],
           },
           {
-            title: 'quote.details.description',
+            title: 'quote.header.overview.description',
             text: ['-'],
           },
         ],
@@ -407,14 +407,14 @@ describe('QuoteHeaderOverviewComponent', () => {
       fixture.detectChanges();
 
       const expected = {
-        title: 'quote.details.estimateAndDate',
+        title: 'quote.header.overview.estimateAndDate',
         paragraphs: [
           {
-            title: 'quote.details.estimatedTotal',
+            title: 'quote.header.overview.estimatedTotal',
             text: [mockQuote.totalPrice.formattedValue],
           },
           {
-            title: 'quote.details.created',
+            title: 'quote.header.overview.created',
             text: ['-'],
           },
         ],
@@ -433,14 +433,14 @@ describe('QuoteHeaderOverviewComponent', () => {
       fixture.detectChanges();
 
       const expected = {
-        title: 'quote.details.update',
+        title: 'quote.header.overview.update',
         paragraphs: [
           {
-            title: 'quote.details.lastUpdated',
+            title: 'quote.header.overview.lastUpdated',
             text: ['-'],
           },
           {
-            title: 'quote.details.expirationTime',
+            title: 'quote.header.overview.expirationTime',
             text: ['-'],
           },
         ],
@@ -487,7 +487,7 @@ describe('QuoteHeaderOverviewComponent', () => {
   describe('getTotalPriceDescription', () => {
     it('should name total price as estimated as long as final status not reached', () => {
       expect(component['getTotalPriceDescription'](mockQuote)).toBe(
-        'quote.details.estimatedTotal'
+        'quote.header.overview.estimatedTotal'
       );
     });
 
@@ -497,14 +497,14 @@ describe('QuoteHeaderOverviewComponent', () => {
         allowedActions: [{ type: QuoteActionType.CHECKOUT, isPrimary: true }],
       };
       expect(component['getTotalPriceDescription'](quoteInOfferState)).toBe(
-        'quote.details.total'
+        'quote.header.overview.total'
       );
     });
 
     it('should be able to deal with empty actions', () => {
       const quoteWoActions: Quote = { ...mockQuote, allowedActions: [] };
       expect(component['getTotalPriceDescription'](quoteWoActions)).toBe(
-        'quote.details.estimatedTotal'
+        'quote.header.overview.estimatedTotal'
       );
     });
   });
diff --git a/feature-libs/quote/components/header/overview/quote-header-overview.component.ts b/feature-libs/quote/components/header/overview/quote-header-overview.component.ts
index 997f3f836c4..ab59bb9034a 100644
--- a/feature-libs/quote/components/header/overview/quote-header-overview.component.ts
+++ b/feature-libs/quote/components/header/overview/quote-header-overview.component.ts
@@ -110,9 +110,9 @@ export class QuoteHeaderOverviewComponent {
    */
   getQuoteInformation(name?: string, description?: string): Observable<Card> {
     return combineLatest([
-      this.translationService.translate('quote.details.information'),
-      this.translationService.translate('quote.details.name'),
-      this.translationService.translate('quote.details.description'),
+      this.translationService.translate('quote.header.overview.information'),
+      this.translationService.translate('quote.header.overview.name'),
+      this.translationService.translate('quote.header.overview.description'),
     ]).pipe(
       map(([infoTitle, nameTitle, descriptionTitle]) => {
         return {
@@ -161,9 +161,11 @@ export class QuoteHeaderOverviewComponent {
     const totalPrice =
       this.getTotalPrice(quote) ?? this.getTotalPriceDescription(quote);
     return combineLatest([
-      this.translationService.translate('quote.details.estimateAndDate'),
-      this.translationService.translate('quote.details.estimatedTotal'),
-      this.translationService.translate('quote.details.created'),
+      this.translationService.translate(
+        'quote.header.overview.estimateAndDate'
+      ),
+      this.translationService.translate('quote.header.overview.estimatedTotal'),
+      this.translationService.translate('quote.header.overview.created'),
     ]).pipe(
       map(([firstTitle, secondTitle, thirdTitle]) => {
         return {
@@ -195,9 +197,9 @@ export class QuoteHeaderOverviewComponent {
     expirationTime?: string | null
   ): Observable<Card> {
     return combineLatest([
-      this.translationService.translate('quote.details.update'),
-      this.translationService.translate('quote.details.lastUpdated'),
-      this.translationService.translate('quote.details.expirationTime'),
+      this.translationService.translate('quote.header.overview.update'),
+      this.translationService.translate('quote.header.overview.lastUpdated'),
+      this.translationService.translate('quote.header.overview.expirationTime'),
     ]).pipe(
       map(([firstTitle, secondTitle, thirdTitle]) => {
         return {
@@ -251,7 +253,7 @@ export class QuoteHeaderOverviewComponent {
       (action: QuoteAction) => action.type === QuoteActionType.CHECKOUT
     );
     return readyToSubmit
-      ? 'quote.details.total'
-      : 'quote.details.estimatedTotal';
+      ? 'quote.header.overview.total'
+      : 'quote.header.overview.estimatedTotal';
   }
 }
diff --git a/feature-libs/quote/components/header/seller-edit/quote-header-seller-edit.component.html b/feature-libs/quote/components/header/seller-edit/quote-header-seller-edit.component.html
index ea64f2df1e6..5cc02809912 100644
--- a/feature-libs/quote/components/header/seller-edit/quote-header-seller-edit.component.html
+++ b/feature-libs/quote/components/header/seller-edit/quote-header-seller-edit.component.html
@@ -3,7 +3,7 @@
     <form (ngSubmit)="onApply(quoteDetails.code)" [formGroup]="form">
       <label>
         <span class="label-content bold">{{
-          'quote.seller.discount' | cxTranslate
+          'quote.header.sellerEdit.discount' | cxTranslate
         }}</span>
         <div class="cx-discount-input">
           <input
@@ -17,7 +17,7 @@
             class="btn btn-block btn-secondary"
             (click)="onApply(quoteDetails.code)"
           >
-            {{ 'quote.seller.apply' | cxTranslate }}
+            {{ 'quote.header.sellerEdit.apply' | cxTranslate }}
           </button>
         </div>
 
@@ -29,13 +29,13 @@
           role="alert"
         >
           <cx-icon [type]="iconType.ERROR"></cx-icon>
-          {{ 'quote.seller.discountValidationText' | cxTranslate }}
+          {{ 'quote.header.sellerEdit.discountValidationText' | cxTranslate }}
         </div>
       </label>
 
       <label>
         <span class="label-content bold">{{
-          'quote.seller.expiryDate' | cxTranslate
+          'quote.header.sellerEdit.expiryDate' | cxTranslate
         }}</span>
         <cx-date-picker
           [control]="$any(form.get('validityDate'))"
diff --git a/feature-libs/quote/components/list/quote-list.component.html b/feature-libs/quote/components/list/quote-list.component.html
index c4ac360b713..87016f63ed5 100644
--- a/feature-libs/quote/components/list/quote-list.component.html
+++ b/feature-libs/quote/components/list/quote-list.component.html
@@ -34,10 +34,10 @@
               {{ 'quote.list.name' | cxTranslate }}
             </th>
             <th role="columnheader">
-              {{ 'quote.commons.id' | cxTranslate }}
+              {{ 'quote.header.overview.id' | cxTranslate }}
             </th>
             <th role="columnheader">
-              {{ 'quote.commons.status' | cxTranslate }}
+              {{ 'quote.header.overview.status' | cxTranslate }}
             </th>
             <th role="columnheader">
               {{ 'quote.list.updated' | cxTranslate }}
@@ -67,13 +67,13 @@
             </td>
             <td role="cell" class="cx-code">
               <div class="cx-mobile-header">
-                {{ 'quote.commons.id' | cxTranslate }}
+                {{ 'quote.header.overview.id' | cxTranslate }}
               </div>
               {{ quote.code }}
             </td>
             <td role="cell" class="cx-status">
               <div class="cx-mobile-header">
-                {{ 'quote.commons.status' | cxTranslate }}
+                {{ 'quote.header.overview.status' | cxTranslate }}
               </div>
               <span [ngClass]="getQuoteStateClass(quote.state)">{{
                 'quote.states.' + quote.state | cxTranslate
diff --git a/feature-libs/quote/components/request-button/quote-request-button.component.html b/feature-libs/quote/components/request-button/quote-request-button.component.html
index 159c42249f0..06d70a3204f 100644
--- a/feature-libs/quote/components/request-button/quote-request-button.component.html
+++ b/feature-libs/quote/components/request-button/quote-request-button.component.html
@@ -4,5 +4,5 @@
   type="button"
   class="btn btn-block btn-secondary"
 >
-  {{ 'quote.request.requestQuote' | cxTranslate }}
+  {{ 'quote.commons.requestQuote' | cxTranslate }}
 </button>