diff --git a/packages/feedback/src/core/createMainStyles.ts b/packages/feedback/src/core/createMainStyles.ts
index 9eb5bd4dc2ab..ca5f138cb960 100644
--- a/packages/feedback/src/core/createMainStyles.ts
+++ b/packages/feedback/src/core/createMainStyles.ts
@@ -1,7 +1,7 @@
+import type { FeedbackInternalOptions } from '@sentry/types';
 import { DOCUMENT } from '../constants';
-import type { FeedbackTheme, FeedbackThemes } from '../types';
 
-function getThemedCssVariables(theme: FeedbackTheme): string {
+function getThemedCssVariables(theme: FeedbackInternalOptions['themeLight']): string {
   return `
   --background: ${theme.background};
   --background-hover: ${theme.backgroundHover};
@@ -39,7 +39,10 @@ function getThemedCssVariables(theme: FeedbackTheme): string {
 /**
  * Creates <style> element for widget actor (button that opens the dialog)
  */
-export function createMainStyles(colorScheme: 'system' | 'dark' | 'light', themes: FeedbackThemes): HTMLStyleElement {
+export function createMainStyles(
+  colorScheme: 'system' | 'dark' | 'light',
+  themes: Pick<FeedbackInternalOptions, 'themeLight' | 'themeDark'>,
+): HTMLStyleElement {
   const style = DOCUMENT.createElement('style');
   style.textContent = `
 :host {
diff --git a/packages/feedback/src/core/integration.ts b/packages/feedback/src/core/integration.ts
index e0a0e273e6f0..e39b032bbc85 100644
--- a/packages/feedback/src/core/integration.ts
+++ b/packages/feedback/src/core/integration.ts
@@ -1,5 +1,11 @@
 import { getClient } from '@sentry/core';
-import type { Integration, IntegrationFn } from '@sentry/types';
+import type {
+  FeedbackDialog,
+  FeedbackInternalOptions,
+  FeedbackModalIntegration,
+  FeedbackScreenshotIntegration,
+  IntegrationFn,
+} from '@sentry/types';
 import { isBrowser, logger } from '@sentry/utils';
 import {
   ACTOR_LABEL,
@@ -17,34 +23,16 @@ import {
   SUBMIT_BUTTON_LABEL,
   SUCCESS_MESSAGE_TEXT,
 } from '../constants';
-import type { IFeedbackModalIntegration } from '../modal/integration';
-import type { IFeedbackScreenshotIntegration } from '../screenshot/integration';
-import type {
-  Dialog,
-  FeedbackInternalOptions,
-  OptionalFeedbackConfiguration,
-  OverrideFeedbackConfiguration,
-} from '../types';
 import { DEBUG_BUILD } from '../util/debug-build';
 import { isScreenshotSupported } from '../util/isScreenshotSupported';
 import { mergeOptions } from '../util/mergeOptions';
 import { Actor } from './components/Actor';
 import { createMainStyles } from './createMainStyles';
 import { sendFeedback } from './sendFeedback';
+import type { OptionalFeedbackConfiguration, OverrideFeedbackConfiguration } from './types';
 
 type Unsubscribe = () => void;
 
-interface PublicFeedbackIntegration {
-  attachTo: (el: Element | string, optionOverrides: OverrideFeedbackConfiguration) => () => void;
-  createWidget: (optionOverrides: OverrideFeedbackConfiguration & { shouldCreateActor?: boolean }) => Promise<Dialog>;
-  getWidget: () => Dialog | null;
-  remove: () => void;
-  openDialog: () => void;
-  closeDialog: () => void;
-  removeWidget: () => void;
-}
-export type IFeedbackIntegration = Integration & PublicFeedbackIntegration;
-
 /**
  * Allow users to capture user feedback and send it to Sentry.
  */
@@ -148,13 +136,13 @@ export const feedbackIntegration = (({
     return _shadow as ShadowRoot;
   };
 
-  const _loadAndRenderDialog = async (options: FeedbackInternalOptions): Promise<Dialog> => {
+  const _loadAndRenderDialog = async (options: FeedbackInternalOptions): Promise<FeedbackDialog> => {
     const client = getClient(); // TODO: getClient<BrowserClient>()
     if (!client) {
       throw new Error('Sentry Client is not initialized correctly');
     }
-    const modalIntegration = client.getIntegrationByName<IFeedbackModalIntegration>('FeedbackModal');
-    const screenshotIntegration = client.getIntegrationByName<IFeedbackScreenshotIntegration>('FeedbackScreenshot');
+    const modalIntegration = client.getIntegrationByName<FeedbackModalIntegration>('FeedbackModal');
+    const screenshotIntegration = client.getIntegrationByName<FeedbackScreenshotIntegration>('FeedbackScreenshot');
     const screenshotIsSupported = isScreenshotSupported();
 
     // START TEMP: Error messages
@@ -196,7 +184,7 @@ export const feedbackIntegration = (({
       throw new Error('Unable to attach to target element');
     }
 
-    let dialog: Dialog | null = null;
+    let dialog: FeedbackDialog | null = null;
     const handleClick = async (): Promise<void> => {
       if (!dialog) {
         dialog = await _loadAndRenderDialog({
@@ -264,7 +252,7 @@ export const feedbackIntegration = (({
     /**
      * Creates a new widget. Accepts partial options to override any options passed to constructor.
      */
-    async createWidget(optionOverrides: OverrideFeedbackConfiguration = {}): Promise<Dialog> {
+    async createWidget(optionOverrides: OverrideFeedbackConfiguration = {}): Promise<FeedbackDialog> {
       return _loadAndRenderDialog(mergeOptions(_options, optionOverrides));
     },
 
diff --git a/packages/feedback/src/core/sendFeedback.ts b/packages/feedback/src/core/sendFeedback.ts
index f3310303082a..5aa795fb16ca 100644
--- a/packages/feedback/src/core/sendFeedback.ts
+++ b/packages/feedback/src/core/sendFeedback.ts
@@ -1,17 +1,16 @@
 import { createAttachmentEnvelope, createEventEnvelope, getClient, withScope } from '@sentry/core';
-import type { FeedbackEvent, TransportMakeRequestResponse } from '@sentry/types';
+import type { FeedbackEvent, SendFeedback, SendFeedbackParams } from '@sentry/types';
 import { getLocationHref } from '@sentry/utils';
 import { FEEDBACK_API_SOURCE, FEEDBACK_WIDGET_SOURCE } from '../constants';
-import type { SendFeedbackOptions, SendFeedbackParams } from '../types';
 import { prepareFeedbackEvent } from '../util/prepareFeedbackEvent';
 
 /**
  * Public API to send a Feedback item to Sentry
  */
-export async function sendFeedback(
+export const sendFeedback: SendFeedback = (
   { name, email, message, attachments, source = FEEDBACK_API_SOURCE, url = getLocationHref() }: SendFeedbackParams,
-  { includeReplay = true }: SendFeedbackOptions = {},
-): Promise<TransportMakeRequestResponse> {
+  { includeReplay = true } = {},
+) => {
   if (!message) {
     throw new Error('Unable to submit feedback with empty message');
   }
@@ -97,7 +96,7 @@ export async function sendFeedback(
       throw error;
     }
   });
-}
+};
 
 /*
  * For reference, the fully built event looks something like this:
diff --git a/packages/feedback/src/core/types.ts b/packages/feedback/src/core/types.ts
new file mode 100644
index 000000000000..a85987301702
--- /dev/null
+++ b/packages/feedback/src/core/types.ts
@@ -0,0 +1,19 @@
+import type { FeedbackInternalOptions } from '@sentry/types';
+
+/**
+ * Partial configuration that overrides default configuration values
+ *
+ * This is the config that gets passed into the integration constructor
+ */
+export interface OptionalFeedbackConfiguration
+  extends Omit<Partial<FeedbackInternalOptions>, 'themeLight' | 'themeDark'> {
+  themeLight?: Partial<FeedbackInternalOptions['themeLight']>;
+  themeDark?: Partial<FeedbackInternalOptions['themeLight']>;
+}
+
+/**
+ * Partial configuration that overrides default configuration values
+ *
+ * This is the config that gets passed into the integration constructor
+ */
+export type OverrideFeedbackConfiguration = Omit<Partial<FeedbackInternalOptions>, 'themeLight' | 'themeDark'>;
diff --git a/packages/feedback/src/index.ts b/packages/feedback/src/index.ts
index c182c98669c3..245469a7f3d6 100644
--- a/packages/feedback/src/index.ts
+++ b/packages/feedback/src/index.ts
@@ -3,6 +3,3 @@ export { feedbackIntegration } from './core/integration';
 export { feedbackModalIntegration } from './modal/integration';
 export { getFeedback } from './core/getFeedback';
 export { feedbackScreenshotIntegration } from './screenshot/integration';
-
-export type { OptionalFeedbackConfiguration } from './types';
-export type { IFeedbackIntegration } from './core/integration';
diff --git a/packages/feedback/src/modal/components/DialogContainer.tsx b/packages/feedback/src/modal/components/DialogContainer.tsx
index 9c178ea9de2d..97d1b7f84e96 100644
--- a/packages/feedback/src/modal/components/DialogContainer.tsx
+++ b/packages/feedback/src/modal/components/DialogContainer.tsx
@@ -1,9 +1,9 @@
+import type { FeedbackFormData } from '@sentry/types';
 // biome-ignore lint/nursery/noUnusedImports: reason
 import { Fragment, h } from 'preact'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import type { VNode } from 'preact';
 import { useCallback, useMemo, useState } from 'preact/hooks';
 import { SUCCESS_MESSAGE_TIMEOUT } from '../../constants';
-import type { FeedbackFormData } from '../../types';
 import { DialogContent } from './DialogContent';
 import { DialogHeader } from './DialogHeader';
 import type { Props as HeaderProps } from './DialogHeader';
diff --git a/packages/feedback/src/modal/components/DialogHeader.tsx b/packages/feedback/src/modal/components/DialogHeader.tsx
index 2af30b580b56..0d6c66d8341c 100644
--- a/packages/feedback/src/modal/components/DialogHeader.tsx
+++ b/packages/feedback/src/modal/components/DialogHeader.tsx
@@ -1,8 +1,8 @@
+import type { FeedbackInternalOptions } from '@sentry/types';
 // biome-ignore lint/nursery/noUnusedImports: reason
 import { h } from 'preact'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import type { VNode } from 'preact';
 import { useMemo } from 'preact/hooks';
-import type { FeedbackInternalOptions } from '../../types';
 import type { Props as LogoProps } from './SentryLogo';
 import { SentryLogo } from './SentryLogo';
 
diff --git a/packages/feedback/src/modal/components/Form.tsx b/packages/feedback/src/modal/components/Form.tsx
index 960b4c3d9038..5b5c5aa80dd4 100644
--- a/packages/feedback/src/modal/components/Form.tsx
+++ b/packages/feedback/src/modal/components/Form.tsx
@@ -1,16 +1,15 @@
+import type {
+  FeedbackFormData,
+  FeedbackInternalOptions,
+  FeedbackScreenshotIntegration,
+  SendFeedback,
+} from '@sentry/types';
 import { logger } from '@sentry/utils';
 // biome-ignore lint/nursery/noUnusedImports: reason
 import { h } from 'preact'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import type { JSX, VNode } from 'preact';
 import { useCallback, useState } from 'preact/hooks';
 import { FEEDBACK_WIDGET_SOURCE } from '../../constants';
-import type {
-  FeedbackFormData,
-  FeedbackInternalOptions,
-  ScreenshotInput,
-  SendFeedbackOptions,
-  SendFeedbackParams,
-} from '../../types';
 import { DEBUG_BUILD } from '../../util/debug-build';
 import { getMissingFields } from '../../util/validate';
 
@@ -34,10 +33,10 @@ export interface Props
   defaultEmail: string;
   defaultName: string;
   onFormClose: () => void;
-  onSubmit: (data: SendFeedbackParams, options?: SendFeedbackOptions) => void;
+  onSubmit: SendFeedback;
   onSubmitSuccess: (data: FeedbackFormData) => void;
   onSubmitError: (error: Error) => void;
-  screenshotInput: ScreenshotInput | undefined;
+  screenshotInput: ReturnType<FeedbackScreenshotIntegration['createInput']> | undefined;
 }
 
 function retrieveStringValue(formData: FormData, key: string): string {
@@ -74,8 +73,8 @@ export function Form({
   const [error, setError] = useState<null | string>(null);
 
   const [showScreenshotInput, setShowScreenshotInput] = useState(false);
-  const ScreenshotInput = screenshotInput && screenshotInput.input;
-  const includeScreenshotValue = ScreenshotInput && showScreenshotInput;
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  const ScreenshotInputComponent: any = screenshotInput && screenshotInput.input;
 
   const [screenshotError, setScreenshotError] = useState<null | Error>(null);
   const onScreenshotError = useCallback((error: Error) => {
@@ -112,7 +111,7 @@ export function Form({
           return;
         }
         const formData = new FormData(e.target);
-        const attachment = await (includeScreenshotValue ? screenshotInput.value() : undefined);
+        const attachment = await (screenshotInput && showScreenshotInput ? screenshotInput.value() : undefined);
         const data: FeedbackFormData = {
           name: retrieveStringValue(formData, 'name'),
           email: retrieveStringValue(formData, 'email'),
@@ -134,12 +133,14 @@ export function Form({
         // pass
       }
     },
-    [includeScreenshotValue, onSubmitSuccess, onSubmitError],
+    [screenshotInput && showScreenshotInput, onSubmitSuccess, onSubmitError],
   );
 
   return (
     <form class="form" onSubmit={handleSubmit}>
-      {includeScreenshotValue ? <ScreenshotInput onError={onScreenshotError} /> : null}
+      {ScreenshotInputComponent && showScreenshotInput ? (
+        <ScreenshotInputComponent onError={onScreenshotError} />
+      ) : null}
 
       <div class="form__right">
         <div class="form__top">
@@ -192,7 +193,7 @@ export function Form({
             />
           </label>
 
-          {ScreenshotInput ? (
+          {ScreenshotInputComponent ? (
             <label for="screenshot" class="form__label">
               <span class="form__label__text">Screenshot</span>
 
diff --git a/packages/feedback/src/modal/components/SentryLogo.ts b/packages/feedback/src/modal/components/SentryLogo.ts
index 1e32ad8efdcd..4c6cb9f81153 100644
--- a/packages/feedback/src/modal/components/SentryLogo.ts
+++ b/packages/feedback/src/modal/components/SentryLogo.ts
@@ -1,5 +1,5 @@
+import type { FeedbackInternalOptions } from '@sentry/types';
 import { DOCUMENT } from '../../constants';
-import type { FeedbackInternalOptions } from '../../types';
 import { setAttributesNS } from '../../util/setAttributesNS';
 
 const XMLNS = 'http://www.w3.org/2000/svg';
diff --git a/packages/feedback/src/modal/createDialog.tsx b/packages/feedback/src/modal/createDialog.tsx
deleted file mode 100644
index 626c1fe20d19..000000000000
--- a/packages/feedback/src/modal/createDialog.tsx
+++ /dev/null
@@ -1,95 +0,0 @@
-import { getCurrentScope } from '@sentry/core';
-import { h, render } from 'preact';
-import { DOCUMENT } from '../constants';
-import type { sendFeedback as sendFeedbackFn } from '../core/sendFeedback';
-import type { IFeedbackScreenshotIntegration } from '../screenshot/integration';
-import type { Dialog, FeedbackFormData, FeedbackInternalOptions } from '../types';
-import { createDialogStyles } from './components/Dialog.css';
-import { DialogComponent } from './components/DialogContainer';
-
-interface Props {
-  options: FeedbackInternalOptions;
-  screenshotIntegration: IFeedbackScreenshotIntegration | undefined;
-  sendFeedback: typeof sendFeedbackFn;
-  shadow: ShadowRoot;
-}
-
-export function createDialog({ options, screenshotIntegration, sendFeedback, shadow }: Props): Dialog {
-  const userKey = options.useSentryUser;
-  const scope = getCurrentScope();
-  const user = scope && scope.getUser();
-
-  const el = DOCUMENT.createElement('div');
-  const style = createDialogStyles();
-
-  const dialog = {
-    get el() {
-      return el;
-    },
-    appendToDom(): void {
-      if (!shadow.contains(style) && !shadow.contains(el)) {
-        shadow.appendChild(style);
-        shadow.appendChild(el);
-      }
-    },
-    removeFromDom(): void {
-      shadow.removeChild(el);
-      shadow.removeChild(style);
-    },
-    open() {
-      renderContent(true);
-      options.onFormOpen && options.onFormOpen();
-    },
-    close() {
-      renderContent(false);
-    },
-  };
-
-  const screenshotInput = screenshotIntegration && screenshotIntegration.createInput(h, dialog);
-
-  const renderContent = (open: boolean): void => {
-    render(
-      <DialogComponent
-        screenshotInput={screenshotInput}
-        colorScheme={options.colorScheme}
-        showBranding={options.showBranding}
-        showName={options.showName || options.isNameRequired}
-        showEmail={options.showEmail || options.isEmailRequired}
-        isNameRequired={options.isNameRequired}
-        isEmailRequired={options.isEmailRequired}
-        formTitle={options.formTitle}
-        cancelButtonLabel={options.cancelButtonLabel}
-        submitButtonLabel={options.submitButtonLabel}
-        emailLabel={options.emailLabel}
-        emailPlaceholder={options.emailPlaceholder}
-        messageLabel={options.messageLabel}
-        messagePlaceholder={options.messagePlaceholder}
-        nameLabel={options.nameLabel}
-        namePlaceholder={options.namePlaceholder}
-        defaultName={(userKey && user && user[userKey.name]) || ''}
-        defaultEmail={(userKey && user && user[userKey.email]) || ''}
-        successMessageText={options.successMessageText}
-        isRequiredText={options.isRequiredText}
-        onFormClose={() => {
-          renderContent(false);
-          options.onFormClose && options.onFormClose();
-        }}
-        onSubmit={sendFeedback}
-        onSubmitSuccess={(data: FeedbackFormData) => {
-          renderContent(false);
-          options.onSubmitSuccess && options.onSubmitSuccess(data);
-        }}
-        onSubmitError={(error: Error) => {
-          options.onSubmitError && options.onSubmitError(error);
-        }}
-        onFormSubmitted={() => {
-          options.onFormSubmitted && options.onFormSubmitted();
-        }}
-        open={open}
-      />,
-      el,
-    );
-  };
-
-  return dialog;
-}
diff --git a/packages/feedback/src/modal/integration.ts b/packages/feedback/src/modal/integration.ts
deleted file mode 100644
index fa034650f023..000000000000
--- a/packages/feedback/src/modal/integration.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import { defineIntegration } from '@sentry/core';
-import type { Integration, IntegrationFn } from '@sentry/types';
-import { createDialog } from './createDialog';
-
-interface PublicFeedbackModalIntegration {
-  createDialog: typeof createDialog;
-}
-
-const INTEGRATION_NAME = 'FeedbackModal';
-
-export type IFeedbackModalIntegration = Integration & PublicFeedbackModalIntegration;
-
-export const _feedbackModalIntegration = (() => {
-  return {
-    name: INTEGRATION_NAME,
-    // eslint-disable-next-line @typescript-eslint/no-empty-function
-    setupOnce() {},
-    createDialog,
-  };
-}) satisfies IntegrationFn;
-
-export const feedbackModalIntegration = defineIntegration(_feedbackModalIntegration);
diff --git a/packages/feedback/src/modal/integration.tsx b/packages/feedback/src/modal/integration.tsx
new file mode 100644
index 000000000000..6f6cc8f5fef6
--- /dev/null
+++ b/packages/feedback/src/modal/integration.tsx
@@ -0,0 +1,94 @@
+import { getCurrentScope } from '@sentry/core';
+import type { CreateDialogProps, FeedbackFormData, FeedbackModalIntegration, IntegrationFn } from '@sentry/types';
+import { h, render } from 'preact';
+import { DOCUMENT } from '../constants';
+import { createDialogStyles } from './components/Dialog.css';
+import { DialogComponent } from './components/DialogContainer';
+
+export const feedbackModalIntegration = ((): FeedbackModalIntegration => {
+  return {
+    name: 'FeedbackModal',
+    // eslint-disable-next-line @typescript-eslint/no-empty-function
+    setupOnce() {},
+    createDialog: ({ options, screenshotIntegration, sendFeedback, shadow }: CreateDialogProps) => {
+      const shadowRoot = shadow as unknown as ShadowRoot;
+      const userKey = options.useSentryUser;
+      const scope = getCurrentScope();
+      const user = scope && scope.getUser();
+
+      const el = DOCUMENT.createElement('div');
+      const style = createDialogStyles();
+
+      const dialog = {
+        get el() {
+          return el;
+        },
+        appendToDom(): void {
+          if (!shadowRoot.contains(style) && !shadowRoot.contains(el)) {
+            shadowRoot.appendChild(style);
+            shadowRoot.appendChild(el);
+          }
+        },
+        removeFromDom(): void {
+          shadowRoot.removeChild(el);
+          shadowRoot.removeChild(style);
+        },
+        open() {
+          renderContent(true);
+          options.onFormOpen && options.onFormOpen();
+        },
+        close() {
+          renderContent(false);
+        },
+      };
+
+      const screenshotInput = screenshotIntegration && screenshotIntegration.createInput(h, dialog);
+
+      const renderContent = (open: boolean): void => {
+        render(
+          <DialogComponent
+            screenshotInput={screenshotInput}
+            colorScheme={options.colorScheme}
+            showBranding={options.showBranding}
+            showName={options.showName || options.isNameRequired}
+            showEmail={options.showEmail || options.isEmailRequired}
+            isNameRequired={options.isNameRequired}
+            isEmailRequired={options.isEmailRequired}
+            formTitle={options.formTitle}
+            cancelButtonLabel={options.cancelButtonLabel}
+            submitButtonLabel={options.submitButtonLabel}
+            emailLabel={options.emailLabel}
+            emailPlaceholder={options.emailPlaceholder}
+            messageLabel={options.messageLabel}
+            messagePlaceholder={options.messagePlaceholder}
+            nameLabel={options.nameLabel}
+            namePlaceholder={options.namePlaceholder}
+            defaultName={(userKey && user && user[userKey.name]) || ''}
+            defaultEmail={(userKey && user && user[userKey.email]) || ''}
+            successMessageText={options.successMessageText}
+            isRequiredText={options.isRequiredText}
+            onFormClose={() => {
+              renderContent(false);
+              options.onFormClose && options.onFormClose();
+            }}
+            onSubmit={sendFeedback}
+            onSubmitSuccess={(data: FeedbackFormData) => {
+              renderContent(false);
+              options.onSubmitSuccess && options.onSubmitSuccess(data);
+            }}
+            onSubmitError={(error: Error) => {
+              options.onSubmitError && options.onSubmitError(error);
+            }}
+            onFormSubmitted={() => {
+              options.onFormSubmitted && options.onFormSubmitted();
+            }}
+            open={open}
+          />,
+          el,
+        );
+      };
+
+      return dialog;
+    },
+  };
+}) satisfies IntegrationFn;
diff --git a/packages/feedback/src/screenshot/components/ScreenshotEditor.tsx b/packages/feedback/src/screenshot/components/ScreenshotEditor.tsx
index f3c0e39970ce..0287b647ece0 100644
--- a/packages/feedback/src/screenshot/components/ScreenshotEditor.tsx
+++ b/packages/feedback/src/screenshot/components/ScreenshotEditor.tsx
@@ -1,10 +1,10 @@
+import type { FeedbackDialog } from '@sentry/types';
 /* eslint-disable max-lines */
 import type { ComponentType, VNode, h as hType } from 'preact';
 // biome-ignore lint: needed for preact
 import { h } from 'preact'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import { useCallback, useEffect, useMemo, useRef, useState } from 'preact/hooks';
 import { CROP_COLOR, DOCUMENT, WINDOW } from '../../constants';
-import type { Dialog } from '../../types';
 import { createScreenshotInputStyles } from './ScreenshotInput.css';
 import { useTakeScreenshot } from './useTakeScreenshot';
 
@@ -16,7 +16,7 @@ const DPI = WINDOW.devicePixelRatio;
 interface FactoryParams {
   h: typeof hType;
   imageBuffer: HTMLCanvasElement;
-  dialog: Dialog;
+  dialog: FeedbackDialog;
 }
 
 interface Props {
@@ -219,7 +219,7 @@ export function makeScreenshotEditorComponent({ h, imageBuffer, dialog }: Factor
 
     useTakeScreenshot({
       onBeforeScreenshot: useCallback(() => {
-        dialog.el.style.display = 'none';
+        (dialog.el as HTMLElement).style.display = 'none';
       }, []),
       onScreenshot: useCallback(
         (imageSource: HTMLVideoElement) => {
@@ -234,13 +234,13 @@ export function makeScreenshotEditorComponent({ h, imageBuffer, dialog }: Factor
         [imageBuffer],
       ),
       onAfterScreenshot: useCallback(() => {
-        dialog.el.style.display = 'block';
+        (dialog.el as HTMLElement).style.display = 'block';
         const container = canvasContainerRef.current;
         container && container.appendChild(imageBuffer);
         resizeCropper();
       }, []),
       onError: useCallback(error => {
-        dialog.el.style.display = 'block';
+        (dialog.el as HTMLElement).style.display = 'block';
         onError(error);
       }, []),
     });
diff --git a/packages/feedback/src/screenshot/createInput.ts b/packages/feedback/src/screenshot/createInput.ts
deleted file mode 100644
index 679a82f5dfba..000000000000
--- a/packages/feedback/src/screenshot/createInput.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import type { Attachment } from '@sentry/types';
-import type { h as hType } from 'preact';
-import { DOCUMENT } from '../constants';
-import type { Dialog, ScreenshotInput } from '../types';
-import { makeScreenshotEditorComponent } from './components/ScreenshotEditor';
-
-/**
- *
- */
-export function createInput(h: typeof hType, dialog: Dialog): ScreenshotInput {
-  const imageBuffer = DOCUMENT.createElement('canvas');
-
-  return {
-    input: makeScreenshotEditorComponent({ h, imageBuffer, dialog }),
-
-    value: async () => {
-      const blob = await new Promise<Parameters<BlobCallback>[0]>(resolve => {
-        imageBuffer.toBlob(resolve, 'image/png');
-      });
-      if (blob) {
-        const data = new Uint8Array(await blob.arrayBuffer());
-        const attachment: Attachment = {
-          data,
-          filename: 'screenshot.png',
-          contentType: 'application/png',
-          // attachmentType?: string;
-        };
-        return attachment;
-      }
-      return;
-    },
-  };
-}
diff --git a/packages/feedback/src/screenshot/integration.ts b/packages/feedback/src/screenshot/integration.ts
index 3b959b971d70..f4d8a287ad96 100644
--- a/packages/feedback/src/screenshot/integration.ts
+++ b/packages/feedback/src/screenshot/integration.ts
@@ -1,22 +1,38 @@
-import { defineIntegration } from '@sentry/core';
-import type { Integration, IntegrationFn } from '@sentry/types';
-import { createInput } from './createInput';
+import type { FeedbackDialog, FeedbackScreenshotIntegration, IntegrationFn } from '@sentry/types';
+import type { Attachment } from '@sentry/types';
+import type { h as hType } from 'preact';
+import { DOCUMENT } from '../constants';
+import { makeScreenshotEditorComponent } from './components/ScreenshotEditor';
 
-interface PublicFeedbackScreenshotIntegration {
-  createInput: typeof createInput;
-}
-
-const INTEGRATION_NAME = 'FeedbackScreenshot';
-
-export type IFeedbackScreenshotIntegration = Integration & PublicFeedbackScreenshotIntegration;
-
-export const _feedbackScreenshotIntegration = (() => {
+export const feedbackScreenshotIntegration = ((): FeedbackScreenshotIntegration => {
   return {
-    name: INTEGRATION_NAME,
+    name: 'FeedbackScreenshot',
     // eslint-disable-next-line @typescript-eslint/no-empty-function
     setupOnce() {},
-    createInput,
+    createInput: (h: unknown, dialog: FeedbackDialog) => {
+      const imageBuffer = DOCUMENT.createElement('canvas');
+
+      return {
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        input: makeScreenshotEditorComponent({ h: h as typeof hType, imageBuffer, dialog }) as any,
+
+        value: async () => {
+          const blob = await new Promise<Parameters<BlobCallback>[0]>(resolve => {
+            imageBuffer.toBlob(resolve, 'image/png');
+          });
+          if (blob) {
+            const data = new Uint8Array(await blob.arrayBuffer());
+            const attachment: Attachment = {
+              data,
+              filename: 'screenshot.png',
+              contentType: 'application/png',
+              // attachmentType?: string;
+            };
+            return attachment;
+          }
+          return undefined;
+        },
+      };
+    },
   };
 }) satisfies IntegrationFn;
-
-export const feedbackScreenshotIntegration = defineIntegration(_feedbackScreenshotIntegration);
diff --git a/packages/feedback/src/types/index.ts b/packages/feedback/src/types/index.ts
deleted file mode 100644
index cee1bae6ab87..000000000000
--- a/packages/feedback/src/types/index.ts
+++ /dev/null
@@ -1,101 +0,0 @@
-import type { Attachment } from '@sentry/types';
-import type { ComponentType } from 'preact';
-import type {
-  FeedbackCallbacks,
-  FeedbackGeneralConfiguration,
-  FeedbackTextConfiguration,
-  FeedbackThemeConfiguration,
-} from './config';
-import type { FeedbackTheme } from './theme';
-
-export type { FeedbackFormData } from './form';
-
-export { FeedbackTheme };
-export interface FeedbackThemes {
-  themeDark: FeedbackTheme;
-  themeLight: FeedbackTheme;
-}
-
-/**
- * The integration's internal `options` member where every value should be set
- */
-export interface FeedbackInternalOptions
-  extends FeedbackGeneralConfiguration,
-    FeedbackThemeConfiguration,
-    FeedbackTextConfiguration,
-    FeedbackCallbacks {}
-
-/**
- * Partial configuration that overrides default configuration values
- *
- * This is the config that gets passed into the integration constructor
- */
-export interface OptionalFeedbackConfiguration
-  extends Omit<Partial<FeedbackInternalOptions>, 'themeLight' | 'themeDark'> {
-  themeLight?: Partial<FeedbackTheme>;
-  themeDark?: Partial<FeedbackTheme>;
-}
-
-/**
- * Partial configuration that overrides default configuration values
- *
- * This is the config that gets passed into the integration constructor
- */
-export type OverrideFeedbackConfiguration = Omit<Partial<FeedbackInternalOptions>, 'themeLight' | 'themeDark'>;
-
-export interface SendFeedbackParams {
-  message: string;
-  name?: string;
-  email?: string;
-  attachments?: Attachment[];
-  url?: string;
-  source?: string;
-}
-
-export interface SendFeedbackOptions {
-  /**
-   * Should include replay with the feedback?
-   */
-  includeReplay?: boolean;
-}
-
-export interface Dialog {
-  /**
-   * The HTMLElement that is containing all the form content
-   */
-  el: HTMLElement;
-
-  /**
-   * Insert the Dialog into the Shadow DOM.
-   *
-   * The Dialog starts in the `closed` state where no inner HTML is rendered.
-   */
-  appendToDom: () => void;
-
-  /**
-   * Remove the dialog from the Shadow DOM
-   */
-  removeFromDom: () => void;
-
-  /**
-   * Open/Show the dialog & form inside it
-   */
-  open: () => void;
-
-  /**
-   * Close/Hide the dialog & form inside it
-   */
-  close: () => void;
-}
-
-export interface ScreenshotInput {
-  /**
-   * The preact component
-   */
-  input: ComponentType<{ onError: (error: Error) => void }>;
-
-  /**
-   * The image/screenshot bytes
-   */
-  value: () => Promise<Attachment | undefined>;
-}
diff --git a/packages/feedback/src/util/mergeOptions.ts b/packages/feedback/src/util/mergeOptions.ts
index da7f4c271f14..8e7961fc9a21 100644
--- a/packages/feedback/src/util/mergeOptions.ts
+++ b/packages/feedback/src/util/mergeOptions.ts
@@ -1,4 +1,5 @@
-import type { FeedbackFormData, FeedbackInternalOptions, OptionalFeedbackConfiguration } from '../types';
+import type { FeedbackFormData, FeedbackInternalOptions } from '@sentry/types';
+import type { OptionalFeedbackConfiguration } from '../core/types';
 
 /**
  * Quick and dirty deep merge for the Feedback integration options
diff --git a/packages/feedback/src/util/validate.ts b/packages/feedback/src/util/validate.ts
index 5ab14743bf03..5525e191dd9d 100644
--- a/packages/feedback/src/util/validate.ts
+++ b/packages/feedback/src/util/validate.ts
@@ -1,4 +1,4 @@
-import type { FeedbackFormData, FeedbackInternalOptions } from '../types';
+import type { FeedbackFormData, FeedbackInternalOptions } from '@sentry/types';
 
 export type Props = Pick<
   FeedbackInternalOptions,
diff --git a/packages/types/src/feedback.ts b/packages/types/src/feedback.ts
deleted file mode 100644
index 37dfe9818994..000000000000
--- a/packages/types/src/feedback.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import type { Event } from './event';
-import type { User } from './user';
-
-/**
- * Crash report feedback object
- */
-export interface UserFeedback {
-  event_id: string;
-  email: User['email'];
-  name: string;
-  comments: string;
-}
-
-interface FeedbackContext extends Record<string, unknown> {
-  message: string;
-  contact_email?: string;
-  name?: string;
-  replay_id?: string;
-  url?: string;
-}
-
-/**
- * NOTE: These types are still considered Alpha and subject to change.
- * @hidden
- */
-export interface FeedbackEvent extends Event {
-  type: 'feedback';
-  contexts: Event['contexts'] & {
-    feedback: FeedbackContext;
-  };
-}
diff --git a/packages/feedback/src/types/config.ts b/packages/types/src/feedback/config.ts
similarity index 100%
rename from packages/feedback/src/types/config.ts
rename to packages/types/src/feedback/config.ts
diff --git a/packages/feedback/src/types/form.ts b/packages/types/src/feedback/form.ts
similarity index 72%
rename from packages/feedback/src/types/form.ts
rename to packages/types/src/feedback/form.ts
index d669ad7ea22e..13c76f55fae1 100644
--- a/packages/feedback/src/types/form.ts
+++ b/packages/types/src/feedback/form.ts
@@ -1,4 +1,4 @@
-import type { Attachment } from '@sentry/types';
+import type { Attachment } from '../attachment';
 
 export type FeedbackFormData = {
   name: string;
diff --git a/packages/types/src/feedback/index.ts b/packages/types/src/feedback/index.ts
new file mode 100644
index 000000000000..477ae46d8f92
--- /dev/null
+++ b/packages/types/src/feedback/index.ts
@@ -0,0 +1,83 @@
+import type { Attachment } from '../attachment';
+import type { Integration } from '../integration';
+
+import type {
+  FeedbackCallbacks,
+  FeedbackGeneralConfiguration,
+  FeedbackTextConfiguration,
+  FeedbackThemeConfiguration,
+} from './config';
+
+export type { FeedbackFormData } from './form';
+
+import type { FeedbackEvent, SendFeedback, SendFeedbackParams, UserFeedback } from './sendFeedback';
+export type { FeedbackEvent, UserFeedback, SendFeedback, SendFeedbackParams };
+
+/**
+ * The integration's internal `options` member where every value should be set
+ */
+export interface FeedbackInternalOptions
+  extends FeedbackGeneralConfiguration,
+    FeedbackThemeConfiguration,
+    FeedbackTextConfiguration,
+    FeedbackCallbacks {}
+
+type HTMLElement = unknown;
+export interface FeedbackDialog {
+  /**
+   * The HTMLElement that is containing all the form content
+   */
+  el: HTMLElement;
+
+  /**
+   * Insert the Dialog into the Shadow DOM.
+   *
+   * The Dialog starts in the `closed` state where no inner HTML is rendered.
+   */
+  appendToDom: () => void;
+
+  /**
+   * Remove the dialog from the Shadow DOM
+   */
+  removeFromDom: () => void;
+
+  /**
+   * Open/Show the dialog & form inside it
+   */
+  open: () => void;
+
+  /**
+   * Close/Hide the dialog & form inside it
+   */
+  close: () => void;
+}
+
+type ShadowRoot = unknown;
+export interface CreateDialogProps {
+  options: FeedbackInternalOptions;
+  screenshotIntegration: FeedbackScreenshotIntegration | undefined;
+  sendFeedback: SendFeedback;
+  shadow: ShadowRoot;
+}
+export interface FeedbackModalIntegration extends Integration {
+  createDialog: (props: CreateDialogProps) => FeedbackDialog;
+}
+
+type HType = unknown;
+type VNode = unknown;
+export interface FeedbackScreenshotIntegration extends Integration {
+  createInput: (
+    h: HType,
+    dialog: FeedbackDialog,
+  ) => {
+    /**
+     * The preact component
+     */
+    input: (props: { onError: (error: Error) => void }) => VNode;
+
+    /**
+     * The image/screenshot bytes
+     */
+    value: () => Promise<Attachment | undefined>;
+  };
+}
diff --git a/packages/types/src/feedback/sendFeedback.ts b/packages/types/src/feedback/sendFeedback.ts
new file mode 100644
index 000000000000..612e0cff001d
--- /dev/null
+++ b/packages/types/src/feedback/sendFeedback.ts
@@ -0,0 +1,54 @@
+import type { Attachment } from '../attachment';
+import type { Event } from '../event';
+import type { TransportMakeRequestResponse } from '../transport';
+import type { User } from '../user';
+
+/**
+ * Crash report feedback object
+ */
+export interface UserFeedback {
+  event_id: string;
+  email: User['email'];
+  name: string;
+  comments: string;
+}
+
+interface FeedbackContext extends Record<string, unknown> {
+  message: string;
+  contact_email?: string;
+  name?: string;
+  replay_id?: string;
+  url?: string;
+}
+
+/**
+ * NOTE: These types are still considered Alpha and subject to change.
+ * @hidden
+ */
+export interface FeedbackEvent extends Event {
+  type: 'feedback';
+  contexts: Event['contexts'] & {
+    feedback: FeedbackContext;
+  };
+}
+
+export interface SendFeedbackParams {
+  message: string;
+  name?: string;
+  email?: string;
+  attachments?: Attachment[];
+  url?: string;
+  source?: string;
+}
+
+interface SendFeedbackOptions {
+  /**
+   * Should include replay with the feedback?
+   */
+  includeReplay?: boolean;
+}
+
+export type SendFeedback = (
+  params: SendFeedbackParams,
+  options?: SendFeedbackOptions,
+) => Promise<TransportMakeRequestResponse>;
diff --git a/packages/feedback/src/types/theme.ts b/packages/types/src/feedback/theme.ts
similarity index 100%
rename from packages/feedback/src/types/theme.ts
rename to packages/types/src/feedback/theme.ts
diff --git a/packages/types/src/index.ts b/packages/types/src/index.ts
index e1ceb7e7e4e2..2e2c61dad4b6 100644
--- a/packages/types/src/index.ts
+++ b/packages/types/src/index.ts
@@ -69,7 +69,18 @@ export type {
   Profile,
 } from './profiling';
 export type { ReplayEvent, ReplayRecordingData, ReplayRecordingMode } from './replay';
-export type { FeedbackEvent, UserFeedback } from './feedback';
+export type {
+  FeedbackDialog,
+  FeedbackEvent,
+  FeedbackFormData,
+  FeedbackInternalOptions,
+  FeedbackModalIntegration,
+  FeedbackScreenshotIntegration,
+  SendFeedback,
+  SendFeedbackParams,
+  CreateDialogProps,
+  UserFeedback,
+} from './feedback';
 export type { QueryParams, Request, SanitizedRequestData } from './request';
 export type { Runtime } from './runtime';
 export type { CaptureContext, Scope, ScopeContext, ScopeData } from './scope';