diff --git a/i18n/default_de.json b/i18n/default_de.json
index 63547ca..44fd906 100644
--- a/i18n/default_de.json
+++ b/i18n/default_de.json
@@ -820,6 +820,7 @@
   "Please select a primary tenant": "Bitte einen Hauptmandanten auswählen",
   "Please select at least one tenant": "Bitte mindestens einen Mandanten auswählen",
   "Please verify your email first": "Bitte bestätige zuerst deine E-Mail",
+  "PNG, square recommended (icons are center-cropped)": "PNG, quadratisch empfohlen (Icons werden zentriert beschnitten)",
   "Policy": "Regel",
   "Port": "Port",
   "POST Parameters": "POST-Parameter",
@@ -886,6 +887,8 @@
   "Remove permission": "Berechtigung entfernen",
   "Remove role": "Rolle entfernen",
   "Remove selected file": "Ausgewaehlte Datei entfernen",
+  "Remove the app logo?": "App-Logo entfernen?",
+  "Remove the favicon?": "Favicon entfernen?",
   "Replace": "Ersetzen",
   "Request": "Anfrage",
   "Request details": "Request-Details",
diff --git a/i18n/default_en.json b/i18n/default_en.json
index 87fe25d..fc68ae2 100644
--- a/i18n/default_en.json
+++ b/i18n/default_en.json
@@ -820,6 +820,7 @@
   "Please select a primary tenant": "Please select a primary tenant",
   "Please select at least one tenant": "Please select at least one tenant",
   "Please verify your email first": "Please verify your email first",
+  "PNG, square recommended (icons are center-cropped)": "PNG, square recommended (icons are center-cropped)",
   "Policy": "Policy",
   "Port": "Port",
   "POST Parameters": "POST Parameters",
@@ -886,6 +887,8 @@
   "Remove permission": "Remove permission",
   "Remove role": "Remove role",
   "Remove selected file": "Remove selected file",
+  "Remove the app logo?": "Remove the app logo?",
+  "Remove the favicon?": "Remove the favicon?",
   "Replace": "Replace",
   "Request": "Request",
   "Request details": "Request details",
diff --git a/pages/admin/settings/branding(default).phtml b/pages/admin/settings/branding(default).phtml
index 643967a..ac4ca4b 100644
--- a/pages/admin/settings/branding(default).phtml
+++ b/pages/admin/settings/branding(default).phtml
@@ -23,82 +23,92 @@ $hasFavicon = app(\MintyPHP\Service\Branding\BrandingFaviconService::class)->has
     require templatePath('partials/app-details-titlebar.phtml');
     ?>
 
-    <details class="app-details-card" name="settings-branding-logo" data-details-key="settings-branding-logo" open>
-      <summary>
-        <span class="app-details-card-summary-title"><?php e(t('App logo')); ?></span>
-        <span class="app-details-card-summary-meta">
-          <span class="badge" data-variant="neutral"><?php e($hasLogo ? t('Configured') : t('Default')); ?></span>
-        </span>
-      </summary>
-      <div class="app-details-card-container">
-        <div class="entity-avatar-block avatar-square avatar-ratio-16-9 avatar-borderless">
-          <a data-fslightbox="app-logo" href="<?php e(appLogoUrl(256)); ?>">
-            <img class="entity-avatar-image" src="<?php e(appLogoUrl(256)); ?>" alt="<?php e(t('App logo')); ?>">
-          </a>
-        </div>
-        <?php if ($canUpdateSettings): ?>
-          <form class="user-avatar-form" method="post" action="admin/settings/logo" enctype="multipart/form-data">
-            <?php
-            $fileUpload = [
-                'name' => 'logo',
-                'accept' => 'image/svg+xml,image/png,image/jpeg,image/webp',
-                'hint' => t('Allowed file types: SVG, PNG, JPG, WEBP'),
-                'currentSrc' => $hasLogo ? appLogoUrl(128) : '',
-                'deleteAction' => $hasLogo ? 'admin/settings/logo-delete' : '',
-            ];
-            require templatePath('partials/app-file-upload.phtml');
-            ?>
-            <div class="app-form-actions">
-              <button type="submit" name="action" value="save" class="secondary outline">
-                <?php e(t('Save')); ?>
-              </button>
-              <button type="submit" name="action" value="save_close" class="primary">
-                <?php e(t('Save & close')); ?>
-              </button>
-            </div>
-            <?php Session::getCsrfInput(); ?>
-          </form>
-        <?php endif; ?>
-      </div>
-    </details>
+    <?php if ($canUpdateSettings): ?>
+      <form id="branding-logo-form" method="post" action="admin/settings/logo"
+        enctype="multipart/form-data" data-standard-detail-form="1" hidden>
+        <?php Session::getCsrfInput(); ?>
+      </form>
+      <form id="branding-logo-delete-form" method="post" action="admin/settings/logo-delete" hidden>
+        <?php Session::getCsrfInput(); ?>
+      </form>
+      <form id="branding-favicon-form" method="post" action="admin/settings/favicon"
+        enctype="multipart/form-data" hidden>
+        <?php Session::getCsrfInput(); ?>
+      </form>
+      <form id="branding-favicon-delete-form" method="post" action="admin/settings/favicon-delete" hidden>
+        <?php Session::getCsrfInput(); ?>
+      </form>
+    <?php endif; ?>
 
