diff --git a/interface/web/sites/templates/database_list.htm b/interface/web/sites/templates/database_list.htm
index 292daf54e0bc6d1a6f0afc65607812158a8bcf2a..1a4435cefe29e97f53066a008a2288ab9a1a9d5a 100644
--- a/interface/web/sites/templates/database_list.htm
+++ b/interface/web/sites/templates/database_list.htm
@@ -34,12 +34,13 @@
         <tbody>
           <tmpl_loop name="records">
           <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
-            <td class="tbl_col_active"><a href="#" onClick="loadContent('sites/database_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
-            <td class="tbl_col_remote_access"><a href="#" onClick="loadContent('sites/database_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="remote_access"}</a></td>
-            <td class="tbl_col_server_id"><a href="#" onClick="loadContent('sites/database_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
+            <td class="tbl_col_active">{tmpl_var name="active"}</td>
+            <td class="tbl_col_remote_access">{tmpl_var name="remote_access"}</td>
+            <td class="tbl_col_server_id">{tmpl_var name="server_id"}</td>
             <td class="tbl_col_database_name"><a href="#" onClick="loadContent('sites/database_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="database_name"}</a></td>
             <td class="tbl_col_buttons">
               <div class="buttons icons16">    
+                <a class="icons16 icoEdit" href="javascript: loadContent('sites/database_edit.php?id={tmpl_var name='id'}');"><span>{tmpl_var name='edit_txt'}</span></a>
                 <a class="icons16 icoDelete" href="javascript: del_record('sites/database_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
               </div>
             </td>
diff --git a/interface/web/themes/default/css/screen/content_ispc.css b/interface/web/themes/default/css/screen/content_ispc.css
index f1bc4a942c8e135d9c45e414d372ae577e1d0314..28fd643d5cd83649b4828feb1db77a97100c3aa2 100644
--- a/interface/web/themes/default/css/screen/content_ispc.css
+++ b/interface/web/themes/default/css/screen/content_ispc.css
@@ -18,14 +18,6 @@
 
 @media all
 {
-	/* Image-Replacement */
-	h1.swap { background-repeat:no-repeat; }
-	h1.swap span {display:none;} 
-	h1#ir-HeaderLogo {
-	  height:32px;
-	  background-image:url("../../images/header_logo.png");
-	} 
-	
 	.pageForm_description {
 		font-size: 12px;
 	}
@@ -130,7 +122,14 @@
 		color:#ffffff;
 		padding:0px 5px;
 	}
-	
+
+	/* Image-Replacement */
+	.swap { background-repeat:no-repeat; }
+	.swap span { display:none; height:16px; } 
+	#ir-HeaderLogo { background-image:url("../../images/header_logo.png"); height:32px; } 
+	#ir-Yes { background-image:url("../../icons/x16/tick_circle.png"); height:16px; } 
+	#ir-No { background-image:url("../../icons/x16/cross_circle.png"); height:16px; } 
+  	
 	/* BUTTONS */
 	.buttons a, .buttons button{
 	    display:block;
@@ -230,5 +229,6 @@
 
 	.icons16.icoDelete { background-image: url("../../icons/x16/minus_circle_frame.png"); }
 	.icons16.icoFilter { background-image: url(../../icons/x16/funnel.png); }
+	.icons16.icoEdit { background-image: url("../../icons/x16/wrench.png"); }
 }