diff --git a/src/app/features/project-editor/sections/branding-section.component.html b/src/app/features/project-editor/sections/branding-section.component.html
index 7d09d3b..8c7862b 100644
--- a/src/app/features/project-editor/sections/branding-section.component.html
+++ b/src/app/features/project-editor/sections/branding-section.component.html
@@ -1,6 +1,5 @@
 @if (bootstrap(); as bootstrap) {
-<section class="editor-section-card">
-  <h2>{{ 'builder.branding' | translate }}</h2>
+<app-section-card [title]="'builder.branding' | translate">
   <div class="editor-grid two">
     <app-form-field [label]="'builder.logo' | translate" [hint]="'builder.logoDesc' | translate">
       <div class="media-field-row">
@@ -25,5 +24,5 @@
     </app-form-field>
   </div>
   <app-media-picker [open]="mediaPickerOpen" (selected)="onImagePicked($event)" (closed)="mediaPickerOpen = false" />
-</section>
+</app-section-card>
 }
diff --git a/src/app/features/project-editor/sections/branding-section.component.ts b/src/app/features/project-editor/sections/branding-section.component.ts
index c85f86c..e455f09 100644
--- a/src/app/features/project-editor/sections/branding-section.component.ts
+++ b/src/app/features/project-editor/sections/branding-section.component.ts
@@ -7,13 +7,14 @@ import { FormFieldComponent } from '../../../shared/ui/form-field/form-field.com
 import { ButtonComponent } from '../../../shared/ui/button/button.component';
 import { MediaPickerComponent } from '../../../shared/media/media-picker/media-picker.component';
 import { MediaAsset } from '../../../core/media/models/media-asset.model';
+import { SectionCardComponent } from '../../../shared/ui/section-card/section-card.component';
 
 type BrandingImageField = 'logoUrl' | 'logoCompactUrl' | 'faviconUrl';
 
 @Component({
   selector: 'app-project-editor-branding-section',
   standalone: true,
-  imports: [FormsModule, TranslatePipe, InputComponent, FormFieldComponent, ButtonComponent, MediaPickerComponent],
+  imports: [FormsModule, TranslatePipe, InputComponent, FormFieldComponent, ButtonComponent, MediaPickerComponent, SectionCardComponent],
   templateUrl: './branding-section.component.html',
   styleUrls: ['./section.shared.scss'],
   changeDetection: ChangeDetectionStrategy.OnPush
diff --git a/src/app/features/project-editor/sections/general-section.component.html b/src/app/features/project-editor/sections/general-section.component.html
index fc857ef..b6c630f 100644
--- a/src/app/features/project-editor/sections/general-section.component.html
+++ b/src/app/features/project-editor/sections/general-section.component.html
@@ -1,6 +1,5 @@
 @if (bootstrap(); as bootstrap) {
-<section class="editor-section-card">
-  <h2>{{ 'builder.general' | translate }}</h2>
+<app-section-card [title]="'builder.general' | translate">
   <div class="editor-grid two">
     <app-form-field [label]="'builder.marketplaceName' | translate" [hint]="'builder.marketplaceNameDesc' | translate">
       <app-input [ngModel]="bootstrap.branding.brandName" (ngModelChange)="updateMarketplaceName($event)" />
@@ -20,5 +19,5 @@
       <app-input [ngModel]="languagesValue()" (ngModelChange)="updateSupportedLanguages($event)" />
     </app-form-field>
   </div>
-</section>
+</app-section-card>
 }
diff --git a/src/app/features/project-editor/sections/general-section.component.ts b/src/app/features/project-editor/sections/general-section.component.ts
index 4c146c7..fb0a4bc 100644
--- a/src/app/features/project-editor/sections/general-section.component.ts
+++ b/src/app/features/project-editor/sections/general-section.component.ts
@@ -4,11 +4,12 @@ import { ProjectEditorFacade } from '../facade/project-editor.facade';
 import { TranslatePipe } from '../../../i18n/translate.pipe';
 import { InputComponent } from '../../../shared/ui/input/input.component';
 import { FormFieldComponent } from '../../../shared/ui/form-field/form-field.component';
+import { SectionCardComponent } from '../../../shared/ui/section-card/section-card.component';
 
 @Component({
   selector: 'app-project-editor-general-section',
   standalone: true,
-  imports: [FormsModule, TranslatePipe, InputComponent, FormFieldComponent],
+  imports: [FormsModule, TranslatePipe, InputComponent, FormFieldComponent, SectionCardComponent],
   templateUrl: './general-section.component.html',
   styleUrls: ['./section.shared.scss'],
   changeDetection: ChangeDetectionStrategy.OnPush