diff --git a/app/scripts/directives/tokenForm.js b/app/scripts/directives/tokenForm.js
index 2c19f4f..8bbfd17 100644
--- a/app/scripts/directives/tokenForm.js
+++ b/app/scripts/directives/tokenForm.js
@@ -35,7 +35,8 @@ angular.module('ffffng')
             'onSubmit': '=fSubmit',
             'onCancel': '=fCancel',
             'submitIcon': '@fSubmitIcon',
-            'submitLabel': '@fSubmitLabel'
+            'submitLabel': '@fSubmitLabel',
+            'submitBtn': '@fSubmitBtn'
         }
     };
 });
diff --git a/app/styles/_variables.scss b/app/styles/_variables.scss
index 86bbdd1..7e653e5 100644
--- a/app/styles/_variables.scss
+++ b/app/styles/_variables.scss
@@ -15,7 +15,6 @@ $brand-warning: #FDBC41;
 $brand-danger: #C9302C;
 $brand-info: #009EE0;
 
-
 // Scaffolding
 $body-bg: $gray-lighter;
 $text-color: $gray-dark;
@@ -62,7 +61,7 @@ $btn-primary-border: darken($btn-primary-bg, 10%);
 $btn-success-color: #FFFFFF;
 $btn-success-bg: $brand-success;
 $btn-success-border: darken($btn-success-bg, 10%);
-$btn-warning-color: #FFFFFF;
+$btn-warning-color: $gray-dark;
 $btn-warning-bg: $brand-warning;
 $btn-warning-border: darken($btn-warning-bg, 10%);
 $btn-danger-color: #FFFFFF;
diff --git a/app/styles/views/_main.scss b/app/styles/views/_main.scss
index c213b19..a0fe764 100644
--- a/app/styles/views/_main.scss
+++ b/app/styles/views/_main.scss
@@ -39,7 +39,7 @@
 
         .delete-node {
             button {
-                //@extend .btn-link;
+                @extend .btn-warning;
             }
         }
     }
diff --git a/app/styles/views/dialogs/_confirmDeletionDialog.scss b/app/styles/views/dialogs/_confirmDeletionDialog.scss
index efee618..dd9d27a 100644
--- a/app/styles/views/dialogs/_confirmDeletionDialog.scss
+++ b/app/styles/views/dialogs/_confirmDeletionDialog.scss
@@ -26,7 +26,7 @@
             margin-left: 5px;
 
             &.proceed {
-                @extend .btn-primary;
+                @extend .btn-warning;
             }
         }
     }
diff --git a/app/styles/views/directives/_tokenForm.scss b/app/styles/views/directives/_tokenForm.scss
index 977fd86..fb9747e 100644
--- a/app/styles/views/directives/_tokenForm.scss
+++ b/app/styles/views/directives/_tokenForm.scss
@@ -17,7 +17,7 @@ f-token-form {
     }
 
     .submit {
-        @extend .btn, .btn-primary;
+        @extend .btn;
 
         margin-left: 5px;
     }
diff --git a/app/views/deleteNodeForm.html b/app/views/deleteNodeForm.html
index 2e93085..198453e 100644
--- a/app/views/deleteNodeForm.html
+++ b/app/views/deleteNodeForm.html
@@ -13,7 +13,7 @@
                 <a href="mailto:{{ config.community.contactEmail }}">{{ config.community.contactEmail }}</a>.
             </strong>
         </p>
-        <f-token-form f-submit="onSubmitToken" f-cancel="cancel" f-submit-icon="fa-trash" f-submit-label="Knoten löschen"></f-token-form>
+        <f-token-form f-submit="onSubmitToken" f-cancel="cancel" f-submit-icon="fa-trash" f-submit-label="Knoten löschen" f-submit-btn="btn-warning"></f-token-form>
 
         <p>
             <em>
diff --git a/app/views/dialogs/confirmDeletionDialog.html b/app/views/dialogs/confirmDeletionDialog.html
index 33e56af..d97a0d8 100644
--- a/app/views/dialogs/confirmDeletionDialog.html
+++ b/app/views/dialogs/confirmDeletionDialog.html
@@ -5,7 +5,7 @@
     </div>
     <div class="modal-body">
         <p>
-            Soll der Knoten „{{node.hostname}}“ wirklich endgültig gelöscht werden?
+            Soll der Knoten <strong>{{node.hostname}}</strong> wirklich endgültig gelöscht werden?
             Du kannst ihn selbstverständlich später jederzeit erneut anmelden!
         </p>
     </div>
diff --git a/app/views/directives/tokenForm.html b/app/views/directives/tokenForm.html
index edf205f..63c1219 100644
--- a/app/views/directives/tokenForm.html
+++ b/app/views/directives/tokenForm.html
@@ -9,7 +9,7 @@
             </span>
         </div>
         <div class="buttons">
-            <button class="submit" type="submit">
+            <button class="submit {{submitBtn}}" type="submit">
                 <i class="fa {{submitIcon}}"></i> {{submitLabel}}
             </button>
             <button class="cancel" type="reset" ng-click="onCancel()">
diff --git a/app/views/updateNodeForm.html b/app/views/updateNodeForm.html
index 2498bc5..f4e1e6b 100644
--- a/app/views/updateNodeForm.html
+++ b/app/views/updateNodeForm.html
@@ -13,7 +13,7 @@
                 <a href="mailto:{{ config.community.contactEmail }}">{{ config.community.contactEmail }}</a>.
             </strong>
         </p>
-        <f-token-form f-submit="onSubmitToken" f-cancel="cancel" f-submit-icon="fa-pencil" f-submit-label="Knotendaten ändern"></f-token-form>
+        <f-token-form f-submit="onSubmitToken" f-cancel="cancel" f-submit-icon="fa-pencil" f-submit-label="Knotendaten ändern" f-submit-btn="btn-primary"></f-token-form>
     </div>
 
     <div ng-if="hasData()">