diff --git a/module/data/action/baseAction.mjs b/module/data/action/baseAction.mjs
index 5b871c9a..be7224cd 100644
--- a/module/data/action/baseAction.mjs
+++ b/module/data/action/baseAction.mjs
@@ -256,8 +256,7 @@ export default class DHBaseAction extends ActionMixin(foundry.abstract.DataModel
 
         if (Hooks.call(`${CONFIG.DH.id}.postUseAction`, this, config) === false) return;
 
-        if (this.chatDisplay && !config.skips.createMessage && !config.actionChatMessageHandled) 
-            await this.toChat(null, config);
+        if (this.chatDisplay && !config.skips.createMessage && !config.actionChatMessageHandled) await this.toChat();
 
         return config;
     }
diff --git a/module/data/fields/action/summonField.mjs b/module/data/fields/action/summonField.mjs
index fef6625a..6845d2ba 100644
--- a/module/data/fields/action/summonField.mjs
+++ b/module/data/fields/action/summonField.mjs
@@ -23,7 +23,7 @@ export default class DHSummonField extends fields.ArrayField {
         super(summonFields, options, context);
     }
 
-    static async execute(config) {
+    static async execute() {
         if (!canvas.scene) {
             ui.notifications.warn(game.i18n.localize('DAGGERHEART.ACTIONS.TYPES.summon.error'));
             return;
@@ -36,7 +36,6 @@ export default class DHSummonField extends fields.ArrayField {
 
         const rolls = [];
         const summonData = [];
-        const chatMessageData = [];
         for (const summon of this.summon) {
             const roll = new Roll(itemAbleRollParse(summon.count, this.actor, this.item));
             await roll.evaluate();
@@ -55,18 +54,17 @@ export default class DHSummonField extends fields.ArrayField {
                     tokenPreviewName: `${actor.prototypeToken.name}${remaining > 1 ? ` (${remaining}x)` : ''}`
                 });
             }
-
-            chatMessageData.push({
-                data: actor,
-                quantity: countNumber
-            });
         }
 
         if (rolls.length) await triggerChatRollFx(rolls);
 
         this.actor.sheet?.minimize();
-        await CONFIG.ux.TokenManager.createTokensWithPreview(summonData, { elevation: this.actor.token?.elevation });
-        this.actor.sheet?.maximize();
-        config.summonData = chatMessageData;
+        DHSummonField.handleSummon(summonData, this.actor);
+    }
+
+    static async handleSummon(summonData, actionActor) {
+        await CONFIG.ux.TokenManager.createTokensWithPreview(summonData, { elevation: actionActor.token?.elevation });
+
+        return actionActor.sheet?.maximize();
     }
 }
diff --git a/module/data/fields/actionField.mjs b/module/data/fields/actionField.mjs
index af8f338e..83672c8e 100644
--- a/module/data/fields/actionField.mjs
+++ b/module/data/fields/actionField.mjs
@@ -269,7 +269,7 @@ export function ActionMixin(Base) {
             return this.delete();
         }
 
