diff --git a/modules/ui/src/app/components/empty-message/empty-message.component.html b/modules/ui/src/app/components/empty-message/empty-message.component.html
index 46f2281ea..ad15f66f0 100644
--- a/modules/ui/src/app/components/empty-message/empty-message.component.html
+++ b/modules/ui/src/app/components/empty-message/empty-message.component.html
@@ -22,6 +22,7 @@
   <span class="empty-message-text" [class.one-line]="!message()">
     <span class="empty-message-header">{{ header() }}</span>
     <span class="empty-message-main">{{ message() }}</span>
+    <span class="empty-message-main next-line">{{ messageNext() }}</span>
   </span>
   <ng-content></ng-content>
 </div>
diff --git a/modules/ui/src/app/components/empty-message/empty-message.component.scss b/modules/ui/src/app/components/empty-message/empty-message.component.scss
index 33e4a4f95..47ec834e5 100644
--- a/modules/ui/src/app/components/empty-message/empty-message.component.scss
+++ b/modules/ui/src/app/components/empty-message/empty-message.component.scss
@@ -32,7 +32,7 @@
   grid-template-columns: auto 1fr;
   align-items: end;
   gap: 32px;
-  max-width: 764px;
+  max-width: 886px;
   .empty-message-img {
     grid-row: 1 / 3;
     justify-self: end;
@@ -53,8 +53,8 @@
 
 .empty-message-header {
   font-weight: 400;
-  line-height: 28px;
-  font-size: 22px;
+  line-height: 32px;
+  font-size: 24px;
   color: colors.$on-surface;
 }
 
@@ -63,7 +63,13 @@
   font-weight: 400;
   font-size: 16px;
   line-height: 24px;
-  letter-spacing: 0.1px;
+  letter-spacing: 0px;
   color: colors.$on-surface-variant;
   display: block;
 }
+
+.empty-message-text {
+  .empty-message-main.next-line {
+    padding-top: 0;
+  }
+}
diff --git a/modules/ui/src/app/components/empty-message/empty-message.component.ts b/modules/ui/src/app/components/empty-message/empty-message.component.ts
index 43a6689a8..bf51345e2 100644
--- a/modules/ui/src/app/components/empty-message/empty-message.component.ts
+++ b/modules/ui/src/app/components/empty-message/empty-message.component.ts
@@ -26,5 +26,6 @@ export class EmptyMessageComponent {
   image = input<string>();
   header = input<string>();
   message = input<string>();
+  messageNext = input<string>();
   isHorizontal = input<boolean>(false);
 }
diff --git a/modules/ui/src/app/components/empty-page/empty-page.component.html b/modules/ui/src/app/components/empty-page/empty-page.component.html
index 4d67a06cf..c0daf35f8 100644
--- a/modules/ui/src/app/components/empty-page/empty-page.component.html
+++ b/modules/ui/src/app/components/empty-page/empty-page.component.html
@@ -17,6 +17,7 @@
   [image]="image()"
   [header]="header()"
   [message]="message()"
+  [messageNext]="messageNext()"
   [isHorizontal]="true">
   <ng-content></ng-content>
 </app-empty-message>
diff --git a/modules/ui/src/app/components/empty-page/empty-page.component.ts b/modules/ui/src/app/components/empty-page/empty-page.component.ts
index b5cbb6eda..f3ed1a15e 100644
--- a/modules/ui/src/app/components/empty-page/empty-page.component.ts
+++ b/modules/ui/src/app/components/empty-page/empty-page.component.ts
@@ -25,4 +25,5 @@ export class EmptyPageComponent {
   image = input<string>();
   header = input<string>();
   message = input<string>();
+  messageNext = input<string>();
 }
