diff --git a/src/portal/src/app/base/left-side-nav/system-robot-accounts/list-all-projects/list-all-projects.component.html b/src/portal/src/app/base/left-side-nav/system-robot-accounts/list-all-projects/list-all-projects.component.html
index ac339b0cb..ae8e2dc77 100644
--- a/src/portal/src/app/base/left-side-nav/system-robot-accounts/list-all-projects/list-all-projects.component.html
+++ b/src/portal/src/app/base/left-side-nav/system-robot-accounts/list-all-projects/list-all-projects.component.html
@@ -40,7 +40,7 @@
                     </button>
                     <clr-dropdown-menu [style.height.px]="140" clrPosition="bottom-left" *clrIfOpen>
                         <div>
-                            <button class="btn btn-link btn-sm select-all-for-dropdown" (click)="selectAllPermissionOrUnselectAll(p.permissions[0].access)">
+                            <button class="btn btn-link btn-sm select-all-for-dropdown ml-20px" (click)="selectAllPermissionOrUnselectAll(p.permissions[0].access)">
                                 <span *ngIf="isSelectAll(p.permissions[0].access)">{{"SYSTEM_ROBOT.SELECT_ALL" | translate}}</span>
                                 <span *ngIf="!isSelectAll(p.permissions[0].access)">{{"SYSTEM_ROBOT.UNSELECT_ALL" | translate}}</span>
                             </button>
diff --git a/src/portal/src/app/base/left-side-nav/system-robot-accounts/list-all-projects/list-all-projects.component.scss b/src/portal/src/app/base/left-side-nav/system-robot-accounts/list-all-projects/list-all-projects.component.scss
index d89d59243..975b1c49d 100644
--- a/src/portal/src/app/base/left-side-nav/system-robot-accounts/list-all-projects/list-all-projects.component.scss
+++ b/src/portal/src/app/base/left-side-nav/system-robot-accounts/list-all-projects/list-all-projects.component.scss
@@ -18,3 +18,6 @@
     display: flex;
     align-items: center;
 }
+.ml-20px {
+    margin-left: 20px;
+}
diff --git a/src/portal/src/app/base/left-side-nav/system-robot-accounts/new-robot/new-robot.component.html b/src/portal/src/app/base/left-side-nav/system-robot-accounts/new-robot/new-robot.component.html
index 97d29ccf2..186a7ae95 100644
--- a/src/portal/src/app/base/left-side-nav/system-robot-accounts/new-robot/new-robot.component.html
+++ b/src/portal/src/app/base/left-side-nav/system-robot-accounts/new-robot/new-robot.component.html
@@ -116,7 +116,7 @@
                             </button>
                             <clr-dropdown-menu class="dropdown-menu" [style.height.px]="230" clrPosition="bottom-left" *clrIfOpen>
                                 <div>
-                                    <button class="btn btn-link btn-sm select-all-for-dropdown" (click)="selectAllOrUnselectAll(defaultAccesses)">
+                                    <button class="btn btn-link btn-sm select-all-for-dropdown ml-20px" (click)="selectAllOrUnselectAll(defaultAccesses)">
                                         <span *ngIf="isSelectAll(defaultAccesses)">{{"SYSTEM_ROBOT.SELECT_ALL" | translate}}</span>
                                         <span *ngIf="!isSelectAll(defaultAccesses)">{{"SYSTEM_ROBOT.UNSELECT_ALL" | translate}}</span>
                                     </button>
diff --git a/src/portal/src/app/base/left-side-nav/system-robot-accounts/new-robot/new-robot.component.scss b/src/portal/src/app/base/left-side-nav/system-robot-accounts/new-robot/new-robot.component.scss
index 1f8222acb..43a91c9c8 100644
--- a/src/portal/src/app/base/left-side-nav/system-robot-accounts/new-robot/new-robot.component.scss
+++ b/src/portal/src/app/base/left-side-nav/system-robot-accounts/new-robot/new-robot.component.scss
@@ -80,3 +80,6 @@
 .dropdown-menu {
   overflow-y: auto;
 }
+.ml-20px {
+  margin-left: 20px;
+}
diff --git a/src/portal/src/app/base/project/robot-account/add-robot/add-robot.component.html b/src/portal/src/app/base/project/robot-account/add-robot/add-robot.component.html
index aa153c36a..a3fd60cde 100644
--- a/src/portal/src/app/base/project/robot-account/add-robot/add-robot.component.html
+++ b/src/portal/src/app/base/project/robot-account/add-robot/add-robot.component.html
@@ -97,7 +97,7 @@
                             </button>
                             <clr-dropdown-menu class="overflow-y-scroll" [style.height.px]="230" clrPosition="bottom-left" *clrIfOpen>
                                 <div>
-                                    <button class="btn btn-link btn-sm select-all-for-dropdown" (click)="selectAllOrUnselectAll(defaultAccesses)">
+                                    <button class="btn btn-link btn-sm select-all-for-dropdown ml-20px" (click)="selectAllOrUnselectAll(defaultAccesses)">
                                         <span *ngIf="isSelectAll(defaultAccesses)">{{"SYSTEM_ROBOT.SELECT_ALL" | translate}}</span>
                                         <span *ngIf="!isSelectAll(defaultAccesses)">{{"SYSTEM_ROBOT.UNSELECT_ALL" | translate}}</span>
                                     </button>
diff --git a/src/portal/src/app/base/project/robot-account/add-robot/add-robot.component.scss b/src/portal/src/app/base/project/robot-account/add-robot/add-robot.component.scss
index 81d056e46..7bf30f692 100644
--- a/src/portal/src/app/base/project/robot-account/add-robot/add-robot.component.scss
+++ b/src/portal/src/app/base/project/robot-account/add-robot/add-robot.component.scss
@@ -57,3 +57,6 @@
 .overflow-y-scroll {
   overflow-y: auto;
 }