-    <details class="app-details-card" name="settings-branding-favicon" data-details-key="settings-branding-favicon">
-      <summary>
-        <span class="app-details-card-summary-title"><?php e(t('Favicon')); ?></span>
-        <span class="app-details-card-summary-meta">
-          <span class="badge" data-variant="neutral"><?php e($hasFavicon ? t('Configured') : t('Default')); ?></span>
-        </span>
-      </summary>
-      <div class="app-details-card-container">
-        <blockquote data-variant="info">
-          <small><?php e(t('Square images are recommended (icons are center-cropped).')); ?></small>
-        </blockquote>
-        <?php if ($canUpdateSettings): ?>
-          <form class="user-avatar-form" method="post" action="admin/settings/favicon" enctype="multipart/form-data">
-            <?php
-            $fileUpload = [
-                'name' => 'favicon',
-                'accept' => 'image/png',
-                'hint' => t('Allowed file types: PNG'),
-                'currentSrc' => $hasFavicon ? asset('favicon/favicon-32x32.png') : '',
-                'currentLabel' => t('Favicon'),
-                'deleteAction' => $hasFavicon ? 'admin/settings/favicon-delete' : '',
-            ];
-            require templatePath('partials/app-file-upload.phtml');
-            ?>
+    <div class="grid">
+      <details class="app-details-card" name="settings-branding-logo" data-details-key="settings-branding-logo" open>
+        <summary>
+          <span class="app-details-card-summary-title"><?php e(t('App logo')); ?></span>
+          <span class="app-details-card-summary-meta">
+            <span class="badge" data-variant="neutral"><?php e($hasLogo ? t('Configured') : t('Default')); ?></span>
+          </span>
+        </summary>
+        <div class="app-details-card-container">
+          <?php
+          $fileUpload = [
+              'name' => 'logo',
+              'accept' => 'image/svg+xml,image/png,image/jpeg,image/webp',
+              'hint' => t('Allowed file types: SVG, PNG, JPG, WEBP'),
+              'currentSrc' => $hasLogo ? appLogoUrl(256) : '',
+              'currentLabel' => t('App logo'),
+              'formId' => $canUpdateSettings ? 'branding-logo-form' : '',
+              'deleteFormId' => $hasLogo && $canUpdateSettings ? 'branding-logo-delete-form' : '',
+              'deleteConfirm' => t('Remove the app logo?'),
+          ];
+          require templatePath('partials/app-file-upload.phtml');
+          ?>
+          <?php if ($canUpdateSettings): ?>
             <div class="app-form-actions">
-              <button type="submit" name="action" value="save" class="secondary outline">
+              <button type="submit" form="branding-logo-form" name="action" value="save" class="secondary outline">
                 <?php e(t('Save')); ?>
               </button>
-              <button type="submit" name="action" value="save_close" class="primary">
+              <button type="submit" form="branding-logo-form" name="action" value="save_close" class="primary">
                 <?php e(t('Save & close')); ?>
               </button>
             </div>
-            <?php Session::getCsrfInput(); ?>
-          </form>
-        <?php endif; ?>
-      </div>
-    </details>
+          <?php endif; ?>
+        </div>
+      </details>
+
+      <details class="app-details-card" name="settings-branding-favicon" data-details-key="settings-branding-favicon" open>
+        <summary>
+          <span class="app-details-card-summary-title"><?php e(t('Favicon')); ?></span>
+          <span class="app-details-card-summary-meta">
+            <span class="badge" data-variant="neutral"><?php e($hasFavicon ? t('Configured') : t('Default')); ?></span>
+          </span>
+        </summary>
+        <div class="app-details-card-container">
+          <?php
+          $fileUpload = [
+              'name' => 'favicon',
+              'accept' => 'image/png',
+              'hint' => t('PNG, square recommended (icons are center-cropped)'),
+              'currentSrc' => $hasFavicon ? asset('favicon/favicon-32x32.png') : '',
+              'currentLabel' => t('Favicon'),
+              'formId' => $canUpdateSettings ? 'branding-favicon-form' : '',
+              'deleteFormId' => $hasFavicon && $canUpdateSettings ? 'branding-favicon-delete-form' : '',
+              'deleteConfirm' => t('Remove the favicon?'),
+          ];
+          require templatePath('partials/app-file-upload.phtml');
+          ?>
+          <?php if ($canUpdateSettings): ?>
+            <div class="app-form-actions">
+              <button type="submit" form="branding-favicon-form" name="action" value="save" class="secondary outline">
+                <?php e(t('Save')); ?>
+              </button>
+              <button type="submit" form="branding-favicon-form" name="action" value="save_close" class="primary">
+                <?php e(t('Save & close')); ?>
+              </button>
+            </div>
+          <?php endif; ?>
+        </div>
+      </details>
+    </div>
   </section>
   <aside id="app-details-aside-section">
     <div class="app-details-aside-section"></div>