diff --git a/UI/Settings/Notifications/EditTemplate.html b/UI/Settings/Notifications/EditTemplate.html
index 825ad7bf9..09ecc5411 100644
--- a/UI/Settings/Notifications/EditTemplate.html
+++ b/UI/Settings/Notifications/EditTemplate.html
@@ -57,19 +57,15 @@
         </div>
 
         {{formBuilder}}
-
-        <div class="control-group">
-            <label class="control-label">Test</label>
-            <div class="controls">
-                <button class="btn x-test"><i class="icon-question x-test-icon"/> Test</button>
-            </div>
-        </div>
+        index
     </div>
 </div>
 <div class="modal-footer">
     {{#if id}}
         <button class="btn btn-danger pull-left x-remove">delete</button>
     {{/if}}
+    <button class="btn x-test">test <i class="x-test-icon"/></button>
+
     <button class="btn" data-dismiss="modal">cancel</button>
     <button class="btn btn-primary x-save">save</button>
 </div>
\ No newline at end of file
diff --git a/UI/Settings/Notifications/EditView.js b/UI/Settings/Notifications/EditView.js
index 7e93901b8..a02cc3593 100644
--- a/UI/Settings/Notifications/EditView.js
+++ b/UI/Settings/Notifications/EditView.js
@@ -53,7 +53,6 @@ define([
             if (testCommand) {
                 this.idle = false;
                 this.ui.testButton.addClass('disabled');
-                this.ui.testIcon.removeClass('icon-question');
                 this.ui.testIcon.addClass('icon-spinner icon-spin');
 
                 var properties = {};
@@ -84,7 +83,6 @@ define([
                 commandPromise.always(function () {
                     if (!self.isClosed) {
                         self.ui.testButton.removeClass('disabled');
-                        self.ui.testIcon.addClass('icon-question');
                         self.ui.testIcon.removeClass('icon-spinner icon-spin');
                         self.idle = true;
                     }