+.ml-20px {
+  margin-left: 20px;
+}
diff --git a/src/portal/src/app/shared/components/remaining-time/remaining-time.component.html b/src/portal/src/app/shared/components/remaining-time/remaining-time.component.html
index 69bb6af90..89d9eb2ef 100644
--- a/src/portal/src/app/shared/components/remaining-time/remaining-time.component.html
+++ b/src/portal/src/app/shared/components/remaining-time/remaining-time.component.html
@@ -1 +1,9 @@
-<span [style.color]= 'color'>{{timeRemain | translate}}</span>
+<span class="container">
+   <cds-icon *ngIf="isError()" class="error" shape="error-standard"></cds-icon>
+   <cds-icon *ngIf="isWarning()" size="20" class="warning" shape="exclamation-triangle"></cds-icon>
+   <cds-icon *ngIf="isSuccess()" class="success" shape="success-standard"></cds-icon>
+    <span class="ml-5px">{{timeRemain | translate}}</span>
+</span>
+
+
+
diff --git a/src/portal/src/app/shared/components/remaining-time/remaining-time.component.scss b/src/portal/src/app/shared/components/remaining-time/remaining-time.component.scss
index e69de29bb..8d45c6d21 100644
--- a/src/portal/src/app/shared/components/remaining-time/remaining-time.component.scss
+++ b/src/portal/src/app/shared/components/remaining-time/remaining-time.component.scss
@@ -0,0 +1,17 @@
+.error {
+ color: #e02200;
+}
+.warning {
+ color: #a36500;
+}
+.success {
+ color: #42810e;
+}
+
+.container {
+  display: flex;
+  align-items: center;
+}
+.ml-5px {
+  margin-left: 5px;
+}
diff --git a/src/portal/src/app/shared/components/remaining-time/remaining-time.component.spec.ts b/src/portal/src/app/shared/components/remaining-time/remaining-time.component.spec.ts
index a90b7ba88..8bd7f2698 100644
--- a/src/portal/src/app/shared/components/remaining-time/remaining-time.component.spec.ts
+++ b/src/portal/src/app/shared/components/remaining-time/remaining-time.component.spec.ts
@@ -34,10 +34,9 @@ describe('RemainingTimeComponent', () => {
     });
     it('should show yellow color', () => {
         component.deltaTime = 0;
-        component.expires_at = new Date(new Date().getTime() + 1000 * 60 * 60 * 24 * 29).getTime() / 1000;
+        component.expires_at = new Date(new Date().getTime() + 1000 * 60 * 60 * 24 * 5).getTime() / 1000;
         fixture.detectChanges();
         expect(component?.remainingTimeComponent.color).toEqual(RobotTimeRemainColor.WARNING);
-        expect(component?.remainingTimeComponent.timeRemain).toEqual('29d 0h 0m');
     });
     it('should show red color', () => {
         component.deltaTime = 0;
diff --git a/src/portal/src/app/shared/components/remaining-time/remaining-time.component.ts b/src/portal/src/app/shared/components/remaining-time/remaining-time.component.ts
index ca988f757..c8875f9e6 100644
--- a/src/portal/src/app/shared/components/remaining-time/remaining-time.component.ts
+++ b/src/portal/src/app/shared/components/remaining-time/remaining-time.component.ts
@@ -22,7 +22,7 @@ const SEC: number = 1000;
 const MIN: number = 60 * 1000;
 const DAY: number = 1000 * 60 * 60 * 24;
 const HOUR: number = 1000 * 60 * 60;
-const WARNING_DAYS = 30;
+const WARNING_DAYS = 7;
 @Component({
     selector: 'app-remaining-time',
     templateUrl: 'remaining-time.component.html',
@@ -80,4 +80,13 @@ export class RemainingTimeComponent implements  OnInit, OnDestroy, OnChanges {
             }
         }
     }
+    isError(): boolean {
+        return this.color === RobotTimeRemainColor.EXPIRED;
+    }
+    isWarning(): boolean {
+        return this.color === RobotTimeRemainColor.WARNING;
+    }
+    isSuccess(): boolean {
+        return this.color === RobotTimeRemainColor.GREEN;
+    }
 }
diff --git a/src/portal/src/i18n/lang/en-us-lang.json b/src/portal/src/i18n/lang/en-us-lang.json
index dbbb5f052..1bd0225cc 100644
--- a/src/portal/src/i18n/lang/en-us-lang.json
+++ b/src/portal/src/i18n/lang/en-us-lang.json
@@ -375,7 +375,7 @@
         "EXPIRES_AT": "Expires At",
         "EXPIRATION_TOOLTIP": "If not set, the expiration time of system configuration will be used",
         "INVALID_VALUE": "The value of the expiration time is invalid",
-        "NEVER_EXPIRED": "Never Expired",
+        "NEVER_EXPIRED": "Never Expires",
         "NAME_PREFIX": "Robot Name Prefix",
         "NAME_PREFIX_REQUIRED": "Robot name prefix is required"
     },
@@ -1683,8 +1683,8 @@
         "EDIT_PROJECT_ROBOT": "Edit Robot Account",
         "EDIT_PROJECT_ROBOT_SUMMARY": "Edit a robot account for this project",
         "NOT_FOUND": "We couldn't find any robots!",
-        "SELECT_ALL": "SELECT ALL",
-        "UNSELECT_ALL": "UNSELECT ALL",
+        "SELECT_ALL": "Select all",
+        "UNSELECT_ALL": "Unselect all",
         "ROBOT_ACCOUNT_NAV": "Robot Accounts",
         "COVERED_PROJECTS": "PROJECT(S)",
         "CONFIRM_SECRET": "Confirm Secret",