diff --git a/htroot/ConfigAccounts_p.html b/htroot/ConfigAccounts_p.html
index edcc19b56..77de2476e 100644
--- a/htroot/ConfigAccounts_p.html
+++ b/htroot/ConfigAccounts_p.html
@@ -5,24 +5,24 @@
     #%env/templates/metas.template%#
   </head>
 <body>
-    #%env/templates/header.template%#
+    #%env/templates/header.template%#
     #%env/templates/submenuUseCaseAccount.template%#
-    <h2>User Administration</h2>
-    
-    <!-- Page 1: Results -->
-    #(text)#
-    ::
-    <p>User created: #[username]#</p>
-    ::
-    <p>User changed: #[username]#</p>
-    #(/text)#
-    #(error)#
-    ::
-    <p class="error">Generic error.</p>
-    ::
-    <p class="error">Passwords do not match.</p>
-    ::
-    <p class="error">Username too short. Username must be &gt;= 4 Characters.</p>
+    <h2>User Administration</h2>
+    
+    <!-- Page 1: Results -->
+    #(text)#
+    ::
+    <p>User created: #[username]#</p>
+    ::
+    <p>User changed: #[username]#</p>
+    #(/text)#
+    #(error)#
+    ::
+    <p class="error">Generic error.</p>
+    ::
+    <p class="error">Passwords do not match.</p>
+    ::
+    <p class="error">Username too short. Username must be &gt;= 4 Characters.</p>
     #(/error)#
     #(passwordNotSetWarning)#::<div class="error">No password is set for the administration account. Please define a password for the admin account.</div>#(/passwordNotSetWarning)#
 
@@ -69,61 +69,61 @@
             </dl>
       </form>
     </fieldset>
