diff --git a/css/style.scss b/css/style.scss
index 12504fe91..a7f6e627a 100644
--- a/css/style.scss
+++ b/css/style.scss
@@ -34,6 +34,7 @@ $color-darkgrey: nc-darken($color-main-background, 32%);
 /**
  * General styles
  */
+
 button,
 .button,
 .app-deck .icon {
diff --git a/templates/part.boardlist.php b/templates/part.boardlist.php
index f7043b51f..a7901e2d5 100644
--- a/templates/part.boardlist.php
+++ b/templates/part.boardlist.php
@@ -13,7 +13,15 @@
 		</div>
 	</div>
 </div>
-<div id="boardlist">
+<div id="emptycontent" ng-if="boardservice.sorted.length == 0 && status.filter == 'archived'">
+	<div class="icon-archive"></div>
+	<h2><?php p($l->t('No archived boards to display')); ?></h2>
+</div>
+<div id="emptycontent" ng-if="boardservice.sorted.length == 0 && status.filter == 'shared'">
+	<div class="icon-share"></div>
+	<h2> <?php p($l->t('No shared boards to display')); ?> </h2>
+</div>
+<div id="boardlist" ng-if="boardservice.sorted.length > 0 || !status.filter">
 	<table width="100%">
 		<thead>
 		<tr>