diff --git a/src/app/app-modules/registrar/generate-abha/generate-abha.component.html b/src/app/app-modules/registrar/generate-abha/generate-abha.component.html
index 70ffed5..9c4bfdb 100644
--- a/src/app/app-modules/registrar/generate-abha/generate-abha.component.html
+++ b/src/app/app-modules/registrar/generate-abha/generate-abha.component.html
@@ -48,25 +48,17 @@ <h4>Generate ABHA CARD</h4>
       </mat-form-field>
     </div>
 
-    <div class="col-xs-12 col-sm-12 col-md-12 col-lg-12">
-      <div
-        class="col-xs-6 col-sm-6 col-md-6 col-lg-6"
-        style="margin-left: -15px"
-      ></div>
-      <div
-        class="col-xs-6 col-sm-6 col-md-6 col-lg-6"
-        style="margin-right: 15px; float: right"
+    <div class="col-12" style="text-align: end">
+      <button
+        (click)="generateABHACard()"
+        mat-raised-button
+        color="primary"
+        style="margin: 0px 15px 10px 0px"
+        class="mat_blue font-regular f-s-18 m-t-8"
+        [disabled]="!abhaGenerateForm.valid"
       >
-        <button
-          (click)="generateABHACard()"
-          mat-raised-button
-          color="primary"
-          class="mat_blue font-regular f-s-18 m-t-8"
-          [disabled]="!abhaGenerateForm.valid"
-        >
-          Generate
-        </button>
-      </div>
+        Generate
+      </button>
     </div>
   </div>
 </div>
diff --git a/src/app/app-modules/registrar/generate-mobile-otp-generation/generate-mobile-otp-generation.component.html b/src/app/app-modules/registrar/generate-mobile-otp-generation/generate-mobile-otp-generation.component.html
index 183c6bc..2952f3e 100644
--- a/src/app/app-modules/registrar/generate-mobile-otp-generation/generate-mobile-otp-generation.component.html
+++ b/src/app/app-modules/registrar/generate-mobile-otp-generation/generate-mobile-otp-generation.component.html
@@ -85,7 +85,7 @@ <h4>{{ currentLanguageSet?.generateABHA }}</h4>
         mat-raised-button
         type="accent"
         color="accent"
-        class="mat_blue"
+        class="mat_green"
         style="margin-right: 10px"
         [disabled]="!generateMobileOTPForm.valid"
         (click)="onSubmitOfMobileNo(); verifyMobileOtp()"
diff --git a/src/app/app-modules/registrar/health-id-otp-generation/health-id-otp-generation.component.html b/src/app/app-modules/registrar/health-id-otp-generation/health-id-otp-generation.component.html
index 1527ec0..50f76b5 100644
--- a/src/app/app-modules/registrar/health-id-otp-generation/health-id-otp-generation.component.html
+++ b/src/app/app-modules/registrar/health-id-otp-generation/health-id-otp-generation.component.html
@@ -92,7 +92,7 @@ <h4>{{ currentLanguageSet?.generateABHA }}</h4>
   class="col-xs-12 col-sm-12"
   [formGroup]="healthIdOTPForm"
 >
-  <div class="row">
+  <div class="row" style="width: 102%">
     <div class="col-xs-12 col-sm-12 col-md-12 col-lg-12">
       <mat-form-field [style.width]="'100%'">
         <mat-label>{{ currentLanguageSet?.enterOTP }}</mat-label>
@@ -122,12 +122,13 @@ <h4>{{ currentLanguageSet?.generateABHA }}</h4>
       >
         {{ currentLanguageSet?.resendOTP }}
       </button>
+
       <button
         id="submitButton"
         mat-raised-button
         type="accent"
         color="accent"
-        class="mat_blue"
+        class="mat_green"
         style="margin-right: 10px"
         [disabled]="!healthIdOTPForm.valid || !checkOTP()"
         (click)="verifyOTPOnSubmit()"
diff --git a/src/app/app-modules/registrar/health-id-otp-generation/health-id-otp-succespopup.html b/src/app/app-modules/registrar/health-id-otp-generation/health-id-otp-succespopup.html
index 01cf9e0..ab20c69 100644
--- a/src/app/app-modules/registrar/health-id-otp-generation/health-id-otp-succespopup.html
+++ b/src/app/app-modules/registrar/health-id-otp-generation/health-id-otp-succespopup.html
@@ -19,6 +19,7 @@ <h3 class="title success">Info</h3>
     <button
       mat-raised-button
       class="full-width-login button-ok"
