diff --git a/app/assets/javascripts/notes/components/issue_discussion.vue b/app/assets/javascripts/notes/components/issue_discussion.vue
index 1f7707a5208bc23bdee5c1a47d98931873329955..b362ef4b53ed4c245546dc04e1abf837740ef991 100644
--- a/app/assets/javascripts/notes/components/issue_discussion.vue
+++ b/app/assets/javascripts/notes/components/issue_discussion.vue
@@ -58,10 +58,10 @@ export default {
     <div class="timeline-entry-inner">
       <div class="timeline-icon">
         <user-avatar-link
-          :link-href="author.path"
-          :img-src="author.avatar_url"
-          :img-alt="author.name"
-          :img-size="40" />
+          :linkHref="author.path"
+          :imgSrc="author.avatar_url"
+          :imgAlt="author.name"
+          :imgSize="40" />
       </div>
       <div class="timeline-content">
         <div class="discussion">
diff --git a/app/assets/javascripts/notes/components/issue_note.vue b/app/assets/javascripts/notes/components/issue_note.vue
index 3dc28d60ddd392bdebca31e307c2f2ed8cbd699f..9ec31589b24784a95dbdc1bbd707548bcf7a0736 100644
--- a/app/assets/javascripts/notes/components/issue_note.vue
+++ b/app/assets/javascripts/notes/components/issue_note.vue
@@ -39,15 +39,20 @@ export default {
       this.isEditing = true;
     },
     deleteHandler() {
-      this.isDeleting = true;
-      this.$store
-        .dispatch('deleteNote', this.note)
-        .then(() => {
-          this.isDeleting = false;
-        })
-        .catch(() => {
-          this.isDeleting = false;
-        });
+      const msg = 'Are you sure you want to delete this list?';
+      const isConfirmed = confirm(msg); // eslint-disable-line
+
+      if (isConfirmed) {
+        this.isDeleting = true;
+        this.$store
+          .dispatch('deleteNote', this.note)
+          .then(() => {
+            this.isDeleting = false;
+          })
+          .catch(() => {
+            this.isDeleting = false;
+          });
+      }
     },
     formUpdateHandler() {
       // console.log('update requested', data);
@@ -66,10 +71,10 @@ export default {
     <div class="timeline-entry-inner">
       <div class="timeline-icon">
         <user-avatar-link
-          :link-href="author.path"
-          :img-src="author.avatar_url"
-          :img-alt="author.name"
-          :img-size="40" />
+          :linkHref="author.path"
+          :imgSrc="author.avatar_url"
+          :imgAlt="author.name"
+          :imgSize="40" />
       </div>
       <div class="timeline-content">
         <div class="note-header">
diff --git a/app/assets/javascripts/notes/components/issue_note_actions.vue b/app/assets/javascripts/notes/components/issue_note_actions.vue
index 1f25421dd74441af490f332a61e96e0989759c80..fb1c865d239716683177375fac4c90ec4bda8001 100644
--- a/app/assets/javascripts/notes/components/issue_note_actions.vue
+++ b/app/assets/javascripts/notes/components/issue_note_actions.vue
@@ -97,6 +97,7 @@ export default {
         </li>
         <li>
           <a
+            v-if="canEdit"
             @click.prevent="deleteHandler"
             class="js-note-delete"
             href="#">
diff --git a/app/assets/javascripts/notes/services/issue_notes_service.js b/app/assets/javascripts/notes/services/issue_notes_service.js
index c36b835c3830cd95abdaf50bfdecd95122823908..01ad151c39c008f4173477c87baec48c6dc72807 100644
--- a/app/assets/javascripts/notes/services/issue_notes_service.js
+++ b/app/assets/javascripts/notes/services/issue_notes_service.js
@@ -8,6 +8,6 @@ export default {
     return Vue.http.get(endpoint);
   },
   deleteNote(endpoint) {
-    return Vue.http.get(endpoint);
+    return Vue.http.delete(endpoint);
   },
 };
diff --git a/app/assets/javascripts/notes/stores/issue_notes_store.js b/app/assets/javascripts/notes/stores/issue_notes_store.js
index eb387811443a9fc6205a7bb1b31a0369e7423945..ac69ca93b1c30852dbc251d8baef2475267b680a 100644
--- a/app/assets/javascripts/notes/stores/issue_notes_store.js
+++ b/app/assets/javascripts/notes/stores/issue_notes_store.js
@@ -53,10 +53,8 @@ const actions = {
       });
   },
   deleteNote(context, note) {
-    // FIXME: Implement request, remove fake delete timer...
     return service
-      .deleteNote(`${document.location.href}.json`)
-      .then(res => res.json)
+      .deleteNote(note.path)
       .then(() => {
         context.commit('deleteNote', note);
       })