diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
index 63e1504d36..ff95de93de 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -968,6 +968,18 @@ div.first fieldset {
   width: 65%;
   }
   
+.dialog table {
+	margin : .5em auto;
+}
+
+.dialog table th {
+	text-align : right;
+}
+
+.dialog table td {
+	text-align : left;
+}
+  
 .dialog  h2, .dialog h3, .dialog h4 {
   	margin : auto;
 	text-align : center;
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbookfund.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbookfund.tmpl
index 999857b3ca..bb6e603834 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbookfund.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbookfund.tmpl
@@ -229,11 +229,12 @@
 
 <!-- TMPL_IF name="delete_confirm" -->
 
+<div class="dialog alert">
+<h3>Confirm Deletion of Fund <em><!-- TMPL_VAR name="bookfundid" --></em></h3>
 <form action="<!-- TMPL_VAR name="action" -->" method="post">
   <input type="hidden" name="op" value="delete_confirmed" />
   <input type="hidden" name="bookfundid" value="<!-- TMPL_VAR name="bookfundid" -->" />
   <input type="hidden" name="branchcode" value="<!-- TMPL_VAR name="branchcode" -->" />
-	<fieldset><legend>Confirm Deletion of Fund <em><!-- TMPL_VAR name="bookfundid" --></em></legend>
 	<table>
 		  <tr>
     <th scope="row">Fund: </th><td>
@@ -251,17 +252,17 @@
     <th scope="row">Group: </th><td>
     <!-- TMPL_VAR name="bookfundgroup" --></td></tr>
   	</table>
-   <fieldset class="action"> <input type="submit" value="Yes, Delete this Fund" /> <a class="cancel" href="/cgi-bin/koha/admin/aqbookfund.pl">Cancel</a></fieldset>
-  </fieldset>
-</form>
+   <input type="submit" class="approve" value="Yes, Delete this Fund" /></form>
+   <form action="/cgi-bin/koha/admin/aqbookfund.pl" method="get"><input type="submit" class="deny" value="No, Do not Delete" /></form>
+   </div>
 
 <!-- /TMPL_IF --> <!-- delete_confirm -->
 
 <!-- TMPL_IF name="delete_confirmed" -->
-<h3>Data Deleted</h3>
+<div class="dialog message"><h3>Data Deleted</h3>
 <form action="<!-- TMPL_VAR name="action" -->" method="post">
-  <input type="submit" value="OK" />
-</form>
+  <input type="submit" class="approve" value="OK" />
+</form></div>
 <!-- /TMPL_IF --> <!-- delete_confirmed -->
 
 </div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl
index 210175a2f4..039a2c2f5d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl
@@ -119,16 +119,16 @@
 
 <!-- TMPL_IF name="else" -->
     <h1>Libraries</h1>
-    <!-- TMPL_IF NAME="message" --><div class="problem">
-        <!-- TMPL_VAR name="message" --><!-- /TMPL_IF -->
-    <!-- TMPL_IF name="MESSAGE1" --><div class="problem">Library saved</div><!-- /TMPL_IF -->
-    <!-- TMPL_IF name="MESSAGE2" --><div class="problem">Library saved</div><!-- /TMPL_IF -->
-    <!-- TMPL_IF name="MESSAGE3" --><div class="problem">Library deleted</div><!-- /TMPL_IF -->
-    <!-- TMPL_IF name="MESSAGE4" --><div class="problem">Library category added</div><!-- /TMPL_IF -->
-    <!-- TMPL_IF name="MESSAGE5" --><div class="problem">Library category modified</div><!-- /TMPL_IF -->
-    <!-- TMPL_IF name="MESSAGE6" --><div class="problem">Library category deleted</div><!-- /TMPL_IF -->
-    <!-- TMPL_IF name="MESSAGE7" --><div class="problem">Library cannot be deleted because there are patrons using that library</div><!-- /TMPL_IF -->
-    <!-- TMPL_IF name="MESSAGE8" --><div class="problem">Category cannot be deleted because there are libraries using that category</div><!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="message" --><div class="dialog message">
+        <!-- TMPL_VAR name="message" --></div><!-- /TMPL_IF -->
+    <!-- TMPL_IF name="MESSAGE1" --><div class="dialog message">Library saved</div><!-- /TMPL_IF -->
+    <!-- TMPL_IF name="MESSAGE2" --><div class="dialog message">Library saved</div><!-- /TMPL_IF -->
+    <!-- TMPL_IF name="MESSAGE3" --><div class="dialog message">Library deleted</div><!-- /TMPL_IF -->
+    <!-- TMPL_IF name="MESSAGE4" --><div class="dialog message">Library category added</div><!-- /TMPL_IF -->
+    <!-- TMPL_IF name="MESSAGE5" --><div class="dialog message">Library category modified</div><!-- /TMPL_IF -->
+    <!-- TMPL_IF name="MESSAGE6" --><div class="dialog message">Library category deleted</div><!-- /TMPL_IF -->
+    <!-- TMPL_IF name="MESSAGE7" --><div class="dialog message">Library cannot be deleted because there are patrons using that library</div><!-- /TMPL_IF -->
+    <!-- TMPL_IF name="MESSAGE8" --><div class="dialog message">Category cannot be deleted because there are libraries using that category</div><!-- /TMPL_IF -->
 
     <table>
         <tr>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tmpl
index 040b999fce..6d8b0df990 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tmpl
@@ -94,46 +94,43 @@
 
 <!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="delete_confirm" -->
-<h3>Confirm Deletion of City</h3>
+		<!-- TMPL_IF NAME="totalgtzero" -->
+<div class="dialog message">
+		<h3>Cannot Delete City "<!-- TMPL_VAR NAME="city_name" -->"</h3>
+		<p>This record is used <!-- TMPL_VAR NAME="total" --> times. Impossible to delete it</p>
+		<!-- TMPL_ELSE -->
+<div class="dialog alert">
+<h3>Delete City "<!-- TMPL_VAR NAME="city_name" -->?"</h3>
+<!-- /TMPL_IF -->
 	<table>
 		<tr>
-			<td>
-				<b>City id</b>
-			</td>
+			<th>City id
+			</th>
 			<td>
 				<!-- TMPL_VAR NAME="cityid" -->
 			</td>
 		</tr>
 		        
 		<tr>
-			<td>City name</td>
+			<th>City name</th>
 			<td><!-- TMPL_VAR NAME="city_name" --></td>
 		</tr>
 		<tr>
-			<td>City zipcode</td>
+			<th>City zipcode</th>
 			<td><!-- TMPL_VAR NAME="city_zipcode" --></td>
 		</tr>
-		<!-- TMPL_IF NAME="totalgtzero" -->
-		<tr>
-			<td colspan="2" align="center" class="problem">This record is used <!-- TMPL_VAR NAME="total" --> times. Impossible to delete it</td>
-		</tr>
-	<tr>
-			<td colspan="2">
-				<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-				<input type="submit" value="OK" />
-				</form>
-			</td>
-		</tr>
-		<!-- TMPL_ELSE -->
-		<tr>
-			<td><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-			<input type="hidden" name="op" value="delete_confirmed" />
-			<input type="hidden" name="cityid" value="<!-- TMPL_VAR NAME="cityid" -->" /><input type="submit" value="YES" /></form></td>
-			<td><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-			<input type="submit" value="NO" /></form></td>
-		</tr>
-		<!-- /TMPL_IF -->
 </table>
+		<!-- TMPL_IF NAME="totalgtzero" -->
+				<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+				<input type="submit" class="approv" value="OK" />
+				</form>
+		<!-- TMPL_ELSE -->
+<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+			<input type="hidden" name="op" value="delete_confirmed" />
+			<input type="hidden" name="cityid" value="<!-- TMPL_VAR NAME="cityid" -->" /><input type="submit" class="approve" value="Yes, Delete" /></form> <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+			<input type="submit" class="deny" value="No, do not Delete" /></form>
+		<!-- /TMPL_IF -->
+</div>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="else" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/roadtype.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/roadtype.tmpl
index 04deafeb93..20f8134b29 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/roadtype.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/roadtype.tmpl
@@ -91,21 +91,19 @@
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="delete_confirm" -->
-	<h3>Confirm Deletion of Road Type</h3>
-	<ul>
-		<li>
-			<strong>Road type id : </strong>
-			<!-- TMPL_VAR NAME="roadtypeid" --></td>
-		</li>
-		<li>
-			<strong>Road type: </strong>
-			<!-- TMPL_VAR NAME="road_type" -->
-		</li>
+	<div class="dialog alert"><h3>Delete Road Type "<!-- TMPL_VAR NAME="road_type" -->?"</h3>
+<table>	<tr>
+		<th>Road type id : </th>
+			<td><!-- TMPL_VAR NAME="roadtypeid" --></td>
+		</tr>
+	<tr>	<th>Road type: </th>
+		<td><!-- TMPL_VAR NAME="road_type" -->
+		</td>
 
-	</ul><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+	</tr></table><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
 			<input type="hidden" name="op" value="delete_confirmed" />
-			<input type="hidden" name="roadtypeid" value="<!-- TMPL_VAR NAME="roadtypeid" -->" /><input type="submit" value="Yes, Delete" /></form> <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-			<input type="submit" value="No, Do Not Delete" /></form>
+			<input type="hidden" name="roadtypeid" value="<!-- TMPL_VAR NAME="roadtypeid" -->" /><input type="submit" class="approve" value="Yes, Delete" /></form> <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+			<input type="submit" class="deny" value="No, Do Not Delete" /></form></div>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="else" -->