+      style="margin-right: 8px; width: 60px"
       mat-dialog-close
       (click)="clearPIDData()"
     >
@@ -26,7 +27,14 @@ <h3 class="title success">Info</h3>
     </button>
     <button
       mat-raised-button
-      class="background-primary mat_blue"
+      style="
+        background-color: #0277bd;
+        color: white;
+        border: unset;
+        width: 60px;
+        border: 1px solid lightgray;
+      "
+      class="background-primary"
       cdkFocusInitial
       (click)="fetchOtp(succdata.healthId, succdata.healthIdNumber)"
     >
diff --git a/src/app/app-modules/registrar/set-password-for-abha/set-password-for-abha.component.css b/src/app/app-modules/registrar/set-password-for-abha/set-password-for-abha.component.css
index 8e1ba0b..1002d5f 100644
--- a/src/app/app-modules/registrar/set-password-for-abha/set-password-for-abha.component.css
+++ b/src/app/app-modules/registrar/set-password-for-abha/set-password-for-abha.component.css
@@ -120,3 +120,9 @@ md2-pagination {
   .fieldPadding {
     padding-right: 0px;
   }
+  .mat_form_field_width_one >>>.mat-mdc-text-field-wrapper {
+    width: 204% !important;
+}
+.mat_form_field_width_two >>>.mat-mdc-text-field-wrapper {
+    width: 113% !important;
+}
diff --git a/src/app/app-modules/registrar/set-password-for-abha/set-password-for-abha.component.html b/src/app/app-modules/registrar/set-password-for-abha/set-password-for-abha.component.html
index 63d5159..a4c911d 100644
--- a/src/app/app-modules/registrar/set-password-for-abha/set-password-for-abha.component.html
+++ b/src/app/app-modules/registrar/set-password-for-abha/set-password-for-abha.component.html
@@ -1,8 +1,15 @@
 <div class="title info">
   <h4>{{ currentLanguageSet?.setPasswordForAbha }}</h4>
-  <button>
+  <button
+    style="
+      text-align: end;
+      float: right;
+      background-color: #0277bd;
+      border: unset;
+    "
+  >
     <mat-icon
-      class="md-24 pull-right close-btn"
+      class="md-24 pull-right close-btn mat_blue_circle"
       matDialogClose
       (click)="closeDialog()"
       mat-icon-button
@@ -18,7 +25,7 @@ <h4>{{ currentLanguageSet?.setPasswordForAbha }}</h4>
     <form #passwordFields="ngForm">
       <div fxLayoutAlign="start end">
         <div class="col-xs-12 col-sm-12 col-md-12 col-lg-12 fieldPadding">
-          <mat-form-field class="full-width">
+          <mat-form-field class="mat_form_field_width_one">
             <mat-label>{{ currentLanguageSet?.newPassword }}</mat-label>
             <input
               autocomplete="off"
@@ -52,7 +59,7 @@ <h4>{{ currentLanguageSet?.setPasswordForAbha }}</h4>
 
       <div fxLayoutAlign="start end">
         <div class="col-xs-12 col-sm-12 col-md-12 col-lg-12 fieldPadding">
-          <mat-form-field class="full-width">
+          <mat-form-field class="full-width mat_form_field_width_two">
             <mat-label>{{ currentLanguageSet?.confirmPassword }}</mat-label>
             <input
               autocomplete="off"
@@ -88,9 +95,10 @@ <h4>{{ currentLanguageSet?.setPasswordForAbha }}</h4>
       <button
         type="button"
         mat-raised-button
+        style="width: 98%"
         color="accent"
         [disabled]="!passwordFields.valid"
-        class="full-width largeBtn buttonSubmit"
+        class="full-width largeBtn buttonSubmit mat_green"
         (click)="updatePass()"
       >
         Submit
diff --git a/src/styles.css b/src/styles.css
index a2c0cff..8a50618 100644
--- a/src/styles.css
+++ b/src/styles.css
@@ -653,4 +653,10 @@ input:-webkit-autofill:hover,
 input:-webkit-autofill:focus,
 input:-webkit-autofill:active {
   -webkit-box-shadow: 0 0 0 30px #ffffff inset !important;
+}
+
+.mat-mdc-dialog-container .mdc-dialog__surface {
+  display: block;
+  width: 100%;
+  height: auto !important;
 }
\ No newline at end of file