diff --git a/typo3/sysext/info_pagetsconfig/Resources/Private/Partials/EditIcon.html b/typo3/sysext/info_pagetsconfig/Resources/Private/Partials/EditIcon.html
index 682f3337fe374cff95f89abfd08f9d5313ff0bf7..7feddc5638e84c53c27e9690ad1f75f188250fc9 100644
--- a/typo3/sysext/info_pagetsconfig/Resources/Private/Partials/EditIcon.html
+++ b/typo3/sysext/info_pagetsconfig/Resources/Private/Partials/EditIcon.html
@@ -1,12 +1,12 @@
 <f:if condition="{editIcon}">
-    <a href="{editIcon -> f:format.raw()}" title="{f:translate(key: 'LLL:EXT:info_pagetsconfig/Resources/Private/Language/locallang.xlf:{editTitle}')}">
+    <a href="{editIcon -> f:format.raw()}" title="{f:translate(key: 'LLL:EXT:info_pagetsconfig/Resources/Private/Language/locallang.xlf:{editTitle}')}" class="btn btn-default">
         <span class="t3js-icon icon icon-size-small icon-state-default icon-actions-document-open" data-identifier="actions-document-open">
             <span class="icon-markup">
                 <img width="16" height="16" src="/typo3/sysext/core/Resources/Public/Icons/T3Icons/actions/actions-document-open.svg">
             </span>
         </span>
         <f:if condition="{editAll}">
-            <strong>{f:translate(key: 'LLL:EXT:info_pagetsconfig/Resources/Private/Language/locallang.xlf:editTSconfig_all')}</strong>
+            <f:translate key="LLL:EXT:info_pagetsconfig/Resources/Private/Language/locallang.xlf:editTSconfig_all" />
         </f:if>
     </a>
 </f:if>
diff --git a/typo3/sysext/info_pagetsconfig/Resources/Private/Partials/Page.html b/typo3/sysext/info_pagetsconfig/Resources/Private/Partials/Page.html
index d99e0e20d4dc01c95c7ce6eec7247a4ff3b7e0a8..40d89a145dab50a1e39ebab5471d49bb87e09ce1 100644
--- a/typo3/sysext/info_pagetsconfig/Resources/Private/Partials/Page.html
+++ b/typo3/sysext/info_pagetsconfig/Resources/Private/Partials/Page.html
@@ -5,23 +5,27 @@
 <f:render partial="Menu" arguments="{_all}" />
 <f:if condition="{tsconfParts99}">
     <f:then>
-        <div>
-            <table class="table table-striped table-hover">
-                <f:for each="{lines}" as="line">
-                    <tr><td nowrap="nowrap">
-                        <f:if condition="{line.defaultPageTSconfig}">
-                            <f:then>
-                                <strong>{f:translate(key: 'LLL:EXT:info_pagetsconfig/Resources/Private/Language/locallang.xlf:editTSconfig_default')}</strong>
-                            </f:then>
-                            <f:else>
-                                <f:format.raw>{line.title}</f:format.raw>
-                            </f:else>
-                        </f:if></td></tr>
-                    <tr><td nowrap="nowrap"><f:format.raw>{line.content}</f:format.raw><f:render partial="EditIcon" arguments="{editIcon: line.editIcon, editTitle: line.editTitle}" /></td></tr>
-                </f:for>
-            </table><br />
-            <f:render partial="EditIcon" arguments="{editIcon: editIcon, editTitle: editTitle, editAll: 1}" />
-        </div>
+        <f:for each="{lines}" as="line">
+            <div class="panel panel-default">
+                <div class="panel-heading">
+                    <f:if condition="{line.defaultPageTSconfig}">
+                        <f:then>
+                          <f:translate key="LLL:EXT:info_pagetsconfig/Resources/Private/Language/locallang.xlf:editTSconfig_default" />
+                        </f:then>
+                        <f:else>
+                            <f:format.raw>{line.title}</f:format.raw>
+                        </f:else>
+                    </f:if>
+                </div>
+                <div class="panel-body">
+                    <f:if condition="{line.content -> f:format.stripTags() -> f:spaceless()}">
+                        <f:format.raw>{line.content}</f:format.raw>
+                    </f:if>
+                    <f:render partial="EditIcon" arguments="{editIcon: line.editIcon, editTitle: line.editTitle}" />
+                </div>
+            </div>
+        </f:for>
+        <f:render partial="EditIcon" arguments="{editIcon: editIcon, editTitle: editTitle, editAll: 1}" />
     </f:then>
     <f:else>
         <div class="nowrap">