diff --git a/view/templates/sub/delivery_count.tpl b/view/templates/sub/delivery_count.tpl
index d10eda639b..b487be8847 100644
--- a/view/templates/sub/delivery_count.tpl
+++ b/view/templates/sub/delivery_count.tpl
@@ -2,12 +2,17 @@
 	Please don't use this template as is, this is a placeholder that needs to be
 	overriden with specific icons to avoid taking too much visual space
 *}}
-{{if $delivery.queue_count == 0}}
-	{{$delivery.notifier_pending|escape}}
-{{elseif $delivery.queue_done == 0}}
-	{{$delivery.delivery_pending|escape}} {{$item.delivery.queue_done}}/{{$item.delivery.queue_count}}
-{{elseif $delivery.queue_done / $delivery.queue_count < 0.75}}
-	{{$delivery.delivery_underway|escape}} {{$item.delivery.queue_done}}/{{$item.delivery.queue_count}}
-{{else}}
-	{{$delivery.delivery_almost|escape}} {{$item.delivery.queue_done}}/{{$item.delivery.queue_count}}
+{{if $delivery.queue_count >= -1 && $delivery.queue_count !== '' && $delivery.queue_count !== null}}
+<span class="delivery">
+	&bullet;
+	{{if $delivery.queue_count == 0}}
+		{{$delivery.notifier_pending}}
+	{{elseif $delivery.queue_done == 0}}
+		{{$delivery.delivery_pending}} {{$item.delivery.queue_done}}/{{$item.delivery.queue_count}}
+	{{elseif $delivery.queue_done / $delivery.queue_count < 0.75}}
+		{{$delivery.delivery_underway}} {{$item.delivery.queue_done}}/{{$item.delivery.queue_count}}
+	{{else}}
+		{{$delivery.delivery_almost}} {{$item.delivery.queue_done}}/{{$item.delivery.queue_count}}
+	{{/if}}
+</span>
 {{/if}}
diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css
index cfb404f9fe..896892531d 100644
--- a/view/theme/frio/css/style.css
+++ b/view/theme/frio/css/style.css
@@ -2094,6 +2094,7 @@ ul.dropdown-menu li:hover {
 /* Media Classes */
 .media .time,
 .media .shared-time,
+.media .delivery,
 .media .location,
 .media .location a {
     font-size: 11px;
diff --git a/view/theme/frio/templates/sub/delivery_count.tpl b/view/theme/frio/templates/sub/delivery_count.tpl
index 05d1d171c7..ee9e411cc4 100644
--- a/view/theme/frio/templates/sub/delivery_count.tpl
+++ b/view/theme/frio/templates/sub/delivery_count.tpl
@@ -1,13 +1,18 @@
-{{if $delivery.queue_count == 0}}
-	<i class="fa fa-hourglass-o" aria-hidden="true" title="{{$delivery.notifier_pending|escape}}"></i>
-	<span class="sr-only">{{$delivery.notifier_pending|escape}}</span>
-{{elseif $delivery.queue_done == 0}}
-	<i class="fa fa-hourglass" aria-hidden="true" title="{{$delivery.delivery_pending|escape}} {{$item.delivery.queue_done}}/{{$item.delivery.queue_count}}"></i>
-	<span class="sr-only">{{$delivery.delivery_pending|escape}}</span>
-{{elseif $delivery.queue_done / $delivery.queue_count < 0.75}}
-	<i class="fa fa-paper-plane-o" aria-hidden="true" title="{{$delivery.delivery_underway|escape}} {{$item.delivery.queue_done}}/{{$item.delivery.queue_count}}"></i>
-	<span class="sr-only">{{$delivery.delivery_underway|escape}}</span>
-{{else}}
-	<i class="fa fa-paper-plane" aria-hidden="true" title="{{$delivery.delivery_almost|escape}} {{$item.delivery.queue_done}}/{{$item.delivery.queue_count}}"></i>
-	<span class="sr-only">{{$delivery.delivery_almost|escape}}</span>
+{{if $delivery.queue_count >= -1 && $delivery.queue_count !== '' && $delivery.queue_count !== null}}
+<span class="delivery">
+	&bullet;
+	{{if $delivery.queue_count == 0}}
+		<i class="fa fa-hourglass-o" aria-hidden="true" title="{{$delivery.notifier_pending}}"></i>
+		<span class="sr-only">{{$delivery.notifier_pending}}</span>
+	{{elseif $delivery.queue_done == 0}}
+		<i class="fa fa-hourglass" aria-hidden="true" title="{{$delivery.delivery_pending}} {{$item.delivery.queue_done}}/{{$item.delivery.queue_count}}"></i>
+		<span class="sr-only">{{$delivery.delivery_pending}}</span>
+	{{elseif $delivery.queue_done / $delivery.queue_count < 0.75}}
+		<i class="fa fa-paper-plane-o" aria-hidden="true" title="{{$delivery.delivery_underway}} {{$item.delivery.queue_done}}/{{$item.delivery.queue_count}}"></i>
+		<span class="sr-only">{{$delivery.delivery_underway}}</span>
+	{{else}}
+		<i class="fa fa-paper-plane" aria-hidden="true" title="{{$delivery.delivery_almost}} {{$item.delivery.queue_done}}/{{$item.delivery.queue_count}}"></i>
+		<span class="sr-only">{{$delivery.delivery_almost}}</span>
+	{{/if}}
+</span>
 {{/if}}
diff --git a/view/theme/frio/templates/wall_thread.tpl b/view/theme/frio/templates/wall_thread.tpl
index 85e12b808d..12e419f8a5 100644
--- a/view/theme/frio/templates/wall_thread.tpl
+++ b/view/theme/frio/templates/wall_thread.tpl
@@ -209,7 +209,6 @@ as the value of $top_child_total (this is done at the end of this file)
 							</span>
 						</a>
 						{{if $item.owner_self}}
-							&bullet;
 							{{include file="sub/delivery_count.tpl" delivery=$item.delivery}}
 						{{/if}}
 					</small>
@@ -233,7 +232,6 @@ as the value of $top_child_total (this is done at the end of this file)
 						<a class="time" href="{{$item.plink.orig}}"><span class="wall-item-ago">{{$item.ago}}</span></a>
 						{{if $item.location}}&nbsp;&mdash;&nbsp;({{$item.location nofilter}}){{/if}}
 						{{if $item.owner_self}}
-							&bullet;
 							{{include file="sub/delivery_count.tpl" delivery=$item.delivery}}
 						{{/if}}
 					</small>
@@ -253,7 +251,6 @@ as the value of $top_child_total (this is done at the end of this file)
 						<a class="time" href="{{$item.plink.orig}}" title="{{$item.localtime}}" data-toggle="tooltip">{{$item.ago}}</a>
 						{{if $item.location}}&nbsp;&mdash;&nbsp;({{$item.location nofilter}}){{/if}}
 						{{if $item.owner_self}}
-							&bullet;
 							{{include file="sub/delivery_count.tpl" delivery=$item.delivery}}
 						{{/if}}
 					</small>
diff --git a/view/theme/vier/templates/sub/delivery_count.tpl b/view/theme/vier/templates/sub/delivery_count.tpl
index 594ce38c53..a0719f762f 100644
--- a/view/theme/vier/templates/sub/delivery_count.tpl
+++ b/view/theme/vier/templates/sub/delivery_count.tpl
@@ -1,13 +1,18 @@
-{{if $delivery.queue_count == 0}}
-	<i class="icon-spinner" aria-hidden="true" title="{{$delivery.notifier_pending|escape}}"></i>
-	<span class="sr-only">{{$delivery.notifier_pending|escape}}</span>
-{{elseif $delivery.queue_done == 0}}
-	<i class="icon-spinner" aria-hidden="true" title="{{$delivery.delivery_pending|escape}} {{$item.delivery.queue_done}}/{{$item.delivery.queue_count}}"></i>
-	<span class="sr-only">{{$delivery.delivery_pending|escape}}</span>
-{{elseif $delivery.queue_done / $delivery.queue_count < 0.75}}
-	<i class="icon-plane" aria-hidden="true" title="{{$delivery.delivery_underway|escape}} {{$item.delivery.queue_done}}/{{$item.delivery.queue_count}}"></i>
-	<span class="sr-only">{{$delivery.delivery_underway|escape}}</span>
-{{else}}
-	<i class="icon-plane" aria-hidden="true" title="{{$delivery.delivery_almost|escape}} {{$item.delivery.queue_done}}/{{$item.delivery.queue_count}}"></i>
-	<span class="sr-only">{{$delivery.delivery_almost|escape}}</span>
+{{if $delivery.queue_count >= -1 && $delivery.queue_count !== '' && $delivery.queue_count !== null}}
+<span class="delivery">
+	&bullet;
+	{{if $delivery.queue_count == 0}}
+		<i class="icon-spinner" aria-hidden="true" title="{{$delivery.notifier_pending}}"></i>
+		<span class="sr-only">{{$delivery.notifier_pending}}</span>
+	{{elseif $delivery.queue_done == 0}}
+		<i class="icon-spinner" aria-hidden="true" title="{{$delivery.delivery_pending}} {{$item.delivery.queue_done}}/{{$item.delivery.queue_count}}"></i>
+		<span class="sr-only">{{$delivery.delivery_pending}}</span>
+	{{elseif $delivery.queue_done / $delivery.queue_count < 0.75}}
+		<i class="icon-plane" aria-hidden="true" title="{{$delivery.delivery_underway}} {{$item.delivery.queue_done}}/{{$item.delivery.queue_count}}"></i>
+		<span class="sr-only">{{$delivery.delivery_underway}}</span>
+	{{else}}
+		<i class="icon-plane" aria-hidden="true" title="{{$delivery.delivery_almost}} {{$item.delivery.queue_done}}/{{$item.delivery.queue_count}}"></i>
+		<span class="sr-only">{{$delivery.delivery_almost}}</span>
+	{{/if}}
+</span>
 {{/if}}
diff --git a/view/theme/vier/templates/wall_thread.tpl b/view/theme/vier/templates/wall_thread.tpl
index 607a789e56..21ebcea38f 100644
--- a/view/theme/vier/templates/wall_thread.tpl
+++ b/view/theme/vier/templates/wall_thread.tpl
@@ -57,7 +57,6 @@
 			<span class="wall-item-ago">
 				{{if $item.plink}}<a title="{{$item.plink.title}}" href="{{$item.plink.href}}" class="u-url" style="color: #999"><time class="dt-published" datetime="{{$item.localtime}}">{{$item.created}}</time></a>{{else}} <time class="dt-published" datetime="{{$item.localtime}}">{{$item.created}}</time> {{/if}}
 				{{if $item.owner_self}}
-					&bullet;
 					{{include file="sub/delivery_count.tpl" delivery=$item.delivery}}
 				{{/if}}
 			</span>