diff --git a/css/shaarli.css b/css/shaarli.css
index 43faf63..3516fb9 100644
--- a/css/shaarli.css
+++ b/css/shaarli.css
@@ -4276,8 +4276,7 @@ pre {
 
 .linklist-item {
   position: relative;
-  margin: 0 0 10px;
-  box-shadow: 1px 1px 3px #797979; }
+  margin: 0 0 16px; }
   .linklist-item.private .linklist-item-title h2, .linklist-item.private .linklist-item-title h2 a {
     color: #d28314; }
   .linklist-item.private .linklist-item-title h2 a:hover {
@@ -4312,7 +4311,6 @@ pre {
     word-wrap: break-word;
     font-size: 24px;
     font-weight: 700;
-    line-height: 29px;
     max-width: 80%; }
     .linklist-item-title h2 a {
       vertical-align: middle;
@@ -4325,8 +4323,9 @@ pre {
         left: 16px; }
       .linklist-item-title h2 a:hover {
         color: var(--dark-main-color); }
-  .linklist-item-title .label-private {
-    background-color: #d28314; }
+
+.label-private {
+  background-color: #d28314; }
 
 .fold-button {
   display: none;
@@ -4412,14 +4411,16 @@ pre {
   padding: 0 0 0 5px;
   height: 90px; }
 
-.linklist-item-infos a {
-  text-decoration: none;
-  color: #252525; }
-  .linklist-item-infos a:hover {
-    color: #000; }
-
-.linklist-item-infos .mobile-buttons {
-  text-align: right; }
+.linklist-item-infos {
+  position: relative;
+  top: -6px; }
+  .linklist-item-infos a {
+    text-decoration: none;
+    color: #252525; }
+    .linklist-item-infos a:hover {
+      color: #000; }
+  .linklist-item-infos .mobile-buttons {
+    text-align: right; }
 
 .linklist-item-infos-dateblock {
   font-size: .9em; }
diff --git a/linklist.html b/linklist.html
index 7a5658c..f6b121d 100644
--- a/linklist.html
+++ b/linklist.html
@@ -88,162 +88,151 @@
       {loop="links"}
         <div class="anchor" id="{$value.shorturl}"></div>
 
-        <div class="linklist-item linklist-item{if="$value.class"} {$value.class}{/if}" data-id="{$value.id}">
-          <div class="linklist-item-title">
-            {if="$thumbnails_enabled && !empty($value.thumbnail)"}
-              <div class="linklist-item-thumbnail" style="width:{$thumbnails_width}px;height:{$thumbnails_height}px;">
-                <div class="thumbnail">
-                  {ignore}RainTPL hack: put the 2 src on two different line to avoid path replace bug{/ignore}
-                  <a href="{$value.real_url}" aria-hidden="true" tabindex="-1">
-                  <img data-src="{$value.thumbnail}#" class="b-lazy"
+<div class="linklist-item {if="$value.class"} {$value.class}{/if}" data-id="{$value.id}">
+	<div class="linklist-item-title pure-g">
+		<h2 class="pure-u-3-5">
+		{if="$thumbnails_enabled && !empty($value.thumbnail)"}
+		<div class="linklist-item-thumbnail" style="width:{$thumbnails_width}px;height:{$thumbnails_height}px;">
+			<div class="thumbnail">
+				{ignore}RainTPL hack: put the 2 src on two different line to avoid path replace bug{/ignore}
+				<a href="{$value.real_url}" aria-hidden="true" tabindex="-1">
+				<img data-src="{$value.thumbnail}#" class="b-lazy"
                     src=""
-                    alt="" width="{$thumbnails_width}" height="{$thumbnails_height}" />
-                  </a>
-                </div>
-              </div>
-            {/if}
-
-            <div class="linklist-item-editbuttons">
-              {if="$value.sticky"}
-                <span class="label label-sticky">{$strSticky}</span>
-              {/if}
-              {if="$value.private"}
-                <span class="label label-private">{$strPrivate}</span>
-              {/if}
-            </div>
-
-            <h2>
-                {if="strpos($value.url, $value.shorturl) === false"}
-              <a href="{$value.real_url}">
-                <span class="linklist-link">{$value.title}</span>
-              </a>
-                {else}
-                <span class="linklist-link">{$value.title}</span>
-                {/if}
-
-            </h2>
-          </div>
-
-          {if="$value.description"}
-            <div class="linklist-item-description">
-              {$value.description}
-            </div>
-          {/if}
-
-          {if="strpos($value.url, $value.shorturl) === false"}
-          <div class="linklist-item-infos-url">
-			<a href="{$value.real_url}" aria-label="{$value.title}" title="{$value.title}">{$value.url}</a>
-          </div>
-          {/if}
-
-          {if="!$hide_timestamps || $is_logged_in"}
-            {$updated=$value.updated_timestamp ? $strEdited. format_date($value.updated) : $strPermalink}
-            <div class="linkdate" title="{$updated}">
-              {$value.created|format_date}
-              {if="$value.updated_timestamp"}*{/if}
-            </div>
-          {/if}
-
-          <div id="linklist-controls" class="pure-g">
-          <div class="linklist-item-tags pure-u-1-2">
-          {if="$is_logged_in"}
-             <span class="ctrl-checkbox">
-               <input type="checkbox" class="link-checkbox" value="{$value.id}">
-             </span>
-          {/if}
-
-          {if="$value.tags"}
-              {$tag_counter=count($value.taglist)}
-              {loop="value.taglist"}
-                <span class="label label-tag" title="{$strAddTag}">
-                  <a href="?addtag={$value|urlencode}">{$value}</a>
-                </span>
-              {/loop}
-          {/if}
-          </div>
-
-          <div class="linklist-item-infos pure-u-1-2">
-                {if="$is_logged_in"}
-                    <span class="linklist-item-infos-controls-item ctrl-edit">
-                      <a href="?edit_link={$value.id}" aria-label="{$strEdit}" title="{$strEdit}"><i class="fa fa-pencil-square-o edit-link" aria-hidden="true"></i></a>
-                    </span>
-                    <span class="linklist-item-infos-controls-item ctrl-delete">
-                      <a href="?delete_link&amp;lf_linkdate={$value.id}&amp;token={$token}" aria-label="{$strDelete}"
-                         title="{$strDelete}" class="delete-link">
-                        <i class="fa fa-trash" aria-hidden="true"></i>
-                      </a>
-                    </span>
-                    <span class="linklist-item-infos-controls-item ctrl-pin">
-                      <a href="?do=pin&amp;id={$value.id}&amp;token={$token}"
-                         title="{$strToggleSticky}" aria-label="{$strToggleSticky}" class="pin-link {if="$value.sticky"}pinned-link{/if}">
-                        <i class="fa fa-thumb-tack" aria-hidden="true"></i>
-                      </a>
-                    </span>
-                {else}
-                  {if="$value.sticky"}
-                      <span class="linklist-item-infos-controls-item ctrl-pin">
-                        <span title="{$strSticky}" class="pin-link pinned-link">
-                          <i class="fa fa-thumb-tack" aria-hidden="true"></i>
-                        </span>
-                      </span>
-                  {/if}
-                {/if}
+                    alt="" width="{$thumbnails_width}" height="{$thumbnails_height}" /></a>
+			</div>
+		</div>
+		{/if}
+
+		{if="strpos($value.url, $value.shorturl) === false"}
+		<a href="{$value.real_url}"><span class="linklist-link">{$value.title}</span></a>
+		{else}
+		<span class="linklist-link">{$value.title}</span>
+		{/if}
+		</h2>
+
+		<div class="linklist-item-infos pure-u-2-5">
+			{if="$is_logged_in"}
+			<span class="linklist-item-infos-controls-item ctrl-edit">
+			<a href="?edit_link={$value.id}" aria-label="{$strEdit}" title="{$strEdit}"><i class="fa fa-pencil-square-o edit-link" aria-hidden="true"></i></a>
+			</span>
+
+			<span class="linklist-item-infos-controls-item ctrl-delete">
+			<a href="?delete_link&amp;lf_linkdate={$value.id}&amp;token={$token}" aria-label="{$strDelete}"
+			title="{$strDelete}" class="delete-link">
+			<i class="fa fa-trash" aria-hidden="true"></i></a>
+			</span>
+
+			<span class="linklist-item-infos-controls-item ctrl-pin">
+			<a href="?do=pin&amp;id={$value.id}&amp;token={$token}"
+			title="{$strToggleSticky}" aria-label="{$strToggleSticky}" class="pin-link {if="$value.sticky"}pinned-link{/if}">
+			<i class="fa fa-thumb-tack" aria-hidden="true"></i></a>
+			</span>
+			{else}
+			{if="$value.sticky"}
+			<span class="linklist-item-infos-controls-item ctrl-pin">
+				<span title="{$strSticky}" class="pin-link pinned-link">
+				<i class="fa fa-thumb-tack" aria-hidden="true"></i>
+			</span>
+			</span>
+			{/if}
+			{/if}
+
+			<span class="linklist-item-infos-controls-item">
+			<a href="?{$value.shorturl}" title="{$strPermalink}">
+			<i class="fa fa-link" aria-hidden="true"></i></a>
+			</span>
+
+			<div class="linklist-item-infos-controls-item">
+                 {if="isset($value.link_plugin)"}
+                   {$link_plugin_counter=count($value.link_plugin)}
+                   {loop="$value.link_plugin"}
+                     {$value}
+                   {/loop}
+                 {/if}
+			</div>
 
                <span class="linklist-item-infos-controls-item">
-                <a href="?{$value.shorturl}" title="{$strPermalink}">
-			      <i class="fa fa-link" aria-hidden="true"></i>
-                </a>
+                 <a href="#" aria-label="{$strFold}" title="{$strFold}" class="fold-button"><i class="fa fa-chevron-up" aria-hidden="true"></i></a>
                </span>
+		</div>
+	</div>
+
+	{if="$value.description"}
+	<div class="linklist-item-description">{$value.description}</div>
+	{/if}
+
+	{if="strpos($value.url, $value.shorturl) === false"}
+	<div class="linklist-item-infos-url">
+		<a href="{$value.real_url}" aria-label="{$value.title}" title="{$value.title}">{$value.url}</a>
+	</div>
+	{/if}
+
+	{if="!$hide_timestamps || $is_logged_in"}
+	{$updated=$value.updated_timestamp ? $strEdited. format_date($value.updated) : $strPermalink}
+	<div class="linkdate" title="{$updated}">
+		{$value.created|format_date}
+		{if="$value.updated_timestamp"}*{/if}
+	</div>
+	{/if}
+
+	<div class="linklist-controls pure-g">
+		<div class="linklist-item-tags pure-u-1-2">
+		{if="$is_logged_in"}
+			<span class="ctrl-checkbox">
+			<input type="checkbox" class="link-checkbox" value="{$value.id}">
+			</span>
+		{/if}
+
+		{if="$value.tags"}
+			{$tag_counter=count($value.taglist)}
+			{loop="value.taglist"}
+				<span class="label label-tag" title="{$strAddTag}">
+					<a href="?addtag={$value|urlencode}">{$value}</a>
+				</span>
+			{/loop}
+		{/if}
+
+		{if="$value.private"}
+			<span class="label label-private">{$strPrivate}</span>
+		{/if}
+		</div>
+	</div>
+
+	<div class="mobile-buttons pure-u-1 pure-u-lg-0">
+		{if="isset($value.link_plugin)"}
+			{$link_plugin_counter=count($value.link_plugin)}
+			{loop="$value.link_plugin"}
+				{$value}
+				{if="$link_plugin_counter - 1 != $counter"}&middot;{/if}
+			{/loop}
+		{/if}
+		{if="$is_logged_in"}
+			&middot;
+			<a href="?delete_link&amp;lf_linkdate={$value.id}&amp;token={$token}" aria-label="{$strDelete}"
+			title="{$strDelete}" class="delete-link confirm-delete">
+			<i class="fa fa-trash" aria-hidden="true"></i>
+			</a>
+			&middot;
+			<a href="?edit_link={$value.id}" aria-label="{$strEdit}" title="{$strEdit}"><i class="fa fa-pencil-square-o edit-link" aria-hidden="true"></i></a>
+		{/if}
+	</div>
+</div>
 
-                <span class="linklist-item-infos-controls-item">
-                  {if="isset($value.link_plugin)"}
-                    {$link_plugin_counter=count($value.link_plugin)}
-                    {loop="$value.link_plugin"}
-                      {$value}
-                    {/loop}
-                  {/if}
-                </span>
-
-                <span class="linklist-item-infos-controls-item">
-                  <a href="#" aria-label="{$strFold}" title="{$strFold}" class="fold-button"><i class="fa fa-chevron-up" aria-hidden="true"></i></a>
-                </span>
-              </div>
-           </div>
-
-              <div class="mobile-buttons pure-u-1 pure-u-lg-0">
-                {if="isset($value.link_plugin)"}
-                  {$link_plugin_counter=count($value.link_plugin)}
-                  {loop="$value.link_plugin"}
-                    {$value}
-                    {if="$link_plugin_counter - 1 != $counter"}&middot;{/if}
-                  {/loop}
-                {/if}
-                {if="$is_logged_in"}
-                  &middot;
-                  <a href="?delete_link&amp;lf_linkdate={$value.id}&amp;token={$token}" aria-label="{$strDelete}"
-                     title="{$strDelete}" class="delete-link confirm-delete">
-                    <i class="fa fa-trash" aria-hidden="true"></i>
-                  </a>
-                  &middot;
-                  <a href="?edit_link={$value.id}" aria-label="{$strEdit}" title="{$strEdit}"><i class="fa fa-pencil-square-o edit-link" aria-hidden="true"></i></a>
-                {/if}
-              </div>
-        </div>
-      {/loop}
-    </div>
-  </div>
+{/loop}
+</div>
+</div>
 </div>
 
-  <div id="plugin_zone_end_linklist" class="plugin_zone">
-    {loop="$plugin_end_zone"}
-    {$value}
-    {/loop}
-  </div>
+<div id="plugin_zone_end_linklist" class="plugin_zone">
+{loop="$plugin_end_zone"}
+{$value}
+{/loop}
+</div>
 
 <div id="linklist-paging-bottom-block" class="pure-g link-count-block">
-  <div id="linklist-paging-bottom-content" class="pure-u-1">
-    {include="linklist.paging"}
-  </div>
+<div id="linklist-paging-bottom-content" class="pure-u-1">
+{include="linklist.paging"}
+</div>
 </div>
 
 {include="page.footer"}
diff --git a/sass/shaarli.scss b/sass/shaarli.scss
index 08d6449..d4b783a 100644
--- a/sass/shaarli.scss
+++ b/sass/shaarli.scss
@@ -713,7 +713,6 @@ pre {
     word-wrap: break-word;
 	font-size: 24px;
 	font-weight: 700;
-	line-height: 29px;
 	max-width: 80%;
 
     a {
@@ -736,14 +735,14 @@ pre {
   .label {
   }
 
-  .label-private {
-	background-color: $orange;
-  }
-
   .label-sticky {
   }
 }
 
+.label-private {
+	background-color: $orange;
+}
+
 .fold-button {
   display: none;
   color: $dark-gray;
@@ -783,13 +782,14 @@ pre {
 }
 
 .pinned-link {
-  color: $blue !important;
+	color: $blue !important;
 }
 
 .linklist-item-description {
   position: relative;
   color: $dark-gray;
   word-wrap: break-word;
+	margin-bottom: 12px;
 	max-width: 800px;
 
   a {
@@ -855,6 +855,8 @@ pre {
 }
 
 .linklist-item-infos {
+	position: relative;
+	top: -6px;
 
   a {
     text-decoration: none;