diff --git a/modules/ui/src/app/components/list-layout/list-layout.component.scss b/modules/ui/src/app/components/list-layout/list-layout.component.scss
index d18d8380d..9677b1a8d 100644
--- a/modules/ui/src/app/components/list-layout/list-layout.component.scss
+++ b/modules/ui/src/app/components/list-layout/list-layout.component.scss
@@ -19,6 +19,8 @@
 
 :host {
   position: relative;
+  height: 100%;
+  display: block;
 }
 
 .entity-list app-list-item:has(.selected) {
diff --git a/modules/ui/src/app/model/layout-type.ts b/modules/ui/src/app/model/layout-type.ts
index 54c6fcc14..736e1ae3b 100644
--- a/modules/ui/src/app/model/layout-type.ts
+++ b/modules/ui/src/app/model/layout-type.ts
@@ -16,5 +16,5 @@
 
 export enum LayoutType {
   Device = 'Devices',
-  Profile = 'Risk Assessement',
+  Profile = 'Risk Assessment',
 }
diff --git a/modules/ui/src/app/pages/devices/devices.component.html b/modules/ui/src/app/pages/devices/devices.component.html
index 2a2c2a207..77d0666e8 100644
--- a/modules/ui/src/app/pages/devices/devices.component.html
+++ b/modules/ui/src/app/pages/devices/devices.component.html
@@ -50,7 +50,8 @@
     <app-empty-page
       image="/assets/icons/empty-devices.svg"
       header="Nothing to test!"
-      message="To begin testing, you'll need to configure at least one device. Please proceed with the device creation process.">
+      message="To begin testing, you'll need to configure at least one device."
+      messageNext="Please proceed with the device creation process.">
       <ng-container *ngTemplateOutlet="addDeviceButton"></ng-container>
     </app-empty-page>
   </ng-template>
diff --git a/modules/ui/src/app/pages/devices/devices.component.scss b/modules/ui/src/app/pages/devices/devices.component.scss
index a584068e2..9256ecf33 100644
--- a/modules/ui/src/app/pages/devices/devices.component.scss
+++ b/modules/ui/src/app/pages/devices/devices.component.scss
@@ -22,8 +22,5 @@
 }
 
 .device-add-button {
-  font-family: variables.$font-text;
-  margin-bottom: 12px;
-  width: fit-content;
-  height: 56px;
+  @include mixins.add-button;
 }
diff --git a/modules/ui/src/app/pages/risk-assessment/risk-assessment.component.html b/modules/ui/src/app/pages/risk-assessment/risk-assessment.component.html
index 620712a2f..b8f47ed3f 100644
--- a/modules/ui/src/app/pages/risk-assessment/risk-assessment.component.html
+++ b/modules/ui/src/app/pages/risk-assessment/risk-assessment.component.html
@@ -14,56 +14,69 @@
 limitations under the License.
 -->
 <ng-container *ngIf="viewModel$ | async as vm">
