diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css
index bccfea149e..2d4670dca4 100644
--- a/view/theme/diabook/style.css
+++ b/view/theme/diabook/style.css
@@ -1113,6 +1113,7 @@ section {
 }
 .wall-item-container .wall-item-location {
   padding-right: 40px;
+  display: table-cell;
 }
 .wall-item-container .wall-item-ago {
   word-wrap: break-word;
@@ -1168,6 +1169,7 @@ section {
 .wall-item-container .wall-item-actions-social {
   float: left;
   margin-bottom: 1px;
+  display: table-cell;
 }
 .wall-item-container .wall-item-actions-social a {
   margin-right: 1em;
@@ -1178,6 +1180,7 @@ section {
 .wall-item-container .wall-item-actions-tools {
   float: right;
   width: 80px;
+  display: table-cell;
 }
 .wall-item-container .wall-item-actions-tools a {
   float: right;
diff --git a/view/theme/diabook/wall_item.tpl b/view/theme/diabook/wall_item.tpl
index b1a0149490..8c892fd2a9 100644
--- a/view/theme/diabook/wall_item.tpl
+++ b/view/theme/diabook/wall_item.tpl
@@ -46,7 +46,6 @@
 
 		</div>
 		<div class="wall-item-actions">
-			<div class="wall-item-location">$item.location&nbsp;</div>
 			<div class="wall-item-actions-social">
 			
 			
@@ -82,7 +81,7 @@
 					<a class="icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
 				{{ endif }}
 			</div>
-			
+			<div class="wall-item-location">$item.location&nbsp;</div>			
 		</div>
 	</div>
 	<div class="wall-item-bottom">
diff --git a/view/theme/diabook/wallwall_item.tpl b/view/theme/diabook/wallwall_item.tpl
index 603a908c5a..3b103745bb 100644
--- a/view/theme/diabook/wallwall_item.tpl
+++ b/view/theme/diabook/wallwall_item.tpl
@@ -52,7 +52,6 @@
 
 		</div>
 		<div class="wall-item-actions">
-			<div class="wall-item-location">$item.location&nbsp;</div>
 			<div class="wall-item-actions-social">
 			
 			
@@ -88,7 +87,8 @@
 					<a class="icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
 				{{ endif }}
 			</div>
-			
+			<div class="wall-item-location">$item.location&nbsp;</div>
+
 		</div>
 	</div>
 	<div class="wall-item-bottom">
@@ -100,4 +100,4 @@
 
 <div class="wall-item-comment-wrapper" >
 	$item.comment
-</div>
\ No newline at end of file
+</div>