diff --git a/themes/_global/js/saveLink.js b/themes/_global/js/saveLink.js
index 9f66b73f1..b7dd7a34f 100755
--- a/themes/_global/js/saveLink.js
+++ b/themes/_global/js/saveLink.js
@@ -82,6 +82,9 @@ $("#tags2add").hide();
 
 $('#showtaginput').click(function(){
   $('#tags2add').toggle();
+  $('#plainurl').toggle();
+  $('#showtaginput').toggleClass('icon-tags');
+  $('#showtaginput').toggleClass('icon-check');
 });
 
 
diff --git a/themes/baggy/_pocheit-form.twig b/themes/baggy/_pocheit-form.twig
index bc4391347..85d338733 100755
--- a/themes/baggy/_pocheit-form.twig
+++ b/themes/baggy/_pocheit-form.twig
@@ -4,7 +4,9 @@
         <a href="javascript: void(null);" id="bagit-form-close" class="close-button--popup close-button">&times;</a>
         <input type="hidden" name="autoclose" value="1" />
         <input required placeholder="example.com/article" class="addurl" id="plainurl" name="plainurl" type="url" />
-        <span id="showtaginput">Add tags</span>
+        <div style="display:inline-block;cursor: pointer;" title="{% trans "Edit tags" %}" id="showtaginput" class="tool icon icon-tags">
+            <span>Add tags</span>
+        </div>
         <input placeholder="tags, with commas" class="addurl" id="tags2add" name="tags" type="text"/>
         <span id="add-link-result"></span>
         <input type="submit" value="{% trans "save link!" %}" />
diff --git a/themes/baggy/css/main.css b/themes/baggy/css/main.css
index 54622cfce..b93a78b82 100755
--- a/themes/baggy/css/main.css
+++ b/themes/baggy/css/main.css
@@ -745,6 +745,9 @@ a.add-to-wallabag-link-after:after {
 .icon-evernote:before {
   content: "\e603";
 }
+.icon-tags:before {
+  content: "\e936";
+}
 
 
 /* .icon-image class, for image-based icons
diff --git a/themes/default/_pocheit-form.twig b/themes/default/_pocheit-form.twig
index f4518fceb..719913410 100755
--- a/themes/default/_pocheit-form.twig
+++ b/themes/default/_pocheit-form.twig
@@ -2,7 +2,9 @@
     <a href="javascript: void(null);" id="bagit-form-close">&nbsp;</a>
     <form method="get" action="index.php" id="bagit-form-form">
       <input required placeholder="example.com/article" class="addurl" id="plainurl" name="plainurl" type="url" />
-      <span id="showtaginput">Add tags</span>
+      <div style="display:inline-block;cursor: pointer;" title="{% trans "Edit tags" %}" id="showtaginput" class="edit-tags">
+         <span id="showtaginput">Add tags</span>
+      </div>
       <input placeholder="tags, with commas" class="addurl" id="tags2add" name="tags" type="text"/>
       <input type="submit" value="{% trans "save link!" %}" />
       <div id="add-link-result"></div>
diff --git a/themes/default/css/style-default.css b/themes/default/css/style-default.css
index 39a4df900..da8703f2b 100755
--- a/themes/default/css/style-default.css
+++ b/themes/default/css/style-default.css
@@ -75,3 +75,13 @@ a.print span {
 a.reload span {
     background-image: url('../img/default/reload.png');
 }
+.edit-tags span {
+    background-image: url('../img/default/tags.png');
+    display: inline-block;
+    width: 16px;
+    height: 16px;
+    /* Hide textual content */
+    overflow: hidden;
+    text-align: left;
+    text-indent: -9999px;
+}
diff --git a/themes/default/img/default/tags.png b/themes/default/img/default/tags.png
new file mode 100644
index 000000000..3714203e8
Binary files /dev/null and b/themes/default/img/default/tags.png differ