diff --git a/src/ActorSheet.hbs b/src/ActorSheet.hbs
index 310ae2c..ddace65 100644
--- a/src/ActorSheet.hbs
+++ b/src/ActorSheet.hbs
@@ -22,6 +22,7 @@
         <a class="fas fa-list    {{#if (eq tabGroups.primary 'talente')      }}active{{/if}}" data-action="tab" data-group="primary" data-tab="talente"       data-tooltip-direction="RIGHT" data-tooltip="{{localize "DSA41.character.talente"}}"></a>
         <a class="fas fa-sack    {{#if (eq tabGroups.primary 'inventar')     }}active{{/if}}" data-action="tab" data-group="primary" data-tab="inventar"      data-tooltip-direction="RIGHT" data-tooltip="{{localize "DSA41.character.inventar"}}"></a>
         <a class="fas fa-swords  {{#if (eq tabGroups.primary 'kampf')        }}active{{/if}}" data-action="tab" data-group="primary" data-tab="kampf"         data-tooltip-direction="RIGHT" data-tooltip="{{localize "DSA41.character.kampf"}}"></a>
+        <a class="fas fa-bolt    {{#if (eq tabGroups.primary 'zauber')       }}active{{/if}}" data-action="tab" data-group="primary" data-tab="zauber"        data-tooltip-direction="RIGHT" data-tooltip="{{localize "DSA41.character.zauber"}}"></a>
     </nav>
 
     <div class="scroll-container">
@@ -474,29 +475,6 @@
                     {{/each}}
                 </div>
 
-                <div class="list Zauber">
-                    <div class="list-header ">
-                        <div>{{localize "DSA41.kampf.zauber"}}</div>
-                        <div class="center"></div>
-                    </div>
-
-                    {{#unless (ne actor.itemTypes.Zauber.length 0)}}
-                        <div class="list-item">{{localize "DSA41.list_empty"}}</div>
-                    {{/unless}}
-
-                    {{#each actor.itemTypes.Zauber}}
-                        <div class="list-item" data-item-id="{{_id}}">
-                            <div class="row" data-action="item-open" data-tooltip="{{system.beschreibung}}">
-                                <img class="item-image" src="{{img}}" title="{{name}}">
-                                <div class="col">
-                                    <span>{{name}}</span>
-                                </div>
-                            </div>
-                            <button class="right" data-action="post-zauber">Post to Chat</button>
-                        </div>
-                    {{/each}}
-                </div>
-
                 <div class="list Ruestung">
                     <div class="list-header rowspan2">
                         <div class="rowspan2">{{localize "DSA41.kampf.ruestungen"}}</div>
@@ -577,6 +555,43 @@
                         {{/each}}
                 </div>
             </div>
+
+            <div class="tab Zauber {{#if (eq tabGroups.primary 'zauber')}}active{{/if}}" data-group="primary" data-tab="zauber">
+                <div class="list Zauber subgrid-columns">
+                    <div class="list-header ">
+                        <div>{{localize "DSA41.kampf.zauber"}}</div>
+                        <div></div>
+                        <div class="center">Eigenschaften</div>
+                        <div></div>
+                        <div class="center">{{localize "DSA41.zauber.label_zauberfertigkeitswert"}}</div>
+                        <div></div>
+                    </div>
+
+                    {{#unless (ne actor.itemTypes.Zauber.length 0)}}
+                        <div class="list-item">{{localize "DSA41.list_empty"}}</div>
+                    {{/unless}}
+
+                    {{#each actor.itemTypes.Zauber}}
+                        <div class="list-item" data-item-id="{{_id}}">
+                            <div class="row" data-action="item-open" data-tooltip-direction="LEFT" data-tooltip="{{system.beschreibung}}">
+                                <img class="item-image" src="{{img}}" title="{{name}}">
+                                <div class="col">
+                                    <span>{{name}}</span>
+                                </div>
+                            </div>
+                            <div></div>
+                            <div class="center" data-action="post-zauber" data-roll-type="zauber">
+                                {{>die-type type=system.attribute1}}
+                                {{>die-type type=system.attribute2}}
+                                {{>die-type type=system.attribute3}}
+                            </div>
+                            <div></div>
+                            <div>{{>editable-input type="number" data-name="system.zauberfertigkeitswert" value=system.zauberfertigkeitswert}}</div>
+                            <div class="center fas fa-trash" data-action="item-delete"></div>
+                        </div>
+                    {{/each}}
+                </div>
+            </div>
         </div>
     </div>
 </div>
\ No newline at end of file
diff --git a/src/lang/de.json b/src/lang/de.json
index 26ecbec..1d7c258 100644
--- a/src/lang/de.json
+++ b/src/lang/de.json
@@ -161,7 +161,8 @@
             "talente":       "Talente",
             "inventar":      "Inventar",
             "kampf":         "Kampf",
-            "allgemein":     "Allgemein"
+            "allgemein":     "Allgemein",
+            "zauber":        "Zauber"
         },
 
         "allgemein": {
@@ -538,9 +539,10 @@
         },
 
         "zauber": {
-            "label_komplexitaet":  "Komplexität",
-            "label_zauberdauer":   "Zauberdauer",
-            "label_wirkungsdauer": "Wirkungsdauer",
+            "label_komplexitaet":          "Komplexität",
+            "label_zauberdauer":           "Zauberdauer",
+            "label_wirkungsdauer":         "Wirkungsdauer",
+            "label_zauberfertigkeitswert": "Zauberfertigkeitswert",
 
             "merkmale": {
                 "label": "Merkmale",
diff --git a/src/main.css b/src/main.css
index 0a09b90..306a371 100644
--- a/src/main.css
+++ b/src/main.css
@@ -598,10 +598,6 @@ html {
                     }
                 }
 
-                & .Zauber {
-                    grid-template-columns: minmax(0, max-content) minmax(0, auto);
-                }
-
                 & .Ruestung {
                     grid-template-columns: 2fr repeat(8, 1fr) repeat(2, 1.5fr);
                     text-align: center;
@@ -611,6 +607,14 @@ html {
                     grid-template-columns: minmax(min-content, max-content) auto min-content;
                 }
             }
+
+            &[data-tab="zauber"] {
+                grid-template-columns: minmax(0, max-content) auto minmax(0, max-content) auto minmax(0, max-content) min-content;
+
+                & > * {
+                    grid-column: 1 / -1;
+                }
+            }
         }
     }
 
diff --git a/src/main.mjs b/src/main.mjs
index 7de1b04..ee1a5f8 100644
--- a/src/main.mjs
+++ b/src/main.mjs
@@ -1436,6 +1436,10 @@ class DSA41_ActorSheet extends DSA41_ApplicationMixin(ActorSheetV2) {
                     return;
                 }
 
+                if (roll_type == "zauber") {
+                    return;
+                }
+
                 let roll = new Roll(roll_formula, this.document.system);
                 roll.toMessage({
                     speaker: ChatMessage.getSpeaker({ actor: this.document }),