diff --git a/spirit/comment/templates/spirit/comment/_editor.html b/spirit/comment/templates/spirit/comment/_editor.html
index d76702545..5dcb8a631 100644
--- a/spirit/comment/templates/spirit/comment/_editor.html
+++ b/spirit/comment/templates/spirit/comment/_editor.html
@@ -9,7 +9,8 @@
  --><li><a class="js-box-italic" href="#" title="{% trans "Italic" %}"><i class="fa fa-italic"></i></a></li><!--
  --><li><a class="js-box-list" href="#" title="{% trans "List" %}"><i class="fa fa-list"></i></a></li><!--
  --><li><a class="js-box-url" href="#" title="{% trans "URL" %}"><i class="fa fa-link"></i></a></li><!--
- --><li><a class="js-box-image" href="#" title="{% trans "Image" %}"><i class="fa fa-picture-o"></i></a></li><!--
+ --><li><a class="js-box-url-image" href="#" title="{% trans "Image" %}"><i class="fa fa-external-link-square"></i></a></li><!--
+ --><li><a class="js-box-image" href="#" title="{% trans "Image" %}"><i class="fa fa-file-image-o"></i></a></li><!--
  -->{% if st_settings.ST_UPLOAD_FILE_ENABLED %}<li>
         <a class="js-box-file" href="#" title="{% trans "File" %}"><i class="fa fa-file"></i></a>
     </li>{% endif %}<!--
diff --git a/spirit/core/static/spirit/scripts/src/editor.coffee b/spirit/core/static/spirit/scripts/src/editor.coffee
index 1e45f72dc..081095c93 100644
--- a/spirit/core/static/spirit/scripts/src/editor.coffee
+++ b/spirit/core/static/spirit/scripts/src/editor.coffee
@@ -35,6 +35,7 @@ class Editor
         $('.js-box-list').on('click', @addList)
         $('.js-box-url').on('click', @addUrl)
         $('.js-box-image').on('click', @addImage)
+        $('.js-box-url-image').on('click', @addUrlImage)
         $('.js-box-poll').on('click', @addPoll)
         $('.js-box-preview').on('click', @togglePreview)
 
@@ -70,6 +71,12 @@ class Editor
         @wrapSelection("[", "](#{ @options.linkUrlText })", @options.linkText)
         return false
 
+    addUrlImage: (e) =>
+        e.preventDefault()
+        @wrapSelection("![", "](#{ @options.imageUrlText })", @options.imageText)
+        $('#id_comment').focus()
+        return false
+
     addImage: =>
         @wrapSelection("![", "](#{ @options.imageUrlText })", @options.imageText)
         return false
diff --git a/spirit/core/static/spirit/stylesheets/mockups/comments.html b/spirit/core/static/spirit/stylesheets/mockups/comments.html
index 11b3cc228..7381b6c3e 100644
--- a/spirit/core/static/spirit/stylesheets/mockups/comments.html
+++ b/spirit/core/static/spirit/stylesheets/mockups/comments.html
@@ -415,7 +415,8 @@ <h1 class="headline">Topic title here</h1>
 						 --><li><a class="js-box-italic" href="#" title="Italic"><i class="fa fa-italic"></i></a></li><!--
 						 --><li><a class="js-box-list" href="#" title="List"><i class="fa fa-list"></i></a></li><!--
 						 --><li><a class="js-box-url" href="#" title="URL"><i class="fa fa-link"></i></a></li><!--
-						 --><li><a class="js-box-image" href="#" title="Image"><i class="fa fa-picture-o"></i></a></li><!--
+                        --><li><a class="js-box-url-image" href="#" title="Image"><i class="fa fa-external-link-square"></i></a></li><!--
+                        --><li><a class="js-box-image" href="#" title="Image"><i class="fa fa-file-image-o"></i></a></li><!--
 						 --><li><a class="js-box-preview" href="#" title="Preview"><i class="fa fa-eye"></i></a></li>
 						</ul>
 
diff --git a/spirit/core/static/spirit/stylesheets/mockups/comments_image_upload.html b/spirit/core/static/spirit/stylesheets/mockups/comments_image_upload.html
index 467ef25c7..cbccc8131 100644
--- a/spirit/core/static/spirit/stylesheets/mockups/comments_image_upload.html
+++ b/spirit/core/static/spirit/stylesheets/mockups/comments_image_upload.html
@@ -106,7 +106,8 @@ <h1 class="headline">Topic title here</h1>
 						 --><li><a class="js-box-italic" href="#" title="Italic"><i class="fa fa-italic"></i></a></li><!--
 						 --><li><a class="js-box-list" href="#" title="List"><i class="fa fa-list"></i></a></li><!--
 						 --><li><a class="js-box-url" href="#" title="URL"><i class="fa fa-link"></i></a></li><!--
-						 --><li><a class="js-box-image" href="./image/upload/" title="Image"><i class="fa fa-picture-o"></i></a></li><!--
+                        --><li><a class="js-box-url-image" href="#" title="Image"><i class="fa fa-link"></i></a></li><!--
+                        --><li><a class="js-box-image" href="./image/upload/" title="Image"><i class="fa fa-external-link-square"></i></a></li><!--
 						 --><li><a class="js-box-preview" href="#" title="Preview"><i class="fa fa-eye"></i></a></li>
 						</ul>