diff --git a/css/bookmarks.css b/css/bookmarks.css
index 65814af4..065f7f6c 100644
--- a/css/bookmarks.css
+++ b/css/bookmarks.css
@@ -88,10 +88,21 @@ input.disabled, input.disabled:hover, input.disabled:focus {
 	display: block;
 }
 
+.bookmark_edit_btn {
+        float: left;
+        position: absolute;
+        top: 0.6em;
+        left: 10em;
+}
+
 .bookmark_title {
-	font-weight: bold;
-	display: inline-block;
-	margin-right: 0.8em;
+        font-weight: bold;
+        display: inline-block;
+        margin-right: 0.8em;
+        width: 8em;
+        text-overflow: ellipsis;
+        overflow: hidden;
+        white-space: nowrap;
 }
 
 .bm_view_list .bookmark_tags {
@@ -102,7 +113,7 @@ input.disabled, input.disabled:hover, input.disabled:focus {
 }
 
 .bookmark_tags {
-        margin-left:7em;
+        margin-left:11em;
         position: absolute;
 }
 .bookmark_tag {
@@ -252,11 +263,12 @@ li:hover em { display : none; }
 	text-overflow:ellipsis;
 	overflow:hidden;
 	display:block;
-        float: left;
+        float:left;
         position: absolute;
-        left: 7em;
-        width:30em;
+        left: 11em;
+        max-width:30em;
         top: 0.7em;
+        font-weight:500;
 }
 .bookmark_date, .bookmark_submit {
 	font-size:small;
diff --git a/templates/js_tpl.php b/templates/js_tpl.php
index a5b1bc7d..2c71b7ee 100644
--- a/templates/js_tpl.php
+++ b/templates/js_tpl.php
@@ -17,6 +17,12 @@
                                     	<span class="bookmark_desc"><%= encodeEntities(description)%> </span>
                                         <span class="bookmark_date"><%= formatDate(added_date) %></span>
 				</p>
+                                <div class="bookmark_edit_btn">
+                                        <span class="bookmark_edit">
+						<img class="svg" src="<?php echo OCP\image_path("", "actions/rename.svg");?>"
+							title="<?php echo $l->t('Edit');?>">
+					</span>
+                                </div>
 			</div>
 </script>