diff --git a/htdocs/theme/raw/plugintype/artefact/comment/templates/commentlist.tpl b/htdocs/theme/raw/plugintype/artefact/comment/templates/commentlist.tpl
index 85b9836d3222b701541d99b637259aaa3602016a..e6b82f325ed7b309b1b9b58977a32b80cc0d2b87 100644
--- a/htdocs/theme/raw/plugintype/artefact/comment/templates/commentlist.tpl
+++ b/htdocs/theme/raw/plugintype/artefact/comment/templates/commentlist.tpl
@@ -1,13 +1,13 @@
 <!-- The "feedbacktable" class is used as an identifier by Javascript -->
 <div class="list-group list-group-lite">
 {foreach from=$data item=item}
-    <div id="comment{$item->id}" class="comment-item list-group-item {if $item->pubmessage}list-group-item-warning{elseif $item->deletedmessage}deleted {/if} {cycle name=rows values='r0,r1'} {if $item->indent} indent-{$item->indent}{/if} {if !$item->deletedmessage && $item->attachments}has-attachment{/if}">
+    <div id="comment{$item->id}" class="comment-item list-group-item {if $item->pubmessage}list-group-item-private{elseif $item->deletedmessage}deleted {/if} {cycle name=rows values='r0,r1'} {if $item->indent} indent-{$item->indent}{/if} {if !$item->deletedmessage && $item->attachments}has-attachment{/if}">
         <div class="usericon-heading">
-            <span class="user-icon user-icon-40 float-left" role="presentation" aria-hidden="true">
+            <span class="user-icon user-icon-30 float-left" role="presentation" aria-hidden="true">
                 {if $item->author && !$item->author->deleted}
-                    <img src="{profile_icon_url user=$item->author maxheight=40 maxwidth=40}" valign="middle" alt="{str tag=profileimagetext arg1=$item->author|display_default_name}"/>
+                    <img src="{profile_icon_url user=$item->author maxheight=30 maxwidth=30}" valign="middle" alt="{str tag=profileimagetext arg1=$item->author|display_default_name}"/>
                 {else}
-                    <img src="{profile_icon_url user=null maxheight=40 maxwidth=40}" valign="middle" alt="{str tag=profileimagetextanonymous}"/>
+                    <img src="{profile_icon_url user=null maxheight=30 maxwidth=30}" valign="middle" alt="{str tag=profileimagetextanonymous}"/>
                 {/if}
             </span>
             <h5 class="float-left list-group-item-heading">
diff --git a/htdocs/theme/raw/plugintype/artefact/file/blocktype/filedownload/templates/filedownload.tpl b/htdocs/theme/raw/plugintype/artefact/file/blocktype/filedownload/templates/filedownload.tpl
index a047765c04d8f4ef04c2538da739375fed4876d0..d38b7c11c6ae32bf0069d9f1f292933d43a5fbcf 100644
--- a/htdocs/theme/raw/plugintype/artefact/file/blocktype/filedownload/templates/filedownload.tpl
+++ b/htdocs/theme/raw/plugintype/artefact/file/blocktype/filedownload/templates/filedownload.tpl
@@ -45,13 +45,12 @@
                </span>
             {/if}
         </h4>
-        <div>
-            <span class="text-small text-midtone">
-                {$file.ctime|format_date:'strftimedaydate'}
-                [{$file.size|display_size}]
-            </span>
-            <span class="icon icon-download icon-lg float-right text-watermark icon-action" role="presentation" aria-hidden="true"></span>
-        </div>
+        <br />
+        <span class="text-small text-midtone">
+            {$file.ctime|format_date:'strftimedaydate'}
+            [{$file.size|display_size}]
+        </span>
+        <span class="icon icon-download icon-lg float-right text-watermark icon-action" role="presentation" aria-hidden="true"></span>
         {if $file.description}
         <div class="file-description">
             <p class="text-small">
diff --git a/htdocs/theme/raw/plugintype/artefact/plans/blocktype/plans/templates/content.tpl b/htdocs/theme/raw/plugintype/artefact/plans/blocktype/plans/templates/content.tpl
index 44223b0c656f1ba020de56e9769a12478c1c1047..59a53fe9ca413954cd067a927d3ca75f745686e5 100644
--- a/htdocs/theme/raw/plugintype/artefact/plans/blocktype/plans/templates/content.tpl
+++ b/htdocs/theme/raw/plugintype/artefact/plans/blocktype/plans/templates/content.tpl
@@ -25,7 +25,7 @@
         <p>{$plan.description}</p>
 
         {if $plan.tags}