-        async toChat(origin, config) {
+        async toChat(origin) {
             const autoExpandDescription = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.appearance)
                 .expandRollMessage?.desc;
 
@@ -282,7 +282,7 @@ export function ActionMixin(Base) {
                     img: this.baseAction ? this.parent.parent.img : this.img,
                     tags: this.tags ? this.tags : ['Spell', 'Arcana', 'Lv 10'],
                     areas: this.areas,
-                    summon: config?.summonData
+                    summon: this.summon
                 },
                 source: {
                     actor: this.actor.uuid,
diff --git a/module/documents/tokenManager.mjs b/module/documents/tokenManager.mjs
index b21b56a0..7678d2c7 100644
--- a/module/documents/tokenManager.mjs
+++ b/module/documents/tokenManager.mjs
@@ -19,10 +19,10 @@ export default class DhTokenManager {
             }
         }
 
-        const placedData = await canvas.tokens.placeTokens(
+        return await canvas.tokens.placeTokens(
             [
                 {
-                    ...(await actor.getTokenDocument()).toObject(),
+                    ...actor.prototypeToken.toObject(),
                     actorId: actor.id,
                     displayName: 50,
                     ...tokenData
@@ -30,8 +30,6 @@ export default class DhTokenManager {
             ],
             { create: false }
         );
-
-        return placedData?.[0] ?? null;
     }
 
     /**
@@ -48,24 +46,22 @@ export default class DhTokenManager {
 
         const createElevation = elevation ?? level.elevation.bottom;
         for (const tokenData of tokensData) {
-            const previewToken = await this.createPreview(tokenData.actor, {
+            const previewTokens = await this.createPreview(tokenData.actor, {
                 name: tokenData.tokenPreviewName,
                 level: game.user.viewedLevel,
                 elevation: createElevation,
                 flags: { daggerheart: { createPlacement: true } }
             });
-            if (!previewToken) return null;
-
-            const finalTokenData = {
-                ...previewToken.toObject(),
-                name: tokenData.actor.prototypeToken.name,
-                displayName: tokenData.actor.prototypeToken.displayName,
-                flags: tokenData.actor.prototypeToken.flags
-            };
+            if (!previewTokens?.length) return null;
 
             await canvas.scene.createEmbeddedDocuments(
                 'Token',
-                [finalTokenData],
+                previewTokens.map(x => ({
+                    ...x.toObject(),
+                    name: tokenData.actor.prototypeToken.name,
+                    displayName: tokenData.actor.prototypeToken.displayName,
+                    flags: tokenData.actor.prototypeToken.flags
+                })),
                 { controlObject: true, parent: canvas.scene }
             );
         }
diff --git a/styles/less/global/elements.less b/styles/less/global/elements.less
index 1b7ed072..edc02f9a 100755
--- a/styles/less/global/elements.less
+++ b/styles/less/global/elements.less
@@ -599,23 +599,27 @@
     }
 
     secret-block {
-        display: block;
-
-        /** A buffer to make the hover behavior work a bit better. The bottom in the button needs to compensate */
-        @buffer: 8px;
-        margin-top: -@buffer;
-        padding-top: @buffer;
-
+        position: relative;
+        section.secret {
+            background-color: @red-10;
+            padding: 0;
+            margin-top: 0.375rem;
+            &.revealed {
+                background-color: @green-10;
+            }
+            p {
+                margin: 0.5rem 0;
+            }
+        }
         button.reveal {
-            --button-size: 1rem;
-            height: var(--button-size);
+            --button-size: 0.875rem;
             position: absolute;
             margin: auto;
             left: 0;
             right: 0;
             width: min-content;
             padding: 1px 8px 0 8px;
-            bottom: calc(100% - 0.4375rem - 1px);
+            bottom: calc(100% - 0.4375rem - 2px);
             
             background-color: var(--dh-window-button-color-bg); // todo: find a better var name
             border-color: var(--color-secret-border);
@@ -623,7 +627,6 @@
             font-size: var(--font-size-10);
             user-select: none;
             text-transform: uppercase;
-            white-space: nowrap;
 
             visibility: hidden;
         }
@@ -632,20 +635,6 @@
             visibility: visible;
         }
     }
-
-    /** 
-     * The element inside a secret-block. 
-     * This is separate since during prosemirror editing, the secret-block container does not exist.
-     */
-    section.secret {
-        --color-secret-bg: @red-10;
-        --color-revealed-bg: @green-10;
-        position: relative;
-        padding: 0;
-        p {
-            margin: 0.5rem 0;
-        }
-    }
 }
 
 .system-daggerheart {
diff --git a/templates/ui/chat/action.hbs b/templates/ui/chat/action.hbs
index d9ceb417..51840363 100644
--- a/templates/ui/chat/action.hbs
+++ b/templates/ui/chat/action.hbs
@@ -16,10 +16,10 @@
                     {{#each action.summon}}
                         <div class="summon-container">
                             <div class="summon-label-container">
-                                <img src="{{this.data.img}}" />
-                                <label>{{this.data.name}}</label>
+                                <img src="{{this.actor.img}}" />
+                                <label>{{this.actor.name}}</label>
                             </div>
-                            <span># {{this.quantity}}</span>
+                            <span># {{this.rolledCount}}</span>
                         </div>
                     {{/each}}
                 </div>