-    
-    <fieldset><legend>User Accounts</legend>
-	<form action="ConfigAccounts_p.html" accept-charset="UTF-8">
-      <fieldset><legend>Select user</legend>
-        <dl>
-          <dt><label for="user">Select user</label>:</dt>
-          <dd>
-            <select name="user" id="user">
-              <option value="newuser">New user</option>#{users}#
-              <option>#[user]#</option>#{/users}#
-            </select>
-          </dd>
-          <dt>&nbsp;</dt>
-          <dd>
-            <input type="submit" name="change_user" value="Edit User" class="btn btn-primary"/>
-            <input type="submit" name="delete_user" value="Delete User" class="btn btn-primary"/>
-          </dd>
-        </dl>
-      </fieldset>
-    </form>
-    
-    <form action="ConfigAccounts_p.html" method="post" accept-charset="UTF-8">
-      <fieldset><legend>Edit current user: #[username]#</legend>
-        <!-- Hidden(text for debugging): <input type="text" name="current_user" value="#[current_user]#" readonly> -->
-        <input type="hidden" name="current_user" value="#[current_user]#" />
-        <dl>
-          <dt><label for="username">Username</label>:</dt>
-          <dd><input type="text" id="username" name="username" value="#[username]#" /></dd>
-          <dt><label for="password">Password</label>:</dt>
-          <dd><input type="password" id="password" name="password" /></dd>
-          <dt><label for="password2">Repeat password</label>:</dt>
-          <dd><input type="password" id="password2" name="password2" /></dd>
-          <dt><label for="firstname">First name</label>:</dt>
-          <dd><input type="text" id="firstname" name="firstname" value="#[firstname]#" /></dd>
-          <dt><label for="lastname">Last name</label>:</dt>
-          <dd><input type="text" id="lastname" name="lastname" value="#[lastname]#" /></dd>
-          <dt><label for="address">Address</label>:</dt>
-          <dd><input type="text" id="address" name="address" value="#[address]#" /></dd>
-          <dt>Rights:</dt>
-          <dd>
-          	#{rights}#
-            <input type="checkbox" id="#[name]#" name="#[name]#"#(set)#:: checked="checked"#(/set)# /><label for="#[name]#">#[friendlyName]# right</label><br />
-            #{/rights}#
-          </dd>
-          <dt><label for="tlimit">Timelimit</label>:</dt>
-          <dd><input type="text" id="tlimit" name="timelimit" value="#[timelimit]#" /></dd>
-          <dt><label for="tused">Time used</label>:</dt>
-          <dd><input type="text" id="tused" name="timeused" value="#[timeused]#" /></dd>
-          <dt>&nbsp;</dt>
-          <dd><input type="submit" name="change" value="Save User" class="btn btn-primary"/></dd>
-        </dl>
-      </fieldset>
+    
+    <fieldset><legend>User Accounts</legend>
+	<form action="ConfigAccounts_p.html" accept-charset="UTF-8">
+      <fieldset><legend>Select user</legend>
+        <dl>
+          <dt><label for="user">Select user</label>:</dt>
+          <dd>
+            <select name="user" id="user">
+              <option value="newuser">New user</option>#{users}#
+              <option>#[user]#</option>#{/users}#
+            </select>
+          </dd>
+          <dt>&nbsp;</dt>
+          <dd>
+            <input type="submit" name="change_user" value="Edit User" class="btn btn-primary"/>
+            <input type="submit" name="delete_user" value="Delete User" class="btn btn-danger"/>
+          </dd>
+        </dl>
+      </fieldset>
+    </form>
+    
+    <form action="ConfigAccounts_p.html" method="post" accept-charset="UTF-8">
+      <fieldset><legend>Edit current user: #[username]#</legend>
+        <!-- Hidden(text for debugging): <input type="text" name="current_user" value="#[current_user]#" readonly> -->
+        <input type="hidden" name="current_user" value="#[current_user]#" />
+        <dl>
+          <dt><label for="username">Username</label>:</dt>
+          <dd><input type="text" id="username" name="username" value="#[username]#" /></dd>
+          <dt><label for="password">Password</label>:</dt>
+          <dd><input type="password" id="password" name="password" /></dd>
+          <dt><label for="password2">Repeat password</label>:</dt>
+          <dd><input type="password" id="password2" name="password2" /></dd>
+          <dt><label for="firstname">First name</label>:</dt>
+          <dd><input type="text" id="firstname" name="firstname" value="#[firstname]#" /></dd>
+          <dt><label for="lastname">Last name</label>:</dt>
+          <dd><input type="text" id="lastname" name="lastname" value="#[lastname]#" /></dd>
+          <dt><label for="address">Address</label>:</dt>
+          <dd><input type="text" id="address" name="address" value="#[address]#" /></dd>
+          <dt>Rights:</dt>
+          <dd>
+          	#{rights}#
+            <input type="checkbox" id="#[name]#" name="#[name]#"#(set)#:: checked="checked"#(/set)# /><label for="#[name]#">#[friendlyName]# right</label><br />
+            #{/rights}#
+          </dd>
+          <dt><label for="tlimit">Timelimit</label>:</dt>
+          <dd><input type="text" id="tlimit" name="timelimit" value="#[timelimit]#" /></dd>
+          <dt><label for="tused">Time used</label>:</dt>
+          <dd><input type="text" id="tused" name="timeused" value="#[timeused]#" /></dd>
+          <dt>&nbsp;</dt>
+          <dd><input type="submit" name="change" value="Save User" class="btn btn-primary"/></dd>
+        </dl>
+      </fieldset>
     </form>
     </fieldset>
-    
+    
 #%env/templates/footer.template%#
 </body>
 </html>
diff --git a/htroot/ConfigAppearance_p.html b/htroot/ConfigAppearance_p.html
index c61a27c5f..c79d626c0 100644
--- a/htroot/ConfigAppearance_p.html
+++ b/htroot/ConfigAppearance_p.html
@@ -52,7 +52,7 @@
           <dt>&nbsp;</dt>
           <dd>
             <input type="submit" name="use_button" value="Use" class="btn btn-primary"/>
-            <input type="submit" name="delete_button" value="Delete" class="btn btn-primary"/>
+            <input type="submit" name="delete_button" value="Delete" class="btn btn-danger"/>
           </dd>
         </dl>
       </fieldset>
