diff --git a/locale.xml b/locale.xml
index f9b1de1df94f882d0f43e49ea94269ba1b7e9bda..30a11b634e8e24030c889c01a3da5935e61fcb24 100644
--- a/locale.xml
+++ b/locale.xml
@@ -1450,7 +1450,7 @@ M&ouml;chten Sie die Bausteine aus der Bausteinzone entfernen?</p>]]></de>
             <en><![CDATA[Standard]]></en>
         </locale>
         <locale name="bricks.BoxContentAdvanced.template.boxWithShadow">
-            <de><![CDATA[Moderne Boxen mit Schatten)]]></de>
+            <de><![CDATA[Moderne Boxen mit Schatten]]></de>
             <en><![CDATA[Modern boxes with shadow]]></en>
         </locale>
         <locale name="bricks.BoxContentAdvanced.centerText">
diff --git a/src/QUI/Bricks/Controls/BoxContentAdvanced.boxWithShadow.html b/src/QUI/Bricks/Controls/BoxContentAdvanced.boxWithShadow.html
index 592c045c1013072ed44e7e80cdf3893c8262a72f..91e247817ada29b8cb07fe22ec41100681478bf8 100644
--- a/src/QUI/Bricks/Controls/BoxContentAdvanced.boxWithShadow.html
+++ b/src/QUI/Bricks/Controls/BoxContentAdvanced.boxWithShadow.html
@@ -26,7 +26,9 @@
                 {/if}
             {/if}
 
+            {if $entry.entryTitle || $entry.entrySubTitle}
             <header>
+                {if $entry.entryTitle}
                 <h4 class="quiqqer-boxContentAdvanced-entry-title" title="{$entry.entryTitle|escape:'html'}">
                     {if $entry.entryUrl}
                     <a href="{url site=$TargetSite rewrited=1}" title="{$TargetSite->getAttribute('title')}">
@@ -38,6 +40,7 @@
                     </a>
                     {/if}
                 </h4>
+                {/if}
                 
                 {if $entry.entrySubTitle}
                 <span class="quiqqer-boxContentAdvanced-entry-subTitle">
@@ -45,6 +48,7 @@
                 </span>
                 {/if}
             </header>
+            {/if}
 
             {if $entry.entryContent}
             <div class="quiqqer-boxContentAdvanced-entry-content">
diff --git a/src/QUI/Bricks/Controls/BoxContentAdvanced.standard.html b/src/QUI/Bricks/Controls/BoxContentAdvanced.standard.html
index c62ecc29501c5deb4169dc81881d97f6a066568b..a0ad68361ae6205d936bd21a7eeb935785c2ebd6 100644
--- a/src/QUI/Bricks/Controls/BoxContentAdvanced.standard.html
+++ b/src/QUI/Bricks/Controls/BoxContentAdvanced.standard.html
@@ -26,7 +26,9 @@
                 {/if}
             {/if}
 
+            {if $entry.entryTitle || $entry.entrySubTitle}
             <header>
+                {if $entry.entryTitle}
                 <h4 class="quiqqer-boxContentAdvanced-entry-title" title="{$entry.entryTitle|escape:'html'}">
                     {if $entry.entryUrl}
                     <a href="{url site=$TargetSite rewrited=1}" title="{$TargetSite->getAttribute('title')}">
@@ -38,6 +40,7 @@
                     </a>
                     {/if}
                 </h4>
+                {/if}
 
                 {if $entry.entrySubTitle}
                 <span class="quiqqer-boxContentAdvanced-entry-subTitle">
@@ -45,6 +48,7 @@
                 </span>
                 {/if}
             </header>
+            {/if}
 
             {if $entry.entryContent}
             <div class="quiqqer-boxContentAdvanced-entry-content">