diff --git a/webcompat/static/css/development/components/loader.css b/webcompat/static/css/development/components/loader.css
index aeeb85dee..be86e5e95 100644
--- a/webcompat/static/css/development/components/loader.css
+++ b/webcompat/static/css/development/components/loader.css
@@ -26,4 +26,9 @@
 
 .wc-Upload-Loader.is-active {
   display: block;
+}
+
+.wc-Issue-Loader {
+  right: 1%;
+  top: 12%;
 }
\ No newline at end of file
diff --git a/webcompat/static/js/lib/issues.js b/webcompat/static/js/lib/issues.js
index c539ac0f3..8ada26a72 100644
--- a/webcompat/static/js/lib/issues.js
+++ b/webcompat/static/js/lib/issues.js
@@ -180,7 +180,7 @@ issues.ImageUploadView = Backbone.View.extend({
     'change .js-buttonUpload': 'validateAndUpload'
   },
   _submitButton: $('.js-Issue-comment-button'),
-  _loaderImage: $('.js-Loader'),
+  _loaderImage: $('.js-Upload-Loader'),
   template: _.template($('#upload-input-tmpl').html()),
   render: function() {
     this.$el.html(this.template()).insertAfter($('textarea'));
diff --git a/webcompat/templates/issue/issue-comment-submit.html b/webcompat/templates/issue/issue-comment-submit.html
index f1a855f41..c1ad3a871 100644
--- a/webcompat/templates/issue/issue-comment-submit.html
+++ b/webcompat/templates/issue/issue-comment-submit.html
@@ -13,11 +13,12 @@
               <label class="wc-UploadForm-label wc-UploadForm-label--uploadForm">Attach images by <span class="wc-UploadForm-label--link">selecting them</span></label>
               <input accept=".jpe,.jpg,.jpeg,.gif,.png,.bmp" class="wc-ButtonUpload js-buttonUpload" id="image" name="image" type="file">
             </div>
-          </div>
+            <img class="wc-Upload-Loader wc-Issue-Loader js-Upload-Loader"
+                 src="/img/upload-loader.svg" alt="Uploading image">
+          </label>
         </form>
       </script>
     </div>
-    <div class="wc-Loader js-Loader"></div>
     <div class="wc-Comment-button">
       <button class="wc-Button wc-Button--action js-Issue-state-button">
         <script type="text/template" id="state-button-tmpl">