diff --git a/htroot/ConfigHTCache_p.html b/htroot/ConfigHTCache_p.html
index 5ab2f1c3a..563e60c53 100644
--- a/htroot/ConfigHTCache_p.html
+++ b/htroot/ConfigHTCache_p.html
@@ -37,7 +37,7 @@
             />Delete HTTP &amp; FTP Cache<br/>
             <input type="checkbox" name="deleteRobots" id="deleteRobots" disabled="disabled" />Delete robots.txt Cache<br/>
             <input type="checkbox" name="deleteSearchFl" id="deleteSearchFl" disabled="disabled" />Delete cached snippet-fetching failures during search<br/><br/><br/>
-            <input type="submit" name="deletecomplete" value="Delete" class="btn btn-primary"/>
+            <input type="submit" name="deletecomplete" value="Delete" class="btn btn-danger"/>
         </dd>
       </dl>
     </fieldset>
diff --git a/htroot/ConfigLanguage_p.html b/htroot/ConfigLanguage_p.html
index 9a2b27f53..bd0a6a44f 100644
--- a/htroot/ConfigLanguage_p.html
+++ b/htroot/ConfigLanguage_p.html
@@ -32,7 +32,7 @@
           <dt></dt>
           <dd>
             <input type="submit" name="use_button" value="Use" class="btn btn-primary"/>
-            <input type="submit" name="delete" value="Delete" class="btn btn-primary"/>
+            <input type="submit" name="delete" value="Delete" class="btn btn-danger"/>
           </dd>
         </dl>
       </fieldset>
diff --git a/htroot/CrawlProfileEditor_p.html b/htroot/CrawlProfileEditor_p.html
index 15b1c7c85..e52bf2b8e 100644
--- a/htroot/CrawlProfileEditor_p.html
+++ b/htroot/CrawlProfileEditor_p.html
@@ -59,7 +59,7 @@
 	    Finished
         <form action="CrawlProfileEditor_p.html" method="get" enctype="multipart/form-data" accept-charset="UTF-8"><div>
         <input type="hidden" name="handle" value="#[handle]#" />
-        <input type="submit" name="delete" value="Delete"/>
+        <input type="submit" name="delete" value="Delete" class="btn btn-danger btn-xs"/>
         </div></form>
         #(/deleteButton)#
 	</td>
@@ -80,7 +80,7 @@
 </table>
 #(existPassiveCrawls)#::
 <form action="CrawlProfileEditor_p.html" method="post" enctype="multipart/form-data" accept-charset="UTF-8"><div>
-<input type="submit" name="deleteTerminatedProfiles" value="Delete finished crawls" />
+<input type="submit" name="deleteTerminatedProfiles" value="Delete finished crawls" class="btn btn-danger" />
 </div></form>
 #(/existPassiveCrawls)#
 </fieldset>
diff --git a/htroot/IndexControlURLs_p.html b/htroot/IndexControlURLs_p.html
index 241d08160..2441009f4 100644
--- a/htroot/IndexControlURLs_p.html
+++ b/htroot/IndexControlURLs_p.html
@@ -108,7 +108,7 @@ function updatepage(str) {
             <input type="checkbox" name="deleteCrawlQueues" id="deleteCrawlQueues" disabled="disabled" /> Stop Crawler and delete Crawl Queues<br/>
             <input type="checkbox" name="deleteRobots" id="deleteRobots" disabled="disabled" /> Delete robots.txt Cache<br/>
             <input type="checkbox" name="deleteSearchFl" id="deleteSearchFl" disabled="disabled" /> Delete cached snippet-fetching failures during search<br/><br/>
-            <input type="submit" name="deletecomplete" id="deletecomplete" value="Delete" disabled="disabled" class="btn btn-primary" style="width:240px;"/>
+            <input type="submit" name="deletecomplete" id="deletecomplete" value="Delete" disabled="disabled" class="btn btn-danger" style="width:240px;"/>
         </dd>
       </dl>
     </fieldset>
@@ -143,7 +143,7 @@ function updatepage(str) {
             <div>
               <input type="hidden" name="domain" value="#[domain]#" />
               <input type="hidden" name="lines" value="#[lines]#" />
-              <input type="submit" name="deletedomain" value="delete all" class="btn btn-primary" style="width:240px;"/>
+              <input type="submit" name="deletedomain" value="delete all" class="btn btn-danger btn-xs" style="padding: 0px 12px;" />
             </div>
           </form>
         </td>
