diff --git a/src/app/core/config/i18n/el.ts b/src/app/core/config/i18n/el.ts
index 1bf7c1a0..0e3253f4 100644
--- a/src/app/core/config/i18n/el.ts
+++ b/src/app/core/config/i18n/el.ts
@@ -956,10 +956,10 @@ export const locale = {
       ERROR_EARN_TOKENS: '',
       ERROR_REDEEM_TOKENS: '',
 
-      NOT_ENOUGH_POINTS: 'Είναι αδύνατο να προχωρήσετε <br> Δεν υπάρχουν αρκετοι Πόντοι',
-      NOT_ENOUGH_TOKENS: 'Είναι αδύνατο να προχωρήσετε <br> Δεν υπάρχουν αρκετα Κουπόνια',
+      NOT_ENOUGH_POINTS: 'Είναι αδύνατο να προχωρήσετε <br> Δεν υπάρχουν αρκετοί Πόντοι',
+      NOT_ENOUGH_TOKENS: 'Είναι αδύνατο να προχωρήσετε <br> Δεν υπάρχουν αρκετά Κουπόνια',
 
-      NEW_EMAIL: 'Ένα νέο email ανιχνεύδηκε',
+      NEW_EMAIL: 'Ένα νέο email ανιχνεύθηκε',
       NEW_CARD: 'Μια νέα κάρτα ανιχεύθηκε<br>Εισάγεται μια ήδη καταχωρημένη διεύθυνση ηλεκτρονικού ταχυδρομείο για να γίνει η σύνδεση! Αν δεν υπάρχει, εισάγεται μια νέα διεύθυνση ηλεκτρονικου ταχυδρομείου για να γίνει εγγραφή! Αλλιώς, προχωρήστε στη δημιουργία λογαριασμού μόνο με τη χρήση κάρτας',
       EXISTING_CARD: 'Μια καταχωρημένη κάρτα ανιχνέυθηκε<br>Εισάγεται διεύθυνση ηλεκτρονικού ταχυδρομείου για σύνδεση ή προχωρήστε',
 
diff --git a/src/app/partner-menu/partner-loyalty/edit-offer/edit-offer.component.html b/src/app/partner-menu/partner-loyalty/edit-offer/edit-offer.component.html
index 261ff74f..ece71993 100644
--- a/src/app/partner-menu/partner-loyalty/edit-offer/edit-offer.component.html
+++ b/src/app/partner-menu/partner-loyalty/edit-offer/edit-offer.component.html
@@ -62,16 +62,13 @@ <h1 class="heading col-md-12">{{'OFFER.EDIT' | translate}}: {{title}}</h1>
             </div>
             <!--end::Form Group "Description"-->
 
-          </div>
-          <div class="col-md-6">
-
             <!--begin::Form Group "Instructions"-->
             <div class="form-group">
               <mat-form-field>
                 <mat-label>{{'FIELDS.OFFER.INSTRUCTIONS.TITLE' | translate}}</mat-label>
                 <textarea class="short" matInput type="text" name="Instructions" formControlName="instructions"
                   placeholder="{{'FIELDS.OFFER.INSTRUCTIONS.PLACEHOLDER' | translate}}">
-                            </textarea>
+                                        </textarea>
                 <mat-error *ngIf="isControlHasError('instructions','required')" class="error text-danger">
                   {{ 'FORM.VALIDATION.REQUIRED_FIELD' | translate }}
                 </mat-error>
@@ -88,6 +85,9 @@ <h1 class="heading col-md-12">{{'OFFER.EDIT' | translate}}: {{title}}</h1>
             </div>
             <!--end::Form Group "Instructions"-->
 
+          </div>
+          <div class="col-md-6">
+
             <!--begin::Form Group "Subtitle"-->
             <div class="form-group">
               <mat-form-field>
@@ -206,12 +206,12 @@ <h4 class="modal-title">{{'OFFER.DELETE' | translate}}</h4>
     {{'OFFER.DELETE_CONFIRM' | translate}} '{{title}}'?
   </div>
   <div class="modal-footer">
-    <button mat-raised-button class="btn btn-secondary mr-3"
-      (click)="deleteItem();c('Close click'); ">{{'OFFER.DELETE' | translate}}
+    <button mat-raised-button class="btn btn-secondary mr-3" (click)="deleteItem();c('Close click'); ">{{'OFFER.DELETE'
+      | translate}}
     </button>
     <button mat-raised-button class="btn" (click)="c('Close click');">
       {{'OFFER.CANCEL' | translate}}
     </button>
   </div>
 </ng-template>
-<!--end::Confirmation Modal (Remove Item)-->
+<!--end::Confirmation Modal (Remove Item)-->
\ No newline at end of file
diff --git a/src/app/partner-menu/partner-loyalty/new-offer/new-offer.component.html b/src/app/partner-menu/partner-loyalty/new-offer/new-offer.component.html
index cae51e61..77f41b32 100644
--- a/src/app/partner-menu/partner-loyalty/new-offer/new-offer.component.html
+++ b/src/app/partner-menu/partner-loyalty/new-offer/new-offer.component.html
@@ -57,16 +57,13 @@
             </div>
             <!--end::Form Group "Description"-->
 
-          </div>
-          <div class="col-md-6">
-
             <!--begin::Form Group "Instructions"-->
             <div class="form-group">
               <mat-form-field>
                 <mat-label>{{'FIELDS.OFFER.INSTRUCTIONS.TITLE' | translate}}</mat-label>
                 <textarea class="short" matInput type="text" name="Instructions" formControlName="instructions"
                   placeholder="{{'FIELDS.OFFER.INSTRUCTIONS.PLACEHOLDER' | translate}}">
-                </textarea>
+                            </textarea>
                 <mat-error *ngIf="isControlHasError('instructions','required')" class="error text-danger">
                   {{ 'FORM.VALIDATION.REQUIRED_FIELD' | translate }}
                 </mat-error>
@@ -83,6 +80,9 @@
             </div>
             <!--end::Form Group "Instructions"-->
 
+          </div>
+          <div class="col-md-6">
+
             <!--begin::Form Group "Subtitle"-->
             <div class="form-group">
               <mat-form-field>
@@ -181,4 +181,4 @@
 
     </mat-card-content>
   </mat-card>
-</div>
+</div>
\ No newline at end of file
diff --git a/src/app/stepper-partner-loyalty_offer/sub-offer-form/sub-offer-form.component.html b/src/app/stepper-partner-loyalty_offer/sub-offer-form/sub-offer-form.component.html
index a9c370e2..57b80452 100644
--- a/src/app/stepper-partner-loyalty_offer/sub-offer-form/sub-offer-form.component.html
+++ b/src/app/stepper-partner-loyalty_offer/sub-offer-form/sub-offer-form.component.html
@@ -41,10 +41,10 @@ <h6 class="stepper-label">{{ 'PARTNER.WIZARD.SUB_OFFER_FORM.FORM_TITLE' | transl
             {{ 'FORM.VALIDATION.REQUIRED_FIELD' | translate }}
           </span>
           <span *ngIf="isControlHasError('quantity','min')" class="error text-danger">
-            {{ 'FORM.VALIDATION.MIN_VALUE_FIELD' | translate }}: {{ '1' }}
+            {{ 'FORM.VALIDATION.MIN_VALUE_FIELD' | translate }} {{ '1' }}
           </span>
           <span *ngIf="isControlHasError('quantity','max')" class="error text-danger">
-            {{ 'FORM.VALIDATION.MAX_VALUE_FIELD' | translate }}: {{ transaction.possible_quantity }}
+            {{ 'FORM.VALIDATION.MAX_VALUE_FIELD' | translate }} {{ transaction.possible_quantity }}
           </span>
           <span class="form-text text-muted">
             {{ 'PARTNER.WIZARD.SUB_OFFER_FORM.FORM_HINT' | translate }}
@@ -68,4 +68,4 @@ <h6 class="stepper-label">{{ 'PARTNER.WIZARD.SUB_OFFER_FORM.FORM_TITLE' | transl
     <!--end::Wizard Buttons-->
 
   </div>
-</div>
+</div>
\ No newline at end of file
diff --git a/src/app/stepper-partner-microcredit_campaign/sub-microcredit-form/sub-microcredit-form.component.html b/src/app/stepper-partner-microcredit_campaign/sub-microcredit-form/sub-microcredit-form.component.html
index d758ff6e..7b915657 100644
--- a/src/app/stepper-partner-microcredit_campaign/sub-microcredit-form/sub-microcredit-form.component.html
+++ b/src/app/stepper-partner-microcredit_campaign/sub-microcredit-form/sub-microcredit-form.component.html
@@ -15,100 +15,101 @@ <h4 class="heading">{{ 'PARTNER.WIZARD.SUB_MICROCREDIT_FORM.SUB_HEADING' | trans
         [value]='item.support_id' name="item.support_id" [checked]="isRadioButtonChecked(item)"
         [disabled]="isRadioButtonDisable(item)" (click)="onRadioButtonChange(item)">
         {{item.payment_id}}
-        <span *ngIf="item.redeemedTokens === item.initialTokens"><i>(Completed)</i></span>
-        <span *ngIf="item.status === 'order'"><i>(Unpaid)</i></span>
+        <span *ngIf="item.status === 'completed'"><i>({{'SUPPORT.STATUS.COMPLETED' | translate}})</i></span>
+        <span *ngIf="item.status === 'unpaid'"><i>({{'SUPPORT.STATUS.PENDING' | translate}})</i></span>
       </mat-radio-button>
     </mat-radio-group>
   </div>
 
-  <hr>
+  <!--begin::Case hasEnoughTokens-->
+  <div *ngIf="transaction.possible_tokens">
+    <hr>
 
-  <h4 class="heading">{{ 'PARTNER.WIZARD.SUB_MICROCREDIT_FORM.SUB_HEADING_2' | translate }} <div
-      class="stepper-subtitle">
-      {{ 'PARTNER.WIZARD.SUB_MICROCREDIT_FORM.SUPPORT_ID' | translate }} {{transaction.support_id}}</div>
-  </h4>
-  <div class="stepper-info microcredit-info">
-    <div class="row">
-      <div class="col-md-4">
-        <div class="col-head init">{{ 'PARTNER.WIZARD.SUB_MICROCREDIT_FORM.INITIAL' | translate }}</div>
-        <div class="token-num">{{transaction.initial_tokens}}</div>
-      </div>
-      <div class="col-md-4">
-        <div class="col-head redeemed">{{ 'PARTNER.WIZARD.SUB_MICROCREDIT_FORM.REDEEMED' | translate }}</div>
-        <div class="token-num">{{transaction.redeemed_tokens}}</div>
-      </div>
-      <div class="col-md-4">
-        <div class="col-head remaining">{{ 'PARTNER.WIZARD.SUB_MICROCREDIT_FORM.REMAINING' | translate }}</div>
-        <div class="token-num">{{transaction.possible_tokens}}</div>
+    <h4 class="heading">{{ 'PARTNER.WIZARD.SUB_MICROCREDIT_FORM.SUB_HEADING_2' | translate }} <div
+        class="stepper-subtitle">
+        {{ 'PARTNER.WIZARD.SUB_MICROCREDIT_FORM.SUPPORT_ID' | translate }} {{transaction.support_id}}</div>
+    </h4>
+    <div class="stepper-info microcredit-info">
+      <div class="row">
+        <div class="col-md-4">
+          <div class="col-head init">{{ 'PARTNER.WIZARD.SUB_MICROCREDIT_FORM.INITIAL' | translate }}</div>
+          <div class="token-num">{{transaction.initial_tokens}}</div>
+        </div>
+        <div class="col-md-4">
+          <div class="col-head redeemed">{{ 'PARTNER.WIZARD.SUB_MICROCREDIT_FORM.REDEEMED' | translate }}</div>
+          <div class="token-num">{{transaction.redeemed_tokens}}</div>
+        </div>
+        <div class="col-md-4">
+          <div class="col-head remaining">{{ 'PARTNER.WIZARD.SUB_MICROCREDIT_FORM.REMAINING' | translate }}</div>
+          <div class="token-num">{{transaction.possible_tokens}}</div>
+        </div>
       </div>
-    </div>
 
-    <hr>
+      <hr>
 
-    <div class="mb-3">
-      <h4 class="heading">{{ 'PARTNER.WIZARD.SUB_MICROCREDIT_FORM.SUB_HEADING_3' | translate }} </h4>
-      <div *ngIf="transactions">
-        <div class="row" *ngFor="let tran of transactions">
-          <div class="col-md-6">
-            <span>{{tran.createdAt | date}}</span>
-          </div>
-          <div class="col-md-6" *ngIf="(tran.type === 'PromiseFund') || ((tran.type === 'SpendFund'))"
-            class="stepper-info microcredit-info">
-            <span class="col-head" [ngClass]="(tran.type==='PromiseFund') ? 'init' : 'redeemed'">
-              {{tran.tokens}} {{ 'HISTORY.TOKENS' | translate }}
-            </span>
-          </div>
-          <div class="col-md-6" *ngIf="(tran.type === 'RevertFund') || ((tran.type === 'ReceiveFund'))"
-            class="stepper-info microcredit-info">
-            <span class="col-head" [ngClass]="(tran.type==='ReceiveFund') ? 'init' : 'redeemed'">
-              {{ (tran.type==='ReceiveFund') ? ('HISTORY.PAID' | translate) :  ('HISTORY.UNPAID' | translate) }}
-            </span>
+      <div class="mb-3">
+        <h4 class="heading">{{ 'PARTNER.WIZARD.SUB_MICROCREDIT_FORM.SUB_HEADING_3' | translate }} </h4>
+        <div *ngIf="transactions">
+          <div class="row" *ngFor="let tran of transactions">
+            <div class="col-md-6">
+              <span>{{tran.createdAt | date}}</span>
+            </div>
+            <div class="col-md-6" *ngIf="(tran.type === 'PromiseFund') || ((tran.type === 'SpendFund'))"
+              class="stepper-info microcredit-info">
+              <span class="col-head" [ngClass]="(tran.type==='PromiseFund') ? 'init' : 'redeemed'">
+                {{tran.tokens}} {{ 'HISTORY.TOKENS' | translate }}
+              </span>
+            </div>
+            <div class="col-md-6" *ngIf="(tran.type === 'RevertFund') || ((tran.type === 'ReceiveFund'))"
+              class="stepper-info microcredit-info">
+              <span class="col-head" [ngClass]="(tran.type==='ReceiveFund') ? 'init' : 'redeemed'">
+                {{ (tran.type==='ReceiveFund') ? ('HISTORY.PAID' | translate) : ('HISTORY.UNPAID' | translate) }}
+              </span>
+            </div>
           </div>
         </div>
       </div>
     </div>
 
-    <!--begin::Case hasEnoughTokens-->
-    <div *ngIf="transaction.possible_tokens">
 
-      <hr>
-      <h6 class="stepper-label">{{ 'PARTNER.WIZARD.SUB_MICROCREDIT_FORM.FORM_TITLE' | translate }}</h6>
 
-      <!--begin::Form(Wizard Step 2)-->
-      <form [formGroup]="stepperForm">
+    <hr>
+    <h6 class="stepper-label">{{ 'PARTNER.WIZARD.SUB_MICROCREDIT_FORM.FORM_TITLE' | translate }}</h6>
 
-        <!--begin::Form Group "Tokens to Redeem"-->
-        <div class="form-group">
-          <!--<label>Tokens</label>-->
-          <div class="input-group amount-input">
-            <input type="number" class="form-control" name="tokens" formControlName="tokens" placeholder="Tokens">
-          </div>
-          <span *ngIf="isControlHasError('tokens','required')"
-            class="error text-danger">{{ 'FORM.VALIDATION.REQUIRED_FIELD' | translate }}</span>
-          <span *ngIf="isControlHasError('tokens','min')"
-            class="error text-danger">{{ 'FORM.VALIDATION.MIN_VALUE_FIELD' | translate }}
-            {{ '1' }}</span>
-          <span *ngIf="isControlHasError('tokens','max')"
-            class="error text-danger">{{ 'FORM.VALIDATION.MAX_VALUE_FIELD' | translate }}
-            {{ transaction.possible_tokens }}</span>
-          <span class="form-text text-muted">{{ 'PARTNER.WIZARD.SUB_MICROCREDIT_FORM.FORM_HINT' | translate }}</span>
+    <!--begin::Form(Wizard Step 2)-->
+    <form [formGroup]="stepperForm">
+
+      <!--begin::Form Group "Tokens to Redeem"-->
+      <div class="form-group">
+        <!--<label>Tokens</label>-->
+        <div class="input-group amount-input">
+          <input type="number" class="form-control" name="tokens" formControlName="tokens" placeholder="Tokens">
         </div>
-        <!--end::Form Group "Tokens"-->
+        <span *ngIf="isControlHasError('tokens','required')" class="error text-danger">{{
+          'FORM.VALIDATION.REQUIRED_FIELD' | translate }}</span>
+        <span *ngIf="isControlHasError('tokens','min')" class="error text-danger">{{ 'FORM.VALIDATION.MIN_VALUE_FIELD'
+          | translate }}
+          {{ '1' }}</span>
+        <span *ngIf="isControlHasError('tokens','max')" class="error text-danger">{{ 'FORM.VALIDATION.MAX_VALUE_FIELD'
+          | translate }}
+          {{ transaction.possible_tokens }}</span>
+        <span class="form-text text-muted">{{ 'PARTNER.WIZARD.SUB_MICROCREDIT_FORM.FORM_HINT' | translate }}</span>
+      </div>
+      <!--end::Form Group "Tokens"-->
 
-      </form>
-      <!--end::Form-->
+    </form>
+    <!--end::Form-->
 
-    </div>
-    <!--end::Case hasEnoughTokens-->
+  </div>
+  <!--end::Case hasEnoughTokens-->
 
-    <!--begin::Wizard Buttons-->
-    <button mat-raised-button class="mr-2" (click)="onPreviousStep()">
-      {{ 'PARTNER.WIZARD.PREVIOUS_STEP' | translate }}
-    </button>
-    <button *ngIf="transaction.possible_tokens" mat-raised-button (click)="onNextStep()">
-      {{ 'PARTNER.WIZARD.NEXT_STEP' | translate }}
-    </button>
-    <!--end::Wizard Buttons-->
+  <!--begin::Wizard Buttons-->
+  <button mat-raised-button class="mr-2" (click)="onPreviousStep()">
+    {{ 'PARTNER.WIZARD.PREVIOUS_STEP' | translate }}
+  </button>
+  <button *ngIf="transaction.possible_tokens" mat-raised-button (click)="onNextStep()">
+    {{ 'PARTNER.WIZARD.NEXT_STEP' | translate }}
+  </button>
+  <!--end::Wizard Buttons-->
 
-  </div>
-</div>
+</div>
\ No newline at end of file
diff --git a/src/app/user-menu/settings/account-settings/account-settings.component.html b/src/app/user-menu/settings/account-settings/account-settings.component.html
index 52b5da73..660dd3d6 100644
--- a/src/app/user-menu/settings/account-settings/account-settings.component.html
+++ b/src/app/user-menu/settings/account-settings/account-settings.component.html
@@ -2,7 +2,7 @@
   <h1 class="heading">{{ 'SETTINGS.ACCOUNT' | translate }}</h1>
 
   <!--begin::Form-->
-  <form class="form" [formGroup]="submitForm">
+  <form class="form profile-form" [formGroup]="submitForm">
 
     <div class="row">
       <div class="col-md-6">
@@ -49,4 +49,4 @@ <h4 class="modal-title">{{'SETTINGS.DEACTIVATE' | translate}}</h4>
     <button mat-raised-button class="btn" (click)="c('Close click');">{{'SETTINGS.CANCEL' | translate}}</button>
   </div>
 </ng-template>
-<!--end::Confirmation Modal (Remove Item)-->
+<!--end::Confirmation Modal (Remove Item)-->
\ No newline at end of file
diff --git a/src/app/user-menu/settings/account-settings/account-settings.component.scss b/src/app/user-menu/settings/account-settings/account-settings.component.scss
index aa8d606d..af4db5be 100644
--- a/src/app/user-menu/settings/account-settings/account-settings.component.scss
+++ b/src/app/user-menu/settings/account-settings/account-settings.component.scss
@@ -1,4 +1,5 @@
 @import "../settings.component.scss";
+@import "../../../../variables.scss";
 
 // @import "../../../../variables.scss";
 
diff --git a/src/app/user-menu/settings/change-password/change-password.component.html b/src/app/user-menu/settings/change-password/change-password.component.html
index 00394b1b..5f0659db 100644
--- a/src/app/user-menu/settings/change-password/change-password.component.html
+++ b/src/app/user-menu/settings/change-password/change-password.component.html
@@ -2,7 +2,7 @@
   <h1 class="heading">{{ 'SETTINGS.CHANGE_PASSWORD' | translate }}</h1>
 
   <!--begin::Form-->
-  <form [formGroup]="submitForm" class="form">
+  <form [formGroup]="submitForm" class="form profile-form">
     <div class="row">
       <div class="col-md-6">
 
@@ -98,4 +98,4 @@ <h1 class="heading">{{ 'SETTINGS.CHANGE_PASSWORD' | translate }}</h1>
   </form>
   <!--end::Form-->
 
-</div>
+</div>
\ No newline at end of file
diff --git a/src/app/user-menu/settings/invitation/invitation.component.html b/src/app/user-menu/settings/invitation/invitation.component.html
index 3b828440..973a7b56 100644
--- a/src/app/user-menu/settings/invitation/invitation.component.html
+++ b/src/app/user-menu/settings/invitation/invitation.component.html
@@ -2,7 +2,7 @@
   <h1 class="heading">{{ 'SETTINGS.INVITATION' | translate }}</h1>
 
   <!--begin::Form-->
-  <form [formGroup]="submitForm" class="form" id="personal_form">
+  <form [formGroup]="submitForm" class="form profile-form" id="personal_form">
 
     <div class="row">
       <div class="col-md-6">
diff --git a/src/app/user-menu/settings/partner-payments/partner-payments.component.html b/src/app/user-menu/settings/partner-payments/partner-payments.component.html
index cac14471..e5fd3037 100644
--- a/src/app/user-menu/settings/partner-payments/partner-payments.component.html
+++ b/src/app/user-menu/settings/partner-payments/partner-payments.component.html
@@ -2,7 +2,7 @@
   <h1 class="heading">{{ 'SETTINGS.SUBMENU.PAYMENTS' | translate }}</h1>
   <!-- <mat-card>
     <mat-card-content> -->
-  <form [formGroup]="partnerForm" class="form" id="personal_form">
+  <form [formGroup]="partnerForm" class="form profile-form" id="personal_form">
 
     <div class="form-group">
       <div formArrayName="payments">
@@ -28,4 +28,4 @@ <h1 class="heading">{{ 'SETTINGS.SUBMENU.PAYMENTS' | translate }}</h1>
   </form>
   <!-- </mat-card-content>
   </mat-card> -->
-</div>
+</div>
\ No newline at end of file
diff --git a/src/app/user-menu/settings/personal-information/personal-information.component.html b/src/app/user-menu/settings/personal-information/personal-information.component.html
index 13575388..bfa2bf6c 100644
--- a/src/app/user-menu/settings/personal-information/personal-information.component.html
+++ b/src/app/user-menu/settings/personal-information/personal-information.component.html
@@ -5,7 +5,7 @@ <h1 class="heading">{{ 'SETTINGS.PERSONAL_INFO' | translate }}</h1>
   <div *ngIf="access === 'partner'">
 
     <!--begin::Form-->
-    <form [formGroup]="partnerForm" class="form single-form" id="personal_form">
+    <form [formGroup]="partnerForm" class="form profile-form" id="personal_form">
       <hr>
       <div class="row">
         <div class="sub-heading col-md-12">{{ 'FIELDS.PROFILE.SUBSECTIONS.BASIC' | translate }}</div>
@@ -60,6 +60,7 @@ <h1 class="heading">{{ 'SETTINGS.PERSONAL_INFO' | translate }}</h1>
 
         </div>
       </div>
+
       <div class="row">
         <div class="col-md-6">
 
@@ -82,11 +83,6 @@ <h1 class="heading">{{ 'SETTINGS.PERSONAL_INFO' | translate }}</h1>
           </div>
           <!--end::Form Group "Subtitle"-->
 
-        </div>
-      </div>
-      <div class="row">
-        <div class="col-md-6">
-
           <!--begin::Form Group "Description"-->
           <div class="form-group">
             <mat-form-field>
@@ -111,37 +107,14 @@ <h1 class="heading">{{ 'SETTINGS.PERSONAL_INFO' | translate }}</h1>
           <!--end::Form Group "Description"-->
 
         </div>
-        <div class="col-md-6">
 
+        <div class="col-md-6">
           <!--begin::Form Group "Image"-->
           <app-image-upload *ngIf="loadImageUploader" [parentForm]="partnerForm" previousURL="{{initialImage}}">
           </app-image-upload>
-          <!-- <div class="form-group">
-            <label class="col-form-label">{{ 'FIELDS.PROFILE.PARTNER_IMAGE.TITLE' | translate }}</label>
-            <div class="">
-              <div class="avatar" id="merchat_avatar">
-                <div class="avatar-img">
-                  <div class="avatar-container">
-                    <img *ngIf="previewUrl" class="avatar-holder" [src]="previewUrl">
-                    <div *ngIf="!originalImage" class="image-cancel">
-                      <span class="mdi mdi-close-circle" (click)="onImageCancel()">
-                      </span>
-                    </div>
-                  </div>
-                </div>
-                <button type="button" mat-raised-button (click)="fileInputMerch.click()">
-                  {{ 'FIELDS.PROFILE.PARTNER_IMAGE.ACTION' | translate }}
-                </button>
-                <label class="avatar-upload">
-                  <input type="file" hidden (change)="fileProgress($event)" name="profile_avatar"
-                    accept=".png, .jpg, .jpeg" #fileInputMerch>
-                </label>
-              </div>
-            </div>
-          </div> -->
           <!--end::Form Group "Image"-->
-
         </div>
+
       </div>
 
       <!--begin::Case hasAddress-->
@@ -324,9 +297,9 @@ <h1 class="heading">{{ 'SETTINGS.PERSONAL_INFO' | translate }}</h1>
           </div>
         </div>
 
-        <!--begin::Form Group "Name"-->
+        <!--begin::Form Group "Phone"-->
         <div class="form-group">
-          <mat-form-field>
+          <mat-form-field class="col-md-6">
             <mat-label>{{ 'FIELDS.PROFILE.PHONE.TITLE' | translate }}</mat-label>
             <input matInput type="text" name="phone" formControlName="phone"
               placeholder="{{ 'FIELDS.PROFILE.PHONE.PLACEHOLDER' | translate }}">
@@ -344,7 +317,7 @@ <h1 class="heading">{{ 'SETTINGS.PERSONAL_INFO' | translate }}</h1>
             </mat-hint>
           </mat-form-field>
         </div>
-        <!--end::Form Group "Name"-->
+        <!--end::Form Group "Phone"-->
 
         <!--begin::Form Group "Contacts"-->
         <div class="form-group">
@@ -557,4 +530,4 @@ <h1 class="heading">{{ 'SETTINGS.PERSONAL_INFO' | translate }}</h1>
   </div>
   <!--end::Case !isPartner-->
 
-</div>
+</div>
\ No newline at end of file
diff --git a/src/app/user-menu/settings/personal-information/personal-information.component.scss b/src/app/user-menu/settings/personal-information/personal-information.component.scss
index 7b0233e0..7cc3085a 100644
--- a/src/app/user-menu/settings/personal-information/personal-information.component.scss
+++ b/src/app/user-menu/settings/personal-information/personal-information.component.scss
@@ -1,5 +1,6 @@
-@import "../../../../variables.scss";
+ @import "../../../../variables.scss";
 @import "../settings.component.scss";
+
 // @import "../../../../variables.scss";
 
 // .form {
diff --git a/src/app/user-menu/settings/settings.component.scss b/src/app/user-menu/settings/settings.component.scss
index b4e4605e..3fe58939 100644
--- a/src/app/user-menu/settings/settings.component.scss
+++ b/src/app/user-menu/settings/settings.component.scss
@@ -17,31 +17,4 @@ label {
 		background-color: #eee;
 		border-radius: 4px;
 	}
-}
-
-.form {
-	margin-bottom: 1.5rem;
-
-	.form-group {
-		padding-left: 30px;
-		padding-right: 30px;
-		margin-bottom: 1.5rem;
-
-		.payment {
-			margin-bottom: 1.5rem;
-		}
-	}
-
-	.form-actions {
-		margin-top: 20px;
-		button {
-			float: right;
-			font-size: 18px;
-			padding: 4px 22px;
-		}
-	}
-
-	mat-form-field {
-		width: 100%;
-	}
-}
+}
\ No newline at end of file
diff --git a/src/assets/scss/config_assets.scss b/src/assets/scss/config_assets.scss
index 9d134167..4751abac 100644
--- a/src/assets/scss/config_assets.scss
+++ b/src/assets/scss/config_assets.scss
@@ -276,17 +276,17 @@ th .mat-sort-header-sorted {
 
 //2.4 Forms
 .single-form {
-  .mat-form-field {
-    display: block;
-    max-width: 400px;
-    //max-width: 100%;
+   .mat-form-field {
+     display: block;
+     max-width: 400px;
+     //max-width: 100%;
 
-    //margin-bottom: 40px;
+   //margin-bottom: 40px;
     .mat-form-field-flex {
       background-color: #f8f6f6;
       padding: 10px;
     }
-  }
+   }
 
   .payment {
     width: 50%;
@@ -404,6 +404,71 @@ th .mat-sort-header-sorted {
   }
 }
 
+.profile-form {
+	margin-bottom: 1.5rem;
+
+	.form-group {
+		padding-left: 30px;
+		padding-right: 30px;
+		margin-bottom: 1.5rem;
+
+		.payment {
+			margin-bottom: 1.5rem;
+		}
+	}
+
+	.form-actions {
+		margin-top: 20px;
+		button {
+			float: right;
+			font-size: 18px;
+			padding: 4px 22px;
+		}
+	}
+
+	.upload-img {
+		&-holder {
+			max-width: 250px;
+			margin-bottom: 15px;
+		}
+	
+		&-container {
+			position: relative;
+			display: inline-block;
+		}
+	
+		&-btn {
+			margin-bottom: 10px;
+		}
+	
+		.image-cancel {
+			position: absolute;
+			top: -6px;
+			right: -6px;
+			font-size: 24px;
+			width: 20px;
+			height: 20px;
+			background: #fff;
+			border-radius: 50%;
+	
+			span {
+				position: relative;
+				top: -10px;
+				right: 5px;
+				font-size: 28px;
+				cursor: pointer;
+			}
+		}
+	}
+	
+	mat-form-field {
+    width: 100%;
+    padding: 10px;
+	}
+
+}
+
+
 .single-delete {
   float: right;
 
diff --git a/tsconfig.base.json b/tsconfig.base.json
index ee34d044..1c3dd102 100644
--- a/tsconfig.base.json
+++ b/tsconfig.base.json
@@ -23,4 +23,4 @@
     "fullTemplateTypeCheck": true,
     "strictInjectionParameters": true
   }
-}
+}
\ No newline at end of file