-  <ng-container *ngIf="isOpenProfileForm; else empty">
-    <mat-drawer-container class="risk-assessment-container">
-      <mat-drawer-content class="risk-assessment-content">
-        <mat-toolbar class="risk-assessment-toolbar">
-          <h2 class="title" tabindex="-1">Risk assessment</h2>
-        </mat-toolbar>
-        <div class="main-content">
-          <app-profile-form
-            [selectedProfile]="vm.selectedProfile"
-            [isCopyProfile]="isCopyProfile"
-            [profiles]="vm.profiles"
-            [profileFormat]="vm.profileFormat"
-            (saveProfile)="saveProfileClicked($event, vm.selectedProfile)"
-            (discard)="discard(vm.selectedProfile)"></app-profile-form>
-        </div>
-      </mat-drawer-content>
-    </mat-drawer-container>
-  </ng-container>
-  <mat-drawer
-    mode="side"
-    opened
-    position="end"
-    class="profiles-drawer"
-    *ngIf="vm.profiles.length">
-    <div class="profiles-drawer-header">
-      <h2 class="profiles-drawer-header-title">Saved profiles</h2>
-    </div>
-    <div class="profiles-drawer-content">
-      <app-profile-item
-        *ngFor="let profile of vm.profiles; let i = index; trackBy: trackByName"
-        [profile]="profile"
-        class="profile-item-{{ i }}"
-        [ngClass]="{ selected: profile.name === vm.selectedProfile?.name }"
-        (deleteButtonClicked)="deleteProfile($event, i, vm.selectedProfile)"
-        (profileClicked)="profileClicked($event)"
-        (copyProfileClicked)="copyProfileAndOpenForm($event)">
-      </app-profile-item>
-    </div>
-  </mat-drawer>
+  <app-list-layout
+    [title]="LayoutType.Profile"
+    addEntityText="Create Risk Profile"
+    [emptyContent]="empty">
+  </app-list-layout>
+  <!--  <ng-container *ngIf="isOpenProfileForm; else empty">-->
+  <!--    <mat-drawer-container class="risk-assessment-container">-->
+  <!--      <mat-drawer-content class="risk-assessment-content">-->
+  <!--        <mat-toolbar class="risk-assessment-toolbar">-->
+  <!--          <h2 class="title" tabindex="-1">Risk assessment</h2>-->
+  <!--        </mat-toolbar>-->
+  <!--        <div class="main-content">-->
+  <!--          <app-profile-form-->
+  <!--            [selectedProfile]="vm.selectedProfile"-->
+  <!--            [isCopyProfile]="isCopyProfile"-->
+  <!--            [profiles]="vm.profiles"-->
+  <!--            [profileFormat]="vm.profileFormat"-->
+  <!--            (saveProfile)="saveProfileClicked($event, vm.selectedProfile)"-->
+  <!--            (discard)="discard(vm.selectedProfile)"></app-profile-form>-->
+  <!--        </div>-->
+  <!--      </mat-drawer-content>-->
+  <!--    </mat-drawer-container>-->
+  <!--  </ng-container>-->
+  <!--  <mat-drawer-->
+  <!--    mode="side"-->
+  <!--    opened-->
+  <!--    position="end"-->
+  <!--    class="profiles-drawer"-->
+  <!--    *ngIf="vm.profiles.length">-->
+  <!--    <div class="profiles-drawer-header">-->
+  <!--      <h2 class="profiles-drawer-header-title">Saved profiles</h2>-->
+  <!--    </div>-->
+  <!--    <div class="profiles-drawer-content">-->
+  <!--      <app-profile-item-->
+  <!--        *ngFor="let profile of vm.profiles; let i = index; trackBy: trackByName"-->
+  <!--        [profile]="profile"-->
+  <!--        class="profile-item-{{ i }}"-->
+  <!--        [ngClass]="{ selected: profile.name === vm.selectedProfile?.name }"-->
+  <!--        (deleteButtonClicked)="deleteProfile($event, i, vm.selectedProfile)"-->
+  <!--        (profileClicked)="profileClicked($event)"-->
+  <!--        (copyProfileClicked)="copyProfileAndOpenForm($event)">-->
+  <!--      </app-profile-item>-->
+  <!--    </div>-->
+  <!--  </mat-drawer>-->
 
   <ng-template #empty>
-    <div class="risk-assessment-content-empty">
-      <button
-        (click)="openForm()"
-        aria-label="Add New Risk Assessment"
-        class="risk-assessment-add-button"
-        color="primary"
-        mat-flat-button>
-        New Risk Assessment
-      </button>
-    </div>
+    <app-empty-page
+      image="/assets/icons/empty-profiles.svg"
+      header="Risk assessment!"
+      message="To perform a full review of your device, we request that you complete a brief risk questionnaire. This will help us assess any potential risks associated with the device.">
+      <ng-container *ngTemplateOutlet="addRiskProfileButton"></ng-container>
+    </app-empty-page>
+  </ng-template>
+
+  <ng-template #addRiskProfileButton>
+    <button
+      (click)="openForm()"
+      aria-label="Create Risk Profile"
+      class="risk-assessment-add-button"
+      color="primary"
+      mat-flat-button>
+      <mat-icon>add</mat-icon>
+      Create Risk Profile
+    </button>
   </ng-template>
 </ng-container>
diff --git a/modules/ui/src/app/pages/risk-assessment/risk-assessment.component.scss b/modules/ui/src/app/pages/risk-assessment/risk-assessment.component.scss
index db1453086..1fbbf41ff 100644
--- a/modules/ui/src/app/pages/risk-assessment/risk-assessment.component.scss
+++ b/modules/ui/src/app/pages/risk-assessment/risk-assessment.component.scss
@@ -17,19 +17,8 @@
 @use 'variables';
 @use 'mixins';
 
