diff --git a/src/app/info/feedback/feedback-form/themed-feedback-form.component.ts b/src/app/info/feedback/feedback-form/themed-feedback-form.component.ts
new file mode 100644
index 0000000000..9b42db629f
--- /dev/null
+++ b/src/app/info/feedback/feedback-form/themed-feedback-form.component.ts
@@ -0,0 +1,27 @@
+import { Component } from '@angular/core';
+import { ThemedComponent } from '../../../shared/theme-support/themed.component';
+import { FeedbackFormComponent } from './feedback-form.component';
+
+/**
+ * Themed wrapper for {@link FeedbackFormComponent}
+ */
+@Component({
+  selector: 'ds-themed-feedback-form',
+  styleUrls: [],
+  templateUrl: '../../../shared/theme-support/themed.component.html',
+})
+export class ThemedFeedbackFormComponent extends ThemedComponent<FeedbackFormComponent> {
+
+  protected getComponentName(): string {
+    return 'FeedbackFormComponent';
+  }
+
+  protected importThemedComponent(themeName: string): Promise<any> {
+    return import(`../../../../themes/${themeName}/app/info/feedback/feedback-form/feedback-form.component`);
+  }
+
+  protected importUnthemedComponent(): Promise<any> {
+    return import('./feedback-form.component');
+  }
+
+}
diff --git a/src/app/info/feedback/feedback.component.html b/src/app/info/feedback/feedback.component.html
index 210bdcf1d7..ad42f0f90e 100644
--- a/src/app/info/feedback/feedback.component.html
+++ b/src/app/info/feedback/feedback.component.html
@@ -1,3 +1,3 @@
 <div class="container">
-  <ds-feedback-form></ds-feedback-form>
-</div>
\ No newline at end of file
+  <ds-themed-feedback-form></ds-themed-feedback-form>
+</div>
diff --git a/src/app/info/info.module.ts b/src/app/info/info.module.ts
index 61eee71f3a..ccc4af0a7d 100644
--- a/src/app/info/info.module.ts
+++ b/src/app/info/info.module.ts
@@ -10,6 +10,7 @@ import { ThemedEndUserAgreementComponent } from './end-user-agreement/themed-end
 import { ThemedPrivacyComponent } from './privacy/themed-privacy.component';
 import { FeedbackComponent } from './feedback/feedback.component';
 import { FeedbackFormComponent } from './feedback/feedback-form/feedback-form.component';
+import { ThemedFeedbackFormComponent } from './feedback/feedback-form/themed-feedback-form.component';
 import { ThemedFeedbackComponent } from './feedback/themed-feedback.component';
 import { FeedbackGuard } from '../core/feedback/feedback.guard';
 
@@ -23,6 +24,7 @@ const DECLARATIONS = [
   ThemedPrivacyComponent,
   FeedbackComponent,
   FeedbackFormComponent,
+  ThemedFeedbackFormComponent,
   ThemedFeedbackComponent
 ];
 
diff --git a/src/themes/custom/app/info/feedback/feedback-form/feedback-form.component.html b/src/themes/custom/app/info/feedback/feedback-form/feedback-form.component.html
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/info/feedback/feedback-form/feedback-form.component.scss b/src/themes/custom/app/info/feedback/feedback-form/feedback-form.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/info/feedback/feedback-form/feedback-form.component.ts b/src/themes/custom/app/info/feedback/feedback-form/feedback-form.component.ts
new file mode 100644
index 0000000000..fb0041882e
--- /dev/null
+++ b/src/themes/custom/app/info/feedback/feedback-form/feedback-form.component.ts
@@ -0,0 +1,14 @@
+import { Component } from '@angular/core';
+import {
+  FeedbackFormComponent as BaseComponent
+} from '../../../../../../app/info/feedback/feedback-form/feedback-form.component';
+
+@Component({
+  selector: 'ds-feedback-form',
+  // templateUrl: './feedback-form.component.html',
+  templateUrl: '../../../../../../app/info/feedback/feedback-form/feedback-form.component.html',
+  // styleUrls: ['./feedback-form.component.scss'],
+  styleUrls: ['../../../../../../app/info/feedback/feedback-form/feedback-form.component.scss'],
+})
+export class FeedbackFormComponent extends BaseComponent {
+}
diff --git a/src/themes/custom/lazy-theme.module.ts b/src/themes/custom/lazy-theme.module.ts
index 9c2b888999..a9bee75236 100644
--- a/src/themes/custom/lazy-theme.module.ts
+++ b/src/themes/custom/lazy-theme.module.ts
@@ -133,6 +133,7 @@ import {
 import { MetadataRepresentationListComponent } from './app/item-page/simple/metadata-representation-list/metadata-representation-list.component';
 import { DsDynamicLookupRelationSearchTabComponent } from './app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component';
 import { DsDynamicLookupRelationExternalSourceTabComponent } from './app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component';
+import { FeedbackFormComponent } from './app/info/feedback/feedback-form/feedback-form.component';
 
 const DECLARATIONS = [
   FileSectionComponent,
@@ -173,6 +174,7 @@ const DECLARATIONS = [
   WorkflowItemSendBackComponent,
   BreadcrumbsComponent,
   FeedbackComponent,
+  FeedbackFormComponent,
   CommunityListComponent,
   ComcolPageHandleComponent,
   AuthNavMenuComponent,