diff --git a/packages/nicolium/src/actions/statuses.ts b/packages/nicolium/src/actions/statuses.ts
index fb298425e..b2745c7ae 100644
--- a/packages/nicolium/src/actions/statuses.ts
+++ b/packages/nicolium/src/actions/statuses.ts
@@ -74,13 +74,11 @@ const createStatus = (
   editedId: string | null,
   redacting = false,
 ) => {
-  if (!params.preview) {
+  if (!params.preview && !editedId) {
     usePendingStatusesStore.getState().actions.importStatus(params, idempotencyKey);
     useContextStore.getState().actions.importPendingStatus(params.in_reply_to_id, idempotencyKey);
     useTimelinesStore.getState().actions.importPendingStatus(params, idempotencyKey);
-    if (!editedId) {
-      incrementReplyCount(params, queryClient);
-    }
+    incrementReplyCount(params, queryClient);
   }
 
   return (
diff --git a/packages/nicolium/src/components/statuses/status-action-bar.tsx b/packages/nicolium/src/components/statuses/status-action-bar.tsx
index 89e8f9f72..62f464d9b 100644
--- a/packages/nicolium/src/components/statuses/status-action-bar.tsx
+++ b/packages/nicolium/src/components/statuses/status-action-bar.tsx
@@ -1488,7 +1488,7 @@ const StatusActionBar: React.FC<IStatusActionBar> = ({
     });
   }, []);
 
-  if (!status) {
+  if (!status || !status.account) {
     return null;
   }
 
diff --git a/packages/nicolium/src/features/compose/components/content-type-button.tsx b/packages/nicolium/src/features/compose/components/content-type-button.tsx
index ddb52d8ed..0848aff6e 100644
--- a/packages/nicolium/src/features/compose/components/content-type-button.tsx
+++ b/packages/nicolium/src/features/compose/components/content-type-button.tsx
@@ -106,6 +106,7 @@ const ContentTypeButton: React.FC<IContentTypeButton> = ({ composeId, compact })
       }))}
     >
       <button
+        type='button'
         className='⁂-content-type-button'
         title={compact ? option?.text : intl.formatMessage(messages.changeContentType)}
       >
diff --git a/packages/nicolium/src/features/compose/components/language-dropdown.tsx b/packages/nicolium/src/features/compose/components/language-dropdown.tsx
index b4c78770c..ac445e1cd 100644
--- a/packages/nicolium/src/features/compose/components/language-dropdown.tsx
+++ b/packages/nicolium/src/features/compose/components/language-dropdown.tsx
@@ -299,7 +299,7 @@ const LanguageDropdownButton: React.FC<ILanguageDropdownButton> = ({ composeId,
 
   return (
     <DropdownMenu component={LanguageDropdown} className='⁂-language-dropdown'>
-      <button title={intl.formatMessage(messages.languagePrompt)}>
+      <button type='button' title={intl.formatMessage(messages.languagePrompt)}>
         <Icon src={iconTranslate} aria-hidden />
         {buttonLabel}
         <Icon src={iconCaretDown} aria-hidden />
diff --git a/packages/nicolium/src/features/compose/components/privacy-dropdown.tsx b/packages/nicolium/src/features/compose/components/privacy-dropdown.tsx
index 363aa0fee..18cdad9ba 100644
--- a/packages/nicolium/src/features/compose/components/privacy-dropdown.tsx
+++ b/packages/nicolium/src/features/compose/components/privacy-dropdown.tsx
@@ -230,7 +230,7 @@ const PrivacyDropdown: React.FC<IPrivacyDropdown> = ({ composeId, compact }) =>
 
   return (
     <DropdownMenu items={items} width='16rem'>
-      <button title={compact ? text : intl.formatMessage(messages.changePrivacy)}>
+      <button type='button' title={compact ? text : intl.formatMessage(messages.changePrivacy)}>
         {valueOption?.icon && <Icon src={valueOption.icon} aria-hidden />}
         {compact ? undefined : text}
         <Icon src={iconCaretDown} aria-hidden />
diff --git a/packages/nicolium/src/features/draft-statuses/builder.tsx b/packages/nicolium/src/features/draft-statuses/builder.tsx
index 49bed3957..cc839b5a8 100644
--- a/packages/nicolium/src/features/draft-statuses/builder.tsx
+++ b/packages/nicolium/src/features/draft-statuses/builder.tsx
@@ -10,7 +10,7 @@ const buildPoll = (draftPoll: DraftStatus['poll']) => {
     return v.parse(pollSchema, {
       ...draftPoll,
       id: 'poll',
-      options: draftPoll.options.map((title: string) => ({ title })).toArray(),
+      options: draftPoll.options.map((title: string) => ({ title })),
     });
   } else {
     return null;
diff --git a/packages/nicolium/src/hooks/use-theme-css.ts b/packages/nicolium/src/hooks/use-theme-css.ts
index 71cf725a3..e108a7bb0 100644
--- a/packages/nicolium/src/hooks/use-theme-css.ts
+++ b/packages/nicolium/src/hooks/use-theme-css.ts
@@ -78,7 +78,7 @@ const useThemeCss = (overwriteConfig?: FrontendConfig) => {
       let baseTheme: Partial<FrontendConfig>;
       if (overwriteConfig) baseTheme = overwriteConfig;
       else if (demo) baseTheme = {};
-      else baseTheme = theme ?? frontendConfig;
+      else baseTheme = { ...frontendConfig, ...theme };
 
       const colors = normalizeColors(baseTheme);
 
diff --git a/packages/pl-api/lib/entities/admin/report.ts b/packages/pl-api/lib/entities/admin/report.ts
index caa3fd927..a96a46777 100644
--- a/packages/pl-api/lib/entities/admin/report.ts
+++ b/packages/pl-api/lib/entities/admin/report.ts
@@ -15,6 +15,11 @@ import { adminAccountSchema } from './account';
 const adminReportSchema = v.pipe(
   v.any(),
   v.transform((report: any) => {
+    report.statuses = report.statuses?.map((status: any) => ({
+      ...status,
+      account: (report.actor ? report.account : report.target_account)?.account || status.account,
+    }));
+
     if (report.actor) {
       /**
        * Convert Pleroma report schema