-:host {
-  overflow: hidden;
-  display: flex;
-}
-
-.risk-assessment-content-empty {
-  @include mixins.content-empty;
-}
-
-:host:has(.profiles-drawer) {
-  .risk-assessment-content-empty {
-    width: calc(100% - #{variables.$profiles-drawer-width});
-  }
+.risk-assessment-add-button {
+  @include mixins.add-button;
 }
 
 .risk-assessment-container,
diff --git a/modules/ui/src/app/pages/risk-assessment/risk-assessment.component.spec.ts b/modules/ui/src/app/pages/risk-assessment/risk-assessment.component.spec.ts
index 4ef34fe46..ae09f468c 100644
--- a/modules/ui/src/app/pages/risk-assessment/risk-assessment.component.spec.ts
+++ b/modules/ui/src/app/pages/risk-assessment/risk-assessment.component.spec.ts
@@ -95,7 +95,7 @@ describe('RiskAssessmentComponent', () => {
     expect(component).toBeTruthy();
   });
 
-  describe('with no data', () => {
+  describe('with no profiles data', () => {
     beforeEach(() => {
       component.viewModel$ = of({
         profiles: [] as Profile[],
@@ -106,7 +106,31 @@ describe('RiskAssessmentComponent', () => {
       fixture.detectChanges();
     });
 
-    it('should have "New Risk Assessment" button', () => {
+    it('should have title', () => {
+      const title = compiled.querySelector('h2.title');
+      const titleContent = title?.innerHTML.trim();
+
+      expect(title).toBeTruthy();
+      expect(titleContent).toContain('Risk Assessment');
+    });
+
+    it('should have empty page with necessary content', () => {
+      const emptyHeader = compiled.querySelector(
+        'app-empty-page .empty-message-header'
+      );
+      const emptyMessage = compiled.querySelector(
+        'app-empty-page .empty-message-main'
+      );
+
+      expect(emptyHeader).toBeTruthy();
+      expect(emptyHeader?.innerHTML).toContain('Risk assessment');
+      expect(emptyMessage).toBeTruthy();
+      expect(emptyMessage?.innerHTML).toContain(
+        'complete a brief risk questionnaire'
+      );
+    });
+
+    it('should have "Create Risk Profile" button', () => {
       const newRiskAssessmentBtn = compiled.querySelector(
         '.risk-assessment-add-button'
       );
@@ -122,21 +146,13 @@ describe('RiskAssessmentComponent', () => {
       newRiskAssessmentBtn.click();
       fixture.detectChanges();
 
-      const toolbarEl = compiled.querySelector('.risk-assessment-toolbar');
       const title = compiled.querySelector('h2.title');
       const titleContent = title?.innerHTML.trim();
-      const profileForm = compiled.querySelectorAll('app-profile-form');
+      // const profileForm = compiled.querySelectorAll('app-profile-form');
 
-      expect(toolbarEl).not.toBeNull();
       expect(title).toBeTruthy();
-      expect(titleContent).toContain('Risk assessment');
-      expect(profileForm).toBeTruthy();
-    });
-
-    it('should not have profiles drawer', () => {
-      const profilesDrawer = compiled.querySelector('.profiles-drawer');
-
-      expect(profilesDrawer).toBeFalsy();
+      expect(titleContent).toContain('Risk Assessment');
+      // expect(profileForm).toBeTruthy();
     });
   });
 
@@ -150,17 +166,12 @@ describe('RiskAssessmentComponent', () => {
       fixture.detectChanges();
     });
 
-    it('should have profiles drawer', () => {
-      const profilesDrawer = compiled.querySelector('.profiles-drawer');
-
-      expect(profilesDrawer).toBeTruthy();
-    });
-
-    it('should have profile items', () => {
-      const profileItems = compiled.querySelectorAll('app-profile-item');
-
-      expect(profileItems.length).toEqual(2);
-    });
+    // TODO: change after profile items are added/updated
+    // it('should have profile items', () => {
+    //   const profileItems = compiled.querySelectorAll('app-profile-item');
+    //
+    //   expect(profileItems.length).toEqual(2);
+    // });
 
     describe('#deleteProfile', () => {
       it('should open delete profile modal', fakeAsync(() => {
diff --git a/modules/ui/src/app/pages/risk-assessment/risk-assessment.component.ts b/modules/ui/src/app/pages/risk-assessment/risk-assessment.component.ts
index 75ee9b9fe..b711e3a75 100644
--- a/modules/ui/src/app/pages/risk-assessment/risk-assessment.component.ts
+++ b/modules/ui/src/app/pages/risk-assessment/risk-assessment.component.ts
@@ -42,6 +42,10 @@ import { MatSidenavModule } from '@angular/material/sidenav';
 import { ReactiveFormsModule } from '@angular/forms';
 import { MatButtonModule } from '@angular/material/button';
 import { ProfileFormComponent } from './profile-form/profile-form.component';
+import { MatIconModule } from '@angular/material/icon';
+import { EmptyPageComponent } from '../../components/empty-page/empty-page.component';
+import { ListLayoutComponent } from '../../components/list-layout/list-layout.component';
+import { LayoutType } from '../../model/layout-type';
 
 const matFormFieldDefaultOptions: MatFormFieldDefaultOptions = {
   hideRequiredMarker: true,
@@ -55,9 +59,12 @@ const matFormFieldDefaultOptions: MatFormFieldDefaultOptions = {
     CommonModule,
     MatToolbarModule,
     MatButtonModule,
+    MatIconModule,
     ReactiveFormsModule,
     MatInputModule,
     MatSidenavModule,
+    EmptyPageComponent,
+    ListLayoutComponent,
     ProfileFormComponent,
     ProfileItemComponent,
   ],
@@ -71,6 +78,7 @@ const matFormFieldDefaultOptions: MatFormFieldDefaultOptions = {
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class RiskAssessmentComponent implements OnInit, OnDestroy {
+  readonly LayoutType = LayoutType;
   private store = inject(RiskAssessmentStore);
   dialog = inject(MatDialog);
   private liveAnnouncer = inject(LiveAnnouncer);
diff --git a/modules/ui/src/assets/icons/empty-profiles.svg b/modules/ui/src/assets/icons/empty-profiles.svg
new file mode 100644
index 000000000..07e36e80b
--- /dev/null
+++ b/modules/ui/src/assets/icons/empty-profiles.svg
@@ -0,0 +1,52 @@
+<svg width="354" height="200" viewBox="0 0 354 200" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_2408_25573)">
+<path d="M275.692 37.7227H55.7462V148.738H275.692V37.7227Z" fill="white" stroke="white" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M50.3155 81.0457V37.7227H275.692" fill="white"/>
+<path d="M50.3155 81.0457V37.7227H275.692" stroke="#3C4043" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M191.429 64.9922H58.124V148.727H191.429V64.9922Z" fill="#D2E3FC" stroke="#D2E3FC" stroke-miterlimit="10"/>
+<path d="M240.097 70.6719H207.998V87.3344H240.097V70.6719Z" fill="#D2E3FC" stroke="#D2E3FC" stroke-miterlimit="10"/>
+<path d="M240.097 94.7266H207.998V111.389H240.097V94.7266Z" fill="#D2E3FC" stroke="#D2E3FC" stroke-miterlimit="10"/>
+<path d="M240.097 119.744H207.998V136.407H240.097V119.744Z" fill="#D2E3FC" stroke="#D2E3FC" stroke-miterlimit="10"/>
+<path d="M64.9926 54.6667C66.7914 54.6667 68.2497 53.2167 68.2497 51.4281C68.2497 49.6394 66.7914 48.1895 64.9926 48.1895C63.1937 48.1895 61.7355 49.6394 61.7355 51.4281C61.7355 53.2167 63.1937 54.6667 64.9926 54.6667Z" fill="#EA4335"/>
+<path d="M78.021 54.6667C79.8199 54.6667 81.2781 53.2167 81.2781 51.4281C81.2781 49.6394 79.8199 48.1895 78.021 48.1895C76.2222 48.1895 74.7639 49.6394 74.7639 51.4281C74.7639 53.2167 76.2222 54.6667 78.021 54.6667Z" fill="#34A853"/>
+<path d="M180.654 150.091H275.692V112.184" stroke="#3C4043" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M93.2207 51.0059H235.66" stroke="#3C4043" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M31.0762 41.7598H42.1456" stroke="#3C4043" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M31.0762 47.4629H42.1456" stroke="#3C4043" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M31.0762 53.1875H42.1456" stroke="#3C4043" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M181.327 161.212L192.656 149.947H180.454C180.454 149.947 182.366 162.245 181.327 161.212Z" fill="#3C4043" stroke="#3C4043" stroke-miterlimit="10"/>
+<path d="M13.6577 72.127L49.6746 63.1855V72.127C49.6746 72.1035 14.4254 71.9332 13.6577 72.127Z" fill="#3C4043" stroke="#3C4043" stroke-miterlimit="10"/>
+<path d="M181.328 71.9863H13.6577V161.213H181.328V71.9863Z" fill="white" stroke="#3C4043" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M174.247 150.348H19.8887V154.455H174.247V150.348Z" fill="#D2E3FC"/>
+<path d="M128.435 150.348H19.8887V154.455H128.435V150.348Z" fill="#FBBC04"/>
+<path d="M173.185 80.998H22.8154V142.814H173.185V80.998Z" fill="#EA4335"/>
+<path d="M308.845 68.729C308.845 68.729 351.754 66.929 357.79 22.4004" stroke="#BDC1C6" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M214.087 69.2299C214.087 69.2299 199.498 39.6442 191.26 54.1585C191.26 54.1585 183.865 29.6299 165.128 30.7585" stroke="#BDC1C6" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M334.748 40.4583C335.862 40.4583 336.765 39.5564 336.765 38.444C336.765 37.3315 335.862 36.4297 334.748 36.4297C333.634 36.4297 332.731 37.3315 332.731 38.444C332.731 39.5564 333.634 40.4583 334.748 40.4583Z" fill="#EA4335" stroke="#EA4335" stroke-linejoin="round"/>
+<path d="M178.931 67.1574C179.981 67.1574 180.833 66.3068 180.833 65.2574C180.833 64.2081 179.981 63.3574 178.931 63.3574C177.88 63.3574 177.028 64.2081 177.028 65.2574C177.028 66.3068 177.88 67.1574 178.931 67.1574Z" fill="#FBBC04" stroke="#FBBC04" stroke-miterlimit="10"/>
+<path d="M355.344 65.3009C356.024 65.3009 356.574 64.7508 356.574 64.0723C356.574 63.3938 356.024 62.8438 355.344 62.8438C354.665 62.8438 354.114 63.3938 354.114 64.0723C354.114 64.7508 354.665 65.3009 355.344 65.3009Z" fill="#4285F4" stroke="#4285F4" stroke-miterlimit="10"/>
+<path d="M201.129 29.4435C201.808 29.4435 202.359 28.8934 202.359 28.2149C202.359 27.5364 201.808 26.9863 201.129 26.9863C200.45 26.9863 199.899 27.5364 199.899 28.2149C199.899 28.8934 200.45 29.4435 201.129 29.4435Z" fill="#E8EAED" stroke="#E8EAED" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M253.779 126.242C254.458 126.242 255.009 125.692 255.009 125.014C255.009 124.335 254.458 123.785 253.779 123.785C253.099 123.785 252.548 124.335 252.548 125.014C252.548 125.692 253.099 126.242 253.779 126.242Z" fill="#E8EAED" stroke="#E8EAED" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M317.871 18.8145H223.757V106.4H317.871V18.8145Z" fill="white" stroke="#3C4043" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M270.813 86.3141C283.918 86.3141 294.542 75.7032 294.542 62.6141C294.542 49.5249 283.918 38.9141 270.813 38.9141C257.708 38.9141 247.085 49.5249 247.085 62.6141C247.085 75.7032 257.708 86.3141 270.813 86.3141Z" fill="#34A853" stroke="#34A853" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M263.476 64.8148L267.123 68.4719L278.165 57.4434" stroke="white" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M335.277 138.413L328.126 118.142L331.816 106.056C331.816 106.056 333.847 98.456 327.654 94.6275C323.363 91.9418 312.45 86.2132 312.45 86.2132C312.45 86.2132 303.71 82.5132 302.695 86.7418C301.679 90.9703 304.483 98.6275 304.483 98.6275L305.913 101.999L307.243 103.013L309.575 102.213L309.732 106.985L299.391 107.085C300.278 109.57 307.715 117.999 310.547 121.899C313.379 125.799 317.055 140.27 317.055 140.27C317.055 140.27 318.886 143.127 324.064 144.27C330.157 145.542 333.075 139.456 335.277 138.413Z" fill="#A06549" stroke="#A06549" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M327.654 99.2567L319.844 98.2138C319.171 98.0893 318.479 98.1085 317.814 98.2703C317.149 98.4321 316.526 98.7327 315.985 99.1524C315.445 99.5721 314.999 100.101 314.678 100.705C314.357 101.309 314.168 101.974 314.123 102.657C313.764 104.583 313.525 106.529 313.408 108.485C313.399 108.736 313.478 108.983 313.633 109.181C313.787 109.379 314.006 109.518 314.252 109.571C315.038 109.742 316.311 109.571 317.499 107.442C318.929 104.985 319.258 104.128 319.258 104.128L323.291 104.871" stroke="#3C4043" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M324.221 93.2275L314.309 92.4989C314.309 92.4989 309.804 92.1703 309.517 98.5989C309.288 101.633 309.374 104.683 309.775 107.699C309.775 107.699 311.749 109.885 313.522 105.785" stroke="#3C4043" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M317.213 89.2429C317.213 89.2429 305.77 87.0714 305.355 90.4429C305.067 93.6295 304.976 96.8308 305.084 100.029C305.084 100.029 306.042 105.071 308.902 102.214" stroke="#3C4043" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M335.277 138.412L328.069 118.141L331.759 106.041" stroke="#3C4043" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M304.426 98.5563C304.426 98.5563 301.565 90.8705 302.638 86.6705C303.71 82.4705 312.392 86.142 312.392 86.142" stroke="#3C4043" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M302.838 106.414H231.208" stroke="#3C4043" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M205.634 138.413L212.786 118.142L209.096 106.056C209.096 106.056 207.05 98.456 213.244 94.6275C217.535 91.9418 228.448 86.2132 228.448 86.2132C228.448 86.2132 237.201 82.5132 238.202 86.7418C239.204 90.9703 236.457 98.556 236.457 98.556L235.027 101.927L233.711 102.942L231.366 102.142L231.208 106.913L241.549 107.013C240.663 109.499 233.239 117.927 230.393 121.827C227.547 125.727 223.899 140.199 223.899 140.199C223.899 140.199 222.054 143.056 216.891 144.199C210.712 145.542 206.936 140.97 205.634 138.413Z" fill="#A06549" stroke="#A06549" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M213.244 99.2567L221.053 98.2138C221.726 98.0893 222.418 98.1085 223.083 98.2703C223.749 98.4321 224.372 98.7327 224.912 99.1524C225.453 99.5721 225.898 100.101 226.219 100.705C226.54 101.309 226.729 101.974 226.774 102.657C227.134 104.583 227.373 106.529 227.49 108.485C227.502 108.735 227.426 108.981 227.274 109.18C227.122 109.379 226.905 109.517 226.66 109.571C225.859 109.742 224.6 109.571 223.399 107.442C221.969 104.985 221.654 104.128 221.654 104.128L217.606 104.871" stroke="#3C4043" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M216.691 93.2275L226.588 92.4989C226.588 92.4989 231.094 92.1703 231.38 98.5989C231.619 101.633 231.533 104.683 231.122 107.699C231.122 107.699 229.149 109.885 227.375 105.785" stroke="#3C4043" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M223.699 89.2429C223.699 89.2429 235.142 87.0714 235.542 90.4429C235.839 93.629 235.929 96.8308 235.814 100.029C235.814 100.029 234.87 105.071 232.009 102.214" stroke="#3C4043" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M205.634 138.412L212.843 118.141L209.153 106.041" stroke="#3C4043" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M236.457 98.5563C236.457 98.5563 239.318 90.8705 238.245 86.6705C237.173 82.4705 228.491 86.142 228.491 86.142" stroke="#3C4043" stroke-linecap="round" stroke-linejoin="round"/>
+</g>
+<defs>
+<clipPath id="clip0_2408_25573">
+<rect width="354" height="200" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/modules/ui/src/styles.scss b/modules/ui/src/styles.scss
index 6d13bddd4..b45d2ebf4 100644
--- a/modules/ui/src/styles.scss
+++ b/modules/ui/src/styles.scss
@@ -436,12 +436,6 @@ body #main {
     gap: 4px !important;
   }
 
-  app-risk-assessment:has(.profiles-drawer) {
-    .risk-assessment-content-empty {
-      width: calc(100% - $profiles-drawer-width-xs) !important;
-    }
-  }
-
   app-risk-assessment .main-content {
     width: auto !important;
     padding: 16px 4px !important;
diff --git a/modules/ui/src/theming/mixins.scss b/modules/ui/src/theming/mixins.scss
index 60481194e..987875d86 100644
--- a/modules/ui/src/theming/mixins.scss
+++ b/modules/ui/src/theming/mixins.scss
@@ -13,6 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+@use 'variables';
+
 @mixin dialog {
   display: grid;
   overflow: hidden;
@@ -66,3 +68,13 @@
   opacity: 0.5;
   pointer-events: none;
 }
+
+@mixin add-button {
+  font-family: variables.$font-text;
+  margin-bottom: 12px;
+  width: fit-content;
+  height: 56px;
+  padding-left: 30px;
+  font-size: 16px;
+  font-weight: 500;
+}