-            <div class="tags">
+            <div class="tags text-small">
                 <strong>{str tag=tags}:</strong> {list_tags owner=$plan.owner tags=$plan.tags view=$plan.view}
             </div>
         {/if}
diff --git a/htdocs/theme/raw/plugintype/artefact/plans/templates/indexplans.tpl b/htdocs/theme/raw/plugintype/artefact/plans/templates/indexplans.tpl
index 5ff772c7c13e7f92a8337f56ccc6e0d0190cfbee..e70d59b8465dbf368b4a1109f0db0783ce8dce4b 100644
--- a/htdocs/theme/raw/plugintype/artefact/plans/templates/indexplans.tpl
+++ b/htdocs/theme/raw/plugintype/artefact/plans/templates/indexplans.tpl
@@ -20,23 +20,21 @@
                         <div class="text-tiny">{$templatetext}</div>
                     {/if}
                 </h3>
-                <div class="list-group-item-controls">
-                    <div class="float-right btn-group btn-group-top">
-                        {if $canedit}
-                            <a href="{$WWWROOT}artefact/plans/plan/edit.php?{$groupurlquery}id={$plan->id}" title="{str(tag=editspecific arg1=$plan->title)|escape:html|safe}" class="btn btn-secondary btn-sm">
-                                <span class="icon icon-lg icon-pencil-alt" role="presentation" aria-hidden="true"></span>
-                                <span class="sr-only">{str tag=edit}</span>
-                            </a>
-                            <a href="{$WWWROOT}artefact/plans/plan/view.php?{$groupurlquery}id={$plan->id}" title="{str tag=managetasks section=artefact.plans}" class="btn btn-secondary btn-sm">
-                                <span class="icon icon-lg icon-cog" role="presentation" aria-hidden="true"></span>
-                                <span class="sr-only">{str tag=managetasks section=artefact.plans}</span>
-                            </a>
-                            <a href="{$WWWROOT}artefact/plans/plan/delete.php?{$groupurlquery}id={$plan->id}" title="{str(tag=deletespecific arg1=$plan->title)|escape:html|safe}" class="btn btn-secondary btn-sm">
-                                <span class="icon icon-trash-alt text-danger icon-lg" role="presentation" aria-hidden="true"></span>
-                                <span class="sr-only">{str tag=delete}</span>
-                            </a>
-                        {/if}
-                    </div>
+                <div class="float-right btn-group btn-group-top">
+                    {if $canedit}
+                        <a href="{$WWWROOT}artefact/plans/plan/edit.php?{$groupurlquery}id={$plan->id}" title="{str(tag=editspecific arg1=$plan->title)|escape:html|safe}" class="btn btn-secondary btn-sm">
+                            <span class="icon icon-lg icon-pencil-alt" role="presentation" aria-hidden="true"></span>
+                            <span class="sr-only">{str tag=edit}</span>
+                        </a>
+                        <a href="{$WWWROOT}artefact/plans/plan/view.php?{$groupurlquery}id={$plan->id}" title="{str tag=managetasks section=artefact.plans}" class="btn btn-secondary btn-sm">
+                            <span class="icon icon-lg icon-cog" role="presentation" aria-hidden="true"></span>
+                            <span class="sr-only">{str tag=managetasks section=artefact.plans}</span>
+                        </a>
+                        <a href="{$WWWROOT}artefact/plans/plan/delete.php?{$groupurlquery}id={$plan->id}" title="{str(tag=deletespecific arg1=$plan->title)|escape:html|safe}" class="btn btn-secondary btn-sm">
+                            <span class="icon icon-trash-alt text-danger icon-lg" role="presentation" aria-hidden="true"></span>
+                            <span class="sr-only">{str tag=delete}</span>
+                        </a>
+                    {/if}
                 </div>
             </div>
 
@@ -45,7 +43,7 @@
             </div>
 
             {if $plan->tags}
-            <div class="tags">
+            <div class="tags text-small">
                 <strong>{str tag=tags}</strong>:
                 {list_tags tags=$plan->tags owner=$plan->owner}
             </div>
diff --git a/htdocs/theme/raw/plugintype/artefact/plans/templates/view/plantasks.tpl b/htdocs/theme/raw/plugintype/artefact/plans/templates/view/plantasks.tpl
index 14d732ade63877dff54a6e9299282d9bf8daea5b..73d1152b068dd3fd8930e7891d281132a03fdcb0 100644
--- a/htdocs/theme/raw/plugintype/artefact/plans/templates/view/plantasks.tpl
+++ b/htdocs/theme/raw/plugintype/artefact/plans/templates/view/plantasks.tpl
@@ -32,7 +32,7 @@
                             {$task->description|clean_html|safe}
                         {/if}
                         {if $task->tags}
-                            <div class="tags">
+                            <div class="tags text-small">
                                 <strong>{str tag=tags}:</strong> {list_tags owner=$task->owner tags=$task->tags view=$view}
                             </div>
                         {/if}
@@ -81,7 +81,7 @@
                             {$task->description|clean_html|safe}
                         {/if}
                         {if $task->tags}
-                            <div class="tags">
+                            <div class="tags text-small">
                                 <strong>{str tag=tags}:</strong> {list_tags owner=$task->owner tags=$task->tags view=$view}
                             </div>
                         {/if}
diff --git a/htdocs/theme/raw/plugintype/blocktype/recentforumposts/templates/recentforumposts.tpl b/htdocs/theme/raw/plugintype/blocktype/recentforumposts/templates/recentforumposts.tpl
index 0dce1dead2ee9c41d4d022d30839da7962fec5b5..8072cad4ebd1e0539101b72cfc7f02a3d53f2e4d 100644
--- a/htdocs/theme/raw/plugintype/blocktype/recentforumposts/templates/recentforumposts.tpl
+++ b/htdocs/theme/raw/plugintype/blocktype/recentforumposts/templates/recentforumposts.tpl
@@ -9,12 +9,12 @@
                     </a>
                     <h4 class="title list-group-item-heading">
                         <a href="{$WWWROOT}interaction/forum/topic.php?id={$postinfo->topic}&post={$postinfo->id}">
-                            {$postinfo->topicname}
+                            {$postinfo->topicname}<br />
                             <span class="metadata text-small">
                                 {if !$postinfo->author->deleted}
-                                    - {$postinfo->author|display_name}
+                                    {$postinfo->author|display_name}
                                 {else}
-                                    - {$postinfo->author|full_name}
+                                    {$postinfo->author|full_name}
                                 {/if}
                             </span>
                         </a>
diff --git a/htdocs/theme/raw/sass/_custom.scss b/htdocs/theme/raw/sass/_custom.scss
index f53408ee32912f360ca0840d33f89d0317167418..53224ac0ab88e441313f03dd4b15d71c43c36e8c 100644
--- a/htdocs/theme/raw/sass/_custom.scss
+++ b/htdocs/theme/raw/sass/_custom.scss
@@ -21,11 +21,23 @@
     margin: 20px 0;
 }
 
-.task-item .complete-task .icon,
-.task-item .overdue-task .icon {
-    margin-left: -8px; // correct alignment
+// Plans
+.task-item {
+    .complete-task,
+    .overdue-task {
+        margin-left: 15px;
+        .icon {
+            margin-left: -22px; // correct alignment
+            padding-right: 2px;
+        }
+    }
+    .card-body {
+        padding-bottom: 0;
+        .tags {
+            margin-bottom: 0;
+        }
+    }
 }
-
 .task-item .btn-group {
     margin-right: -8px; // correct alignment
     a {
diff --git a/htdocs/theme/raw/sass/features/_filebrowser.scss b/htdocs/theme/raw/sass/features/_filebrowser.scss
index 625ee0f91a522d46a475621adde909b90da636e7..b2d4d136998a3602146d8e14734aeaad8a0126dd 100644
--- a/htdocs/theme/raw/sass/features/_filebrowser.scss
+++ b/htdocs/theme/raw/sass/features/_filebrowser.scss
@@ -125,12 +125,18 @@
         width: 20px;
         vertical-align: top;
     }
+    .icon-lg {
+        width: 24px;
+    }
     a {
         word-break: break-all;
     }
     .file-description {
         padding-left: 30px;
     }
+    .text-small {
+        margin-left: 28px;
+    }
 }
 
 .filelist-wrapper {
diff --git a/htdocs/theme/raw/sass/typography/_typography.scss b/htdocs/theme/raw/sass/typography/_typography.scss
index 245c202479dba346a91f189f32c026b75522e8a5..c8507e383dc190d3ef626a51a5b04f2423ef3b6a 100644
--- a/htdocs/theme/raw/sass/typography/_typography.scss
+++ b/htdocs/theme/raw/sass/typography/_typography.scss
@@ -265,14 +265,18 @@ label.lead {
     margin: 10px 0;
 }
 
-
 .metadata {
     font-family: $font-family-sans-serif;
-    font-size: 0.8em;
-    color: $gray-500;
-    .title & {
-        margin-left: 5px;
-    }
+    font-size: $font-size-sm;
+    font-weight: 400;
+    color: $theme-text-midtone-color;
+}
+
+.postedon {
+    font-family: $font-family-sans-serif;
+    font-size: $font-size-sm;
+    font-weight: 400;
+    color: $theme-text-midtone-color;
 }
 
 .license {