diff --git a/interface/web/admin/templates/firewall_list.htm b/interface/web/admin/templates/firewall_list.htm
index d209a45882908bf19cd44bc16e37c2bea5e396a5..53e2e4bc39dbec679eab20f3265379a3309f42cc 100644
--- a/interface/web/admin/templates/firewall_list.htm
+++ b/interface/web/admin/templates/firewall_list.htm
@@ -6,7 +6,7 @@
     <div class="pnl_toolsarea">
         <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
             <div class="buttons">
-                <button class="iconstxt icoAdd" type="button" onClick="loadContent('admin/firewall_edit.php');">
+                <button class="button iconstxt icoAdd" type="button" onClick="loadContent('admin/firewall_edit.php');">
                     <span>{tmpl_var name="add_new_record_txt"}</span>
                 </button>
             </div>
@@ -17,19 +17,21 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr>
+                    <tr class="caption">
                         <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
                         <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
                         <th class="tbl_col_tcp_port" scope="col"><tmpl_var name="tcp_port_txt"></th>
                         <th class="tbl_col_udp_port" scope="col"><tmpl_var name="udp_port_txt"></th>
                         <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
                     </tr>
-                    <tr>
+                    <tr class="filter">
                         <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
                         <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
                         <td class="tbl_col_tcp_port"><input type="text" name="search_tcp_port" value="{tmpl_var name='search_tcp_port'}" /></td>
                         <td class="tbl_col_udp_port"><input type="text" name="search_udp_port" value="{tmpl_var name='search_udp_port'}" /></td>
-                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','admin/firewall_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                        <td class="tbl_col_buttons">
+                            <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','admin/firewall_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+                        </td>
                     </tr>
                 </thead>
                 <tbody>
@@ -40,9 +42,7 @@
                             <td class="tbl_col_tcp_port"><a href="#" onClick="loadContent('admin/firewall_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="tcp_port"}</a></td>
                             <td class="tbl_col_udp_port"><a href="#" onClick="loadContent('admin/firewall_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="udp_port"}</a></td>
                             <td class="tbl_col_buttons">
-                                <div class="buttons icons16">    
-                                    <a class="icons16 icoDelete" href="javascript: del_record('admin/firewall_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>
+                                <a class="button icons16 icoDelete" href="javascript: del_record('admin/firewall_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>
                             </td>
                         </tr>
                     </tmpl_loop>
diff --git a/interface/web/admin/templates/groups_list.htm b/interface/web/admin/templates/groups_list.htm
index 3fc1918ec70af360daad66048bb2de1a8557165a..6cdbcc394ea863ad2c55904301e1d4f579acd3cd 100644
--- a/interface/web/admin/templates/groups_list.htm
+++ b/interface/web/admin/templates/groups_list.htm
@@ -6,7 +6,7 @@
     <div class="pnl_toolsarea">
         <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
             <div class="buttons">
-                <button class="iconstxt icoAdd" type="button" onClick="loadContent('admin/groups_edit.php');">
+                <button class="button iconstxt icoAdd" type="button" onClick="loadContent('admin/groups_edit.php');">
                     <span>{tmpl_var name="add_new_record_txt"}</span>
                 </button>
                 <p><tmpl_var name="warning_txt"></p>
@@ -18,15 +18,17 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr>
+                    <tr class="caption">
                         <th class="tbl_col_name" scope="col"><tmpl_var name="name_txt"></th>
                         <th class="tbl_col_description" scope="col"><tmpl_var name="description_txt"></th>
                         <th class="tbl_col_buttons" scope="col">&nbsp;</th>
                     </tr>
-                    <tr>
+                    <tr class="filter">
                         <td class="tbl_col_name"><input type="text" name="search_name" value="{tmpl_var name='search_name'}" /></td>
                         <td class="tbl_col_description"><input type="text" name="search_description" value="{tmpl_var name='search_description'}" /></td>
-                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','admin/groups_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                        <td class="tbl_col_buttons">
+                            <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','admin/groups_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+                        </td>
                     </tr>
                 </thead>
                 <tbody>
@@ -35,9 +37,7 @@
                             <td class="tbl_col_name"><a href="#" onClick="loadContent('admin/groups_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="name"}</a></td>
                             <td class="tbl_col_description"><a href="#" onClick="loadContent('admin/groups_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="description"}</a></td>
                             <td class="tbl_col_buttons">
-                                <div class="buttons icons16">    
-                                    <a class="icons16 icoDelete" href="javascript: del_record('admin/groups_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>
+                                <a class="button icons16 icoDelete" href="javascript: del_record('admin/groups_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>
                             </td>
                         </tr>
                     </tmpl_loop>
diff --git a/interface/web/admin/templates/iptables_edit.htm b/interface/web/admin/templates/iptables_edit.htm
index 33574c9ef5fd66a22fba12d75c3a91877a17b2dd..87033ab2c1ed2dda09589a353b0bf891ee4cdb36 100644
--- a/interface/web/admin/templates/iptables_edit.htm
+++ b/interface/web/admin/templates/iptables_edit.htm
@@ -1,67 +1,67 @@
-<h2><tmpl_var name="list_head_txt"></h2>
-<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_iptables">
-    
-    <div class="pnl_formsarea">
-        <fieldset class="inlineLabels">
-            <div class="ctrlHolder">
-                <label for="server_id">{tmpl_var name='server_id_txt'}</label>
-                <select name="server_id" id="server_id" class="selectInput">
-                    {tmpl_var name='server_id'}
-                </select>
-            </div>
-            <div class="ctrlHolder">
-                <label for="table">{tmpl_var name='table_txt'}</label>
-                <select name="table" id="table" class="selectInput formLengthLimit">
-                    {tmpl_var name='table'}
-                </select>
-            </div>
-            <div class="ctrlHolder">
-                <label for="protocol">{tmpl_var name='protocol_txt'}</label>
-                <select name="protocol" id="protocol" class="selectInput formLengthLimit">
-                    {tmpl_var name='protocol'}
-                </select>
-            </div>
-            <div class="ctrlHolder">
-                <label for="singleport">{tmpl_var name='singleport_txt'}</label>
-                <input name="singleport" id="singleport" value="{tmpl_var name='singleport'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
-            </div>
-            <div class="ctrlHolder">
-                <label for="multiport">{tmpl_var name='multiport_txt'}</label>
-                <input name="multiport" id="multiport" value="{tmpl_var name='multiport'}" size="20" maxlength="40" type="text" class="textInput" />
-            </div>
-            <div class="ctrlHolder">
-                <label for="destination_ip">{tmpl_var name='destination_ip_txt'}</label>
-                <input name="destination_ip" id="destination_ip" value="{tmpl_var name='destination_ip'}" size="16" maxlength="20" type="text" class="textInput formLengthIPv4" />
-            </div>
-            <div class="ctrlHolder">
-                <label for="source_ip">{tmpl_var name='source_ip_txt'}</label>
-                <input name="source_ip" id="source_ip" value="{tmpl_var name='source_ip'}" size="16" maxlength="20" type="text" class="textInput formLengthIPv4" />
-            </div>
-            <div class="ctrlHolder">
-                <label for="state">{tmpl_var name='state_txt'}</label>
-                <input name="state" id="state" value="{tmpl_var name='state'}" size="16" maxlength="20" type="text" class="textInput" />
-            </div>
-            <div class="ctrlHolder">
-                <label for="target">{tmpl_var name='target_txt'}</label>
-                <select name="target" id="target" class="selectInput formLengthLimit">
-                    {tmpl_var name='target'}
-                </select>
-            </div>
-            <div class="ctrlHolder">
-                <p class="label">{tmpl_var name='active_txt'}</p>
-                <div class="multiField">
-                    {tmpl_var name='active'}
-                </div>
-            </div>
-        </fieldset>
-        <input type="hidden" name="id" value="{tmpl_var name='id'}">
-        <div class="buttonHolder buttons">
-            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/iptables_edit.php');">
-                <span>{tmpl_var name='btn_save_txt'}</span></button>
-            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/iptables_list.php');">
-                <span>{tmpl_var name='btn_cancel_txt'}</span></button>
-        </div>
-    </div> 
-    
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+<div class="panel panel_iptables">
+    
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="server_id">{tmpl_var name='server_id_txt'}</label>
+                <select name="server_id" id="server_id" class="selectInput">
+                    {tmpl_var name='server_id'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="table">{tmpl_var name='table_txt'}</label>
+                <select name="table" id="table" class="selectInput formLengthLimit">
+                    {tmpl_var name='table'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="protocol">{tmpl_var name='protocol_txt'}</label>
+                <select name="protocol" id="protocol" class="selectInput formLengthLimit">
+                    {tmpl_var name='protocol'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="singleport">{tmpl_var name='singleport_txt'}</label>
+                <input name="singleport" id="singleport" value="{tmpl_var name='singleport'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="multiport">{tmpl_var name='multiport_txt'}</label>
+                <input name="multiport" id="multiport" value="{tmpl_var name='multiport'}" size="20" maxlength="40" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="destination_ip">{tmpl_var name='destination_ip_txt'}</label>
+                <input name="destination_ip" id="destination_ip" value="{tmpl_var name='destination_ip'}" size="16" maxlength="20" type="text" class="textInput formLengthIPv4" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="source_ip">{tmpl_var name='source_ip_txt'}</label>
+                <input name="source_ip" id="source_ip" value="{tmpl_var name='source_ip'}" size="16" maxlength="20" type="text" class="textInput formLengthIPv4" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="state">{tmpl_var name='state_txt'}</label>
+                <input name="state" id="state" value="{tmpl_var name='state'}" size="16" maxlength="20" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="target">{tmpl_var name='target_txt'}</label>
+                <select name="target" id="target" class="selectInput formLengthLimit">
+                    {tmpl_var name='target'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='active_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='active'}
+                </div>
+            </div>
+        </fieldset>
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/iptables_edit.php');">
+                <span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/iptables_list.php');">
+                <span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div> 
+    
 </div>
\ No newline at end of file
diff --git a/interface/web/admin/templates/iptables_list.htm b/interface/web/admin/templates/iptables_list.htm
index 6c65094daa7cc39d5831bcd2c5baf1043bc317c7..f1159f3292558eb8ffa59d00ad8f6f56bfcf3299 100644
--- a/interface/web/admin/templates/iptables_list.htm
+++ b/interface/web/admin/templates/iptables_list.htm
@@ -1,73 +1,69 @@
-<h2><tmpl_var name="list_head_txt"></h2>
-
-<div class="panel panel_list_iptables">
-
-    <div class="pnl_toolsarea">
-        <fieldset><legend>Tools</legend>
-            <div class="buttons">
-                <button class="iconstxt icoAdd" type="button" onClick="loadContent('admin/iptables_edit.php');">
-                    <span>{tmpl_var name="add_new_rule_txt"}</span>
-                </button>
-            </div>
-        </fieldset>
-    </div>
-
-    <div class="pnl_listarea">
-        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
-            <table class="list">
-                <thead>
-                    <tr>
-                        <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
-                        <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
-                        <th class="tbl_col_table" scope="col"><tmpl_var name="table_txt"></th>
-                        <th class="tbl_col_protocol" scope="col"><tmpl_var name="protocol_txt"></th>
-                        <th class="tbl_col_port" scope="col"><tmpl_var name="singleport_txt"></th>
-                        <th class="tbl_col_port" scope="col"><tmpl_var name="multiport_txt"></th>
-                        <th class="tbl_col_state" scope="col"><tmpl_var name="state_txt"></th>
-                        <th class="tbl_col_target" scope="col"><tmpl_var name="target_txt"></th>
-                        <th class="tbl_col_buttons" scope="col">&nbsp;</th>
-                    </tr>
-                    <tr>
-                        <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
-                        <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
-                        <td class="tbl_col_table"></td>
-                        <td class="tbl_col_protocol"><select name="search_protocol">{tmpl_var name='search_protocol'}</select></td>
-                        <td class="tbl_col_singleport"></td>
-                        <td class="tbl_col_multiport"></td>
-                        <td class="tbl_col_state"></td>
-                        <td class="tbl_col_target"><select name="search_target">{tmpl_var name='search_target'}</select></td>
-                        <td class="tbl_col_buttons">
-                            <div class="buttons">
-                                <button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','admin/iptables_list.php');"><span>{tmpl_var name="filter_txt"}filter_txt</span></button>
-                            </div>
-                        </td>
-                    </tr>
-                </thead>
-                <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('admin/iptables_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
-                            <td class="tbl_col_server_id"><a href="#" onClick="loadContent('admin/iptables_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
-                            <td class="tbl_col_table"><a href="#" onClick="loadContent('admin/iptables_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="table"}</a></td>
-                            <td class="tbl_col_protocol"><a href="#" onClick="loadContent('admin/iptables_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="protocol"}</a></td>
-                            <td class="tbl_col_singleport"><a href="#" onClick="loadContent('admin/iptables_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="singleport"}</a></td>
-                            <td class="tbl_col_multiport"><a href="#" onClick="loadContent('admin/iptables_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="multiport"}</a></td>
-                            <td class="tbl_col_state"><a href="#" onClick="loadContent('admin/iptables_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="state"}</a></td>
-                            <td class="tbl_col_target"><a href="#" onClick="loadContent('admin/iptables_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="target"}</a></td>
-                            <td class="tbl_col_buttons">
-                                <div class="buttons icons16">    
-                                    <a class="icons16 icoDelete" href="javascript: del_record('admin/iptables_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>
-                        </tr>
-                    </tmpl_loop>
-                </tbody>
-                <tfoot>
-                    <tr>
-                        <td class="tbl_footer tbl_paging" colspan="9"><tmpl_var name="paging"></td>
-                    </tr>
-                </tfoot>
-            </table>
-        </fieldset>
-    </div>
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_list_iptables">
+
+    <div class="pnl_toolsarea">
+        <fieldset><legend>Tools</legend>
+            <div class="buttons">
+                <button class="button iconstxt icoAdd" type="button" onClick="loadContent('admin/iptables_edit.php');">
+                    <span>{tmpl_var name="add_new_rule_txt"}</span>
+                </button>
+            </div>
+        </fieldset>
+    </div>
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr class="caption">
+                        <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+                        <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
+                        <th class="tbl_col_table" scope="col"><tmpl_var name="table_txt"></th>
+                        <th class="tbl_col_protocol" scope="col"><tmpl_var name="protocol_txt"></th>
+                        <th class="tbl_col_port" scope="col"><tmpl_var name="singleport_txt"></th>
+                        <th class="tbl_col_port" scope="col"><tmpl_var name="multiport_txt"></th>
+                        <th class="tbl_col_state" scope="col"><tmpl_var name="state_txt"></th>
+                        <th class="tbl_col_target" scope="col"><tmpl_var name="target_txt"></th>
+                        <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+                    </tr>
+                    <tr class="filter">
+                        <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
+                        <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+                        <td class="tbl_col_table"></td>
+                        <td class="tbl_col_protocol"><select name="search_protocol">{tmpl_var name='search_protocol'}</select></td>
+                        <td class="tbl_col_singleport"></td>
+                        <td class="tbl_col_multiport"></td>
+                        <td class="tbl_col_state"></td>
+                        <td class="tbl_col_target"><select name="search_target">{tmpl_var name='search_target'}</select></td>
+                        <td class="tbl_col_buttons">
+                            <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','admin/iptables_list.php');"><span>{tmpl_var name="filter_txt"}filter_txt</span></button>
+                        </td>
+                    </tr>
+                </thead>
+                <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('admin/iptables_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+                            <td class="tbl_col_server_id"><a href="#" onClick="loadContent('admin/iptables_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
+                            <td class="tbl_col_table"><a href="#" onClick="loadContent('admin/iptables_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="table"}</a></td>
+                            <td class="tbl_col_protocol"><a href="#" onClick="loadContent('admin/iptables_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="protocol"}</a></td>
+                            <td class="tbl_col_singleport"><a href="#" onClick="loadContent('admin/iptables_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="singleport"}</a></td>
+                            <td class="tbl_col_multiport"><a href="#" onClick="loadContent('admin/iptables_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="multiport"}</a></td>
+                            <td class="tbl_col_state"><a href="#" onClick="loadContent('admin/iptables_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="state"}</a></td>
+                            <td class="tbl_col_target"><a href="#" onClick="loadContent('admin/iptables_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="target"}</a></td>
+                            <td class="tbl_col_buttons">
+                                <a class="button icons16 icoDelete" href="javascript: del_record('admin/iptables_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>
+                            </td>
+                        </tr>
+                    </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="9"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
 </div>
\ No newline at end of file
diff --git a/interface/web/admin/templates/language_list.htm b/interface/web/admin/templates/language_list.htm
index d2689535d3ef67540d85bfce002e5b217ebd211a..c0718decdf75b947b9828c88c1b25cc0a4c95f82 100644
--- a/interface/web/admin/templates/language_list.htm
+++ b/interface/web/admin/templates/language_list.htm
@@ -20,7 +20,7 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr>
+                    <tr class="caption">
                         <th class="tbl_col_module" scope="col"><tmpl_var name="module_txt"></th>
                         <th class="tbl_col_lang_file" scope="col"><tmpl_var name="lang_file_txt"></th>
                         <th class="tbl_col_limit" scope="col"><tmpl_var name="lang_file_date_txt"></th>
diff --git a/interface/web/admin/templates/remote_user_list.htm b/interface/web/admin/templates/remote_user_list.htm
index a4549c0655d6c58f7e2e6a53932be3352fa43850..131c1aa3d2386a748a3199e5633ecadaf5ea9907 100644
--- a/interface/web/admin/templates/remote_user_list.htm
+++ b/interface/web/admin/templates/remote_user_list.htm
@@ -5,7 +5,7 @@
     <div class="pnl_toolsarea">
         <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
             <div class="buttons">
-                <button class="iconstxt icoAdd" type="button" onClick="loadContent('admin/remote_user_edit.php');">
+                <button class="button iconstxt icoAdd" type="button" onClick="loadContent('admin/remote_user_edit.php');">
                     <span>{tmpl_var name="add_new_record_txt"}</span>
                 </button>
             </div>
@@ -16,26 +16,26 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr>
-                        <th class="tbl_col_remote_userid" scope="col"><tmpl_var name="parent_remote_userid_txt"></th>
+                    <tr class="caption">
+                        <th class="tbl_col_remote_user_pid" scope="col"><tmpl_var name="parent_remote_userid_txt"></th>
                         <th class="tbl_col_remote_username" scope="col"><tmpl_var name="username_txt"></th>
                         <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
                     </tr>
-                    <tr>
-                        <td class="tbl_col_remote_userid">&nbsp;</td>           
+                    <tr class="filter">
+                        <td class="tbl_col_remote_user_pid">&nbsp;</td>           
                         <td class="tbl_col_remote_username"><input type="text" name="search_username" value="{tmpl_var name='search_username'}" /></td>
-                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','admin/remote_user_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                        <td class="tbl_col_buttons">
+                            <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','admin/remote_user_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+                        </td>
                     </tr>
                 </thead>
                 <tbody>
                     <tmpl_loop name="records">
                         <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
-                            <td class="tbl_col_remote_userid"><a href="#" onClick="loadContent('admin/remote_user_edit.php?id={tmpl_var name='remote_userid'}');">{tmpl_var name="remote_userid"}</a></td>
+                            <td class="tbl_col_remote_user_pid"><a href="#" onClick="loadContent('admin/remote_user_edit.php?id={tmpl_var name='remote_userid'}');">{tmpl_var name="remote_userid"}</a></td>
                             <td class="tbl_col_remote_username"><a href="#" onClick="loadContent('admin/remote_user_edit.php?id={tmpl_var name='remote_userid'}');">{tmpl_var name="remote_username"}</a></td>
                             <td class="tbl_col_buttons">
-                                <div class="buttons icons16">    
-                                    <a class="icons16 icoDelete" href="javascript: del_record('admin/remote_user_del.php?id={tmpl_var name='remote_userid'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
-                                </div>
+                                <a class="button icons16 icoDelete" href="javascript: del_record('admin/remote_user_del.php?id={tmpl_var name='remote_userid'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
                             </td>
                         </tr>
                     </tmpl_loop>
diff --git a/interface/web/admin/templates/server_config_list.htm b/interface/web/admin/templates/server_config_list.htm
index 1f5356b94b78e596f81e6b20e11824a453351ba5..b2f0aa352d0778c9fbf2acc9a10f829d569cccd4 100644
--- a/interface/web/admin/templates/server_config_list.htm
+++ b/interface/web/admin/templates/server_config_list.htm
@@ -7,13 +7,15 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr>
+                    <tr class="caption">
                         <th class="tbl_col_server_name" scope="col"><tmpl_var name="server_name_txt"></th>
                         <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
                     </tr>
-                    <tr>
+                    <tr class="filter">
                         <td class="tbl_col_server_name"><input type="text" name="search_server_name" value="{tmpl_var name='search_server_name'}" /></td>
-                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','admin/server_config_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                        <td class="tbl_col_buttons">
+                            <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','admin/server_config_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+                        </td>
                     </tr>
                 </thead>
                 <tbody>
@@ -21,9 +23,7 @@
                         <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
                             <td class="tbl_col_server_name"><a href="#" onClick="loadContent('admin/server_config_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_name"}</a></td>
                             <td class="tbl_col_buttons">
-                                <div class="buttons icons16">    
-                                    <a class="icons16 icoDelete" href="javascript: del_record('admin/server_config_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>
+                                <a class="button icons16 icoDelete" href="javascript: del_record('admin/server_config_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>
                             </td>
                         </tr>
                     </tmpl_loop>
diff --git a/interface/web/admin/templates/server_config_web_edit.htm b/interface/web/admin/templates/server_config_web_edit.htm
index a41efef09834b687caf84365fdec4155c5427092..c0c9b3b963778968925170ad7f31669d2ef40795 100644
--- a/interface/web/admin/templates/server_config_web_edit.htm
+++ b/interface/web/admin/templates/server_config_web_edit.htm
@@ -94,18 +94,6 @@
                 <div class="multiField">
                     {tmpl_var name='enable_ip_wildcard'}
                 </div>
-            </div>
-			<div class="ctrlHolder">
-                <p class="label">{tmpl_var name='overtraffic_notify_admin_txt'}</p>
-                <div class="multiField">
-                    {tmpl_var name='overtraffic_notify_admin'}
-                </div>
-            </div>
-			<div class="ctrlHolder">
-                <p class="label">{tmpl_var name='overtraffic_notify_client_txt'}</p>
-                <div class="multiField">
-                    {tmpl_var name='overtraffic_notify_client'}
-                </div>
             </div>
             <div class="subsectiontoggle"><span></span>{tmpl_var name='ssl_settings_txt'}<em></em></div>
             <div style="display:none;">
diff --git a/interface/web/admin/templates/server_ip_list.htm b/interface/web/admin/templates/server_ip_list.htm
index 4234e00a971fb3447cb2118ec91e36b074a69c22..c82e9a334fc86770b3acdc830cc7e9108019f4e6 100644
--- a/interface/web/admin/templates/server_ip_list.htm
+++ b/interface/web/admin/templates/server_ip_list.htm
@@ -5,7 +5,7 @@
     <div class="pnl_toolsarea">
         <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
             <div class="buttons">
-                <button class="iconstxt icoAdd" type="button" onClick="loadContent('admin/server_ip_edit.php');">
+                <button class="button iconstxt icoAdd" type="button" onClick="loadContent('admin/server_ip_edit.php');">
                     <span>{tmpl_var name="add_new_record_txt"}</span>
                 </button>
             </div>
@@ -16,38 +16,38 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr>
+                    <tr class="caption">
                         <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
-                        <th class="tbl_col_client_id" scope="col"><tmpl_var name="client_id_txt"></th>
+                        <th class="tbl_col_client_pid" scope="col"><tmpl_var name="client_id_txt"></th>
                         <th class="tbl_col_ip_type" scope="col"><tmpl_var name="ip_type_txt"></th>
                         <th class="tbl_col_ip_address" scope="col"><tmpl_var name="ip_address_txt"></th>
                         <th class="tbl_col_virtualhost" scope="col"><tmpl_var name="virtualhost_txt"></th>
                         <th class="tbl_col_virtualhost_port" scope="col"><tmpl_var name="virtualhost_port_txt"></th>
                         <th class="tbl_col_buttons" scope="col">{tmpl_var name='search_limit'}</th>
                     </tr>
-                    <tr>
+                    <tr class="filter">
                         <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
-                        <td class="tbl_col_client_id"><select name="search_client_id">{tmpl_var name='search_client_id'}</select></td>
+                        <td class="tbl_col_client_pid"><select name="search_client_id">{tmpl_var name='search_client_id'}</select></td>
                         <td class="tbl_col_ip_type"><select name="search_ip_type">{tmpl_var name='search_ip_type'}</select></td>
                         <td class="tbl_col_ip_address"><input type="text" name="search_ip_address" value="{tmpl_var name='search_ip_address'}" /></td>
                         <td class="tbl_col_virtualhost"><select name="search_virtualhost">{tmpl_var name='search_virtualhost'}</select></td>
                         <td class="tbl_col_virtualhost_port"><input type="text" name="search_virtualhost_port" value="{tmpl_var name='search_virtualhost_port'}" /></td>
-                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','admin/server_ip_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                        <td class="tbl_col_buttons">
+                            <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','admin/server_ip_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+                        </td>
                     </tr>
                 </thead>
                 <tbody>
                     <tmpl_loop name="records">
                         <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
                             <td class="tbl_col_server_id"><a href="#" onClick="loadContent('admin/server_ip_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
-                            <td class="tbl_col_client_id"><a href="#" onClick="loadContent('admin/server_ip_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="client_id"}</a></td>
+                            <td class="tbl_col_client_pid"><a href="#" onClick="loadContent('admin/server_ip_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="client_id"}</a></td>
                             <td class="tbl_col_ip_type"><a href="#" onClick="loadContent('admin/server_ip_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="ip_type"}</a></td>
                             <td class="tbl_col_ip_address"><a href="#" onClick="loadContent('admin/server_ip_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="ip_address"}</a></td>
                             <td class="tbl_col_virtualhost"><a href="#" onClick="loadContent('admin/server_ip_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="virtualhost"}</a></td>
                             <td class="tbl_col_virtualhost_port"><a href="#" onClick="loadContent('admin/server_ip_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="virtualhost_port"}</a></td>
                             <td class="tbl_col_buttons">
-                                <div class="buttons icons16">    
-                                    <a class="icons16 icoDelete" href="javascript: del_record('admin/server_ip_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>
+                                <a class="button icons16 icoDelete" href="javascript: del_record('admin/server_ip_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>
                             </td>
                         </tr>
                     </tmpl_loop>
diff --git a/interface/web/admin/templates/server_list.htm b/interface/web/admin/templates/server_list.htm
index 078d262eb0ffca39216e5ffca6af16bd2ecc76e1..fd2da095cba386c222e2bb7c205a406e06902614 100644
--- a/interface/web/admin/templates/server_list.htm
+++ b/interface/web/admin/templates/server_list.htm
@@ -7,7 +7,7 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr>
+                    <tr class="caption">
                         <th class="tbl_col_server_name" scope="col"><tmpl_var name="server_name_txt"></th>
                         <th class="tbl_col_mail_server" scope="col"><tmpl_var name="mail_server_txt"></th>
                         <th class="tbl_col_web_server" scope="col"><tmpl_var name="web_server_txt"></th>
@@ -17,7 +17,7 @@
                         <th class="tbl_col_vserver_server" scope="col"><tmpl_var name="vserver_server_txt"></th>
                         <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
                     </tr>
-                    <tr>
+                    <tr class="filter">
                         <td class="tbl_col_server_name"><input type="text" name="search_server_name" value="{tmpl_var name='search_server_name'}" /></td>
                         <td class="tbl_col_mail_server"><select name="search_active">{tmpl_var name='search_mail_server'}</select></td>
                         <td class="tbl_col_web_server"><select name="search_active">{tmpl_var name='search_web_server'}</select></td>
@@ -25,7 +25,9 @@
                         <td class="tbl_col_file_server"><select name="search_active">{tmpl_var name='search_file_server'}</select></td>
                         <td class="tbl_col_db_server"><select name="search_active">{tmpl_var name='search_db_server'}</select></td>
                         <td class="tbl_col_vserver_server"><select name="search_active">{tmpl_var name='search_vserver_server'}</select></td>
-                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','admin/server_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                        <td class="tbl_col_buttons">
+                            <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','admin/server_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+                        </td>
                     </tr>
                 </thead>
                 <tbody>
@@ -39,9 +41,7 @@
                             <td class="tbl_col_db_server">{tmpl_var name="db_server"}</td>
                             <td class="tbl_col_vserver_server">{tmpl_var name="vserver_server"}</td>
                             <td class="tbl_col_buttons">
-                                <div class="buttons icons16">    
-                                    <a class="icons16 icoDelete" href="javascript: del_record('admin/server_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>
+                                <a class="button icons16 icoDelete" href="javascript: del_record('admin/server_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>
                             </td>
                         </tr>
                     </tmpl_loop>
diff --git a/interface/web/admin/templates/server_php_list.htm b/interface/web/admin/templates/server_php_list.htm
index 44e6a1fdeea6409cc7f7b5afb02ecbf841efc15a..f41ff2635551bdbed578d91c8c79423defda22ac 100644
--- a/interface/web/admin/templates/server_php_list.htm
+++ b/interface/web/admin/templates/server_php_list.htm
@@ -5,7 +5,7 @@
     <div class="pnl_toolsarea">
         <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
             <div class="buttons">
-                <button class="iconstxt icoAdd" type="button" onClick="loadContent('admin/server_php_edit.php');">
+                <button class="button iconstxt icoAdd" type="button" onClick="loadContent('admin/server_php_edit.php');">
                     <span>{tmpl_var name="add_new_record_txt"}</span>
                 </button>
             </div>
@@ -16,29 +16,29 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr>
+                    <tr class="caption">
                         <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
-                        <th class="tbl_col_client_id" scope="col"><tmpl_var name="client_id_txt"></th>
+                        <th class="tbl_col_client_pid" scope="col"><tmpl_var name="client_id_txt"></th>
                         <th class="tbl_col_ip_address" scope="col"><tmpl_var name="name_txt"></th>
                         <th class="tbl_col_buttons" scope="col">{tmpl_var name='search_limit'}</th>
                     </tr>
-                    <tr>
+                    <tr class="filter">
                         <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
-                        <td class="tbl_col_client_id"><select name="search_client_id">{tmpl_var name='search_client_id'}</select></td>
+                        <td class="tbl_col_client_pid"><select name="search_client_id">{tmpl_var name='search_client_id'}</select></td>
                         <td class="tbl_col_ip_address"><input type="text" name="search_name" value="{tmpl_var name='search_name'}" /></td>
-                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','admin/server_php_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                        <td class="tbl_col_buttons">
+                            <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','admin/server_php_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+                        </td>
                     </tr>
                 </thead>
                 <tbody>
                     <tmpl_loop name="records">
                         <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
                             <td class="tbl_col_server_id"><a href="#" onClick="loadContent('admin/server_php_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
-                            <td class="tbl_col_client_id"><a href="#" onClick="loadContent('admin/server_php_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="client_id"}</a></td>
+                            <td class="tbl_col_client_pid"><a href="#" onClick="loadContent('admin/server_php_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="client_id"}</a></td>
                             <td class="tbl_col_name"><a href="#" onClick="loadContent('admin/server_php_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="name"}</a></td>
                             <td class="tbl_col_buttons">
-                                <div class="buttons icons16">    
-                                    <a class="icons16 icoDelete" href="javascript: del_record('admin/server_php_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>
+                                <a class="button icons16 icoDelete" href="javascript: del_record('admin/server_php_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>
                             </td>
                         </tr>
                     </tmpl_loop>
diff --git a/interface/web/admin/templates/software_package_list.htm b/interface/web/admin/templates/software_package_list.htm
index 0cb6f47c16f6a7b1b45246453c4c00932a6c1688..d31d8ff34d277f0156a93c0c752d25646df42e81 100644
--- a/interface/web/admin/templates/software_package_list.htm
+++ b/interface/web/admin/templates/software_package_list.htm
@@ -6,7 +6,7 @@
     <div class="pnl_toolsarea">
         <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
             <div class="buttons">
-                <button class="iconstxt icoAdd" type="button" onClick="loadContent('admin/software_package_list.php?action=repoupdate');">
+                <button class="button iconstxt icoAdd" type="button" onClick="loadContent('admin/software_package_list.php?action=repoupdate');">
                     <span>{tmpl_var name="repoupdate_txt"}</span>
                 </button>
             </div>
@@ -17,7 +17,7 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr>
+                    <tr class="caption">
                         <th class="tbl_col_installed" scope="col"><tmpl_var name="installed_txt"></th>
                         <th class="tbl_col_package_title" scope="col"><tmpl_var name="package_title_txt"></th>
                         <th class="tbl_col_package_description" scope="col"><tmpl_var name="package_description_txt"></th>
diff --git a/interface/web/admin/templates/software_repo_list.htm b/interface/web/admin/templates/software_repo_list.htm
index 16a1749315931a5241c85975334690d86b295428..66aa396633e6290992d7fe99d8ae8d1304187301 100644
--- a/interface/web/admin/templates/software_repo_list.htm
+++ b/interface/web/admin/templates/software_repo_list.htm
@@ -6,7 +6,7 @@
     <div class="pnl_toolsarea">
         <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
             <div class="buttons">
-                <button class="iconstxt icoAdd" type="button" onClick="loadContent('admin/software_repo_edit.php');">
+                <button class="button iconstxt icoAdd" type="button" onClick="loadContent('admin/software_repo_edit.php');">
                     <span>{tmpl_var name="add_new_record_txt"}</span>
                 </button>
             </div>
@@ -17,17 +17,19 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr>
+                    <tr class="caption">
                         <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
                         <th class="tbl_col_repo_name" scope="col"><tmpl_var name="repo_name_txt"></th>
                         <th class="tbl_col_repo_url" scope="col"><tmpl_var name="repo_url_txt"></th>
                         <th class="tbl_col_buttons" scope="col">&nbsp;</th>
                     </tr>
-                    <tr>
+                    <tr class="filter">
                         <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
                         <td class="tbl_col_repo_name"><input type="text" name="search_repo_name" value="{tmpl_var name='search_repo_name'}" /></td>
                         <td class="tbl_col_repo_url"><input type="text" name="search_repo_url" value="{tmpl_var name='search_repo_url'}" /></td>
-                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','admin/software_repo_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                        <td class="tbl_col_buttons">
+                            <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','admin/software_repo_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+                        </td>
                     </tr>
                 </thead>
                 <tbody>
@@ -37,9 +39,7 @@
                             <td class="tbl_col_repo_name"><a href="#" onClick="loadContent('admin/software_repo_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="repo_name"}</a></td>
                             <td class="tbl_col_repo_url"><a href="#" onClick="loadContent('admin/software_repo_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="repo_url"}</a></td>
                             <td class="tbl_col_buttons">
-                                <div class="buttons icons16">    
-                                    <a class="icons16 icoDelete" href="javascript: del_record('admin/software_repo_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>
+                                <a class="button icons16 icoDelete" href="javascript: del_record('admin/software_repo_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>
                             </td>
                         </tr>
                     </tmpl_loop>
diff --git a/interface/web/admin/templates/software_update_list.htm b/interface/web/admin/templates/software_update_list.htm
index 8a3760e71a94eebdecf979ee37d8e32408b11d6b..7f8a5f833736564e800bf0359676843df1d36e28 100644
--- a/interface/web/admin/templates/software_update_list.htm
+++ b/interface/web/admin/templates/software_update_list.htm
@@ -22,7 +22,7 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr>
+                    <tr class="caption">
                         <th class="tbl_col_installed" scope="col"><tmpl_var name="installed_txt"></th>
                         <th class="tbl_col_update_title" scope="col"><tmpl_var name="update_title_txt"></th>
                         <th class="tbl_col_version" scope="col"><tmpl_var name="version_txt"></th>
diff --git a/interface/web/admin/templates/users_list.htm b/interface/web/admin/templates/users_list.htm
index d66228162677537a3f3dca5ce8b0909d51462384..1b824866b7eb7444f80e57ff7fb0eeba08200a4d 100644
--- a/interface/web/admin/templates/users_list.htm
+++ b/interface/web/admin/templates/users_list.htm
@@ -6,7 +6,7 @@
     <div class="pnl_toolsarea">
         <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
             <div class="buttons">
-                <button class="iconstxt icoAdd" type="button" onClick="loadContent('admin/users_edit.php');">
+                <button class="button iconstxt icoAdd" type="button" onClick="loadContent('admin/users_edit.php');">
                     <span>{tmpl_var name="add_new_record_txt"}</span>
                 </button>
                 <p><tmpl_var name="warning_txt"></p>
@@ -18,35 +18,35 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr>
-                        <th class="tbl_col_client_id" scope="col"><tmpl_var name="client_id_txt"></th>
+                    <tr class="caption">
+                        <th class="tbl_col_client_pid" scope="col"><tmpl_var name="client_id_txt"></th>
                         <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
                         <th class="tbl_col_username" scope="col"><tmpl_var name="username_txt"></th>
                         <th class="tbl_col_groups" scope="col"><tmpl_var name="groups_txt"></th>
                         <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
                     </tr>
-                    <tr>
-                        <td class="tbl_col_client_id"><input type="text" name="search_client_id" value="{tmpl_var name='search_client_id'}" /></td>
+                    <tr class="filter">
+                        <td class="tbl_col_client_pid"><input type="text" name="search_client_id" value="{tmpl_var name='search_client_id'}" /></td>
                         <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
                         <td class="tbl_col_username"><input type="text" name="search_username" value="{tmpl_var name='search_username'}" /></td>
                         <td class="tbl_col_groups"><select name="search_groups">{tmpl_var name='search_groups'}</select></td>
-                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','admin/users_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                        <td class="tbl_col_buttons">
+                            <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','admin/users_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+                        </td>
                     </tr>
                 </thead>
                 <tbody>
                     <tmpl_loop name="records">
                         <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
-                            <td class="tbl_col_client_id"><a href="#" onClick="loadContent('admin/users_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="client_id"}</a></td>
+                            <td class="tbl_col_client_pid"><a href="#" onClick="loadContent('admin/users_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="client_id"}</a></td>
                             <td class="tbl_col_active"><a href="#" onClick="loadContent('admin/users_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
-                            <td class="tbl_col_username"><a href="#" onClick="loadContent('admin/users_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="username"}</a></td>
+                            <td class="tbl_col_username"><div class="icons16 group-{tmpl_var name="typ"}" title="{tmpl_var name="typ"}"><span>{tmpl_var name="typ"}</span></div> <div class="group-icon"><a href="#" onClick="loadContent('admin/users_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="username"}</a></div></td>
                             <td class="tbl_col_groups">{tmpl_var name="groups"}</td>
                             <td class="tbl_col_buttons">
-                                <div class="buttons icons16">    
-                                    <tmpl_if name="username" op="!=" value="admin">
-                                        <a class="icons16 icoLoginAs" href="javascript: loadContent('admin/login_as.php?id={tmpl_var name='id'}');"><span>{tmpl_var name='login_as_txt'}</span></a>
-                                        <a class="icons16 icoDelete" href="javascript: del_record('admin/users_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>
-                                    </tmpl_if>
-                                </div>
+                                <tmpl_if name="username" op="!=" value="admin">
+                                    <a class="button icons16 icoLoginAs" href="javascript: loadContent('admin/login_as.php?id={tmpl_var name='id'}');"><span>{tmpl_var name='login_as_txt'}</span></a>
+                                    <a class="button icons16 icoDelete" href="javascript: del_record('admin/users_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>
+                                </tmpl_if>
                             </td>
                         </tr>
                     </tmpl_loop>
diff --git a/interface/web/client/templates/client_circle_list.htm b/interface/web/client/templates/client_circle_list.htm
index 4c5a889b64df653a7a20ef6d45e5ee8edc6b348a..08a8148ef5c36a171209dcecbc8d731e9a9520c8 100644
--- a/interface/web/client/templates/client_circle_list.htm
+++ b/interface/web/client/templates/client_circle_list.htm
@@ -6,7 +6,7 @@
     <div class="pnl_toolsarea">
         <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
             <div class="buttons">
-                <button class="iconstxt icoAdd" type="button" onClick="loadContent('client/client_circle_edit.php');">
+                <button class="button iconstxt icoAdd" type="button" onClick="loadContent('client/client_circle_edit.php');">
                     <span>{tmpl_var name="add_new_record_txt"}</span>
                 </button>
             </div>
@@ -17,32 +17,32 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr>
-                        <th class="tbl_col_circle_id" scope="col"><tmpl_var name="circle_id_txt"></th>
+                    <tr class="caption">
+                        <th class="tbl_col_circle_pid" scope="col"><tmpl_var name="circle_id_txt"></th>
                         <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
                         <th class="tbl_col_circle_name" scope="col"><tmpl_var name="circle_name_txt"></th>
                         <th class="tbl_col_description" scope="col"><tmpl_var name="description_txt"></th>
                         <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
                     </tr>
-                    <tr>
-                        <td class="tbl_col_circle_id"><input type="text" name="search_circle_id" value="{tmpl_var name='search_circle_id'}" style="width:30px;" /></td>
+                    <tr class="filter">
+                        <td class="tbl_col_circle_pid"><input type="text" name="search_circle_id" value="{tmpl_var name='search_circle_id'}" /></td>
                         <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
-                        <td class="tbl_col_circle_name"><input type="text" name="search_circle_name" value="{tmpl_var name='search_circle_name'}" style="width:120px;" /></td>
-                        <td class="tbl_col_description"><input type="text" name="search_description" value="{tmpl_var name='search_description'}" style="width:120px;" /></td>
-                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','client/client_circle_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                        <td class="tbl_col_circle_name"><input type="text" name="search_circle_name" value="{tmpl_var name='search_circle_name'}" /></td>
+                        <td class="tbl_col_description"><input type="text" name="search_description" value="{tmpl_var name='search_description'}" /></td>
+                        <td class="tbl_col_buttons">
+                            <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','client/client_circle_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+                        </td>
                     </tr>
                 </thead>
                 <tbody>
                     <tmpl_loop name="records">
                         <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
-                            <td class="tbl_col_circle_id"><a href="#" onClick="loadContent('client/client_circle_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="circle_id"}</a></td>
+                            <td class="tbl_col_circle_pid"><a href="#" onClick="loadContent('client/client_circle_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="circle_id"}</a></td>
                             <td class="tbl_col_active"><a href="#" onClick="loadContent('client/client_circle_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
                             <td class="tbl_col_circle_name"><a href="#" onClick="loadContent('client/client_circle_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="circle_name"}</a></td>
                             <td class="tbl_col_description"><a href="#" onClick="loadContent('client/client_circle_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="description"}</a></td>
                             <td class="tbl_col_buttons">
-                                <div class="buttons icons16" style="width:60px;">
-                                    <a class="icons16 icoDelete" href="javascript: del_record('client/client_circle_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>
+                                <a class="button icons16 icoDelete" href="javascript: del_record('client/client_circle_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>
                             </td>
                         </tr>
                     </tmpl_loop>
diff --git a/interface/web/client/templates/client_edit_limits.htm b/interface/web/client/templates/client_edit_limits.htm
index 8ce7f80fa6dec3e7a4ceb8388267085097593fcc..9e12671b11db14ec046022100bfcbf912e7618bb 100644
--- a/interface/web/client/templates/client_edit_limits.htm
+++ b/interface/web/client/templates/client_edit_limits.htm
@@ -6,7 +6,7 @@
     <tmpl_if name="is_admin">
         <div class="pnl_toolsarea">
             <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
-                <div class="buttons">
+                <div class="buttons topbuttons">
                     <button class="positive iconstxt icoAdd" type="button" value="{tmpl_var name='add_additional_template_txt'}" onClick="addAdditionalTemplate();"><span>{tmpl_var name='add_additional_template_txt'}</span></button>
                     <button class="negative iconstxt icoDelete" type="button" value="{tmpl_var name='delete_additional_template_txt'}" onClick="delAdditionalTemplate();"><span>{tmpl_var name='delete_additional_template_txt'}</span></button>
                 </div>
diff --git a/interface/web/client/templates/client_template_list.htm b/interface/web/client/templates/client_template_list.htm
index 5249fce5d5bb0bb5b728baff4ed5640596ecde5c..81d93fd9b22c11591815833e7c8cbd4efebede9e 100644
--- a/interface/web/client/templates/client_template_list.htm
+++ b/interface/web/client/templates/client_template_list.htm
@@ -6,7 +6,7 @@
   <div class="pnl_toolsarea">
     <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
       <div class="buttons">
-        <button class="iconstxt icoAdd" type="button" onClick="loadContent('client/client_template_edit.php');">
+        <button class="button iconstxt icoAdd" type="button" onClick="loadContent('client/client_template_edit.php');">
           <span>{tmpl_var name="add_new_record_txt"}</span>
         </button>
       </div>
@@ -17,17 +17,19 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr>
+                    <tr class="caption">
                         <th class="tbl_col_template_id" scope="col"><tmpl_var name="template_id_txt"></th>
                         <th class="tbl_col_template_type" scope="col"><tmpl_var name="template_type_txt"></th>
                         <th class="tbl_col_template_name" scope="col"><tmpl_var name="template_name_txt"></th>
                         <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
                     </tr>
-                    <tr>
-                        <td class="tbl_col_template_id"><input type="text" name="search_template_id" value="{tmpl_var name='search_template_id'}" style="width:30px;" /></td>
+                    <tr class="filter">
+                        <td class="tbl_col_template_id"><input type="text" name="search_template_id" value="{tmpl_var name='search_template_id'}" /></td>
                         <td class="tbl_col_template_type"><select name="search_template_type">{tmpl_var name='search_template_type'}</select></td>
                         <td class="tbl_col_template_name"><input type="text" name="search_template_name" value="{tmpl_var name='search_template_name'}" /></td>
-                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','client/client_template_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                        <td class="tbl_col_buttons">
+                            <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','client/client_template_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+                        </td>
                     </tr>
                 </thead>
                 <tbody>
@@ -37,9 +39,7 @@
                             <td class="tbl_col_template_type"><a href="#" onClick="loadContent('client/client_template_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="template_type"}</a></td>
                             <td class="tbl_col_template_name"><a href="#" onClick="loadContent('client/client_template_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="template_name"}</a></td>
                             <td class="tbl_col_buttons">
-                                <div class="buttons icons16">
-                                    <a class="icons16 icoDelete" href="javascript: del_record('client/client_template_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>
+                                <a class="button icons16 icoDelete" href="javascript: del_record('client/client_template_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>
                             </td>
                         </tr>
                     </tmpl_loop>
diff --git a/interface/web/client/templates/clients_list.htm b/interface/web/client/templates/clients_list.htm
index 2e906d00be9cfa6a71d761703a78b7f5e3cc2a97..cc948ce2f4c91271df2d0916df3a1c7b927fa395 100644
--- a/interface/web/client/templates/clients_list.htm
+++ b/interface/web/client/templates/clients_list.htm
@@ -6,7 +6,7 @@
     <div class="pnl_toolsarea">
         <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
             <div class="buttons">
-                <button class="iconstxt icoAdd" type="button" onClick="loadContent('client/client_edit.php');">
+                <button class="button iconstxt icoAdd" type="button" onClick="loadContent('client/client_edit.php');">
                     <span>{tmpl_var name="add_new_record_txt"}</span>
                 </button>
             </div>
@@ -17,8 +17,8 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr>
-                        <th class="tbl_col_client_id" scope="col"><tmpl_var name="client_id_txt"></th>
+                    <tr class="caption">
+                        <th class="tbl_col_client_pid" scope="col"><tmpl_var name="client_id_txt"></th>
                         <th class="tbl_col_company_name" scope="col"><tmpl_var name="company_name_txt"></th>
                         <th class="tbl_col_contact_name" scope="col"><tmpl_var name="contact_name_txt"></th>
                         <th class="tbl_col_username" scope="col"><tmpl_var name="username_txt"></th>
@@ -26,32 +26,32 @@
                         <th class="tbl_col_country" scope="col"><tmpl_var name="country_txt"></th>
                         <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
                     </tr>
-                    <tr>
-                        <td class="tbl_col_client_id"><input type="text" name="search_client_id" value="{tmpl_var name='search_client_id'}" style="width:30px;" /></td>
-                        <td class="tbl_col_company_name"><input type="text" name="search_company_name" value="{tmpl_var name='search_company_name'}" style="width:120px;" /></td>
-                        <td class="tbl_col_contact_name"><input type="text" name="search_contact_name" value="{tmpl_var name='search_contact_name'}" style="width:120px;" /></td>
-                        <td class="tbl_col_username"><input type="text" name="search_username" value="{tmpl_var name='search_username'}" style="width:120px;" /></td>
-                        <td class="tbl_col_city"><input type="text" name="search_city" value="{tmpl_var name='search_city'}" style="width:120px;" /></td>
-                        <td class="tbl_col_country"><select name="search_country" class="selectInput flags" style="width:120px;">{tmpl_var name='search_country'}</select></td>
-                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','client/client_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    <tr class="filter">
+                        <td class="tbl_col_client_pid"><input type="text" name="search_client_id" value="{tmpl_var name='search_client_id'}" /></td>
+                        <td class="tbl_col_company_name"><input type="text" name="search_company_name" value="{tmpl_var name='search_company_name'}" /></td>
+                        <td class="tbl_col_contact_name"><input type="text" name="search_contact_name" value="{tmpl_var name='search_contact_name'}" /></td>
+                        <td class="tbl_col_username"><input type="text" name="search_username" value="{tmpl_var name='search_username'}" /></td>
+                        <td class="tbl_col_city"><input type="text" name="search_city" value="{tmpl_var name='search_city'}" /></td>
+                        <td class="tbl_col_country"><select name="search_country">{tmpl_var name='search_country'}</select></td>
+                        <td class="tbl_col_buttons">
+                            <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','client/client_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+                        </td>
                     </tr>
                 </thead>
                 <tbody>
                     <tmpl_loop name="records">
                         <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
-                            <td class="tbl_col_client_id"><a href="#" onClick="loadContent('client/client_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="client_id"}</a></td>
+                            <td class="tbl_col_client_pid"><a href="#" onClick="loadContent('client/client_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="client_id"}</a></td>
                             <td class="tbl_col_company_name"><a href="#" onClick="loadContent('client/client_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="company_name"}</a></td>
                             <td class="tbl_col_contact_name"><a href="#" onClick="loadContent('client/client_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="contact_name"}</a></td>
                             <td class="tbl_col_username"><a href="#" onClick="loadContent('client/client_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="username"}</a></td>
                             <td class="tbl_col_city"><a href="#" onClick="loadContent('client/client_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="city"}</a></td>
-                            <td class="tbl_col_country"><a href="#" onClick="loadContent('client/client_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="country"}</a></td>
+                            <td class="tbl_col_country"><div class="country-{tmpl_var name="country"}"><span>{tmpl_var name="country"}</span></div></td>
                             <td class="tbl_col_buttons">
-                                <div class="buttons icons16" style="width:60px;">
-                                    <tmpl_if name="is_admin">
-                                        <a class="icons16 icoLoginAs" href="javascript: loadContent('admin/login_as.php?cid={tmpl_var name='id'}');"><span>{tmpl_var name='login_as_txt'}</span></a>
-                                    </tmpl_if>
-                                    <a class="icons16 icoDelete" href="javascript: del_record('client/client_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>
+                                <tmpl_if name="is_admin">
+                                    <a class="button icons16 icoLoginAs" href="javascript: loadContent('admin/login_as.php?cid={tmpl_var name='id'}');"><span>{tmpl_var name='login_as_txt'}</span></a>
+                                </tmpl_if>
+                                <a class="button icons16 icoDelete" href="javascript: del_record('client/client_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>
                             </td>
                         </tr>
                     </tmpl_loop>
diff --git a/interface/web/client/templates/resellers_list.htm b/interface/web/client/templates/resellers_list.htm
index 42a9a0cc9a3cc0d2430d7194a394167391f6cf50..f5e1726d12aa6e852c9a4bec92c023c8433c7a3b 100644
--- a/interface/web/client/templates/resellers_list.htm
+++ b/interface/web/client/templates/resellers_list.htm
@@ -6,7 +6,7 @@
     <div class="pnl_toolsarea">
         <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
             <div class="buttons">
-                <button class="iconstxt icoAdd" type="button" onClick="loadContent('client/reseller_edit.php');">
+                <button class="button iconstxt icoAdd" type="button" onClick="loadContent('client/reseller_edit.php');">
                     <span>{tmpl_var name="add_new_record_txt"}</span>
                 </button>
             </div>
@@ -17,36 +17,36 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr>
-                        <th class="tbl_col_client_id" scope="col"><tmpl_var name="client_id_txt"></th>
+                    <tr class="caption">
+                        <th class="tbl_col_client_pid" scope="col"><tmpl_var name="client_id_txt"></th>
                         <th class="tbl_col_company_name" scope="col"><tmpl_var name="company_name_txt"></th>
                         <th class="tbl_col_contact_name" scope="col"><tmpl_var name="contact_name_txt"></th>
                         <th class="tbl_col_city" scope="col"><tmpl_var name="city_txt"></th>
                         <th class="tbl_col_country" scope="col"><tmpl_var name="country_txt"></th>
                         <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
                     </tr>
-                    <tr>
-                        <td class="tbl_col_client_id"><input type="text" name="search_client_id" value="{tmpl_var name='search_client_id'}" style="width:30px;" /></td>
-                        <td class="tbl_col_company_name"><input type="text" name="search_company_name" value="{tmpl_var name='search_company_name'}" style="width:120px;" /></td>
-                        <td class="tbl_col_contact_name"><input type="text" name="search_contact_name" value="{tmpl_var name='search_contact_name'}" style="width:120px;" /></td>
-                        <td class="tbl_col_city"><input type="text" name="search_city" value="{tmpl_var name='search_city'}" style="width:120px;" /></td>
-                        <td class="tbl_col_country"><select name="search_country" class="selectInput flags" style="width:120px;">{tmpl_var name='search_country'}</select></td>
-                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','client/reseller_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    <tr class="filter">
+                        <td class="tbl_col_client_pid"><input type="text" name="search_client_id" value="{tmpl_var name='search_client_id'}" /></td>
+                        <td class="tbl_col_company_name"><input type="text" name="search_company_name" value="{tmpl_var name='search_company_name'}" /></td>
+                        <td class="tbl_col_contact_name"><input type="text" name="search_contact_name" value="{tmpl_var name='search_contact_name'}" /></td>
+                        <td class="tbl_col_city"><input type="text" name="search_city" value="{tmpl_var name='search_city'}" /></td>
+                        <td class="tbl_col_country"><select name="search_country">{tmpl_var name='search_country'}</select></td>
+                        <td class="tbl_col_buttons">
+                            <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','client/reseller_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+                        </td>
                     </tr>
                 </thead>
                 <tbody>
                     <tmpl_loop name="records">
                         <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
-                            <td class="tbl_col_client_id"><a href="#" onClick="loadContent('client/reseller_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="client_id"}</a></td>
+                            <td class="tbl_col_client_pid"><a href="#" onClick="loadContent('client/reseller_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="client_id"}</a></td>
                             <td class="tbl_col_company_name"><a href="#" onClick="loadContent('client/reseller_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="company_name"}</a></td>
                             <td class="tbl_col_contact_name"><a href="#" onClick="loadContent('client/reseller_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="contact_name"}</a></td>
                             <td class="tbl_col_city"><a href="#" onClick="loadContent('client/reseller_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="city"}</a></td>
-                            <td class="tbl_col_country"><a href="#" onClick="loadContent('client/reseller_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="country"}</a></td>
+                            <td class="tbl_col_country"><div class="country-{tmpl_var name="country"}"><span>{tmpl_var name="country"}</span></div></td>
                             <td class="tbl_col_buttons">
-                            <div class="buttons icons16" style="width:60px;">
-                                <a class="icons16 icoLoginAs" href="javascript: loadContent('admin/login_as.php?cid={tmpl_var name='id'}');"><span>{tmpl_var name='login_as_txt'}</span></a>
-                                <a class="icons16 icoDelete" href="javascript: del_record('client/reseller_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>
+                                <a class="button icons16 icoLoginAs" href="javascript: loadContent('admin/login_as.php?cid={tmpl_var name='id'}');"><span>{tmpl_var name='login_as_txt'}</span></a>
+                                <a class="button icons16 icoDelete" href="javascript: del_record('client/reseller_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>
                             </td>
                         </tr>
                     </tmpl_loop>
diff --git a/interface/web/dns/templates/dns_a_list.htm b/interface/web/dns/templates/dns_a_list.htm
index 913f628a69a919f09dd928b0c332fb65bf7673c2..658962146e493fb726fb09a17b3244407b333c25 100644
--- a/interface/web/dns/templates/dns_a_list.htm
+++ b/interface/web/dns/templates/dns_a_list.htm
@@ -1,39 +1,17 @@
 <div class="pnl_toolsarea">
     <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
-        <div class="buttons">
-            <button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_a_edit.php?zone={tmpl_var name='parent_id'}');">
-                <span>A</span>
-            </button>
-            <button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_aaaa_edit.php?zone={tmpl_var name='parent_id'}');">
-                <span>AAAA</span>
-            </button>
-            <button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_alias_edit.php?zone={tmpl_var name='parent_id'}');">
-                <span>ALIAS</span>
-            </button>
-            <button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_cname_edit.php?zone={tmpl_var name='parent_id'}');">
-                <span>CNAME</span>
-            </button>
-            <button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_hinfo_edit.php?zone={tmpl_var name='parent_id'}');">
-                <span>HINFO</span>
-            </button>
-            <button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_mx_edit.php?zone={tmpl_var name='parent_id'}');">
-                <span>MX</span>
-            </button>
-            <button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_ns_edit.php?zone={tmpl_var name='parent_id'}');">
-                <span>NS</span>
-            </button>
-            <button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_ptr_edit.php?zone={tmpl_var name='parent_id'}');">
-                <span>PTR</span>
-            </button>
-            <button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_rp_edit.php?zone={tmpl_var name='parent_id'}');">
-                <span>RP</span>
-            </button>
-            <button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_srv_edit.php?zone={tmpl_var name='parent_id'}');">
-                <span>SRV</span>
-            </button>
-            <button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_txt_edit.php?zone={tmpl_var name='parent_id'}');">
-                <span>TXT</span>
-            </button>
+        <div class="buttons topbuttons">
+            <button class="button iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_a_edit.php?zone={tmpl_var name='parent_id'}');"><span>A</span></button>
+            <button class="button iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_aaaa_edit.php?zone={tmpl_var name='parent_id'}');"><span>AAAA</span></button>
+            <button class="button iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_alias_edit.php?zone={tmpl_var name='parent_id'}');"><span>ALIAS</span></button>
+            <button class="button iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_cname_edit.php?zone={tmpl_var name='parent_id'}');"><span>CNAME</span></button>
+            <button class="button iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_hinfo_edit.php?zone={tmpl_var name='parent_id'}');"><span>HINFO</span></button>
+            <button class="button iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_mx_edit.php?zone={tmpl_var name='parent_id'}');"><span>MX</span></button>
+            <button class="button iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_ns_edit.php?zone={tmpl_var name='parent_id'}');"><span>NS</span></button>
+            <button class="button iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_ptr_edit.php?zone={tmpl_var name='parent_id'}');"><span>PTR</span></button>
+            <button class="button iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_rp_edit.php?zone={tmpl_var name='parent_id'}');"><span>RP</span></button>
+            <button class="button iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_srv_edit.php?zone={tmpl_var name='parent_id'}');"><span>SRV</span></button>
+            <button class="button iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_txt_edit.php?zone={tmpl_var name='parent_id'}');"><span>TXT</span></button>
         </div>
     </fieldset>
 </div>
@@ -42,7 +20,7 @@
     <fieldset><legend><tmpl_var name="list_head_txt"></legend>
         <table class="list">
             <thead>
-                <tr>
+                <tr class="caption">
                     <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
                     <th class="tbl_col_type" scope="col"><tmpl_var name="type_txt"></th>
                     <th class="tbl_col_name" scope="col"><tmpl_var name="name_txt"></th>
@@ -51,14 +29,16 @@
                     <th class="tbl_col_ttl" scope="col"><tmpl_var name="ttl_txt"></th>
                     <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
                 </tr>
-                <tr>
+                <tr class="filter">
                     <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
                     <td class="tbl_col_type"><select name="search_type">{tmpl_var name='search_type'}</select></td>
                     <td class="tbl_col_name"><input type="text" name="search_name" value="{tmpl_var name='search_name'}" /></td>
                     <td class="tbl_col_data"><input type="text" name="search_data" value="{tmpl_var name='search_data'}" /></td>
                     <td class="tbl_col_aux"><input type="text" name="search_aux" value="{tmpl_var name='search_aux'}" /></td>
                     <td class="tbl_col_ttl"><input type="text" name="search_ttl" value="{tmpl_var name='search_ttl'}" /></td>
-                    <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="changeTab('dns_records','dns/dns_soa_edit.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    <td class="tbl_col_buttons">
+                        <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="changeTab('dns_records','dns/dns_soa_edit.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+                    </td>
                 </tr>
             </thead>
             <tbody>
@@ -71,9 +51,7 @@
                         <td class="tbl_col_aux"><a href="#" onClick="loadContent('dns/dns_{tmpl_var name='type_lowercase'}_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="aux"}</a></td>
                         <td class="tbl_col_ttl"><a href="#" onClick="loadContent('dns/dns_{tmpl_var name='type_lowercase'}_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="ttl"}</a></td>
                         <td class="tbl_col_buttons">
-                            <div class="buttons icons16">    
-                                <a class="icons16 icoDelete" href="javascript: del_record('dns/dns_rr_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>
+                            <a class="button icons16 icoDelete" href="javascript: del_record('dns/dns_rr_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>
                         </td>
                     </tr>
                 </tmpl_loop>
diff --git a/interface/web/dns/templates/dns_slave_list.htm b/interface/web/dns/templates/dns_slave_list.htm
index d4458e0d9f2221aa9eaaed339546df8bb985a8d5..730b13ae3bef056f00d43d98dfc0346776c63424 100644
--- a/interface/web/dns/templates/dns_slave_list.htm
+++ b/interface/web/dns/templates/dns_slave_list.htm
@@ -6,7 +6,7 @@
     <div class="pnl_toolsarea">
         <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
             <div class="buttons">
-                <button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_slave_edit.php');">
+                <button class="button iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_slave_edit.php');">
                     <span>{tmpl_var name="add_new_record_txt"}</span>
                 </button>
             </div>
@@ -17,19 +17,21 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                <tr>
+                <tr class="caption">
                     <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
                     <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
                     <th class="tbl_col_origin" scope="col"><tmpl_var name="origin_txt"></th>
                     <th class="tbl_col_ns" scope="col"><tmpl_var name="ns_txt"></th>
                     <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
                 </tr>
-                <tr>
+                <tr class="filter">
                     <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
                     <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
                     <td class="tbl_col_origin"><input type="text" name="search_origin" value="{tmpl_var name='search_origin'}" /></td>
                     <td class="tbl_col_ns"><input type="text" name="search_ns" value="{tmpl_var name='search_ns'}" /></td>
-                    <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','dns/dns_slave_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    <td class="tbl_col_buttons">
+                        <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','dns/dns_slave_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+                    </td>
                 </tr>
                 </thead>
                 <tbody>
@@ -40,9 +42,7 @@
                         <td class="tbl_col_origin"><a href="#" onClick="loadContent('dns/dns_slave_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="origin"}</a></td>
                         <td class="tbl_col_ns"><a href="#" onClick="loadContent('dns/dns_slave_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="ns"}</a></td>
                         <td class="tbl_col_buttons">
-                        <div class="buttons icons16">    
-                            <a class="icons16 icoDelete" href="javascript: del_record('dns/dns_slave_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>
+                            <a class="button icons16 icoDelete" href="javascript: del_record('dns/dns_slave_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>
                         </td>
                     </tr>
                 </tmpl_loop>
diff --git a/interface/web/dns/templates/dns_soa_list.htm b/interface/web/dns/templates/dns_soa_list.htm
index fa09c78e0e7bf902796f2810557ba746c91a3f6d..980b002fdd3b39936e8b123b39fbb0511c577a3a 100644
--- a/interface/web/dns/templates/dns_soa_list.htm
+++ b/interface/web/dns/templates/dns_soa_list.htm
@@ -6,9 +6,9 @@
     <div class="pnl_toolsarea">
         <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
             <div class="buttons">
-                <button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_wizard.php');"><span>{tmpl_var name="add_new_record_wizard_txt"}</span></button>
-                <button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_soa_edit.php');"><span>{tmpl_var name="add_new_record_txt"}</span></button>
-                <button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_import.php');"><span>Import Zone File</span></button>
+                <button class="button iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_wizard.php');"><span>{tmpl_var name="add_new_record_wizard_txt"}</span></button>
+                <button class="button iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_soa_edit.php');"><span>{tmpl_var name="add_new_record_txt"}</span></button>
+                <button class="button iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_import.php');"><span>Import Zone File</span></button>
             </div>
         </fieldset>
     </div>
@@ -17,7 +17,7 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
             <thead>
-                <tr>
+                <tr class="caption">
                     <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
                     <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
                     <th class="tbl_col_origin" scope="col"><tmpl_var name="origin_txt"></th>
@@ -25,13 +25,15 @@
                     <th class="tbl_col_mbox" scope="col"><tmpl_var name="mbox_txt"></th>
                     <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
                 </tr>
-                <tr>
+                <tr class="filter">
                     <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
                     <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
                     <td class="tbl_col_origin"><input type="text" name="search_origin" value="{tmpl_var name='search_origin'}" /></td>
                     <td class="tbl_col_ns"><input type="text" name="search_ns" value="{tmpl_var name='search_ns'}" /></td>
                     <td class="tbl_col_mbox"><input type="text" name="search_mbox" value="{tmpl_var name='search_mbox'}" /></td>
-                    <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','dns/dns_soa_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    <td class="tbl_col_buttons">
+                        <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','dns/dns_soa_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+                    </td>
                 </tr>
             </thead>
             <tbody>
@@ -42,10 +44,8 @@
                         <td class="tbl_col_origin"><a href="#" onClick="loadContent('dns/dns_soa_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="origin"}</a></td>
                         <td class="tbl_col_ns"><a href="#" onClick="loadContent('dns/dns_soa_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="ns"}</a></td>
                         <td class="tbl_col_mbox"><a href="#" onClick="loadContent('dns/dns_soa_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="mbox"}</a></td>
-                        <td class="tbl_col_buttons">
-                            <div class="buttons icons16">    
-                                <a class="icons16 icoDelete" href="javascript: del_record('dns/dns_soa_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 class="tbl_col_buttons">   
+                            <a class="button icons16 icoDelete" href="javascript: del_record('dns/dns_soa_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>
                         </td>
                     </tr>
                 </tmpl_loop>
diff --git a/interface/web/dns/templates/dns_template_list.htm b/interface/web/dns/templates/dns_template_list.htm
index 7039d34b106220ea8a38639972743660cc568111..87b28387e29ba4d29c4ba95523763de4bf2e5665 100644
--- a/interface/web/dns/templates/dns_template_list.htm
+++ b/interface/web/dns/templates/dns_template_list.htm
@@ -6,7 +6,7 @@
     <div class="pnl_toolsarea">
         <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
             <div class="buttons">
-                <button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_template_edit.php');">
+                <button class="button iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_template_edit.php');">
                     <span>{tmpl_var name="add_new_record_txt"}</span>
                 </button>
             </div>
@@ -17,15 +17,17 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr>
+                    <tr class="caption">
                         <th class="tbl_col_visible" scope="col"><tmpl_var name="visible_txt"></th>
                         <th class="tbl_col_name" scope="col"><tmpl_var name="name_txt"></th>
                         <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
                     </tr>
-                    <tr>
+                    <tr class="filter">
                         <td class="tbl_col_visible"><select name="search_visible">{tmpl_var name='search_visible'}</select></td>
                         <td class="tbl_col_name"><input type="text" name="search_name" value="{tmpl_var name='search_name'}" /></td>
-                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','dns/dns_template_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                        <td class="tbl_col_buttons">
+                            <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','dns/dns_template_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+                        </td>
                     </tr>
                 </thead>
                 <tbody>
@@ -34,9 +36,7 @@
                         <td class="tbl_col_visible"><a href="#" onClick="loadContent('dns/dns_template_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="visible"}</a></td>
                         <td class="tbl_col_name"><a href="#" onClick="loadContent('dns/dns_template_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="name"}</a></td>
                         <td class="tbl_col_buttons">
-                            <div class="buttons icons16">    
-                                <a class="icons16 icoDelete" href="javascript: del_record('dns/dns_template_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>
+                            <a class="button icons16 icoDelete" href="javascript: del_record('dns/dns_template_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>
                         </td>
                     </tr>
                 </tmpl_loop>
diff --git a/interface/web/help/templates/faq_manage_questions_list.htm b/interface/web/help/templates/faq_manage_questions_list.htm
index c045dfbb1be5c039f1db3c9483d62011ac766c15..ad5d1f8faa5b8539e247227c2accef557383ab9a 100644
--- a/interface/web/help/templates/faq_manage_questions_list.htm
+++ b/interface/web/help/templates/faq_manage_questions_list.htm
@@ -4,7 +4,7 @@
     <div class="pnl_toolsarea">
         <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
             <div class="buttons">
-                <button class="iconstxt icoAdd" type="button" onclick="loadContent('help/faq_edit.php');">
+                <button class="button iconstxt icoAdd" type="button" onclick="loadContent('help/faq_edit.php');">
                     <span>{tmpl_var name="faq_new_question_txt"}</span>
                 </button>
             </div>
@@ -15,7 +15,7 @@
         <fieldset><legend><tmpl_var name="faq_sections_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr>
+                    <tr class="caption">
                         <th class="tbl_col_active" scope="col">{tmpl_var name="faq_question_txt"}</th>
                         <th class="tbl_col_active" scope="col">{tmpl_var name="faq_section_name_txt"}</th>
                         <th class="tbl_col_server_id" scope="col">{tmpl_var name="faq_delete_txt"}</th>
@@ -26,10 +26,8 @@
                     <tr>
                         <td>{tmpl_var name='hf_question'}</td>
                         <td>{tmpl_var name='hf_section'}</td>
-                        <td>
-                            <div class="buttons icons16">
-                                <a class="icons16 icoDelete" href="javascript: del_record('help/faq_delete.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');">
-                                    <span>{tmpl_var name="faq_delete_txt"}</span></a> </div>
+                        <td class="tbl_col_buttons">
+                            <a class="button icons16 icoDelete" href="javascript: del_record('help/faq_delete.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name="faq_delete_txt"}</span></a>
                         </td>
                         <td>
                             <a href="#" onClick="loadContent('help/faq_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="faq_edit_txt"}</a>
diff --git a/interface/web/help/templates/help_faq_list.htm b/interface/web/help/templates/help_faq_list.htm
index 6af928f7676e2479e7d9c6865c4ff7c95a69da1d..436f515597190d7d66a5d35f83ae373ee977d618 100644
--- a/interface/web/help/templates/help_faq_list.htm
+++ b/interface/web/help/templates/help_faq_list.htm
@@ -5,9 +5,7 @@
         {tmpl_var name='hf_answer'}
     </p>
     <tmpl_if name='is_admin'>
-        <div class="buttons icons16">
-            <a class="icons16 icoDelete" href="javascript: del_record('help/faq_delete.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>Delete</span></a>
-        </div>
+        <a class="button icons16 icoDelete" href="javascript: del_record('help/faq_delete.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>Delete</span></a>
         <a href="#" onClick="loadContent('help/faq_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="edit_txt"}</a>
         <br/>
         <br/>
diff --git a/interface/web/help/templates/help_faq_sections_list.htm b/interface/web/help/templates/help_faq_sections_list.htm
index ddb1a560e10705ed672000cc1cfb37e55cd4afcd..8f1db6ea4991ade6bd2ffed8ba68604142d3d5a7 100644
--- a/interface/web/help/templates/help_faq_sections_list.htm
+++ b/interface/web/help/templates/help_faq_sections_list.htm
@@ -6,7 +6,7 @@
     <div class="pnl_toolsarea">
         <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
             <div class="buttons">
-                <button class="iconstxt icoAdd" type="button" onclick="loadContent('help/faq_sections_edit.php');">
+                <button class="button iconstxt icoAdd" type="button" onclick="loadContent('help/faq_sections_edit.php');">
                     <span>{tmpl_var name="faq_new_section_txt"}</span>
                 </button>
             </div>
@@ -17,7 +17,7 @@
         <fieldset><legend><tmpl_var name="faq_sections_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr>
+                    <tr class="caption">
                         <th class="tbl_col_active" scope="col">{tmpl_var name="faq_section_name_txt"}</th>
                         <th class="tbl_col_server_id" scope="col">{tmpl_var name="faq_delete_txt"}</th>
                         <th class="tbl_col_domain" scope="col">{tmpl_var name="faq_edit_txt"}</th>
@@ -27,11 +27,9 @@
                     <tr>
                         <td><b>{tmpl_var name='hfs_name'}</b></td>
                         <td>
-                            <div class="buttons icons16">
-                                <a class="icons16 icoDelete" href="javascript: del_record('help/faq_sections_delete.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');">
-                                    <span>{tmpl_var name="faq_delete_txt"}</span></a> </div>
-                        </td><td>
-
+                            <a class="button icons16 icoDelete" href="javascript: del_record('help/faq_sections_delete.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name="faq_delete_txt"}</span></a>
+                        </td>
+                        <td>
                             <a href="#" onClick="loadContent('help/faq_sections_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="faq_edit_txt"}</a>
                         </td>
                     </tr>
diff --git a/interface/web/help/templates/support_message_list.htm b/interface/web/help/templates/support_message_list.htm
index e828fe9e5750d4a53f38525fe69c26c08657f504..6a7d6d640e7a898c53cd7e99707aa0b0b5bc3889 100644
--- a/interface/web/help/templates/support_message_list.htm
+++ b/interface/web/help/templates/support_message_list.htm
@@ -6,7 +6,7 @@
     <div class="pnl_toolsarea">
         <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
             <div class="buttons">
-                <button class="iconstxt icoAdd" type="button" onClick="loadContent('help/support_message_edit.php');">
+                <button class="button iconstxt icoAdd" type="button" onClick="loadContent('help/support_message_edit.php');">
                     <span>{tmpl_var name="add_new_record_txt"}</span>
                 </button>
             </div>
@@ -17,15 +17,17 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr>
+                    <tr class="caption">
                         <th class="tbl_col_sender_id" scope="col"><tmpl_var name="sender_id_txt"></th>
                         <th class="tbl_col_subject" scope="col"><tmpl_var name="subject_txt"></th>
                         <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
                     </tr>
-                    <tr>
+                    <tr class="filter">
                         <td class="tbl_col_sender_id"><select name="search_sender_id">{tmpl_var name='search_sender_id'}</select></td>
                         <td class="tbl_col_subject"><input type="text" name="search_subject" value="{tmpl_var name='search_subject'}" /></td>
-                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','help/support_message_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                        <td class="tbl_col_buttons">
+                            <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','help/support_message_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+                        </td>
                     </tr>
                 </thead>
                 <tbody>
@@ -34,9 +36,7 @@
                             <td class="tbl_col_sender_id"><a href="#" onClick="loadContent('help/support_message_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="sender_id"}</a></td>
                             <td class="tbl_col_subject"><a href="#" onClick="loadContent('help/support_message_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="subject"}</a></td>
                             <td class="tbl_col_buttons">
-                                <div class="buttons icons16">    
-                                    <a class="icons16 icoDelete" href="javascript: del_record('help/support_message_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>
+                                <a class="button icons16 icoDelete" href="javascript: del_record('help/support_message_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>
                             </td>
                         </tr>
                     </tmpl_loop>
diff --git a/interface/web/mail/templates/mail_alias_list.htm b/interface/web/mail/templates/mail_alias_list.htm
index 92755ddb9fff7536a5238f89cacfb71d79b6e065..b6935a75a55362dc56f929d37c225489612e6119 100644
--- a/interface/web/mail/templates/mail_alias_list.htm
+++ b/interface/web/mail/templates/mail_alias_list.htm
@@ -6,7 +6,7 @@
     <div class="pnl_toolsarea">
         <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
             <div class="buttons">
-                <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_alias_edit.php');">
+                <button class="button iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_alias_edit.php');">
                     <span>{tmpl_var name="add_new_record_txt"}</span>
                 </button>
             </div>
@@ -17,17 +17,19 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr>
+                    <tr class="caption">
                         <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
                         <th class="tbl_col_source" scope="col"><tmpl_var name="source_txt"></th>
                         <th class="tbl_col_destination" scope="col"><tmpl_var name="destination_txt"></th>
                         <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
                     </tr>
-                    <tr>
+                    <tr class="filter">
                         <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
                         <td class="tbl_col_source"><input type="text" name="search_source" value="{tmpl_var name='search_source'}" /></td>
                         <td class="tbl_col_destination"><input type="text" name="search_destination" value="{tmpl_var name='search_destination'}" /></td>
-                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_alias_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                        <td class="tbl_col_buttons">
+                            <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_alias_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+                        </td>
                     </tr>
                 </thead>
                 <tbody>
@@ -37,9 +39,7 @@
                             <td class="tbl_col_source"><a href="#" onClick="loadContent('mail/mail_alias_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="source"}</a></td>
                             <td class="tbl_col_destination"><a href="#" onClick="loadContent('mail/mail_alias_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="destination"}</a></td>
                             <td class="tbl_col_buttons">
-                            <div class="buttons icons16">    
-                                <a class="icons16 icoDelete" href="javascript: del_record('mail/mail_alias_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>
+                                <a class="button icons16 icoDelete" href="javascript: del_record('mail/mail_alias_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>
                             </td>
                         </tr>
                     </tmpl_loop>
diff --git a/interface/web/mail/templates/mail_aliasdomain_list.htm b/interface/web/mail/templates/mail_aliasdomain_list.htm
index d75c236e6479c9f0e849dfe1b690644be845e4fa..5303a78b43dcc9a9527232365c28039774f7579a 100644
--- a/interface/web/mail/templates/mail_aliasdomain_list.htm
+++ b/interface/web/mail/templates/mail_aliasdomain_list.htm
@@ -6,7 +6,7 @@
     <div class="pnl_toolsarea">
         <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
             <div class="buttons">
-                <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_aliasdomain_edit.php');">
+                <button class="button iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_aliasdomain_edit.php');">
                     <span>{tmpl_var name="add_new_record_txt"}</span>
                 </button>
             </div>
@@ -17,17 +17,19 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr>
+                    <tr class="caption">
                         <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
                         <th class="tbl_col_source" scope="col"><tmpl_var name="source_txt"></th>
                         <th class="tbl_col_destination" scope="col"><tmpl_var name="destination_txt"></th>
                         <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
                     </tr>
-                    <tr>
+                    <tr class="filter">
                         <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
                         <td class="tbl_col_source"><input type="text" name="search_source" value="{tmpl_var name='search_source'}" /></td>
                         <td class="tbl_col_destination"><input type="text" name="search_destination" value="{tmpl_var name='search_destination'}" /></td>
-                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_aliasdomain_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                        <td class="tbl_col_buttons">
+                            <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_aliasdomain_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+                        </td>
                     </tr>
                 </thead>
                 <tbody>
@@ -37,9 +39,7 @@
                             <td class="tbl_col_source"><a href="#" onClick="loadContent('mail/mail_aliasdomain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="source"}</a></td>
                             <td class="tbl_col_destination"><a href="#" onClick="loadContent('mail/mail_aliasdomain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="destination"}</a></td>
                             <td class="tbl_col_buttons">
-                                <div class="buttons icons16">    
-                                    <a class="icons16 icoDelete" href="javascript: del_record('mail/mail_aliasdomain_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>
+                                <a class="button icons16 icoDelete" href="javascript: del_record('mail/mail_aliasdomain_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>
                             </td>
                         </tr>
                     </tmpl_loop>
diff --git a/interface/web/mail/templates/mail_blacklist_list.htm b/interface/web/mail/templates/mail_blacklist_list.htm
index 6dd81c62c59318fc69c6843cab4bdc8501b2dd7c..cb410099a57aaf1cd17f76da57ac4e9278af5dcc 100644
--- a/interface/web/mail/templates/mail_blacklist_list.htm
+++ b/interface/web/mail/templates/mail_blacklist_list.htm
@@ -6,7 +6,7 @@
     <div class="pnl_toolsarea">
         <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
             <div class="buttons">
-                <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_blacklist_edit.php');">
+                <button class="button iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_blacklist_edit.php');">
                     <span>{tmpl_var name="add_new_record_txt"}</span>
                 </button>
             </div>
@@ -17,19 +17,21 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr>
+                    <tr class="caption">
                         <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
                         <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
                         <th class="tbl_col_source" scope="col"><tmpl_var name="source_txt"></th>
                         <th class="tbl_col_type" scope="col"><tmpl_var name="type_txt"></th>
                         <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
                     </tr>
-                    <tr>
+                    <tr class="filter">
                         <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
                         <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
                         <td class="tbl_col_source"><input type="text" name="search_source" value="{tmpl_var name='search_source'}" /></td>
                         <td class="tbl_col_type"><select name="search_type">{tmpl_var name='search_type'}</select></td>
-                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_blacklist_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                        <td class="tbl_col_buttons">
+                            <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_blacklist_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+                        </td>
                     </tr>
                 </thead>
                 <tbody>
@@ -40,9 +42,7 @@
                             <td class="tbl_col_source"><a href="#" onClick="loadContent('mail/mail_blacklist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="source"}</a></td>
                             <td class="tbl_col_type"><a href="#" onClick="loadContent('mail/mail_blacklist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="type"}</a></td>
                             <td class="tbl_col_buttons">
-                                <div class="buttons icons16">    
-                                    <a class="icons16 icoDelete" href="javascript: del_record('mail/mail_blacklist_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>
+                                <a class="button icons16 icoDelete" href="javascript: del_record('mail/mail_blacklist_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>
                             </td>
                         </tr>
                     </tmpl_loop>
diff --git a/interface/web/mail/templates/mail_content_filter_list.htm b/interface/web/mail/templates/mail_content_filter_list.htm
index fda80a6cc141ff969ce94dff2f380a31411b5906..c55d9990abe12a5ca97c1baa824de81f6021d3f1 100644
--- a/interface/web/mail/templates/mail_content_filter_list.htm
+++ b/interface/web/mail/templates/mail_content_filter_list.htm
@@ -6,7 +6,7 @@
     <div class="pnl_toolsarea">
         <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
             <div class="buttons">
-                <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_content_filter_edit.php');">
+                <button class="button iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_content_filter_edit.php');">
                     <span>{tmpl_var name="add_new_record_txt"}</span>
                 </button>
             </div>
@@ -17,19 +17,21 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr>
+                    <tr class="caption">
                         <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
                         <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
                         <th class="tbl_col_pattern" scope="col"><tmpl_var name="pattern_txt"></th>
                         <th class="tbl_col_action" scope="col"><tmpl_var name="action_txt"></th>
                         <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
                     </tr>
-                    <tr>
+                    <tr class="filter">
                         <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
                         <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
                         <td class="tbl_col_pattern"><input type="text" name="search_pattern" value="{tmpl_var name='search_pattern'}" /></td>
                         <td class="tbl_col_action"><select name="search_action">{tmpl_var name='search_action'}</select></td>
-                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_content_filter_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                        <td class="tbl_col_buttons">
+                            <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_content_filter_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+                        </td>
                     </tr>
                 </thead>
                 <tbody>
@@ -40,9 +42,7 @@
                             <td class="tbl_col_pattern"><a href="#" onClick="loadContent('mail/mail_content_filter_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="pattern"}</a></td>
                             <td class="tbl_col_action"><a href="#" onClick="loadContent('mail/mail_content_filter_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="action"}</a></td>
                             <td class="tbl_col_buttons">
-                                <div class="buttons icons16">    
-                                    <a class="icons16 icoDelete" href="javascript: del_record('mail/mail_content_filter_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>
+                                <a class="button icons16 icoDelete" href="javascript: del_record('mail/mail_content_filter_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>
                             </td>
                         </tr>
                     </tmpl_loop>
diff --git a/interface/web/mail/templates/mail_domain_admin_list.htm b/interface/web/mail/templates/mail_domain_admin_list.htm
index 4b26fb14c7cbb5a6b70bad3ba096213237f6782e..7fae59575e4dfdb405502596239267d6d9ee6ba3 100644
--- a/interface/web/mail/templates/mail_domain_admin_list.htm
+++ b/interface/web/mail/templates/mail_domain_admin_list.htm
@@ -5,7 +5,7 @@
     <div class="pnl_toolsarea">
         <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
             <div class="buttons">
-                <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_domain_edit.php');">
+                <button class="button iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_domain_edit.php');">
                     <span>{tmpl_var name="add_new_record_txt"}</span>
                 </button>
             </div>
@@ -16,19 +16,21 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr>
+                    <tr class="caption">
                         <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
                         <th class="tbl_col_sys_groupid" scope="col"><tmpl_var name="sys_groupid_txt"></th>
                         <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
                         <th class="tbl_col_domain" scope="col"><tmpl_var name="domain_txt"></th>
                         <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
                     </tr>
-                    <tr>
+                    <tr class="filter">
                         <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
                         <td class="tbl_col_sys_groupid"><select name="search_sys_groupid">{tmpl_var name='search_sys_groupid'}</select></td>
                         <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
                         <td class="tbl_col_domain"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td>
-                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_domain_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                        <td class="tbl_col_buttons">
+                            <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_domain_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+                        </td>
                     </tr>
                 </thead>
                 <tbody>
@@ -39,9 +41,7 @@
                             <td class="tbl_col_server_id"><a href="#" onClick="loadContent('mail/mail_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
                             <td class="tbl_col_domain"><a href="#" onClick="loadContent('mail/mail_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="domain"}</a></td>
                             <td class="tbl_col_buttons">
-                                <div class="buttons icons16">    
-                                    <a class="icons16 icoDelete" href="javascript: del_record('mail/mail_domain_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>
+                                <a class="button icons16 icoDelete" href="javascript: del_record('mail/mail_domain_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>
                             </td>
                         </tr>
                     </tmpl_loop>
diff --git a/interface/web/mail/templates/mail_domain_catchall_list.htm b/interface/web/mail/templates/mail_domain_catchall_list.htm
index d608425ddb16c27c8e7ab5ad280d21721cda7ccd..1800917bc30385399cbb4f87bcb5562b5aa1eeff 100644
--- a/interface/web/mail/templates/mail_domain_catchall_list.htm
+++ b/interface/web/mail/templates/mail_domain_catchall_list.htm
@@ -6,7 +6,7 @@
     <div class="pnl_toolsarea">
         <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
             <div class="buttons">
-                <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_domain_catchall_edit.php');">
+                <button class="button iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_domain_catchall_edit.php');">
                     <span>{tmpl_var name="add_new_record_txt"}</span>
                 </button>
             </div>
@@ -17,17 +17,19 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr>
+                    <tr class="caption">
                         <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
                         <th class="tbl_col_source" scope="col"><tmpl_var name="source_txt"></th>
                         <th class="tbl_col_destination" scope="col"><tmpl_var name="destination_txt"></th>
                         <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
                     </tr>
-                    <tr>
+                    <tr class="filter">
                         <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
                         <td class="tbl_col_source"><input type="text" name="search_source" value="{tmpl_var name='search_source'}" /></td>
                         <td class="tbl_col_destination"><input type="text" name="search_destination" value="{tmpl_var name='search_destination'}" /></td>
-                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_domain_catchall_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                        <td class="tbl_col_buttons">
+                            <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_domain_catchall_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+                        </td>
                     </tr>
                 </thead>
                 <tbody>
@@ -37,9 +39,7 @@
                             <td class="tbl_col_source"><a href="#" onClick="loadContent('mail/mail_domain_catchall_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="source"}</a></td>
                             <td class="tbl_col_destination"><a href="#" onClick="loadContent('mail/mail_domain_catchall_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="destination"}</a></td>
                             <td class="tbl_col_buttons">
-                                <div class="buttons icons16">    
-                                    <a class="icons16 icoDelete" href="javascript: del_record('mail/mail_domain_catchall_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>
+                                <a class="button icons16 icoDelete" href="javascript: del_record('mail/mail_domain_catchall_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>
                             </td>
                         </tr>
                     </tmpl_loop>
diff --git a/interface/web/mail/templates/mail_domain_list.htm b/interface/web/mail/templates/mail_domain_list.htm
index 958f7430043af1860451dd5a0ae80d83b1a86e54..0b888bd85179656ea7dd67b182a3de92bc1cf21c 100644
--- a/interface/web/mail/templates/mail_domain_list.htm
+++ b/interface/web/mail/templates/mail_domain_list.htm
@@ -6,7 +6,7 @@
     <div class="pnl_toolsarea">
         <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
             <div class="buttons">
-                <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_domain_edit.php');">
+                <button class="button iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_domain_edit.php');">
                     <span>{tmpl_var name="add_new_record_txt"}</span>
                 </button>
             </div>
@@ -17,17 +17,19 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr>
+                    <tr class="caption">
                         <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
                         <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
                         <th class="tbl_col_domain" scope="col"><tmpl_var name="domain_txt"></th>
                         <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
                     </tr>
-                    <tr>
+                    <tr class="filter">
                         <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
                         <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
                         <td class="tbl_col_domain"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td>
-                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_domain_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                        <td class="tbl_col_buttons">
+                            <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_domain_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+                        </td>
                     </tr>
                 </thead>
                 <tbody>
@@ -37,9 +39,7 @@
                             <td class="tbl_col_server_id"><a href="#" onClick="loadContent('mail/mail_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
                             <td class="tbl_col_domain"><a href="#" onClick="loadContent('mail/mail_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="domain"}</a></td>
                             <td class="tbl_col_buttons">
-                                <div class="buttons icons16">    
-                                    <a class="icons16 icoDelete" href="javascript: del_record('mail/mail_domain_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>
+                                <a class="button icons16 icoDelete" href="javascript: del_record('mail/mail_domain_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>
                             </td>
                         </tr>
                     </tmpl_loop>
diff --git a/interface/web/mail/templates/mail_forward_list.htm b/interface/web/mail/templates/mail_forward_list.htm
index 24a0538802aff71f7c5c09125c20f8c347a616d8..83d1be39790637cec76162270e534c8353024fbf 100644
--- a/interface/web/mail/templates/mail_forward_list.htm
+++ b/interface/web/mail/templates/mail_forward_list.htm
@@ -6,7 +6,7 @@
     <div class="pnl_toolsarea">
         <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
             <div class="buttons">
-                <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_forward_edit.php');">
+                <button class="button iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_forward_edit.php');">
                     <span>{tmpl_var name="add_new_record_txt"}</span>
                 </button>
             </div>
@@ -17,17 +17,19 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                <tr>
+                <tr class="caption">
                         <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
                         <th class="tbl_col_source" scope="col"><tmpl_var name="source_txt"></th>
                         <th class="tbl_col_destination" scope="col"><tmpl_var name="destination_txt"></th>
                         <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
                     </tr>
-                    <tr>
+                    <tr class="filter">
                         <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
                         <td class="tbl_col_source"><input type="text" name="search_source" value="{tmpl_var name='search_source'}" /></td>
                         <td class="tbl_col_destination"><input type="text" name="search_destination" value="{tmpl_var name='search_destination'}" /></td>
-                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_forward_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                        <td class="tbl_col_buttons">
+                            <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_forward_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+                        </td>
                     </tr>
                 </thead>
                 <tbody>
@@ -37,9 +39,7 @@
                             <td class="tbl_col_source"><a href="#" onClick="loadContent('mail/mail_forward_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="source"}</a></td>
                             <td class="tbl_col_destination"><a href="#" onClick="loadContent('mail/mail_forward_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="destination"}</a></td>
                             <td class="tbl_col_buttons">
-                                <div class="buttons icons16">    
-                                    <a class="icons16 icoDelete" href="javascript: del_record('mail/mail_forward_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>
+                                <a class="button icons16 icoDelete" href="javascript: del_record('mail/mail_forward_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>
                             </td>
                         </tr>
                     </tmpl_loop>
diff --git a/interface/web/mail/templates/mail_get_list.htm b/interface/web/mail/templates/mail_get_list.htm
index 2997bf77c52c9e6a941e659293a828b265663a3b..34b731849eb346ed08dca57eba8bd9ad107fe34a 100644
--- a/interface/web/mail/templates/mail_get_list.htm
+++ b/interface/web/mail/templates/mail_get_list.htm
@@ -6,7 +6,7 @@
     <div class="pnl_toolsarea">
         <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
             <div class="buttons">
-                <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_get_edit.php');">
+                <button class="button iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_get_edit.php');">
                     <span>{tmpl_var name="add_new_record_txt"}</span>
                 </button>
             </div>
@@ -17,7 +17,7 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr>
+                    <tr class="caption">
                         <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
                         <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
                         <th class="tbl_col_source_server" scope="col"><tmpl_var name="source_server_txt"></th>
@@ -25,13 +25,15 @@
                         <th class="tbl_col_destination" scope="col"><tmpl_var name="destination_txt"></th>
                         <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
                     </tr>
-                    <tr>
+                    <tr class="filter">
                         <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
                         <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
                         <td class="tbl_col_source_server"><input type="text" name="search_source_server" value="{tmpl_var name='search_source_server'}" /></td>
                         <td class="tbl_col_source_username"><input type="text" name="search_source_username" value="{tmpl_var name='search_source_username'}" /></td>
                         <td class="tbl_col_destination"><input type="text" name="search_destination" value="{tmpl_var name='search_destination'}" /></td>
-                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_get_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                        <td class="tbl_col_buttons">
+                            <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_get_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+                        </td>
                     </tr>
                 </thead>
                 <tbody>
@@ -43,9 +45,7 @@
                             <td class="tbl_col_source_username"><a href="#" onClick="loadContent('mail/mail_get_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="source_username"}</a></td>
                             <td class="tbl_col_destination"><a href="#" onClick="loadContent('mail/mail_get_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="destination"}</a></td>
                             <td class="tbl_col_buttons">
-                                <div class="buttons icons16">    
-                                    <a class="icons16 icoDelete" href="javascript: del_record('mail/mail_get_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>
+                                <a class="button icons16 icoDelete" href="javascript: del_record('mail/mail_get_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>
                             </td>
                         </tr>
                     </tmpl_loop>
diff --git a/interface/web/mail/templates/mail_mailinglist_list.htm b/interface/web/mail/templates/mail_mailinglist_list.htm
index cbb572f746c372d41314e39ae535625c69b70aae..0b9e6b9b68ffca8ad9b3d630f8e6f06d42145fe7 100644
--- a/interface/web/mail/templates/mail_mailinglist_list.htm
+++ b/interface/web/mail/templates/mail_mailinglist_list.htm
@@ -5,7 +5,7 @@
     <div class="pnl_toolsarea">
         <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
             <div class="buttons">
-                <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_mailinglist_edit.php');">
+                <button class="button iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_mailinglist_edit.php');">
                     <span>{tmpl_var name="add_new_record_txt"}</span>
                 </button>
             </div>
@@ -16,15 +16,17 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr>
+                    <tr class="caption">
                         <th class="tbl_col_listname" scope="col"><tmpl_var name="listname_txt"></th>
                         <th class="tbl_col_domain" scope="col"><tmpl_var name="domain_txt"></th>
                         <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
                     </tr>
-                    <tr>
+                    <tr class="filter">
                         <td class="tbl_col_listname"><input type="text" name="search_listname" value="{tmpl_var name='search_listname'}" /></td>
                         <td class="tbl_col_domain"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td>
-                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_mailinglist_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                        <td class="tbl_col_buttons">
+                            <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_mailinglist_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+                        </td>
                     </tr>
                 </thead>
                 <tbody>
@@ -33,10 +35,10 @@
                             <td class="tbl_col_listname"><a href="#" onClick="loadContent('mail/mail_mailinglist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="listname"}</a></td>
                             <td class="tbl_col_domain"><a href="#" onClick="loadContent('mail/mail_mailinglist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="domain"}</a></td>
                             <td class="tbl_col_buttons">
-                                <div class="buttons icons16">
-                                                    <tmpl_if name="mailmailinglist_link"><a class="icons16 icoWebmailer" href="mail/mailinglist.php?id={tmpl_var name='id'}" target="mailmailinglist"><span>{tmpl_var name='delete_txt'}</span></a></tmpl_if>
-                                    <a class="icons16 icoDelete" href="javascript: del_record('mail/mail_mailinglist_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>
+                                <tmpl_if name="mailmailinglist_link">
+                                    <a class="button icons16 icoWebmailer" href="mail/mailinglist.php?id={tmpl_var name='id'}" target="mailmailinglist"><span>{tmpl_var name='delete_txt'}</span></a>
+                                </tmpl_if>
+                                <a class="button icons16 icoDelete" href="javascript: del_record('mail/mail_mailinglist_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>
                             </td>
                         </tr>
                     </tmpl_loop>
diff --git a/interface/web/mail/templates/mail_relay_recipient_list.htm b/interface/web/mail/templates/mail_relay_recipient_list.htm
index 7aeb45f7dc4f39c8a22cc3ef116e322dc0a40948..c86e68f2b7810df982ea32f5cbc9cab14e0904da 100644
--- a/interface/web/mail/templates/mail_relay_recipient_list.htm
+++ b/interface/web/mail/templates/mail_relay_recipient_list.htm
@@ -5,7 +5,7 @@
     <div class="pnl_toolsarea">
         <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
         <div class="buttons">
-            <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_relay_recipient_edit.php');">
+            <button class="button iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_relay_recipient_edit.php');">
             <span>{tmpl_var name="add_new_record_txt"}</span>
             </button>
         </div>
@@ -16,17 +16,19 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr>
+                    <tr class="caption">
                         <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
                         <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
                         <th class="tbl_col_source" scope="col"><tmpl_var name="source_txt"></th>
                         <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
                     </tr>
-                    <tr>
+                    <tr class="filter">
                         <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
                         <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
                         <td class="tbl_col_source"><input type="text" name="search_source" value="{tmpl_var name='search_source'}" /></td>
-                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_relay_recipient_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                        <td class="tbl_col_buttons">
+                            <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_relay_recipient_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+                        </td>
                     </tr>
                 </thead>
                 <tbody>
@@ -36,9 +38,7 @@
                             <td class="tbl_col_server_id"><a href="#" onClick="loadContent('mail/mail_relay_recipient_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
                             <td class="tbl_col_source"><a href="#" onClick="loadContent('mail/mail_relay_recipient_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="source"}</a></td>
                             <td class="tbl_col_buttons">
-                                <div class="buttons icons16">    
-                                    <a class="icons16 icoDelete" href="javascript: del_record('mail/mail_relay_recipient_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>
+                                <a class="button icons16 icoDelete" href="javascript: del_record('mail/mail_relay_recipient_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>
                             </td>
                         </tr>
                     </tmpl_loop>
diff --git a/interface/web/mail/templates/mail_transport_list.htm b/interface/web/mail/templates/mail_transport_list.htm
index 3f56fb5d2358d4ce93af209876bd318dc753e6a7..70bd71745fa56556ec021430a05aaafd4bbdc029 100644
--- a/interface/web/mail/templates/mail_transport_list.htm
+++ b/interface/web/mail/templates/mail_transport_list.htm
@@ -6,7 +6,7 @@
     <div class="pnl_toolsarea">
         <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
             <div class="buttons">
-                <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_transport_edit.php');">
+                <button class="button iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_transport_edit.php');">
                     <span>{tmpl_var name="add_new_record_txt"}</span>
                 </button>
             </div>
@@ -17,7 +17,7 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr>
+                    <tr class="caption">
                         <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
                         <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
                         <th class="tbl_col_domain" scope="col"><tmpl_var name="domain_txt"></th>
@@ -25,13 +25,15 @@
                         <th class="tbl_col_sort_order" scope="col"><tmpl_var name="sort_order_txt"></th>
                         <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
                     </tr>
-                    <tr>
+                    <tr class="filter">
                         <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
                         <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
                         <td class="tbl_col_domain"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td>
                         <td class="tbl_col_transport"><input type="text" name="search_transport" value="{tmpl_var name='search_transport'}" /></td>
                         <td class="tbl_col_sort_order"><input type="text" name="search_sort_order" value="{tmpl_var name='search_sort_order'}" /></td>
-                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_transport_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                        <td class="tbl_col_buttons">
+                            <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_transport_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+                        </td>
                     </tr>
                 </thead>
                 <tbody>
@@ -43,9 +45,7 @@
                             <td class="tbl_col_transport"><a href="#" onClick="loadContent('mail/mail_transport_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="transport"}</a></td>
                             <td class="tbl_col_sort_order"><a href="#" onClick="loadContent('mail/mail_transport_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="sort_order"}</a></td>
                             <td class="tbl_col_buttons">
-                                <div class="buttons icons16">    
-                                    <a class="icons16 icoDelete" href="javascript: del_record('mail/mail_transport_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>
+                                <a class="button icons16 icoDelete" href="javascript: del_record('mail/mail_transport_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>
                             </td>
                         </tr>
                     </tmpl_loop>
diff --git a/interface/web/mail/templates/mail_user_filter_list.htm b/interface/web/mail/templates/mail_user_filter_list.htm
index f270944bbe4e779c74b385d78633073f0d9f6d22..018e82562c58a0afdb1a2c75866ebc1b0e072a2b 100644
--- a/interface/web/mail/templates/mail_user_filter_list.htm
+++ b/interface/web/mail/templates/mail_user_filter_list.htm
@@ -2,7 +2,7 @@
 <div class="pnl_toolsarea">
     <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
         <div class="buttons">
-            <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_user_filter_edit.php?mailuser_id={tmpl_var name='parent_id'}');">
+            <button class="button iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_user_filter_edit.php?mailuser_id={tmpl_var name='parent_id'}');">
                 <span>{tmpl_var name="add_new_record_txt"}</span>
             </button>
         </div>
@@ -13,13 +13,15 @@
     <fieldset><legend><tmpl_var name="list_head_txt"></legend>
         <table class="list">
             <thead>
-                <tr>
+                <tr class="caption">
                     <th class="tbl_col_rulename" scope="col"><tmpl_var name="rulename_txt"></th>
                     <th class="tbl_col_buttons" scope="col">{tmpl_var name='search_limit'}</th>
                 </tr>
-                <tr>
+                <tr class="filter">
                     <td class="tbl_col_rulename"><input type="text" name="search_rulename" value="{tmpl_var name='search_rulename'}" /></td>
-                    <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="changeTab('filter_records','mail/mail_user_edit.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    <td class="tbl_col_buttons">
+                        <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="changeTab('filter_records','mail/mail_user_edit.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+                    </td>
                 </tr>
             </thead>
             <tbody>
@@ -27,9 +29,7 @@
                     <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
                         <td class="tbl_col_rulename"><a href="#" onClick="loadContent('mail/mail_user_filter_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="rulename"}</a></td>
                         <td class="tbl_col_buttons">
-                            <div class="buttons icons16">    
-                                <a class="icons16 icoDelete" href="javascript: del_record('mail/mail_user_filter_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>
+                            <a class="button icons16 icoDelete" href="javascript: del_record('mail/mail_user_filter_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>
                         </td>
                     </tr>
                 </tmpl_loop>
diff --git a/interface/web/mail/templates/mail_user_list.htm b/interface/web/mail/templates/mail_user_list.htm
index 8e1dda458b49dcd6d9f446c806ddde31bca06e55..66ff0b0fb01a7eeeee927edcb951173561243b51 100644
--- a/interface/web/mail/templates/mail_user_list.htm
+++ b/interface/web/mail/templates/mail_user_list.htm
@@ -6,7 +6,7 @@
     <div class="pnl_toolsarea">
         <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
             <div class="buttons">
-                <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_user_edit.php');">
+                <button class="button iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_user_edit.php');">
                     <span>{tmpl_var name="add_new_record_txt"}</span>
                 </button>
             </div>
@@ -17,19 +17,21 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr>
+                    <tr class="caption">
                         <th class="tbl_col_email" scope="col"><tmpl_var name="email_txt"></th>
                 <tmpl_if name="enable_custom_login"><th class="tbl_col_login" scope="col"><tmpl_var name="login_txt"></th></tmpl_if>
                 <th class="tbl_col_name" scope="col"><tmpl_var name="name_txt"></th>
                         <th class="tbl_col_autoresponder" scope="col"><tmpl_var name="autoresponder_txt"></th>
                         <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
                     </tr>
-                    <tr>
+                    <tr class="filter">
                         <td class="tbl_col_email"><input type="text" name="search_email" value="{tmpl_var name='search_email'}" /></td>
                                     <td class="tbl_col_name"><input type="text" name="search_name" value="{tmpl_var name='search_name'}" /></td>
             <tmpl_if name="enable_custom_login"><td class="tbl_col_login"><input type="text" name="search_login" value="{tmpl_var name='search_login'}" /></td></tmpl_if>
                         <td class="tbl_col_autoresponder"><select name="search_autoresponder">{tmpl_var name='search_autoresponder'}</select></td>
-                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_user_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                        <td class="tbl_col_buttons">
+                            <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_user_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+                        </td>
                     </tr>
                 </thead>
                 <tbody>
@@ -44,12 +46,10 @@
                         <td class="tbl_col_name"><a href="#" onClick="loadContent('mail/mail_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="name"}</a></td>
                         <td class="tbl_col_autoresponder"><a href="#" onClick="loadContent('mail/mail_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="autoresponder"}</a></td>
                         <td class="tbl_col_buttons">
-                            <div class="buttons icons16">    
-                                <tmpl_if name="mailboxlist_webmail_link">
-                                    <a class="icons16 icoWebmailer" href="mail/webmailer.php?id={tmpl_var name='id'}" target="webmail"><span>{tmpl_var name='delete_txt'}</span></a>
-                                </tmpl_if>
-                                <a class="icons16 icoDelete" href="javascript: del_record('mail/mail_user_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>
+                            <tmpl_if name="mailboxlist_webmail_link">
+                                <a class="button icons16 icoWebmailer" href="mail/webmailer.php?id={tmpl_var name='id'}" target="webmail"><span>{tmpl_var name='delete_txt'}</span></a>
+                            </tmpl_if>
+                            <a class="button icons16 icoDelete" href="javascript: del_record('mail/mail_user_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>
                         </td>
                     </tr>
                 </tmpl_loop>
diff --git a/interface/web/mail/templates/mail_user_stats_list.htm b/interface/web/mail/templates/mail_user_stats_list.htm
index 2000f34b46e4e287228300ac159d930a9ffe9ff5..fac9fa9d1dd4610715f05b29059b38bca669d521 100644
--- a/interface/web/mail/templates/mail_user_stats_list.htm
+++ b/interface/web/mail/templates/mail_user_stats_list.htm
@@ -7,7 +7,7 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr>
+                    <tr class="caption">
                         <th class="tbl_col_email" scope="col"><tmpl_var name="email_txt"></th>
                         <th class="tbl_col_mail_traffic_this_month" scope="col"><tmpl_var name="this_month_txt"></th>
                         <th class="tbl_col_mail_traffic_last_month" scope="col"><tmpl_var name="last_month_txt"></th>
@@ -15,13 +15,15 @@
                         <th class="tbl_col_mail_traffic_last_year" scope="col"><tmpl_var name="last_year_txt"></th>
                         <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
                     </tr>
-                    <tr>
+                    <tr class="filter">
                         <td class="tbl_col_email"><input type="text" name="search_email" value="{tmpl_var name='search_email'}" /></td>
                         <td class="tbl_col_this_month"></td>
                         <td class="tbl_col_last_month"></td>
                         <td class="tbl_col_this_year"></td>
                         <td class="tbl_col_last_year"></td>
-                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_user_stats.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                        <td class="tbl_col_buttons">
+                            <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_user_stats.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+                        </td>
                     </tr>
                 </thead>
                 <tbody>
@@ -32,11 +34,7 @@
                             <td class="tbl_col_last_month"><a href="#" onClick="loadContent('mail/mail_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="last_month"} MB</a></td>
                             <td class="tbl_col_this_year"><a href="#" onClick="loadContent('mail/mail_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="this_year"} MB</a></td>
                             <td class="tbl_col_last_year"><a href="#" onClick="loadContent('mail/mail_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="last_year"} MB</a></td>
-                            <td class="tbl_col_buttons">
-                                <div class="buttons icons16">
-                                    &nbsp;
-                                </div>
-                            </td>
+                            <td class="tbl_col_buttons"></td>
                         </tr>
                     </tmpl_loop>
                 </tbody>
diff --git a/interface/web/mail/templates/mail_whitelist_list.htm b/interface/web/mail/templates/mail_whitelist_list.htm
index 219345fe08c84b4e5b7577851a9691d781a82300..043875a0f5ba586fe71ba39c526630038500db02 100644
--- a/interface/web/mail/templates/mail_whitelist_list.htm
+++ b/interface/web/mail/templates/mail_whitelist_list.htm
@@ -6,7 +6,7 @@
     <div class="pnl_toolsarea">
         <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
             <div class="buttons">
-                <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_whitelist_edit.php');">
+                <button class="button iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_whitelist_edit.php');">
                     <span>{tmpl_var name="add_new_record_txt"}</span>
                 </button>
             </div>
@@ -17,19 +17,21 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr>
+                    <tr class="caption">
                         <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
                         <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
                         <th class="tbl_col_source" scope="col"><tmpl_var name="source_txt"></th>
                         <th class="tbl_col_type" scope="col"><tmpl_var name="type_txt"></th>
                         <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
                     </tr>
-                    <tr>
+                    <tr class="filter">
                         <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
                         <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
                         <td class="tbl_col_source"><input type="text" name="search_source" value="{tmpl_var name='search_source'}" /></td>
                         <td class="tbl_col_type"><select name="search_type">{tmpl_var name='search_type'}</select></td>
-                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_whitelist_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                        <td class="tbl_col_buttons">
+                            <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_whitelist_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+                        </td>
                     </tr>
                 </thead>
                 <tbody>
@@ -40,9 +42,7 @@
                             <td class="tbl_col_source"><a href="#" onClick="loadContent('mail/mail_whitelist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="source"}</a></td>
                             <td class="tbl_col_type"><a href="#" onClick="loadContent('mail/mail_whitelist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="type"}</a></td>
                             <td class="tbl_col_buttons">
-                                <div class="buttons icons16">    
-                                    <a class="icons16 icoDelete" href="javascript: del_record('mail/mail_whitelist_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>
+                                <a class="button icons16 icoDelete" href="javascript: del_record('mail/mail_whitelist_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>
                             </td>
                         </tr>
                     </tmpl_loop>
diff --git a/interface/web/mail/templates/spamfilter_blacklist_list.htm b/interface/web/mail/templates/spamfilter_blacklist_list.htm
index 8a05d36a00adb4db0d2719db011ff2bc3af38083..181c68649866608197696db2630c629aa3798b44 100644
--- a/interface/web/mail/templates/spamfilter_blacklist_list.htm
+++ b/interface/web/mail/templates/spamfilter_blacklist_list.htm
@@ -6,7 +6,7 @@
     <div class="pnl_toolsarea">
         <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
             <div class="buttons">
-                <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/spamfilter_blacklist_edit.php');">
+                <button class="button iconstxt icoAdd" type="button" onClick="loadContent('mail/spamfilter_blacklist_edit.php');">
                     <span>{tmpl_var name="add_new_record_txt"}</span>
                 </button>
             </div>
@@ -17,7 +17,7 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr>
+                    <tr class="caption">
                         <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
                         <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
                         <th class="tbl_col_priority" scope="col"><tmpl_var name="priority_txt"></th>
@@ -25,13 +25,15 @@
                         <th class="tbl_col_email" scope="col"><tmpl_var name="email_txt"></th>
                         <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
                     </tr>
-                    <tr>
+                    <tr class="filter">
                         <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
                         <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
                         <td class="tbl_col_priority"><select name="search_priority">{tmpl_var name='search_priority'}</select></td>
                         <td class="tbl_col_rid"><select name="search_rid">{tmpl_var name='search_rid'}</select></td>
                         <td class="tbl_col_email"><input type="text" name="search_email" value="{tmpl_var name='search_email'}" /></td>
-                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/spamfilter_blacklist_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                        <td class="tbl_col_buttons">
+                            <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/spamfilter_blacklist_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+                        </td>
                     </tr>
                 </thead>
                 <tbody>
@@ -43,9 +45,7 @@
                             <td class="tbl_col_rid"><a href="#" onClick="loadContent('mail/spamfilter_blacklist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="rid"}</a></td>
                             <td class="tbl_col_email"><a href="#" onClick="loadContent('mail/spamfilter_blacklist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="email"}</a></td>
                             <td class="tbl_col_buttons">
-                                <div class="buttons icons16">    
-                                    <a class="icons16 icoDelete" href="javascript: del_record('mail/spamfilter_blacklist_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>
+                                <a class="button icons16 icoDelete" href="javascript: del_record('mail/spamfilter_blacklist_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>
                             </td>
                         </tr>
                     </tmpl_loop>
diff --git a/interface/web/mail/templates/spamfilter_config_list.htm b/interface/web/mail/templates/spamfilter_config_list.htm
index b84a77f9aa9f76828200e58ae1954c39bd5a344f..5f6a28f572e138fc972b92d4a240d471c8382631 100644
--- a/interface/web/mail/templates/spamfilter_config_list.htm
+++ b/interface/web/mail/templates/spamfilter_config_list.htm
@@ -6,7 +6,7 @@
     <div class="pnl_toolsarea">
         <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
             <div class="buttons">
-                <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/spamfilter_config_edit.php');">
+                <button class="button iconstxt icoAdd" type="button" onClick="loadContent('mail/spamfilter_config_edit.php');">
                     <span>{tmpl_var name="add_new_record_txt"}</span>
                 </button>
             </div>
@@ -17,13 +17,15 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr>
+                    <tr class="caption">
                         <th class="tbl_col_server_name" scope="col"><tmpl_var name="server_name_txt"></th>
                         <th class="tbl_col_buttons" scope="col">&nbsp;</th>
                     </tr>
-                    <tr>
+                    <tr class="filter">
                         <td class="tbl_col_server_name"><input type="text" name="search_server_name" value="{tmpl_var name='search_server_name'}" /></td>
-                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/spamfilter_config_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                        <td class="tbl_col_buttons">
+                            <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/spamfilter_config_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+                        </td>
                     </tr>
                 </thead>
                 <tbody>
@@ -31,9 +33,7 @@
                         <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
                             <td class="tbl_col_server_name"><a href="#" onClick="loadContent('mail/spamfilter_config_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_name"}</a></td>
                             <td class="tbl_col_buttons">
-                                <div class="buttons icons16">    
-                                    <a class="icons16 icoDelete" href="javascript: del_record('mail/spamfilter_config_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>
+                                <a class="button icons16 icoDelete" href="javascript: del_record('mail/spamfilter_config_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>
                             </td>
                         </tr>
                     </tmpl_loop>
diff --git a/interface/web/mail/templates/spamfilter_policy_list.htm b/interface/web/mail/templates/spamfilter_policy_list.htm
index 48d323f775458fc4ee4b8e761f1e00af8a04d76c..653c4bcaed874563fc3a6ea802b85b7b0da83e3c 100644
--- a/interface/web/mail/templates/spamfilter_policy_list.htm
+++ b/interface/web/mail/templates/spamfilter_policy_list.htm
@@ -6,7 +6,7 @@
     <div class="pnl_toolsarea">
         <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
             <div class="buttons">
-                <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/spamfilter_policy_edit.php');">
+                <button class="button iconstxt icoAdd" type="button" onClick="loadContent('mail/spamfilter_policy_edit.php');">
                     <span>{tmpl_var name="add_new_record_txt"}</span>
                 </button>
             </div>
@@ -17,7 +17,7 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr>
+                    <tr class="caption">
                         <th class="tbl_col_policy_name" scope="col"><tmpl_var name="policy_name_txt"></th>
                         <th class="tbl_col_virus_lover" scope="col"><tmpl_var name="virus_lover_txt"></th>
                         <th class="tbl_col_spam_lover" scope="col"><tmpl_var name="spam_lover_txt"></th>
@@ -25,13 +25,15 @@
                         <th class="tbl_col_bad_header_lover" scope="col"><tmpl_var name="bad_header_lover_txt"></th>
                         <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
                     </tr>
-                    <tr>
+                    <tr class="filter">
                         <td class="tbl_col_policy_name"><input type="text" name="search_policy_name" value="{tmpl_var name='search_policy_name'}" /></td>
                         <td class="tbl_col_virus_lover"><select name="search_virus_lover">{tmpl_var name='search_virus_lover'}</select></td>
                         <td class="tbl_col_spam_lover"><select name="search_spam_lover">{tmpl_var name='search_spam_lover'}</select></td>
                         <td class="tbl_col_banned_files_lover"><select name="search_banned_files_lover">{tmpl_var name='search_banned_files_lover'}</select></td>
                         <td class="tbl_col_bad_header_lover"><select name="search_bad_header_lover">{tmpl_var name='search_bad_header_lover'}</select></td>
-                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/spamfilter_policy_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                        <td class="tbl_col_buttons">
+                            <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/spamfilter_policy_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+                        </td>
                     </tr>
                 </thead>
                 <tbody>
@@ -43,9 +45,7 @@
                         <td class="tbl_col_banned_files_lover"><a href="#" onClick="loadContent('mail/spamfilter_policy_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="banned_files_lover"}</a></td>
                         <td class="tbl_col_bad_header_lover"><a href="#" onClick="loadContent('mail/spamfilter_policy_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="bad_header_lover"}</a></td>
                         <td class="tbl_col_buttons">
-                            <div class="buttons icons16">    
-                                <a class="icons16 icoDelete" href="javascript: del_record('mail/spamfilter_policy_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>
+                            <a class="button icons16 icoDelete" href="javascript: del_record('mail/spamfilter_policy_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>
                         </td>
                     </tr>
                 </tmpl_loop>
diff --git a/interface/web/mail/templates/spamfilter_users_list.htm b/interface/web/mail/templates/spamfilter_users_list.htm
index 280e7664f87d5b775e0bb0e69c78c53328b17fb6..39c4ef8686346be57c07ba3efca5473d777c2985 100644
--- a/interface/web/mail/templates/spamfilter_users_list.htm
+++ b/interface/web/mail/templates/spamfilter_users_list.htm
@@ -6,7 +6,7 @@
     <div class="pnl_toolsarea">
         <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
             <div class="buttons">
-                <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/spamfilter_users_edit.php');">
+                <button class="button iconstxt icoAdd" type="button" onClick="loadContent('mail/spamfilter_users_edit.php');">
                     <span>{tmpl_var name="add_new_record_txt"}</span>
                 </button>
             </div>
@@ -17,7 +17,7 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr>
+                    <tr class="caption">
                         <th class="tbl_col_local" scope="col"><tmpl_var name="local_txt"></th>
                         <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
                         <th class="tbl_col_priority" scope="col"><tmpl_var name="priority_txt"></th>
@@ -25,13 +25,15 @@
                         <th class="tbl_col_fullname" scope="col"><tmpl_var name="fullname_txt"></th>
                         <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
                     </tr>
-                    <tr>
+                    <tr class="filter">
                         <td class="tbl_col_local"><select name="search_local">{tmpl_var name='search_local'}</select></td>
                         <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
                         <td class="tbl_col_priority"><select name="search_priority">{tmpl_var name='search_priority'}</select></td>
                         <td class="tbl_col_policy_id"><select name="search_policy_id">{tmpl_var name='search_policy_id'}</select></td>
                         <td class="tbl_col_fullname"><input type="text" name="search_fullname" value="{tmpl_var name='search_fullname'}" /></td>
-                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/spamfilter_users_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                        <td class="tbl_col_buttons">
+                            <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/spamfilter_users_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+                        </td>
                     </tr>
                 </thead>
                 <tbody>
@@ -43,9 +45,7 @@
                         <td class="tbl_col_policy_id"><a href="#" onClick="loadContent('mail/spamfilter_users_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="policy_id"}</a></td>
                         <td class="tbl_col_fullname"><a href="#" onClick="loadContent('mail/spamfilter_users_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="fullname"}</a></td>
                         <td class="tbl_col_buttons">
-                            <div class="buttons icons16">    
-                                <a class="icons16 icoDelete" href="javascript: del_record('mail/spamfilter_users_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>
+                            <a class="button icons16 icoDelete" href="javascript: del_record('mail/spamfilter_users_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>
                         </td>
                     </tr>
                     </tmpl_loop>
diff --git a/interface/web/mail/templates/spamfilter_whitelist_list.htm b/interface/web/mail/templates/spamfilter_whitelist_list.htm
index 6c7ff3d834a530f69249443c13bc44153409783e..9cb4ba6bbbb83cab53fe962dea51d4bae7433723 100644
--- a/interface/web/mail/templates/spamfilter_whitelist_list.htm
+++ b/interface/web/mail/templates/spamfilter_whitelist_list.htm
@@ -6,7 +6,7 @@
     <div class="pnl_toolsarea">
         <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
             <div class="buttons">
-                <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/spamfilter_whitelist_edit.php');">
+                <button class="button iconstxt icoAdd" type="button" onClick="loadContent('mail/spamfilter_whitelist_edit.php');">
                     <span>{tmpl_var name="add_new_record_txt"}</span>
                 </button>
             </div>
@@ -17,7 +17,7 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr>
+                    <tr class="caption">
                         <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
                         <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
                         <th class="tbl_col_priority" scope="col"><tmpl_var name="priority_txt"></th>
@@ -25,13 +25,15 @@
                         <th class="tbl_col_email" scope="col"><tmpl_var name="email_txt"></th>
                         <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
                     </tr>
-                    <tr>
+                    <tr class="filter">
                         <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
                         <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
                         <td class="tbl_col_priority"><select name="search_priority">{tmpl_var name='search_priority'}</select></td>
                         <td class="tbl_col_rid"><select name="search_rid">{tmpl_var name='search_rid'}</select></td>
                         <td class="tbl_col_email"><input type="text" name="search_email" value="{tmpl_var name='search_email'}" /></td>
-                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/spamfilter_whitelist_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                        <td class="tbl_col_buttons">
+                            <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/spamfilter_whitelist_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+                        </td>
                     </tr>
                 </thead>
                 <tbody>
@@ -43,9 +45,7 @@
                             <td class="tbl_col_rid"><a href="#" onClick="loadContent('mail/spamfilter_whitelist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="rid"}</a></td>
                             <td class="tbl_col_email"><a href="#" onClick="loadContent('mail/spamfilter_whitelist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="email"}</a></td>
                             <td class="tbl_col_buttons">
-                                <div class="buttons icons16">    
-                                    <a class="icons16 icoDelete" href="javascript: del_record('mail/spamfilter_whitelist_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>
+                                <a class="button icons16 icoDelete" href="javascript: del_record('mail/spamfilter_whitelist_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>
                             </td>
                         </tr>
                     </tmpl_loop>
diff --git a/interface/web/mail/templates/user_quota_stats_list.htm b/interface/web/mail/templates/user_quota_stats_list.htm
index b4f3c1e2f67b30198bdc67bad92e1f63f74dbdc5..1f8a9ecc8507f528a3e2c899e94e03ecc87b8044 100644
--- a/interface/web/mail/templates/user_quota_stats_list.htm
+++ b/interface/web/mail/templates/user_quota_stats_list.htm
@@ -1,52 +1,46 @@
-<h2><tmpl_var name="list_head_txt"></h2>
-
-<div class="panel panel_list_user_quota_stats">
-
-    <div class="pnl_listarea">
-        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
-            <table class="list">
-                <thead>
-                    <tr>
-                        <th class="tbl_col_email" scope="col"><tmpl_var name="email_txt"></th>
-                        <th class="tbl_col_name" scope="col"><tmpl_var name="name_txt"></th>
-                        <th class="" scope="col" style="text-align:right;"><tmpl_var name="used_txt"></th>
-                        <th class="" scope="col" style="text-align:right;"><tmpl_var name="quota_txt"></th>
-                        <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
-                    </tr>
-                    <tr>
-                        <td class="tbl_col_domain"><input type="text" name="search_email" value="{tmpl_var name='search_email'}" /></td>
-                        <td class="tbl_col_system_user"><input type="text" name="search_system_user" value="{tmpl_var name='search_name'}" /></td>
-                        <td class="tbl_col_system_user">&nbsp;</td>
-                        <td class="tbl_col_system_user">&nbsp;</td>
-                        <td class="tbl_col_buttons">
-                            <div class="buttons">
-                                <button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/user_quota_stats.php');"><span>{tmpl_var name="filter_txt"}</span></button>
-                            </div>
-                        </td>
-                    </tr>
-                </thead>
-                <tbody>
-                    <tmpl_loop name="records">
-                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
-                            <td class="tbl_col_email"><a href="#" onClick="loadContent('mail/mail_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="email"}</a></td>
-                            <td class="tbl_col_name"><a href="#" onClick="loadContent('mail/mail_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="name"}</a></td>
-                            <td class="tbl_col_used" style="text-align:right;"><a href="#" onClick="loadContent('mail/mail_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="used"}</a></td>
-                            <td class="tbl_col_limit" style="text-align:right;"><a href="#" onClick="loadContent('mail/mail_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="quota"}</a></td>
-                            <td class="tbl_col_buttons">
-                                <div class="buttons icons16">    
-                                    &nbsp;
-                                </div>
-                            </td>
-                        </tr>
-                    </tmpl_loop>
-                </tbody>
-                <tfoot>
-                    <tr>
-                        <td class="tbl_footer tbl_paging" colspan="5"><tmpl_var name="paging"></td>
-                    </tr>
-                </tfoot>
-            </table>
-        </fieldset>
-    </div>
-
-</div>
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_list_user_quota_stats">
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr class="caption">
+                        <th class="tbl_col_email" scope="col"><tmpl_var name="email_txt"></th>
+                        <th class="tbl_col_name" scope="col"><tmpl_var name="name_txt"></th>
+                        <th class="tbl_col_used" scope="col"><tmpl_var name="used_txt"></th>
+                        <th class="tbl_col_quota" scope="col"><tmpl_var name="quota_txt"></th>
+                        <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+                    </tr>
+                    <tr class="filter">
+                        <td class="tbl_col_email"><input type="text" name="search_email" value="{tmpl_var name='search_email'}" /></td>
+                        <td class="tbl_col_name"><input type="text" name="search_system_user" value="{tmpl_var name='search_name'}" /></td>
+                        <td class="tbl_col_used">&nbsp;</td>
+                        <td class="tbl_col_quota">&nbsp;</td>
+                        <td class="tbl_col_buttons">
+                            <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/user_quota_stats.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+                        </td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tmpl_loop name="records">
+                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                            <td class="tbl_col_email"><a href="#" onClick="loadContent('mail/mail_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="email"}</a></td>
+                            <td class="tbl_col_name"><a href="#" onClick="loadContent('mail/mail_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="name"}</a></td>
+                            <td class="tbl_col_used"><a href="#" onClick="loadContent('mail/mail_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="used"}</a></td>
+                            <td class="tbl_col_quota"><a href="#" onClick="loadContent('mail/mail_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="quota"}</a></td>
+                            <td class="tbl_col_buttons"></td>
+                        </tr>
+                    </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="5"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
diff --git a/interface/web/mailuser/templates/mail_user_filter_list.htm b/interface/web/mailuser/templates/mail_user_filter_list.htm
index b8501e8ddee0d579964fcfbe93acb752db795a0e..a303d03484106644bc601268d1aabcf457762627 100644
--- a/interface/web/mailuser/templates/mail_user_filter_list.htm
+++ b/interface/web/mailuser/templates/mail_user_filter_list.htm
@@ -5,7 +5,7 @@
   <div class="pnl_toolsarea">
     <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
       <div class="buttons">
-        <button class="iconstxt icoAdd" type="button" onClick="loadContent('mailuser/mail_user_filter_edit.php');">
+        <button class="button iconstxt icoAdd" type="button" onClick="loadContent('mailuser/mail_user_filter_edit.php');">
           <span>{tmpl_var name="add_new_record_txt"}</span>
         </button>
       </div>
@@ -16,13 +16,15 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                <tr>
+                <tr class="caption">
                     <th class="tbl_col_rulename" scope="col"><tmpl_var name="rulename_txt"></th>
                     <th class="tbl_col_buttons" scope="col">&nbsp;</th>
                 </tr>
-                <tr>
+                <tr class="filter">
                     <td class="tbl_col_rulename"><input type="text" name="search_rulename" value="{tmpl_var name='search_rulename'}" /></td>
-                    <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_user_edit.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    <td class="tbl_col_buttons">
+                        <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_user_edit.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+                    </td>
                 </tr>
                 </thead>
                 <tbody>
@@ -30,9 +32,7 @@
                 <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
                     <td class="tbl_col_rulename"><a href="#" onClick="loadContent('mailuser/mail_user_filter_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="rulename"}</a></td>
                     <td class="tbl_col_buttons">
-                    <div class="buttons icons16">    
-                        <a class="icons16 icoDelete" href="javascript: del_record('mailuser/mail_user_filter_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>
+                        <a class="button icons16 icoDelete" href="javascript: del_record('mailuser/mail_user_filter_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>
                     </td>
                 </tr>
                 </tmpl_loop>
diff --git a/interface/web/monitor/templates/datalog_list.htm b/interface/web/monitor/templates/datalog_list.htm
index 158a5a84a1d7bc7f5415e495a09bf3d938dc364f..e237e5aa1ac63eccd1cf6f33639950e2d44ba902 100644
--- a/interface/web/monitor/templates/datalog_list.htm
+++ b/interface/web/monitor/templates/datalog_list.htm
@@ -7,19 +7,21 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr>
+                    <tr class="caption">
                         <th class="tbl_col_tstamp" scope="col"><tmpl_var name="tstamp_txt"></th>
                         <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
                         <th class="tbl_col_action" scope="col"><tmpl_var name="action_txt"></th>
                         <th class="tbl_col_dbtable" scope="col"><tmpl_var name="dbtable_txt"></th>
                         <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
                     </tr>
-                    <tr>
+                    <tr class="filter">
                         <td class="tbl_col_tstamp">&nbsp;</td>
                         <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
                         <td class="tbl_col_action"><select name="search_action">{tmpl_var name='search_action'}</select></td>
                         <td class="tbl_col_dbtable"><input type="text" name="search_dbtable" value="{tmpl_var name='search_dbtable'}" /></td>
-                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','monitor/datalog_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                        <td class="tbl_col_buttons">
+                            <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','monitor/datalog_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+                        </td>
                     </tr>
                 </thead>
                 <tbody>
@@ -29,10 +31,8 @@
                             <td class="tbl_col_server_id">{tmpl_var name="server_id"}</td>
                             <td class="tbl_col_action">{tmpl_var name="action"}</td>
                             <td class="tbl_col_dbtable">{tmpl_var name="dbtable"}</td>
-                            <td class="tbl_col_buttons">
-                                <div class="buttons icons16">    
-                                    <!--<a class="icons16 icoDelete" href="javascript: del_record('monitor/datalog_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 class="tbl_col_buttons">    
+                                <!--<a class="button icons16 icoDelete" href="javascript: del_record('monitor/datalog_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> -->
                             </td>
                         </tr>
                     </tmpl_loop>
diff --git a/interface/web/monitor/templates/syslog_list.htm b/interface/web/monitor/templates/syslog_list.htm
index e3d18cb318164caa6558f9f57b13d37b412658b5..9b796f246f7b430c1b279e045a8f0b0597a023d1 100644
--- a/interface/web/monitor/templates/syslog_list.htm
+++ b/interface/web/monitor/templates/syslog_list.htm
@@ -7,19 +7,21 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr>
+                    <tr class="caption">
                         <th class="tbl_col_tstamp" scope="col"><tmpl_var name="tstamp_txt"></th>
                         <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
                         <th class="tbl_col_loglevel" scope="col"><tmpl_var name="loglevel_txt"></th>
                         <th class="tbl_col_message" scope="col"><tmpl_var name="message_txt"></th>
                         <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
                     </tr>
-                    <tr>
+                    <tr class="filter">
                         <td class="tbl_col_tstamp">&nbsp;</td>
                         <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
                         <td class="tbl_col_loglevel"><select name="search_loglevel">{tmpl_var name='search_loglevel'}</select></td>
                         <td class="tbl_col_message"><input type="text" name="search_message" value="{tmpl_var name='search_message'}" /></td>
-                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','monitor/log_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                        <td class="tbl_col_buttons">
+                            <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','monitor/log_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+                        </td>
                     </tr>
                 </thead>
                 <tbody>
@@ -31,14 +33,10 @@
                             <td class="tbl_col_message">{tmpl_var name="message"}</td>
                             <td class="tbl_col_buttons">
                                 <tmpl_if name="loglevel" op="==" value="Error">
-                                    <div class="buttons icons16">
-                                        <a class="icons16 icoDelete" href="javascript: del_record('monitor/log_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>
+                                    <a class="button icons16 icoDelete" href="javascript: del_record('monitor/log_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>
                                 </tmpl_if>
                                 <tmpl_if name="loglevel" op="==" value="Warning">
-                                    <div class="buttons icons16">
-                                        <a class="icons16 icoDelete" href="javascript: del_record('monitor/log_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>
+                                    <a class="button icons16 icoDelete" href="javascript: del_record('monitor/log_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>
                                 </tmpl_if>
                             </td>
                         </tr>
diff --git a/interface/web/sites/templates/aps_instances_list.htm b/interface/web/sites/templates/aps_instances_list.htm
index 640c0bb96c8ab99e50f9efb0d225107e63cfebc9..3007d40c7f99bff19cdf78e29322589c793c1620 100644
--- a/interface/web/sites/templates/aps_instances_list.htm
+++ b/interface/web/sites/templates/aps_instances_list.htm
@@ -6,7 +6,7 @@
         <fieldset><legend>{tmpl_var name="list_head_txt"}</legend>
             <table class="list">
                 <thead>
-                    <tr>
+                    <tr class="caption">
                         <th class="tbl_col_name" scope="col">{tmpl_var name='name_txt'}</th>
                         <th class="tbl_col_version" scope="col">{tmpl_var name='version_txt'}</th>
                         <tmpl_if name='is_noclient'>
@@ -16,7 +16,7 @@
                         <th class="tbl_col_instancestatus" scope="col">{tmpl_var name='status_txt'}</th>
                         <th class="tbl_col_buttons" scope="col" >&nbsp;</th>
                     </tr>
-                    <tr>
+                    <tr class="filter">
                         <td class="tbl_col_name"><input type="text" name="search_name" value="{tmpl_var name='search_name'}" /></td>
                         <td class="tbl_col_version"><input type="text" name="search_version" value="{tmpl_var name='search_version'}" /></td>
                         <tmpl_if name='is_noclient'>
@@ -25,9 +25,7 @@
                         <td class="tbl_col_installlocation">&nbsp;</td>
                         <td class="tbl_col_instancestatus"><select name="search_instance_status" onChange="submitForm('pageForm','sites/aps_installedpackages_list.php');">{tmpl_var name='search_instance_status'}</select></td>
                         <td class="tbl_col_buttons">
-                        <button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name='filter_txt'}" onClick="submitForm('pageForm','sites/aps_installedpackages_list.php');">
-                            <span>{tmpl_var name='filter_txt'}</span>
-                        </button>
+                            <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name='filter_txt'}" onClick="submitForm('pageForm','sites/aps_installedpackages_list.php');"><span>{tmpl_var name='filter_txt'}</span></button>
                         </td>
                     </tr>
                 </thead>
@@ -42,10 +40,12 @@
                             <td class="tbl_col_installlocation"><a href="http://{tmpl_var name='install_location'}" target="_blank">{tmpl_var name='install_location_short'}</a></td>
                             <td class="tbl_col_instancestatus"><span id="status_content{tmpl_var name='__ROWNUM__'}">{tmpl_var name='instance_status'}</span></td>
                             <td class="tbl_col_buttons">
-                                <div class="buttons icons16" style="width:60px;">
-                                    <tmpl_if name='delete_possible'><a class="icons16 icoDelete" href="javascript:if(window.confirm('{tmpl_var name='pkg_delete_confirmation'}')){ loadContentInto('status_content{tmpl_var name='__ROWNUM__'}', 'sites/aps_do_operation.php?action=delete_instance&id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}'); }"><span>{tmpl_var name='delete_txt'}</span></a></tmpl_if>
-                                    <tmpl_if name='reinstall_possible'><a class="icons16 icoEdit" href="javascript:if(window.confirm('{tmpl_var name='pkg_reinstall_confirmation'}')){ loadContentInto('status_content{tmpl_var name='__ROWNUM__'}', 'sites/aps_do_operation.php?action=reinstall_instance&id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}'); }"><span>{tmpl_var name='reinstall_txt'}</span></a></tmpl_if>
-                                </div>
+                                <tmpl_if name='delete_possible'>
+                                    <a class="button icons16 icoDelete" href="javascript:if(window.confirm('{tmpl_var name='pkg_delete_confirmation'}')){ loadContentInto('status_content{tmpl_var name='__ROWNUM__'}', 'sites/aps_do_operation.php?action=delete_instance&id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}'); }"><span>{tmpl_var name='delete_txt'}</span></a>
+                                </tmpl_if>
+                                <tmpl_if name='reinstall_possible'>
+                                    <a class="button icons16 icoEdit" href="javascript:if(window.confirm('{tmpl_var name='pkg_reinstall_confirmation'}')){ loadContentInto('status_content{tmpl_var name='__ROWNUM__'}', 'sites/aps_do_operation.php?action=reinstall_instance&id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}'); }"><span>{tmpl_var name='reinstall_txt'}</span></a>
+                                </tmpl_if>
                             </td>        
                         </tr>
                     </tmpl_loop>
diff --git a/interface/web/sites/templates/aps_packagedetails_show.htm b/interface/web/sites/templates/aps_packagedetails_show.htm
index 351d3ac0460a708d0fdcc02d175149bd8ef3a4b5..403522a9ef568dd1cecb074cea09676d151a28eb 100644
--- a/interface/web/sites/templates/aps_packagedetails_show.htm
+++ b/interface/web/sites/templates/aps_packagedetails_show.htm
@@ -8,11 +8,9 @@
 <p>&nbsp;</p>
 
 <div class="pnl_toolsarea">
-    <div class="buttons">
-        <button class="iconstxt icoAdd" type="button" onClick="loadContent('sites/aps_install_package.php?id={tmpl_var name='pkg_id'}');">
+        <button class="button iconstxt icoAdd" type="button" onClick="loadContent('sites/aps_install_package.php?id={tmpl_var name='pkg_id'}');">
             <span>{tmpl_var name='install_package_txt'}</span>
         </button>
-    </div>
     <p>&nbsp;</p><p>&nbsp;</p>
 </div>
 
diff --git a/interface/web/sites/templates/aps_packages_list.htm b/interface/web/sites/templates/aps_packages_list.htm
index e7db3e84a4e7b5313658dac83414c8a443f005f1..454822d7d1cab9c68c4879dd30fd50c854a08802 100644
--- a/interface/web/sites/templates/aps_packages_list.htm
+++ b/interface/web/sites/templates/aps_packages_list.htm
@@ -6,7 +6,7 @@
         <fieldset><legend>{tmpl_var name="list_head_txt"} ({tmpl_var name='package_count'})</legend>
             <table class="list">
                 <thead>
-                    <tr>
+                    <tr class="caption">
                         <th class="tbl_col_name" scope="col">{tmpl_var name='name_txt'}</th>
                         <th class="tbl_col_version" scope="col">{tmpl_var name='version_txt'}</th>
                         <th class="tbl_col_category" scope="col">{tmpl_var name='category_txt'}</th>
@@ -15,14 +15,14 @@
                             </tmpl_if>
                         <th class="tbl_col_buttons" scope="col" width="60px;">&nbsp;</th>
                     </tr>
-                    <tr>
+                    <tr class="filter">
                         <td class="tbl_col_name"><input type="text" name="search_name" value="{tmpl_var name='search_name'}" /></td>
                         <td class="tbl_col_version"><input type="text" name="search_version" value="{tmpl_var name='search_version'}" /></td>
                         <td class="tbl_col_customerid"><select name="search_category" onChange="submitForm('pageForm','sites/aps_availablepackages_list.php');">{tmpl_var name='search_category'}</select></td>
                             <tmpl_if name='is_admin'>
                                 <td class="tbl_col_status"><select name="search_package_status" onChange="submitForm('pageForm','sites/aps_availablepackages_list.php');">{tmpl_var name='search_package_status'}</select></td>
                             </tmpl_if>
-                        <td class="tbl_col_buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name='filter_txt'}" onClick="submitForm('pageForm','sites/aps_availablepackages_list.php');"><span>{tmpl_var name='filter_txt'}</span></button></td>
+                        <td class="tbl_col_buttons"><button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name='filter_txt'}" onClick="submitForm('pageForm','sites/aps_availablepackages_list.php');"><span>{tmpl_var name='filter_txt'}</span></button></td>
                     </tr>
                 </thead>
                 <tbody>
diff --git a/interface/web/sites/templates/cron_list.htm b/interface/web/sites/templates/cron_list.htm
index f822b89ebeb14497d458d2972474e80060125df2..868469c5cf812adcb584844d23d99c2daa04d486 100644
--- a/interface/web/sites/templates/cron_list.htm
+++ b/interface/web/sites/templates/cron_list.htm
@@ -6,7 +6,7 @@
     <div class="pnl_toolsarea">
         <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
             <div class="buttons">
-                <button class="iconstxt icoAdd" type="button" onClick="loadContent('sites/cron_edit.php');">
+                <button class="button iconstxt icoAdd" type="button" onClick="loadContent('sites/cron_edit.php');">
                     <span>{tmpl_var name="add_new_cron_txt"}</span>
                 </button>
             </div>
@@ -17,7 +17,7 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr>
+                    <tr class="caption">
                         <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
                         <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
                         <th class="tbl_col_parent_domain_id" scope="col"><tmpl_var name="parent_domain_id_txt"></th>
@@ -29,7 +29,7 @@
                         <th class="tbl_col_command" scope="col"><tmpl_var name="command_txt"></th>
                         <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
                     </tr>
-                    <tr>
+                    <tr class="filter">
                         <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
                         <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
                         <td class="tbl_col_parent_domain_id"><select name="search_parent_domain_id">{tmpl_var name='search_parent_domain_id'}</select></td>
@@ -39,7 +39,9 @@
                         <td class="tbl_col_run_month"><input type="text" name="search_run_month" size="1" value="{tmpl_var name='search_run_month'}" /></td>
                         <td class="tbl_col_run_wday"><input type="text" name="search_run_wday" size="1" value="{tmpl_var name='search_run_wday'}" /></td>
                         <td class="tbl_col_command"><input type="text" name="search_command" value="{tmpl_var name='search_command'}" /></td>
-                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','sites/cron_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                        <td class="tbl_col_buttons">
+                            <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','sites/cron_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+                        </td>
                     </tr>
                 </thead>
                 <tbody>
@@ -56,7 +58,7 @@
                             <td class="tbl_col_commnd"><a href="#" onClick="loadContent('sites/cron_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="command"}</a></td>
                             <td class="tbl_col_buttons">
                                 <div class="buttons icons16">    
-                                    <a class="icons16 icoDelete" href="javascript: del_record('sites/cron_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>
+                                    <a class="button icons16 icoDelete" href="javascript: del_record('sites/cron_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>
                         </tr>
diff --git a/interface/web/sites/templates/database_admin_list.htm b/interface/web/sites/templates/database_admin_list.htm
index fda3ba70c8a1a047cb6c68e5168f3f104ded4cd4..b62b3491cde1c4406965e5239e1bfbb5545b27a2 100644
--- a/interface/web/sites/templates/database_admin_list.htm
+++ b/interface/web/sites/templates/database_admin_list.htm
@@ -5,7 +5,7 @@
     <div class="pnl_toolsarea">
         <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
             <div class="buttons">
-                <button class="iconstxt icoAdd" type="button" onClick="loadContent('sites/database_edit.php');">
+                <button class="button iconstxt icoAdd" type="button" onClick="loadContent('sites/database_edit.php');">
                     <span>{tmpl_var name="add_new_record_txt"}</span>
                 </button>
             </div>
@@ -16,7 +16,7 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr>
+                    <tr class="caption">
                         <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
                         <th class="tbl_col_remote_access" scope="col"><tmpl_var name="remote_access_txt"></th>
                         <th class="tbl_col_sys_groupid" scope="col"><tmpl_var name="sys_groupid_txt"></th>
@@ -25,14 +25,16 @@
                         <th class="tbl_col_database_name" scope="col"><tmpl_var name="database_name_txt"></th>
                         <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
                     </tr>
-                    <tr>
+                    <tr class="filter">
                         <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
                         <td class="tbl_col_remote_access"><select name="search_remote_access">{tmpl_var name='search_remote_access'}</select></td>
                         <td class="tbl_col_sys_groupid"><select name="search_sys_groupid">{tmpl_var name='search_sys_groupid'}</select></td>
                         <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
                         <td class="tbl_col_database_user"><select name="search_database_user_id">{tmpl_var name='search_database_user_id'}</select></td>
                         <td class="tbl_col_database_name"><input type="text" name="search_database_name" value="{tmpl_var name='search_database_name'}" /></td>
-                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','sites/database_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                        <td class="tbl_col_buttons">
+                            <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','sites/database_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+                        </td>
                     </tr>
                 </thead>
                 <tbody>
@@ -42,16 +44,14 @@
                             <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_sys_groupid"><a href="#" onClick="loadContent('sites/database_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="sys_groupid"}</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_database_user"><a href="#" onClick="loadContent('sites/database_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="database_user_id"}</a></td>
+                            <td class="tbl_col_database_user"><a href="#" onClick="loadContent('sites/database_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="database_user"}</a></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">
-                                    <tmpl_if name="dblist_phpmyadmin_link">
-                                        <a class="icons16 icoDbAdmin" href="sites/database_phpmyadmin.php?id={tmpl_var name='id'}" target="phpmyadmin"><span>{tmpl_var name='admin_txt'}</span></a>
-                                    </tmpl_if>
-                                    <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>
+                                <tmpl_if name="dblist_phpmyadmin_link">
+                                    <a class="button icons16 icoDbAdmin" href="sites/database_phpmyadmin.php?id={tmpl_var name='id'}" target="phpmyadmin"><span>{tmpl_var name='admin_txt'}</span></a>
+                                </tmpl_if>
+                                <a class="button icons16 icoEdit" href="javascript: loadContent('sites/database_edit.php?id={tmpl_var name='id'}');"><span>{tmpl_var name='edit_txt'}</span></a>
+                                <a class="button 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>
                             </td>
                         </tr>
                     </tmpl_loop>
diff --git a/interface/web/sites/templates/database_list.htm b/interface/web/sites/templates/database_list.htm
index 7b49e87044fc2f2618026bddd7c776aca947c844..ea2162f1525163f465fd7ca58d193e05e3b55553 100644
--- a/interface/web/sites/templates/database_list.htm
+++ b/interface/web/sites/templates/database_list.htm
@@ -6,7 +6,7 @@
     <div class="pnl_toolsarea">
         <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
             <div class="buttons">
-                <button class="iconstxt icoAdd" type="button" onClick="loadContent('sites/database_edit.php');">
+                <button class="button iconstxt icoAdd" type="button" onClick="loadContent('sites/database_edit.php');">
                     <span>{tmpl_var name="add_new_record_txt"}</span>
                 </button>
             </div>
@@ -17,7 +17,7 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr>
+                    <tr class="caption">
                         <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
                         <th class="tbl_col_remote_access" scope="col"><tmpl_var name="remote_access_txt"></th>
                         <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
@@ -25,13 +25,15 @@
                         <th class="tbl_col_database_name" scope="col"><tmpl_var name="database_name_txt"></th>
                         <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
                     </tr>
-                    <tr>
+                    <tr class="filter">
                         <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
                         <td class="tbl_col_remote_access"><select name="search_remote_access">{tmpl_var name='search_remote_access'}</select></td>
                         <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
                         <td class="tbl_col_database_user"><select name="search_database_user_id">{tmpl_var name='search_database_user_id'}</select></td>
                         <td class="tbl_col_database_name"><input type="text" name="search_database_name" value="{tmpl_var name='search_database_name'}"/></td>
-                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','sites/database_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                        <td class="tbl_col_buttons">
+                            <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','sites/database_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+                        </td>
                     </tr>
                 </thead>
                 <tbody>
@@ -40,16 +42,14 @@
                             <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_database_user"><a href="#" onClick="loadContent('sites/database_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="database_user_id"}</a></td>
+                            <td class="tbl_col_database_user"><a href="#" onClick="loadContent('sites/database_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="database_user"}</a></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">    
-                                    <tmpl_if name="dblist_phpmyadmin_link">
-                                        <a class="icons16 icoDbAdmin" href="sites/database_phpmyadmin.php?id={tmpl_var name='id'}" target="phpmyadmin"><span>{tmpl_var name='admin_txt'}</span></a>
-                                    </tmpl_if>
-                                    <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>
+                                <tmpl_if name="dblist_phpmyadmin_link">
+                                    <a class="button icons16 icoDbAdmin" href="sites/database_phpmyadmin.php?id={tmpl_var name='id'}" target="phpmyadmin"><span>{tmpl_var name='admin_txt'}</span></a>
+                                </tmpl_if>
+                                <a class="button icons16 icoEdit" href="javascript: loadContent('sites/database_edit.php?id={tmpl_var name='id'}');"><span>{tmpl_var name='edit_txt'}</span></a>
+                                <a class="button 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>
                             </td>
                         </tr>
                     </tmpl_loop>
diff --git a/interface/web/sites/templates/ftp_user_list.htm b/interface/web/sites/templates/ftp_user_list.htm
index d455e0d4cdd0d266d52cf56e802c3e8447ab72c6..8c07458ff2bdd3666f1bd583fc84603a741889ad 100644
--- a/interface/web/sites/templates/ftp_user_list.htm
+++ b/interface/web/sites/templates/ftp_user_list.htm
@@ -6,7 +6,7 @@
     <div class="pnl_toolsarea">
         <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
             <div class="buttons">
-                <button class="iconstxt icoAdd" type="button" onClick="loadContent('sites/ftp_user_edit.php');">
+                <button class="button iconstxt icoAdd" type="button" onClick="loadContent('sites/ftp_user_edit.php');">
                     <span>{tmpl_var name="add_new_record_txt"}</span>
                 </button>
             </div>
@@ -17,19 +17,21 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr>
+                    <tr class="caption">
                         <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
                         <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
                         <th class="tbl_col_parent_domain_id" scope="col"><tmpl_var name="parent_domain_id_txt"></th>
                         <th class="tbl_col_username" scope="col"><tmpl_var name="username_txt"></th>
                         <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
                     </tr>
-                    <tr>
+                    <tr class="filter">
                         <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
                         <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
                         <td class="tbl_col_parent_domain_id"><select name="search_parent_domain_id">{tmpl_var name='search_parent_domain_id'}</select></td>
                         <td class="tbl_col_username"><input type="text" name="search_username" value="{tmpl_var name='search_username'}" /></td>
-                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','sites/ftp_user_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                        <td class="tbl_col_buttons">
+                            <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','sites/ftp_user_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+                        </td>
                     </tr>
                 </thead>
                 <tbody>
@@ -40,12 +42,10 @@
                             <td class="tbl_col_parent_domain_id"><a href="#" onClick="loadContent('sites/ftp_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="parent_domain_id"}</a></td>
                             <td class="tbl_col_username"><a href="#" onClick="loadContent('sites/ftp_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="username"}</a></td>
                             <td class="tbl_col_buttons">
-                                <div class="buttons icons16">    
-                                    <tmpl_if name="webftp_link">
-                                        <a class="icons16 icoDbAdmin" href="{tmpl_var name='webftp_url'}" target="_blank"><span>{tmpl_var name='admin_txt'}</span></a>
-                                    </tmpl_if>
-                                    <a class="icons16 icoDelete" href="javascript: del_record('sites/ftp_user_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>
+                            <tmpl_if name="webftp_link">
+                                <a class="button icons16 icoDbAdmin" href="{tmpl_var name='webftp_url'}" target="_blank"><span>{tmpl_var name='admin_txt'}</span></a>
+                            </tmpl_if>
+                            <a class="button icons16 icoDelete" href="javascript: del_record('sites/ftp_user_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>
                             </td>
                         </tr>
                     </tmpl_loop>
diff --git a/interface/web/sites/templates/shell_user_list.htm b/interface/web/sites/templates/shell_user_list.htm
index 9087c6669afccbc04fc53419ab1e5ea9f1b26025..d98c959754033a0c8dbb61c31e4e0a94ffe58d76 100644
--- a/interface/web/sites/templates/shell_user_list.htm
+++ b/interface/web/sites/templates/shell_user_list.htm
@@ -6,7 +6,7 @@
     <div class="pnl_toolsarea">
         <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
             <div class="buttons">
-                <button class="iconstxt icoAdd" type="button" onClick="loadContent('sites/shell_user_edit.php');">
+                <button class="button iconstxt icoAdd" type="button" onClick="loadContent('sites/shell_user_edit.php');">
                     <span>{tmpl_var name="add_new_record_txt"}</span>
                 </button>
             </div>
@@ -17,19 +17,21 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr>
+                    <tr class="caption">
                         <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
                         <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
                         <th class="tbl_col_parent_domain_id" scope="col"><tmpl_var name="parent_domain_id_txt"></th>
                         <th class="tbl_col_username" scope="col"><tmpl_var name="username_txt"></th>
                         <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
                     </tr>
-                    <tr>
+                    <tr class="filter">
                         <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
                         <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
                         <td class="tbl_col_parent_domain_id"><select name="search_parent_domain_id">{tmpl_var name='search_parent_domain_id'}</select></td>
                         <td class="tbl_col_username"><input type="text" name="search_username" value="{tmpl_var name='search_username'}" /></td>
-                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','sites/shell_user_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                        <td class="tbl_col_buttons">
+                            <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','sites/shell_user_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+                        </td>
                     </tr>
                 </thead>
                 <tbody>
@@ -40,9 +42,7 @@
                             <td class="tbl_col_parent_domain_id"><a href="#" onClick="loadContent('sites/shell_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="parent_domain_id"}</a></td>
                             <td class="tbl_col_username"><a href="#" onClick="loadContent('sites/shell_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="username"}</a></td>
                             <td class="tbl_col_buttons">
-                                <div class="buttons icons16">    
-                                    <a class="icons16 icoDelete" href="javascript: del_record('sites/shell_user_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>
+                                <a class="button icons16 icoDelete" href="javascript: del_record('sites/shell_user_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>
                             </td>
                         </tr>
                     </tmpl_loop>
diff --git a/interface/web/sites/templates/user_quota_stats_list.htm b/interface/web/sites/templates/user_quota_stats_list.htm
index adb1e356143b61522a97cd11b7c96ef515ecb419..43b6a00b7868b3c2edcc8d0a34bcc2c872b27872 100644
--- a/interface/web/sites/templates/user_quota_stats_list.htm
+++ b/interface/web/sites/templates/user_quota_stats_list.htm
@@ -6,23 +6,25 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                <tr>
+                <tr class="caption">
                     <th class="tbl_col_domain" scope="col"><tmpl_var name="domain_txt"></th>
                     <th class="tbl_col_system_user" scope="col"><tmpl_var name="system_user_txt"></th>
-                    <th class="" scope="col" style="text-align:right;"><tmpl_var name="used_txt"></th>
-                    <th class="" scope="col" style="text-align:right;"><tmpl_var name="soft_txt"></th>
-                    <th class="" scope="col" style="text-align:right;"><tmpl_var name="hard_txt"></th>
-                    <th class="" scope="col" style="text-align:right;"><tmpl_var name="files_txt"></th>
+                    <th class="tbl_col_used" scope="col"><tmpl_var name="used_txt"></th>
+                    <th class="tbl_col_soft" scope="col"><tmpl_var name="soft_txt"></th>
+                    <th class="tbl_col_hard" scope="col"><tmpl_var name="hard_txt"></th>
+                    <th class="tbl_col_files" scope="col"><tmpl_var name="files_txt"></th>
                     <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
                 </tr>
-                <tr>
+                <tr class="filter">
                     <td class="tbl_col_domain"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td>
                     <td class="tbl_col_system_user"><input type="text" name="search_system_user" value="{tmpl_var name='search_system_user'}" /></td>
-                    <td class="tbl_col_system_user">&nbsp;</td>
-                    <td class="tbl_col_system_user">&nbsp;</td>
-                    <td class="tbl_col_system_user">&nbsp;</td>
-                    <td class="tbl_col_system_user">&nbsp;</td>
-                    <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','sites/user_quota_stats.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    <td class="tbl_col_used">&nbsp;</td>
+                    <td class="tbl_col_soft">&nbsp;</td>
+                    <td class="tbl_col_hard">&nbsp;</td>
+                    <td class="tbl_col_files">&nbsp;</td>
+                    <td class="tbl_col_buttons">
+                        <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','sites/user_quota_stats.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+                    </td>
                 </tr>
                 </thead>
                 <tbody>
@@ -30,15 +32,11 @@
                         <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
                             <td class="tbl_col_domain"><a href="#" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="domain"}</a></td>
                             <td class="tbl_col_system_user"><a href="#" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="system_user"}</a></td>
-                            <td class="tbl_col_used" style="text-align:right;"><a href="#" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="used"}</a></td>
-                            <td class="tbl_col_soft" style="text-align:right;"><a href="#" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="soft"}</a></td>
-                            <td class="tbl_col_hard" style="text-align:right;"><a href="#" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="hard"}</a></td>
-                            <td class="tbl_col_files" style="text-align:right;"><a href="#" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="files"}</a></td>
-                            <td class="tbl_col_buttons">
-                                <div class="buttons icons16">    
-                                    &nbsp;
-                                </div>
-                            </td>
+                            <td class="tbl_col_used"><a href="#" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="used"}</a></td>
+                            <td class="tbl_col_soft"><a href="#" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="soft"}</a></td>
+                            <td class="tbl_col_hard"><a href="#" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="hard"}</a></td>
+                            <td class="tbl_col_files"><a href="#" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="files"}</a></td>
+                            <td class="tbl_col_buttons"></td>
                         </tr>
                     </tmpl_loop>
                 </tbody>
diff --git a/interface/web/sites/templates/web_aliasdomain_list.htm b/interface/web/sites/templates/web_aliasdomain_list.htm
index faab74e1919b48a1798761f81bb6419b62ba3b63..126a972d95a7a8afb5ccee33c8e512195df5dbac 100644
--- a/interface/web/sites/templates/web_aliasdomain_list.htm
+++ b/interface/web/sites/templates/web_aliasdomain_list.htm
@@ -6,7 +6,7 @@
     <div class="pnl_listsarea">
         <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
             <div class="buttons">
-                <button class="iconstxt icoAdd" type="button" onClick="loadContent('sites/web_aliasdomain_edit.php');">
+                <button class="button iconstxt icoAdd" type="button" onClick="loadContent('sites/web_aliasdomain_edit.php');">
                     <span>{tmpl_var name="add_new_record_txt"}</span>
                 </button>
             </div>
@@ -17,19 +17,21 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr>
+                    <tr class="caption">
                         <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
                         <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
                         <th class="tbl_col_parent_domain_id" scope="col"><tmpl_var name="parent_domain_id_txt"></th>
                         <th class="tbl_col_domain" scope="col"><tmpl_var name="domain_txt"></th>
                         <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
                     </tr>
-                    <tr>
+                    <tr class="filter">
                         <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
                         <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
                         <td class="tbl_col_parent_domain_id"><select name="search_parent_domain_id">{tmpl_var name='search_parent_domain_id'}</select></td>
                         <td class="tbl_col_domain"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td>
-                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','sites/web_aliasdomain_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                        <td class="tbl_col_buttons">
+                            <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','sites/web_aliasdomain_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+                        </td>
                     </tr>
                 </thead>
                 <tbody>
@@ -40,9 +42,7 @@
                             <td class="tbl_col_parent_domain_id"><a href="#" onClick="loadContent('sites/web_aliasdomain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="parent_domain_id"}</a></td>
                             <td class="tbl_col_domain"><a href="#" onClick="loadContent('sites/web_aliasdomain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="domain"}</a></td>
                             <td class="tbl_col_buttons">
-                                <div class="buttons icons16">    
-                                    <a class="icons16 icoDelete" href="javascript: del_record('sites/web_aliasdomain_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>
+                                <a class="button icons16 icoDelete" href="javascript: del_record('sites/web_aliasdomain_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>
                             </td>
                         </tr>
                     </tmpl_loop>
diff --git a/interface/web/sites/templates/web_backup_list.htm b/interface/web/sites/templates/web_backup_list.htm
index 85639770961b52ab02e7a4f3f2fc8c696f4e6b34..0347072e5952f1e37dff65094660165ff1e01524 100644
--- a/interface/web/sites/templates/web_backup_list.htm
+++ b/interface/web/sites/templates/web_backup_list.htm
@@ -12,7 +12,7 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr>
+                    <tr class="caption">
                         <th class="tbl_col_date" scope="col"><tmpl_var name="date_txt"></th>
                         <th class="tbl_col_date" scope="col"><tmpl_var name="backup_type_txt"></th>
                         <th class="tbl_col_filename" scope="col"><tmpl_var name="filename_txt"></th>
@@ -25,10 +25,10 @@
                             <td class="tbl_col_date">{tmpl_var name="date"}</td>
                             <td class="tbl_col_date">{tmpl_var name="backup_type"}</td>
                             <td class="tbl_col_filename">{tmpl_var name="filename"}</td>
-                            <td class="tbl_col_buttons" style="width:300px;">
-                                <div class="buttons" >
-                                    <button class="iconstxt icoRestore" type="button" onClick="confirm_action('sites/web_domain_edit.php?id={tmpl_var name='parent_id'}&next_tab=backup&backup_action=restore&backup_id={tmpl_var name='backup_id'}','{tmpl_var name='restore_confirm_txt'}');"><span>{tmpl_var name="restore_backup_txt"}</span></button>
-                                    <button class="iconstxt icoDownload" type="button" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='parent_id'}&next_tab=backup&backup_action=download&backup_id={tmpl_var name='backup_id'}');"><span>{tmpl_var name="download_backup_txt"}</span></button>
+                            <td class="tbl_col_buttons">
+                                <div class="buttons">
+                                    <button class="button iconstxt icoRestore" type="button" onClick="confirm_action('sites/web_domain_edit.php?id={tmpl_var name='parent_id'}&next_tab=backup&backup_action=restore&backup_id={tmpl_var name='backup_id'}','{tmpl_var name='restore_confirm_txt'}');"><span>{tmpl_var name="restore_backup_txt"}</span></button>
+                                    <button class="button iconstxt icoDownload" type="button" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='parent_id'}&next_tab=backup&backup_action=download&backup_id={tmpl_var name='backup_id'}');"><span>{tmpl_var name="download_backup_txt"}</span></button>
                                 </div>
                             </td>
                         </tr>
diff --git a/interface/web/sites/templates/web_domain_admin_list.htm b/interface/web/sites/templates/web_domain_admin_list.htm
index f363e44c70cfd8bcbb31a08ee1d1a1efec5b478e..627868b2d2507f001ac4b9062526ce068ada3606 100644
--- a/interface/web/sites/templates/web_domain_admin_list.htm
+++ b/interface/web/sites/templates/web_domain_admin_list.htm
@@ -5,7 +5,7 @@
     <div class="pnl_toolsarea">
         <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
             <div class="buttons">
-                <button class="iconstxt icoAdd" type="button" onClick="loadContent('sites/web_domain_edit.php');">
+                <button class="button iconstxt icoAdd" type="button" onClick="loadContent('sites/web_domain_edit.php');">
                     <span>{tmpl_var name="add_new_record_txt"}</span>
                 </button>
             </div>
@@ -16,7 +16,7 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr>
+                    <tr class="caption">
                         <th class="tbl_col_domain_id" scope="col"><tmpl_var name="domain_id_txt"></th>
                         <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
                         <th class="tbl_col_sys_groupid" scope="col"><tmpl_var name="sys_groupid_txt"></th>
@@ -24,13 +24,15 @@
                         <th class="tbl_col_domain" scope="col"><tmpl_var name="domain_txt"></th>
                         <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
                     </tr>
-                    <tr>
+                    <tr class="filter">
                         <td class="tbl_col_domain_id"><input type="text" name="search_domain_id" size="4" value="{tmpl_var name='search_domain_id'}" /></td>
                         <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
                         <td class="tbl_col_sys_groupid"><select name="search_sys_groupid">{tmpl_var name='search_sys_groupid'}</select></td>
                         <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
                         <td class="tbl_col_domain"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td>
-                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','sites/web_domain_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                        <td class="tbl_col_buttons">
+                            <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','sites/web_domain_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+                        </td>
                     </tr>
                 </thead>
                 <tbody>
@@ -42,9 +44,7 @@
                         <td class="tbl_col_server_id"><a href="#" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
                         <td class="tbl_col_domain"><a href="#" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="domain"}</a></td>
                         <td class="tbl_col_buttons">
-                            <div class="buttons icons16">    
-                                <a class="icons16 icoDelete" href="javascript: del_record('sites/web_domain_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>
+                            <a class="button icons16 icoDelete" href="javascript: del_record('sites/web_domain_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>
                         </td>
                     </tr>
                 </tmpl_loop>
diff --git a/interface/web/sites/templates/web_domain_edit.htm b/interface/web/sites/templates/web_domain_edit.htm
index c2d9d21ea574fb7661785503365469cfd415c053..edf1836d29a0ab48a764a21844efce438b4cbfee 100644
--- a/interface/web/sites/templates/web_domain_edit.htm
+++ b/interface/web/sites/templates/web_domain_edit.htm
@@ -246,4 +246,4 @@
         });
     </tmpl_if>
 			
-</script>
\ No newline at end of file
+</script>
diff --git a/interface/web/sites/templates/web_domain_list.htm b/interface/web/sites/templates/web_domain_list.htm
index 4ce5d5ddd43c7891e7bc3df8fce6e612ced757a7..fe782f88e952658c2013f9a52b02a20d28f99fdc 100644
--- a/interface/web/sites/templates/web_domain_list.htm
+++ b/interface/web/sites/templates/web_domain_list.htm
@@ -6,7 +6,7 @@
     <div class="pnl_toolsarea">
         <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
             <div class="buttons">
-                <button class="iconstxt icoAdd" type="button" onClick="loadContent('sites/web_domain_edit.php');">
+                <button class="button iconstxt icoAdd" type="button" onClick="loadContent('sites/web_domain_edit.php');">
                     <span>{tmpl_var name="add_new_record_txt"}</span>
                 </button>
             </div>
@@ -17,19 +17,21 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                <tr>
+                <tr class="caption">
                     <th class="tbl_col_domain_id" scope="col"><tmpl_var name="domain_id_txt"></th>
                     <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
                     <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
                     <th class="tbl_col_domain" scope="col"><tmpl_var name="domain_txt"></th>
                     <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
                 </tr>
-                <tr>
+                <tr class="filter">
                     <td class="tbl_col_domain_id"><input type="text" size="5" name="search_domain_id" value="{tmpl_var name='search_domain_id'}" /></td>
                     <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
                     <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
                     <td class="tbl_col_domain"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td>
-                    <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','sites/web_domain_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    <td class="tbl_col_buttons">
+                        <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','sites/web_domain_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+                    </td>
                 </tr>
                 </thead>
                 <tbody>
@@ -40,9 +42,7 @@
                         <td class="tbl_col_server_id"><a href="#" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
                         <td class="tbl_col_domain"><a href="#" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="domain"}</a></td>
                         <td class="tbl_col_buttons">
-                            <div class="buttons icons16">    
-                                <a class="icons16 icoDelete" href="javascript: del_record('sites/web_domain_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>
+                            <a class="button icons16 icoDelete" href="javascript: del_record('sites/web_domain_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>
                         </td>
                     </tr>
                 </tmpl_loop>
diff --git a/interface/web/sites/templates/web_folder_list.htm b/interface/web/sites/templates/web_folder_list.htm
index 3dcb9ee0cbb2c415165ef1cbb2eb789eed3aa305..6b7761c98f9d6a93ec527da2f0dcb271a26a4442 100644
--- a/interface/web/sites/templates/web_folder_list.htm
+++ b/interface/web/sites/templates/web_folder_list.htm
@@ -5,7 +5,7 @@
     <div class="pnl_toolsarea">
         <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
             <div class="buttons">
-                <button class="iconstxt icoAdd" type="button" onClick="loadContent('sites/web_folder_edit.php');">
+                <button class="button iconstxt icoAdd" type="button" onClick="loadContent('sites/web_folder_edit.php');">
                     <span>{tmpl_var name="add_new_record_txt"}</span>
                 </button>
             </div>
@@ -16,19 +16,21 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr>
+                    <tr class="caption">
                         <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
                         <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
                         <th class="tbl_col_parent_domain_id" scope="col"><tmpl_var name="parent_domain_id_txt"></th>
                         <th class="tbl_col_path" scope="col"><tmpl_var name="path_txt"></th>
                         <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
                     </tr>
-                    <tr>
+                    <tr class="filter">
                         <td class="tbl_col_active"><select name="search_active" onChange="submitForm('pageForm','sites/web_folder_list.php');">{tmpl_var name='search_active'}</select></td>
                         <td class="tbl_col_server_id"><select name="search_server_id" onChange="submitForm('pageForm','sites/web_folder_list.php');">{tmpl_var name='search_server_id'}</select></td>
                         <td class="tbl_col_parent_domain_id"><select name="search_parent_domain_id" onChange="submitForm('pageForm','sites/web_folder_list.php');">{tmpl_var name='search_parent_domain_id'}</select></td>
                         <td class="tbl_col_path"><input type="text" name="search_path" value="{tmpl_var name='search_path'}" /></td>
-                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','sites/web_folder_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                        <td class="tbl_col_buttons">
+                            <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','sites/web_folder_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+                        </td>
                     </tr>
                 </thead>
                 <tbody>
@@ -39,9 +41,7 @@
                         <td class="tbl_col_parent_domain_id"><a href="#" onClick="loadContent('sites/web_folder_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="parent_domain_id"}</a></td>
                         <td class="tbl_col_path"><a href="#" onClick="loadContent('sites/web_folder_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="path"}</a></td>
                         <td class="tbl_col_buttons">
-                            <div class="buttons icons16">    
-                                <a class="icons16 icoDelete" href="javascript: del_record('sites/web_folder_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>
+                            <a class="button icons16 icoDelete" href="javascript: del_record('sites/web_folder_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>
                         </td>
                     </tr>
                 </tmpl_loop>
diff --git a/interface/web/sites/templates/web_folder_user_list.htm b/interface/web/sites/templates/web_folder_user_list.htm
index 2df924f1c9993b148606ecb69a8d0615752eb3c0..ae00cccb28dc23903f54f8f55924d9f69498334a 100644
--- a/interface/web/sites/templates/web_folder_user_list.htm
+++ b/interface/web/sites/templates/web_folder_user_list.htm
@@ -5,7 +5,7 @@
     <div class="pnl_toolsarea">
         <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
             <div class="buttons">
-                <button class="iconstxt icoAdd" type="button" onClick="loadContent('sites/web_folder_user_edit.php');">
+                <button class="button iconstxt icoAdd" type="button" onClick="loadContent('sites/web_folder_user_edit.php');">
                     <span>{tmpl_var name="add_new_record_txt"}</span>
                 </button>
             </div>
@@ -16,17 +16,19 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr>
+                    <tr class="caption">
                         <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
                         <th class="tbl_col_web_folder_id" scope="col"><tmpl_var name="web_folder_id_txt"></th>
                         <th class="tbl_col_username" scope="col"><tmpl_var name="username_txt"></th>
                         <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
                     </tr>
-                    <tr>
+                    <tr class="filter">
                         <td class="tbl_col_active"><select name="search_active" onChange="submitForm('pageForm','sites/web_folder_user_list.php');">{tmpl_var name='search_active'}</select></td>
                         <td class="tbl_col_web_folder_id"><select name="search_web_folder_id" onChange="submitForm('pageForm','sites/web_folder_user_list.php');">{tmpl_var name='search_web_folder_id'}</select></td>
                         <td class="tbl_col_username"><input type="text" name="search_username" value="{tmpl_var name='search_username'}" /></td>
-                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','sites/web_folder_user_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                        <td class="tbl_col_buttons">
+                            <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','sites/web_folder_user_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+                        </td>
                     </tr>
                 </thead>
                 <tbody>
@@ -36,9 +38,7 @@
                         <td class="tbl_col_web_folder_id"><a href="#" onClick="loadContent('sites/web_folder_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="web_folder_id"}</a></td>
                         <td class="tbl_col_username"><a href="#" onClick="loadContent('sites/web_folder_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="username"}</a></td>
                         <td class="tbl_col_buttons">
-                            <div class="buttons icons16">    
-                                <a class="icons16 icoDelete" href="javascript: del_record('sites/web_folder_user_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>
+                            <a class="button icons16 icoDelete" href="javascript: del_record('sites/web_folder_user_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>
                         </td>
                     </tr>
                 </tmpl_loop>
diff --git a/interface/web/sites/templates/web_sites_stats_list.htm b/interface/web/sites/templates/web_sites_stats_list.htm
index d51e0e2b812ca2d0f672a004fb90946d2f5a5234..475c9d1b9ca058be15d04d579120dbe823061fcc 100644
--- a/interface/web/sites/templates/web_sites_stats_list.htm
+++ b/interface/web/sites/templates/web_sites_stats_list.htm
@@ -7,7 +7,7 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr>
+                    <tr class="caption">
                         <th class="tbl_col_domain" scope="col"><tmpl_var name="domain_txt"></th>
                         <th class="tbl_col_web_traffic_this_month" scope="col"><tmpl_var name="this_month_txt"></th>
                         <th class="tbl_col_web_traffic_last_month" scope="col"><tmpl_var name="last_month_txt"></th>
@@ -15,13 +15,15 @@
                         <th class="tbl_col_web_traffic_last_year" scope="col"><tmpl_var name="last_year_txt"></th>
                         <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
                     </tr>
-                    <tr>
+                    <tr class="filter">
                         <td class="tbl_col_domain"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td>
                         <td class="tbl_col_this_month"></td>
                         <td class="tbl_col_last_month"></td>
                         <td class="tbl_col_this_year"></td>
                         <td class="tbl_col_last_year"></td>
-                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','sites/web_sites_stats.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                        <td class="tbl_col_buttons">
+                            <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','sites/web_sites_stats.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+                        </td>
                     </tr>
                 </thead>
                 <tbody>
@@ -32,10 +34,7 @@
                         <td class="tbl_col_last_month"><a href="#" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="last_month"} MB</a></td>
                         <td class="tbl_col_this_year"><a href="#" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="this_year"} MB</a></td>
                         <td class="tbl_col_last_year"><a href="#" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="last_year"} MB</a></td>
-                        <td class="tbl_col_buttons">
-                            <div class="buttons icons16">    
-                            </div>
-                        </td>
+                        <td class="tbl_col_buttons"></td>
                     </tr>
                 </tmpl_loop>
 				<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
diff --git a/interface/web/sites/templates/web_subdomain_list.htm b/interface/web/sites/templates/web_subdomain_list.htm
index 237cd8568970f9066346379b389250c9aa10ffc8..7d097ec48704631d6d82a0243e7d0ed14ecf0b2c 100644
--- a/interface/web/sites/templates/web_subdomain_list.htm
+++ b/interface/web/sites/templates/web_subdomain_list.htm
@@ -6,7 +6,7 @@
     <div class="pnl_toolsarea">
         <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
             <div class="buttons">
-                <button class="iconstxt icoAdd" type="button" onClick="loadContent('sites/web_subdomain_edit.php');">
+                <button class="button iconstxt icoAdd" type="button" onClick="loadContent('sites/web_subdomain_edit.php');">
                     <span>{tmpl_var name="add_new_record_txt"}</span>
                 </button>
             </div>
@@ -17,19 +17,21 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr>
+                    <tr class="caption">
                         <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
                         <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
                         <th class="tbl_col_parent_domain_id" scope="col"><tmpl_var name="parent_domain_id_txt"></th>
                         <th class="tbl_col_domain" scope="col"><tmpl_var name="domain_txt"></th>
                         <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
                     </tr>
-                    <tr>
+                    <tr class="filter">
                         <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
                         <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
                         <td class="tbl_col_parent_domain_id"><select name="search_parent_domain_id">{tmpl_var name='search_parent_domain_id'}</select></td>
                         <td class="tbl_col_domain"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td>
-                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','sites/web_subdomain_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                        <td class="tbl_col_buttons">
+                            <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','sites/web_subdomain_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+                        </td>
                     </tr>
                 </thead>
                 <tbody>
@@ -40,9 +42,7 @@
                             <td class="tbl_col_parent_domain_id"><a href="#" onClick="loadContent('sites/web_subdomain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="parent_domain_id"}</a></td>
                             <td class="tbl_col_domain"><a href="#" onClick="loadContent('sites/web_subdomain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="domain"}</a></td>
                             <td class="tbl_col_buttons">
-                                <div class="buttons icons16">    
-                                    <a class="icons16 icoDelete" href="javascript: del_record('sites/web_subdomain_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>
+                                <a class="button icons16 icoDelete" href="javascript: del_record('sites/web_subdomain_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>
                             </td>
                         </tr>
                     </tmpl_loop>
diff --git a/interface/web/sites/templates/webdav_user_list.htm b/interface/web/sites/templates/webdav_user_list.htm
index ee2b45df80049d536cb6d0ac7bb5cc9ae284e892..e5b055a2ba1e3bc398a7f5ada37115779880fbba 100644
--- a/interface/web/sites/templates/webdav_user_list.htm
+++ b/interface/web/sites/templates/webdav_user_list.htm
@@ -6,7 +6,7 @@
     <div class="pnl_toolsarea">
         <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
             <div class="buttons">
-                <button class="iconstxt icoAdd" type="button" onClick="loadContent('sites/webdav_user_edit.php');">
+                <button class="button iconstxt icoAdd" type="button" onClick="loadContent('sites/webdav_user_edit.php');">
                     <span>{tmpl_var name="add_new_record_txt"}</span>
                 </button>
             </div>
@@ -17,19 +17,21 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr>
+                    <tr class="caption">
                         <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
                         <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
                         <th class="tbl_col_parent_domain_id" scope="col"><tmpl_var name="parent_domain_id_txt"></th>
                         <th class="tbl_col_username" scope="col"><tmpl_var name="username_txt"></th>
                         <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
                     </tr>
-                    <tr>
+                    <tr class="filter">
                         <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
                         <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
                         <td class="tbl_col_parent_domain_id"><select name="search_parent_domain_id">{tmpl_var name='search_parent_domain_id'}</select></td>
                         <td class="tbl_col_username"><input type="text" name="search_username" value="{tmpl_var name='search_username'}" /></td>
-                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','sites/webdav_user_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                        <td class="tbl_col_buttons">
+                            <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','sites/webdav_user_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+                        </td>
                     </tr>
                 </thead>
                 <tbody>
@@ -40,9 +42,7 @@
                             <td class="tbl_col_parent_domain_id"><a href="#" onClick="loadContent('sites/webdav_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="parent_domain_id"}</a></td>
                             <td class="tbl_col_username"><a href="#" onClick="loadContent('sites/webdav_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="username"}</a></td>
                             <td class="tbl_col_buttons">
-                                <div class="buttons icons16">    
-                                    <a class="icons16 icoDelete" href="javascript: del_record('sites/webdav_user_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>
+                                <a class="button icons16 icoDelete" href="javascript: del_record('sites/webdav_user_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>
                             </td>
                         </tr>
                     </tmpl_loop>
diff --git a/interface/web/themes/default/css/central.css b/interface/web/themes/default-304/css/central.css
similarity index 100%
rename from interface/web/themes/default/css/central.css
rename to interface/web/themes/default-304/css/central.css
diff --git a/interface/web/themes/default/css/navigation/nav_side.css b/interface/web/themes/default-304/css/navigation/nav_side.css
similarity index 100%
rename from interface/web/themes/default/css/navigation/nav_side.css
rename to interface/web/themes/default-304/css/navigation/nav_side.css
diff --git a/interface/web/themes/default/css/navigation/nav_top.css b/interface/web/themes/default-304/css/navigation/nav_top.css
similarity index 100%
rename from interface/web/themes/default/css/navigation/nav_top.css
rename to interface/web/themes/default-304/css/navigation/nav_top.css
diff --git a/interface/web/themes/default/css/patches/central.css b/interface/web/themes/default-304/css/patches/central.css
similarity index 100%
rename from interface/web/themes/default/css/patches/central.css
rename to interface/web/themes/default-304/css/patches/central.css
diff --git a/interface/web/themes/default/css/print/print_100.css b/interface/web/themes/default-304/css/print/print_100.css
similarity index 100%
rename from interface/web/themes/default/css/print/print_100.css
rename to interface/web/themes/default-304/css/print/print_100.css
diff --git a/interface/web/themes/default/css/screen/basemod.css b/interface/web/themes/default-304/css/screen/basemod.css
similarity index 100%
rename from interface/web/themes/default/css/screen/basemod.css
rename to interface/web/themes/default-304/css/screen/basemod.css
diff --git a/interface/web/themes/default/css/screen/basemod_2col_left_seo.css b/interface/web/themes/default-304/css/screen/basemod_2col_left_seo.css
similarity index 100%
rename from interface/web/themes/default/css/screen/basemod_2col_left_seo.css
rename to interface/web/themes/default-304/css/screen/basemod_2col_left_seo.css
diff --git a/interface/web/themes/default/css/screen/content.css b/interface/web/themes/default-304/css/screen/content.css
similarity index 100%
rename from interface/web/themes/default/css/screen/content.css
rename to interface/web/themes/default-304/css/screen/content.css
diff --git a/interface/web/themes/default/css/screen/content_ispc.css b/interface/web/themes/default-304/css/screen/content_ispc.css
similarity index 100%
rename from interface/web/themes/default/css/screen/content_ispc.css
rename to interface/web/themes/default-304/css/screen/content_ispc.css
diff --git a/interface/web/themes/default/css/screen/jquery-ui-custom.css b/interface/web/themes/default-304/css/screen/jquery-ui-custom.css
similarity index 100%
rename from interface/web/themes/default/css/screen/jquery-ui-custom.css
rename to interface/web/themes/default-304/css/screen/jquery-ui-custom.css
diff --git a/interface/web/themes/default-v2/css/images/ui-bg_flat_0_aaaaaa_40x100.png b/interface/web/themes/default-304/css/screen/redmond/images/ui-bg_flat_0_aaaaaa_40x100.png
similarity index 100%
rename from interface/web/themes/default-v2/css/images/ui-bg_flat_0_aaaaaa_40x100.png
rename to interface/web/themes/default-304/css/screen/redmond/images/ui-bg_flat_0_aaaaaa_40x100.png
diff --git a/interface/web/themes/default-v2/css/images/ui-bg_flat_55_fbec88_40x100.png b/interface/web/themes/default-304/css/screen/redmond/images/ui-bg_flat_55_fbec88_40x100.png
similarity index 100%
rename from interface/web/themes/default-v2/css/images/ui-bg_flat_55_fbec88_40x100.png
rename to interface/web/themes/default-304/css/screen/redmond/images/ui-bg_flat_55_fbec88_40x100.png
diff --git a/interface/web/themes/default-v2/css/images/ui-bg_glass_75_d0e5f5_1x400.png b/interface/web/themes/default-304/css/screen/redmond/images/ui-bg_glass_75_d0e5f5_1x400.png
similarity index 100%
rename from interface/web/themes/default-v2/css/images/ui-bg_glass_75_d0e5f5_1x400.png
rename to interface/web/themes/default-304/css/screen/redmond/images/ui-bg_glass_75_d0e5f5_1x400.png
diff --git a/interface/web/themes/default-v2/css/images/ui-bg_glass_85_dfeffc_1x400.png b/interface/web/themes/default-304/css/screen/redmond/images/ui-bg_glass_85_dfeffc_1x400.png
similarity index 100%
rename from interface/web/themes/default-v2/css/images/ui-bg_glass_85_dfeffc_1x400.png
rename to interface/web/themes/default-304/css/screen/redmond/images/ui-bg_glass_85_dfeffc_1x400.png
diff --git a/interface/web/themes/default-v2/css/images/ui-bg_glass_95_fef1ec_1x400.png b/interface/web/themes/default-304/css/screen/redmond/images/ui-bg_glass_95_fef1ec_1x400.png
similarity index 100%
rename from interface/web/themes/default-v2/css/images/ui-bg_glass_95_fef1ec_1x400.png
rename to interface/web/themes/default-304/css/screen/redmond/images/ui-bg_glass_95_fef1ec_1x400.png
diff --git a/interface/web/themes/default-v2/css/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png b/interface/web/themes/default-304/css/screen/redmond/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png
similarity index 100%
rename from interface/web/themes/default-v2/css/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png
rename to interface/web/themes/default-304/css/screen/redmond/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png
diff --git a/interface/web/themes/default-v2/css/images/ui-bg_inset-hard_100_f5f8f9_1x100.png b/interface/web/themes/default-304/css/screen/redmond/images/ui-bg_inset-hard_100_f5f8f9_1x100.png
similarity index 100%
rename from interface/web/themes/default-v2/css/images/ui-bg_inset-hard_100_f5f8f9_1x100.png
rename to interface/web/themes/default-304/css/screen/redmond/images/ui-bg_inset-hard_100_f5f8f9_1x100.png
diff --git a/interface/web/themes/default-v2/css/images/ui-bg_inset-hard_100_fcfdfd_1x100.png b/interface/web/themes/default-304/css/screen/redmond/images/ui-bg_inset-hard_100_fcfdfd_1x100.png
similarity index 100%
rename from interface/web/themes/default-v2/css/images/ui-bg_inset-hard_100_fcfdfd_1x100.png
rename to interface/web/themes/default-304/css/screen/redmond/images/ui-bg_inset-hard_100_fcfdfd_1x100.png
diff --git a/interface/web/themes/default-v2/css/images/ui-icons_217bc0_256x240.png b/interface/web/themes/default-304/css/screen/redmond/images/ui-icons_217bc0_256x240.png
similarity index 100%
rename from interface/web/themes/default-v2/css/images/ui-icons_217bc0_256x240.png
rename to interface/web/themes/default-304/css/screen/redmond/images/ui-icons_217bc0_256x240.png
diff --git a/interface/web/themes/default-v2/css/images/ui-icons_2e83ff_256x240.png b/interface/web/themes/default-304/css/screen/redmond/images/ui-icons_2e83ff_256x240.png
similarity index 100%
rename from interface/web/themes/default-v2/css/images/ui-icons_2e83ff_256x240.png
rename to interface/web/themes/default-304/css/screen/redmond/images/ui-icons_2e83ff_256x240.png
diff --git a/interface/web/themes/default-v2/css/images/ui-icons_469bdd_256x240.png b/interface/web/themes/default-304/css/screen/redmond/images/ui-icons_469bdd_256x240.png
similarity index 100%
rename from interface/web/themes/default-v2/css/images/ui-icons_469bdd_256x240.png
rename to interface/web/themes/default-304/css/screen/redmond/images/ui-icons_469bdd_256x240.png
diff --git a/interface/web/themes/default-v2/css/images/ui-icons_6da8d5_256x240.png b/interface/web/themes/default-304/css/screen/redmond/images/ui-icons_6da8d5_256x240.png
similarity index 100%
rename from interface/web/themes/default-v2/css/images/ui-icons_6da8d5_256x240.png
rename to interface/web/themes/default-304/css/screen/redmond/images/ui-icons_6da8d5_256x240.png
diff --git a/interface/web/themes/default-v2/css/images/ui-icons_cd0a0a_256x240.png b/interface/web/themes/default-304/css/screen/redmond/images/ui-icons_cd0a0a_256x240.png
similarity index 100%
rename from interface/web/themes/default-v2/css/images/ui-icons_cd0a0a_256x240.png
rename to interface/web/themes/default-304/css/screen/redmond/images/ui-icons_cd0a0a_256x240.png
diff --git a/interface/web/themes/default-v2/css/images/ui-icons_d8e7f3_256x240.png b/interface/web/themes/default-304/css/screen/redmond/images/ui-icons_d8e7f3_256x240.png
similarity index 100%
rename from interface/web/themes/default-v2/css/images/ui-icons_d8e7f3_256x240.png
rename to interface/web/themes/default-304/css/screen/redmond/images/ui-icons_d8e7f3_256x240.png
diff --git a/interface/web/themes/default-v2/css/images/ui-icons_f9bd01_256x240.png b/interface/web/themes/default-304/css/screen/redmond/images/ui-icons_f9bd01_256x240.png
similarity index 100%
rename from interface/web/themes/default-v2/css/images/ui-icons_f9bd01_256x240.png
rename to interface/web/themes/default-304/css/screen/redmond/images/ui-icons_f9bd01_256x240.png
diff --git a/interface/web/themes/default-v2/css/jquery-ui-1.8.16.custom.css b/interface/web/themes/default-304/css/screen/redmond/jquery-ui-1.8.16.custom.css
similarity index 100%
rename from interface/web/themes/default-v2/css/jquery-ui-1.8.16.custom.css
rename to interface/web/themes/default-304/css/screen/redmond/jquery-ui-1.8.16.custom.css
diff --git a/interface/web/themes/default/css/screen/tipsy.css b/interface/web/themes/default-304/css/screen/tipsy.css
similarity index 100%
rename from interface/web/themes/default/css/screen/tipsy.css
rename to interface/web/themes/default-304/css/screen/tipsy.css
diff --git a/interface/web/themes/default/css/screen/uni-form-generic.css b/interface/web/themes/default-304/css/screen/uni-form-generic.css
similarity index 100%
rename from interface/web/themes/default/css/screen/uni-form-generic.css
rename to interface/web/themes/default-304/css/screen/uni-form-generic.css
diff --git a/interface/web/themes/default/css/screen/uni-form.css b/interface/web/themes/default-304/css/screen/uni-form.css
similarity index 100%
rename from interface/web/themes/default/css/screen/uni-form.css
rename to interface/web/themes/default-304/css/screen/uni-form.css
diff --git a/interface/web/themes/default/icons/device_sprite.png b/interface/web/themes/default-304/icons/device_sprite.png
similarity index 100%
rename from interface/web/themes/default/icons/device_sprite.png
rename to interface/web/themes/default-304/icons/device_sprite.png
diff --git a/interface/web/themes/default-v2/icons/flags_sprite.png b/interface/web/themes/default-304/icons/flags_sprite.png
similarity index 100%
rename from interface/web/themes/default-v2/icons/flags_sprite.png
rename to interface/web/themes/default-304/icons/flags_sprite.png
diff --git a/interface/web/themes/default/icons/x12/accept.png b/interface/web/themes/default-304/icons/x12/accept.png
similarity index 100%
rename from interface/web/themes/default/icons/x12/accept.png
rename to interface/web/themes/default-304/icons/x12/accept.png
diff --git a/interface/web/themes/default/icons/x12/accept_blue.png b/interface/web/themes/default-304/icons/x12/accept_blue.png
similarity index 100%
rename from interface/web/themes/default/icons/x12/accept_blue.png
rename to interface/web/themes/default-304/icons/x12/accept_blue.png
diff --git a/interface/web/themes/default/icons/x12/accept_green.png b/interface/web/themes/default-304/icons/x12/accept_green.png
similarity index 100%
rename from interface/web/themes/default/icons/x12/accept_green.png
rename to interface/web/themes/default-304/icons/x12/accept_green.png
diff --git a/interface/web/themes/default/icons/x12/arrow_2_left_round.png b/interface/web/themes/default-304/icons/x12/arrow_2_left_round.png
similarity index 100%
rename from interface/web/themes/default/icons/x12/arrow_2_left_round.png
rename to interface/web/themes/default-304/icons/x12/arrow_2_left_round.png
diff --git a/interface/web/themes/default/icons/x12/arrow_2_right_round.png b/interface/web/themes/default-304/icons/x12/arrow_2_right_round.png
similarity index 100%
rename from interface/web/themes/default/icons/x12/arrow_2_right_round.png
rename to interface/web/themes/default-304/icons/x12/arrow_2_right_round.png
diff --git a/interface/web/themes/default/icons/x12/arrow_left_blue_round.png b/interface/web/themes/default-304/icons/x12/arrow_left_blue_round.png
similarity index 100%
rename from interface/web/themes/default/icons/x12/arrow_left_blue_round.png
rename to interface/web/themes/default-304/icons/x12/arrow_left_blue_round.png
diff --git a/interface/web/themes/default/icons/x12/arrow_right_blue_round.png b/interface/web/themes/default-304/icons/x12/arrow_right_blue_round.png
similarity index 100%
rename from interface/web/themes/default/icons/x12/arrow_right_blue_round.png
rename to interface/web/themes/default-304/icons/x12/arrow_right_blue_round.png
diff --git a/interface/web/themes/default/icons/x12/article.png b/interface/web/themes/default-304/icons/x12/article.png
similarity index 100%
rename from interface/web/themes/default/icons/x12/article.png
rename to interface/web/themes/default-304/icons/x12/article.png
diff --git a/interface/web/themes/default/icons/x12/article_text.png b/interface/web/themes/default-304/icons/x12/article_text.png
similarity index 100%
rename from interface/web/themes/default/icons/x12/article_text.png
rename to interface/web/themes/default-304/icons/x12/article_text.png
diff --git a/interface/web/themes/default/icons/x12/bar_graph.png b/interface/web/themes/default-304/icons/x12/bar_graph.png
similarity index 100%
rename from interface/web/themes/default/icons/x12/bar_graph.png
rename to interface/web/themes/default-304/icons/x12/bar_graph.png
diff --git a/interface/web/themes/default/icons/x12/burst.png b/interface/web/themes/default-304/icons/x12/burst.png
similarity index 100%
rename from interface/web/themes/default/icons/x12/burst.png
rename to interface/web/themes/default-304/icons/x12/burst.png
diff --git a/interface/web/themes/default/icons/x12/calendar.png b/interface/web/themes/default-304/icons/x12/calendar.png
similarity index 100%
rename from interface/web/themes/default/icons/x12/calendar.png
rename to interface/web/themes/default-304/icons/x12/calendar.png
diff --git a/interface/web/themes/default/icons/x12/calendar2.png b/interface/web/themes/default-304/icons/x12/calendar2.png
similarity index 100%
rename from interface/web/themes/default/icons/x12/calendar2.png
rename to interface/web/themes/default-304/icons/x12/calendar2.png
diff --git a/interface/web/themes/default/icons/x12/cancel.png b/interface/web/themes/default-304/icons/x12/cancel.png
similarity index 100%
rename from interface/web/themes/default/icons/x12/cancel.png
rename to interface/web/themes/default-304/icons/x12/cancel.png
diff --git a/interface/web/themes/default/icons/x12/cancel_round.png b/interface/web/themes/default-304/icons/x12/cancel_round.png
similarity index 100%
rename from interface/web/themes/default/icons/x12/cancel_round.png
rename to interface/web/themes/default-304/icons/x12/cancel_round.png
diff --git a/interface/web/themes/default/icons/x12/clock.png b/interface/web/themes/default-304/icons/x12/clock.png
similarity index 100%
rename from interface/web/themes/default/icons/x12/clock.png
rename to interface/web/themes/default-304/icons/x12/clock.png
diff --git a/interface/web/themes/default/icons/x12/code.png b/interface/web/themes/default-304/icons/x12/code.png
similarity index 100%
rename from interface/web/themes/default/icons/x12/code.png
rename to interface/web/themes/default-304/icons/x12/code.png
diff --git a/interface/web/themes/default/icons/x12/comment_blue.png b/interface/web/themes/default-304/icons/x12/comment_blue.png
similarity index 100%
rename from interface/web/themes/default/icons/x12/comment_blue.png
rename to interface/web/themes/default-304/icons/x12/comment_blue.png
diff --git a/interface/web/themes/default/icons/x12/dollar.png b/interface/web/themes/default-304/icons/x12/dollar.png
similarity index 100%
rename from interface/web/themes/default/icons/x12/dollar.png
rename to interface/web/themes/default-304/icons/x12/dollar.png
diff --git a/interface/web/themes/default/icons/x12/double_comment.png b/interface/web/themes/default-304/icons/x12/double_comment.png
similarity index 100%
rename from interface/web/themes/default/icons/x12/double_comment.png
rename to interface/web/themes/default-304/icons/x12/double_comment.png
diff --git a/interface/web/themes/default/icons/x12/download.png b/interface/web/themes/default-304/icons/x12/download.png
similarity index 100%
rename from interface/web/themes/default/icons/x12/download.png
rename to interface/web/themes/default-304/icons/x12/download.png
diff --git a/interface/web/themes/default/icons/x12/envelope.png b/interface/web/themes/default-304/icons/x12/envelope.png
similarity index 100%
rename from interface/web/themes/default/icons/x12/envelope.png
rename to interface/web/themes/default-304/icons/x12/envelope.png
diff --git a/interface/web/themes/default/icons/x12/flag_black.png b/interface/web/themes/default-304/icons/x12/flag_black.png
similarity index 100%
rename from interface/web/themes/default/icons/x12/flag_black.png
rename to interface/web/themes/default-304/icons/x12/flag_black.png
diff --git a/interface/web/themes/default/icons/x12/flag_blue.png b/interface/web/themes/default-304/icons/x12/flag_blue.png
similarity index 100%
rename from interface/web/themes/default/icons/x12/flag_blue.png
rename to interface/web/themes/default-304/icons/x12/flag_blue.png
diff --git a/interface/web/themes/default/icons/x12/flag_green.png b/interface/web/themes/default-304/icons/x12/flag_green.png
similarity index 100%
rename from interface/web/themes/default/icons/x12/flag_green.png
rename to interface/web/themes/default-304/icons/x12/flag_green.png
diff --git a/interface/web/themes/default/icons/x12/flag_orange.png b/interface/web/themes/default-304/icons/x12/flag_orange.png
similarity index 100%
rename from interface/web/themes/default/icons/x12/flag_orange.png
rename to interface/web/themes/default-304/icons/x12/flag_orange.png
diff --git a/interface/web/themes/default/icons/x12/flag_red.png b/interface/web/themes/default-304/icons/x12/flag_red.png
similarity index 100%
rename from interface/web/themes/default/icons/x12/flag_red.png
rename to interface/web/themes/default-304/icons/x12/flag_red.png
diff --git a/interface/web/themes/default/icons/x12/flag_yellow.png b/interface/web/themes/default-304/icons/x12/flag_yellow.png
similarity index 100%
rename from interface/web/themes/default/icons/x12/flag_yellow.png
rename to interface/web/themes/default-304/icons/x12/flag_yellow.png
diff --git a/interface/web/themes/default/icons/x12/folder.png b/interface/web/themes/default-304/icons/x12/folder.png
similarity index 100%
rename from interface/web/themes/default/icons/x12/folder.png
rename to interface/web/themes/default-304/icons/x12/folder.png
diff --git a/interface/web/themes/default/icons/x12/info.png b/interface/web/themes/default-304/icons/x12/info.png
similarity index 100%
rename from interface/web/themes/default/icons/x12/info.png
rename to interface/web/themes/default-304/icons/x12/info.png
diff --git a/interface/web/themes/default/icons/x12/link.png b/interface/web/themes/default-304/icons/x12/link.png
similarity index 100%
rename from interface/web/themes/default/icons/x12/link.png
rename to interface/web/themes/default-304/icons/x12/link.png
diff --git a/interface/web/themes/default/icons/x12/lock.png b/interface/web/themes/default-304/icons/x12/lock.png
similarity index 100%
rename from interface/web/themes/default/icons/x12/lock.png
rename to interface/web/themes/default-304/icons/x12/lock.png
diff --git a/interface/web/themes/default/icons/x12/magnify.png b/interface/web/themes/default-304/icons/x12/magnify.png
similarity index 100%
rename from interface/web/themes/default/icons/x12/magnify.png
rename to interface/web/themes/default-304/icons/x12/magnify.png
diff --git a/interface/web/themes/default/icons/x12/minus.png b/interface/web/themes/default-304/icons/x12/minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x12/minus.png
rename to interface/web/themes/default-304/icons/x12/minus.png
diff --git a/interface/web/themes/default/icons/x12/minus_round.png b/interface/web/themes/default-304/icons/x12/minus_round.png
similarity index 100%
rename from interface/web/themes/default/icons/x12/minus_round.png
rename to interface/web/themes/default-304/icons/x12/minus_round.png
diff --git a/interface/web/themes/default/icons/x12/money.png b/interface/web/themes/default-304/icons/x12/money.png
similarity index 100%
rename from interface/web/themes/default/icons/x12/money.png
rename to interface/web/themes/default-304/icons/x12/money.png
diff --git a/interface/web/themes/default/icons/x12/new.png b/interface/web/themes/default-304/icons/x12/new.png
similarity index 100%
rename from interface/web/themes/default/icons/x12/new.png
rename to interface/web/themes/default-304/icons/x12/new.png
diff --git a/interface/web/themes/default/icons/x12/pencil.png b/interface/web/themes/default-304/icons/x12/pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x12/pencil.png
rename to interface/web/themes/default-304/icons/x12/pencil.png
diff --git a/interface/web/themes/default/icons/x12/pictures.png b/interface/web/themes/default-304/icons/x12/pictures.png
similarity index 100%
rename from interface/web/themes/default/icons/x12/pictures.png
rename to interface/web/themes/default-304/icons/x12/pictures.png
diff --git a/interface/web/themes/default/icons/x12/plus.png b/interface/web/themes/default-304/icons/x12/plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x12/plus.png
rename to interface/web/themes/default-304/icons/x12/plus.png
diff --git a/interface/web/themes/default/icons/x12/printer.png b/interface/web/themes/default-304/icons/x12/printer.png
similarity index 100%
rename from interface/web/themes/default/icons/x12/printer.png
rename to interface/web/themes/default-304/icons/x12/printer.png
diff --git a/interface/web/themes/default/icons/x12/question_blue.png b/interface/web/themes/default-304/icons/x12/question_blue.png
similarity index 100%
rename from interface/web/themes/default/icons/x12/question_blue.png
rename to interface/web/themes/default-304/icons/x12/question_blue.png
diff --git a/interface/web/themes/default/icons/x12/refresh.png b/interface/web/themes/default-304/icons/x12/refresh.png
similarity index 100%
rename from interface/web/themes/default/icons/x12/refresh.png
rename to interface/web/themes/default-304/icons/x12/refresh.png
diff --git a/interface/web/themes/default/icons/x12/rss.png b/interface/web/themes/default-304/icons/x12/rss.png
similarity index 100%
rename from interface/web/themes/default/icons/x12/rss.png
rename to interface/web/themes/default-304/icons/x12/rss.png
diff --git a/interface/web/themes/default/icons/x12/rss_round.png b/interface/web/themes/default-304/icons/x12/rss_round.png
similarity index 100%
rename from interface/web/themes/default/icons/x12/rss_round.png
rename to interface/web/themes/default-304/icons/x12/rss_round.png
diff --git a/interface/web/themes/default/icons/x12/security_green.png b/interface/web/themes/default-304/icons/x12/security_green.png
similarity index 100%
rename from interface/web/themes/default/icons/x12/security_green.png
rename to interface/web/themes/default-304/icons/x12/security_green.png
diff --git a/interface/web/themes/default/icons/x12/security_orange.png b/interface/web/themes/default-304/icons/x12/security_orange.png
similarity index 100%
rename from interface/web/themes/default/icons/x12/security_orange.png
rename to interface/web/themes/default-304/icons/x12/security_orange.png
diff --git a/interface/web/themes/default/icons/x12/security_red.png b/interface/web/themes/default-304/icons/x12/security_red.png
similarity index 100%
rename from interface/web/themes/default/icons/x12/security_red.png
rename to interface/web/themes/default-304/icons/x12/security_red.png
diff --git a/interface/web/themes/default/icons/x12/star.png b/interface/web/themes/default-304/icons/x12/star.png
similarity index 100%
rename from interface/web/themes/default/icons/x12/star.png
rename to interface/web/themes/default-304/icons/x12/star.png
diff --git a/interface/web/themes/default/icons/x12/star_blue.png b/interface/web/themes/default-304/icons/x12/star_blue.png
similarity index 100%
rename from interface/web/themes/default/icons/x12/star_blue.png
rename to interface/web/themes/default-304/icons/x12/star_blue.png
diff --git a/interface/web/themes/default/icons/x12/stop.png b/interface/web/themes/default-304/icons/x12/stop.png
similarity index 100%
rename from interface/web/themes/default/icons/x12/stop.png
rename to interface/web/themes/default-304/icons/x12/stop.png
diff --git a/interface/web/themes/default/icons/x12/stop_round.png b/interface/web/themes/default-304/icons/x12/stop_round.png
similarity index 100%
rename from interface/web/themes/default/icons/x12/stop_round.png
rename to interface/web/themes/default-304/icons/x12/stop_round.png
diff --git a/interface/web/themes/default/icons/x12/upload.png b/interface/web/themes/default-304/icons/x12/upload.png
similarity index 100%
rename from interface/web/themes/default/icons/x12/upload.png
rename to interface/web/themes/default-304/icons/x12/upload.png
diff --git a/interface/web/themes/default/icons/x12/world.png b/interface/web/themes/default-304/icons/x12/world.png
similarity index 100%
rename from interface/web/themes/default/icons/x12/world.png
rename to interface/web/themes/default-304/icons/x12/world.png
diff --git a/interface/web/themes/default/icons/x12/world2.png b/interface/web/themes/default-304/icons/x12/world2.png
similarity index 100%
rename from interface/web/themes/default/icons/x12/world2.png
rename to interface/web/themes/default-304/icons/x12/world2.png
diff --git a/interface/web/themes/default/icons/x16-list/accept.png b/interface/web/themes/default-304/icons/x16-list/accept.png
similarity index 100%
rename from interface/web/themes/default/icons/x16-list/accept.png
rename to interface/web/themes/default-304/icons/x16-list/accept.png
diff --git a/interface/web/themes/default/icons/x16-list/accept_blue.png b/interface/web/themes/default-304/icons/x16-list/accept_blue.png
similarity index 100%
rename from interface/web/themes/default/icons/x16-list/accept_blue.png
rename to interface/web/themes/default-304/icons/x16-list/accept_blue.png
diff --git a/interface/web/themes/default/icons/x16-list/accept_green.png b/interface/web/themes/default-304/icons/x16-list/accept_green.png
similarity index 100%
rename from interface/web/themes/default/icons/x16-list/accept_green.png
rename to interface/web/themes/default-304/icons/x16-list/accept_green.png
diff --git a/interface/web/themes/default/icons/x16-list/arrow_2_left_round.png b/interface/web/themes/default-304/icons/x16-list/arrow_2_left_round.png
similarity index 100%
rename from interface/web/themes/default/icons/x16-list/arrow_2_left_round.png
rename to interface/web/themes/default-304/icons/x16-list/arrow_2_left_round.png
diff --git a/interface/web/themes/default/icons/x16-list/arrow_2_right_round.png b/interface/web/themes/default-304/icons/x16-list/arrow_2_right_round.png
similarity index 100%
rename from interface/web/themes/default/icons/x16-list/arrow_2_right_round.png
rename to interface/web/themes/default-304/icons/x16-list/arrow_2_right_round.png
diff --git a/interface/web/themes/default/icons/x16-list/arrow_left_blue_round.png b/interface/web/themes/default-304/icons/x16-list/arrow_left_blue_round.png
similarity index 100%
rename from interface/web/themes/default/icons/x16-list/arrow_left_blue_round.png
rename to interface/web/themes/default-304/icons/x16-list/arrow_left_blue_round.png
diff --git a/interface/web/themes/default/icons/x16-list/arrow_right_blue_round.png b/interface/web/themes/default-304/icons/x16-list/arrow_right_blue_round.png
similarity index 100%
rename from interface/web/themes/default/icons/x16-list/arrow_right_blue_round.png
rename to interface/web/themes/default-304/icons/x16-list/arrow_right_blue_round.png
diff --git a/interface/web/themes/default/icons/x16-list/article.png b/interface/web/themes/default-304/icons/x16-list/article.png
similarity index 100%
rename from interface/web/themes/default/icons/x16-list/article.png
rename to interface/web/themes/default-304/icons/x16-list/article.png
diff --git a/interface/web/themes/default/icons/x16-list/article_text.png b/interface/web/themes/default-304/icons/x16-list/article_text.png
similarity index 100%
rename from interface/web/themes/default/icons/x16-list/article_text.png
rename to interface/web/themes/default-304/icons/x16-list/article_text.png
diff --git a/interface/web/themes/default/icons/x16-list/bar_graph.png b/interface/web/themes/default-304/icons/x16-list/bar_graph.png
similarity index 100%
rename from interface/web/themes/default/icons/x16-list/bar_graph.png
rename to interface/web/themes/default-304/icons/x16-list/bar_graph.png
diff --git a/interface/web/themes/default/icons/x16-list/burst.png b/interface/web/themes/default-304/icons/x16-list/burst.png
similarity index 100%
rename from interface/web/themes/default/icons/x16-list/burst.png
rename to interface/web/themes/default-304/icons/x16-list/burst.png
diff --git a/interface/web/themes/default/icons/x16-list/calendar.png b/interface/web/themes/default-304/icons/x16-list/calendar.png
similarity index 100%
rename from interface/web/themes/default/icons/x16-list/calendar.png
rename to interface/web/themes/default-304/icons/x16-list/calendar.png
diff --git a/interface/web/themes/default/icons/x16-list/calendar2.png b/interface/web/themes/default-304/icons/x16-list/calendar2.png
similarity index 100%
rename from interface/web/themes/default/icons/x16-list/calendar2.png
rename to interface/web/themes/default-304/icons/x16-list/calendar2.png
diff --git a/interface/web/themes/default/icons/x16-list/cancel.png b/interface/web/themes/default-304/icons/x16-list/cancel.png
similarity index 100%
rename from interface/web/themes/default/icons/x16-list/cancel.png
rename to interface/web/themes/default-304/icons/x16-list/cancel.png
diff --git a/interface/web/themes/default/icons/x16-list/cancel_round.png b/interface/web/themes/default-304/icons/x16-list/cancel_round.png
similarity index 100%
rename from interface/web/themes/default/icons/x16-list/cancel_round.png
rename to interface/web/themes/default-304/icons/x16-list/cancel_round.png
diff --git a/interface/web/themes/default/icons/x16-list/clock.png b/interface/web/themes/default-304/icons/x16-list/clock.png
similarity index 100%
rename from interface/web/themes/default/icons/x16-list/clock.png
rename to interface/web/themes/default-304/icons/x16-list/clock.png
diff --git a/interface/web/themes/default/icons/x16-list/code.png b/interface/web/themes/default-304/icons/x16-list/code.png
similarity index 100%
rename from interface/web/themes/default/icons/x16-list/code.png
rename to interface/web/themes/default-304/icons/x16-list/code.png
diff --git a/interface/web/themes/default/icons/x16-list/comment_blue.png b/interface/web/themes/default-304/icons/x16-list/comment_blue.png
similarity index 100%
rename from interface/web/themes/default/icons/x16-list/comment_blue.png
rename to interface/web/themes/default-304/icons/x16-list/comment_blue.png
diff --git a/interface/web/themes/default/icons/x16-list/dollar.png b/interface/web/themes/default-304/icons/x16-list/dollar.png
similarity index 100%
rename from interface/web/themes/default/icons/x16-list/dollar.png
rename to interface/web/themes/default-304/icons/x16-list/dollar.png
diff --git a/interface/web/themes/default/icons/x16-list/double_comment.png b/interface/web/themes/default-304/icons/x16-list/double_comment.png
similarity index 100%
rename from interface/web/themes/default/icons/x16-list/double_comment.png
rename to interface/web/themes/default-304/icons/x16-list/double_comment.png
diff --git a/interface/web/themes/default/icons/x16-list/download.png b/interface/web/themes/default-304/icons/x16-list/download.png
similarity index 100%
rename from interface/web/themes/default/icons/x16-list/download.png
rename to interface/web/themes/default-304/icons/x16-list/download.png
diff --git a/interface/web/themes/default/icons/x16-list/envelope.png b/interface/web/themes/default-304/icons/x16-list/envelope.png
similarity index 100%
rename from interface/web/themes/default/icons/x16-list/envelope.png
rename to interface/web/themes/default-304/icons/x16-list/envelope.png
diff --git a/interface/web/themes/default/icons/x16-list/flag_black.png b/interface/web/themes/default-304/icons/x16-list/flag_black.png
similarity index 100%
rename from interface/web/themes/default/icons/x16-list/flag_black.png
rename to interface/web/themes/default-304/icons/x16-list/flag_black.png
diff --git a/interface/web/themes/default/icons/x16-list/flag_blue.png b/interface/web/themes/default-304/icons/x16-list/flag_blue.png
similarity index 100%
rename from interface/web/themes/default/icons/x16-list/flag_blue.png
rename to interface/web/themes/default-304/icons/x16-list/flag_blue.png
diff --git a/interface/web/themes/default/icons/x16-list/flag_green.png b/interface/web/themes/default-304/icons/x16-list/flag_green.png
similarity index 100%
rename from interface/web/themes/default/icons/x16-list/flag_green.png
rename to interface/web/themes/default-304/icons/x16-list/flag_green.png
diff --git a/interface/web/themes/default/icons/x16-list/flag_orange.png b/interface/web/themes/default-304/icons/x16-list/flag_orange.png
similarity index 100%
rename from interface/web/themes/default/icons/x16-list/flag_orange.png
rename to interface/web/themes/default-304/icons/x16-list/flag_orange.png
diff --git a/interface/web/themes/default/icons/x16-list/flag_red.png b/interface/web/themes/default-304/icons/x16-list/flag_red.png
similarity index 100%
rename from interface/web/themes/default/icons/x16-list/flag_red.png
rename to interface/web/themes/default-304/icons/x16-list/flag_red.png
diff --git a/interface/web/themes/default/icons/x16-list/flag_yellow.png b/interface/web/themes/default-304/icons/x16-list/flag_yellow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16-list/flag_yellow.png
rename to interface/web/themes/default-304/icons/x16-list/flag_yellow.png
diff --git a/interface/web/themes/default/icons/x16-list/folder.png b/interface/web/themes/default-304/icons/x16-list/folder.png
similarity index 100%
rename from interface/web/themes/default/icons/x16-list/folder.png
rename to interface/web/themes/default-304/icons/x16-list/folder.png
diff --git a/interface/web/themes/default/icons/x16-list/info.png b/interface/web/themes/default-304/icons/x16-list/info.png
similarity index 100%
rename from interface/web/themes/default/icons/x16-list/info.png
rename to interface/web/themes/default-304/icons/x16-list/info.png
diff --git a/interface/web/themes/default/icons/x16-list/link.png b/interface/web/themes/default-304/icons/x16-list/link.png
similarity index 100%
rename from interface/web/themes/default/icons/x16-list/link.png
rename to interface/web/themes/default-304/icons/x16-list/link.png
diff --git a/interface/web/themes/default/icons/x16-list/lock.png b/interface/web/themes/default-304/icons/x16-list/lock.png
similarity index 100%
rename from interface/web/themes/default/icons/x16-list/lock.png
rename to interface/web/themes/default-304/icons/x16-list/lock.png
diff --git a/interface/web/themes/default/icons/x16-list/magnify.png b/interface/web/themes/default-304/icons/x16-list/magnify.png
similarity index 100%
rename from interface/web/themes/default/icons/x16-list/magnify.png
rename to interface/web/themes/default-304/icons/x16-list/magnify.png
diff --git a/interface/web/themes/default/icons/x16-list/minus.png b/interface/web/themes/default-304/icons/x16-list/minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16-list/minus.png
rename to interface/web/themes/default-304/icons/x16-list/minus.png
diff --git a/interface/web/themes/default/icons/x16-list/minus_round.png b/interface/web/themes/default-304/icons/x16-list/minus_round.png
similarity index 100%
rename from interface/web/themes/default/icons/x16-list/minus_round.png
rename to interface/web/themes/default-304/icons/x16-list/minus_round.png
diff --git a/interface/web/themes/default/icons/x16-list/money.png b/interface/web/themes/default-304/icons/x16-list/money.png
similarity index 100%
rename from interface/web/themes/default/icons/x16-list/money.png
rename to interface/web/themes/default-304/icons/x16-list/money.png
diff --git a/interface/web/themes/default/icons/x16-list/new.png b/interface/web/themes/default-304/icons/x16-list/new.png
similarity index 100%
rename from interface/web/themes/default/icons/x16-list/new.png
rename to interface/web/themes/default-304/icons/x16-list/new.png
diff --git a/interface/web/themes/default/icons/x16-list/pencil.png b/interface/web/themes/default-304/icons/x16-list/pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16-list/pencil.png
rename to interface/web/themes/default-304/icons/x16-list/pencil.png
diff --git a/interface/web/themes/default/icons/x16-list/pictures.png b/interface/web/themes/default-304/icons/x16-list/pictures.png
similarity index 100%
rename from interface/web/themes/default/icons/x16-list/pictures.png
rename to interface/web/themes/default-304/icons/x16-list/pictures.png
diff --git a/interface/web/themes/default/icons/x16-list/plus.png b/interface/web/themes/default-304/icons/x16-list/plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16-list/plus.png
rename to interface/web/themes/default-304/icons/x16-list/plus.png
diff --git a/interface/web/themes/default/icons/x16-list/printer.png b/interface/web/themes/default-304/icons/x16-list/printer.png
similarity index 100%
rename from interface/web/themes/default/icons/x16-list/printer.png
rename to interface/web/themes/default-304/icons/x16-list/printer.png
diff --git a/interface/web/themes/default/icons/x16-list/question_blue.png b/interface/web/themes/default-304/icons/x16-list/question_blue.png
similarity index 100%
rename from interface/web/themes/default/icons/x16-list/question_blue.png
rename to interface/web/themes/default-304/icons/x16-list/question_blue.png
diff --git a/interface/web/themes/default/icons/x16-list/refresh.png b/interface/web/themes/default-304/icons/x16-list/refresh.png
similarity index 100%
rename from interface/web/themes/default/icons/x16-list/refresh.png
rename to interface/web/themes/default-304/icons/x16-list/refresh.png
diff --git a/interface/web/themes/default/icons/x16-list/rss.png b/interface/web/themes/default-304/icons/x16-list/rss.png
similarity index 100%
rename from interface/web/themes/default/icons/x16-list/rss.png
rename to interface/web/themes/default-304/icons/x16-list/rss.png
diff --git a/interface/web/themes/default/icons/x16-list/rss_round.png b/interface/web/themes/default-304/icons/x16-list/rss_round.png
similarity index 100%
rename from interface/web/themes/default/icons/x16-list/rss_round.png
rename to interface/web/themes/default-304/icons/x16-list/rss_round.png
diff --git a/interface/web/themes/default/icons/x16-list/security_green.png b/interface/web/themes/default-304/icons/x16-list/security_green.png
similarity index 100%
rename from interface/web/themes/default/icons/x16-list/security_green.png
rename to interface/web/themes/default-304/icons/x16-list/security_green.png
diff --git a/interface/web/themes/default/icons/x16-list/security_orange.png b/interface/web/themes/default-304/icons/x16-list/security_orange.png
similarity index 100%
rename from interface/web/themes/default/icons/x16-list/security_orange.png
rename to interface/web/themes/default-304/icons/x16-list/security_orange.png
diff --git a/interface/web/themes/default/icons/x16-list/security_red.png b/interface/web/themes/default-304/icons/x16-list/security_red.png
similarity index 100%
rename from interface/web/themes/default/icons/x16-list/security_red.png
rename to interface/web/themes/default-304/icons/x16-list/security_red.png
diff --git a/interface/web/themes/default/icons/x16-list/star.png b/interface/web/themes/default-304/icons/x16-list/star.png
similarity index 100%
rename from interface/web/themes/default/icons/x16-list/star.png
rename to interface/web/themes/default-304/icons/x16-list/star.png
diff --git a/interface/web/themes/default/icons/x16-list/star_blue.png b/interface/web/themes/default-304/icons/x16-list/star_blue.png
similarity index 100%
rename from interface/web/themes/default/icons/x16-list/star_blue.png
rename to interface/web/themes/default-304/icons/x16-list/star_blue.png
diff --git a/interface/web/themes/default/icons/x16-list/stop.png b/interface/web/themes/default-304/icons/x16-list/stop.png
similarity index 100%
rename from interface/web/themes/default/icons/x16-list/stop.png
rename to interface/web/themes/default-304/icons/x16-list/stop.png
diff --git a/interface/web/themes/default/icons/x16-list/stop_round.png b/interface/web/themes/default-304/icons/x16-list/stop_round.png
similarity index 100%
rename from interface/web/themes/default/icons/x16-list/stop_round.png
rename to interface/web/themes/default-304/icons/x16-list/stop_round.png
diff --git a/interface/web/themes/default/icons/x16-list/upload.png b/interface/web/themes/default-304/icons/x16-list/upload.png
similarity index 100%
rename from interface/web/themes/default/icons/x16-list/upload.png
rename to interface/web/themes/default-304/icons/x16-list/upload.png
diff --git a/interface/web/themes/default/icons/x16-list/world.png b/interface/web/themes/default-304/icons/x16-list/world.png
similarity index 100%
rename from interface/web/themes/default/icons/x16-list/world.png
rename to interface/web/themes/default-304/icons/x16-list/world.png
diff --git a/interface/web/themes/default/icons/x16-list/world2.png b/interface/web/themes/default-304/icons/x16-list/world2.png
similarity index 100%
rename from interface/web/themes/default/icons/x16-list/world2.png
rename to interface/web/themes/default-304/icons/x16-list/world2.png
diff --git a/interface/web/themes/default/icons/x16/address_book.png b/interface/web/themes/default-304/icons/x16/address_book.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/address_book.png
rename to interface/web/themes/default-304/icons/x16/address_book.png
diff --git a/interface/web/themes/default/icons/x16/address_book__arrow.png b/interface/web/themes/default-304/icons/x16/address_book__arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/address_book__arrow.png
rename to interface/web/themes/default-304/icons/x16/address_book__arrow.png
diff --git a/interface/web/themes/default/icons/x16/address_book__exclamation.png b/interface/web/themes/default-304/icons/x16/address_book__exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/address_book__exclamation.png
rename to interface/web/themes/default-304/icons/x16/address_book__exclamation.png
diff --git a/interface/web/themes/default/icons/x16/address_book__minus.png b/interface/web/themes/default-304/icons/x16/address_book__minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/address_book__minus.png
rename to interface/web/themes/default-304/icons/x16/address_book__minus.png
diff --git a/interface/web/themes/default/icons/x16/address_book__pencil.png b/interface/web/themes/default-304/icons/x16/address_book__pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/address_book__pencil.png
rename to interface/web/themes/default-304/icons/x16/address_book__pencil.png
diff --git a/interface/web/themes/default/icons/x16/address_book__plus.png b/interface/web/themes/default-304/icons/x16/address_book__plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/address_book__plus.png
rename to interface/web/themes/default-304/icons/x16/address_book__plus.png
diff --git a/interface/web/themes/default/icons/x16/address_book_blue.png b/interface/web/themes/default-304/icons/x16/address_book_blue.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/address_book_blue.png
rename to interface/web/themes/default-304/icons/x16/address_book_blue.png
diff --git a/interface/web/themes/default-v2/icons/x16/arrow.png b/interface/web/themes/default-304/icons/x16/arrow.png
similarity index 100%
rename from interface/web/themes/default-v2/icons/x16/arrow.png
rename to interface/web/themes/default-304/icons/x16/arrow.png
diff --git a/interface/web/themes/default/icons/x16/arrow_000_small.png b/interface/web/themes/default-304/icons/x16/arrow_000_small.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/arrow_000_small.png
rename to interface/web/themes/default-304/icons/x16/arrow_000_small.png
diff --git a/interface/web/themes/default/icons/x16/arrow_045.png b/interface/web/themes/default-304/icons/x16/arrow_045.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/arrow_045.png
rename to interface/web/themes/default-304/icons/x16/arrow_045.png
diff --git a/interface/web/themes/default/icons/x16/arrow_045_small.png b/interface/web/themes/default-304/icons/x16/arrow_045_small.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/arrow_045_small.png
rename to interface/web/themes/default-304/icons/x16/arrow_045_small.png
diff --git a/interface/web/themes/default/icons/x16/arrow_090.png b/interface/web/themes/default-304/icons/x16/arrow_090.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/arrow_090.png
rename to interface/web/themes/default-304/icons/x16/arrow_090.png
diff --git a/interface/web/themes/default/icons/x16/arrow_090_small.png b/interface/web/themes/default-304/icons/x16/arrow_090_small.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/arrow_090_small.png
rename to interface/web/themes/default-304/icons/x16/arrow_090_small.png
diff --git a/interface/web/themes/default/icons/x16/arrow_135.png b/interface/web/themes/default-304/icons/x16/arrow_135.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/arrow_135.png
rename to interface/web/themes/default-304/icons/x16/arrow_135.png
diff --git a/interface/web/themes/default/icons/x16/arrow_135_small.png b/interface/web/themes/default-304/icons/x16/arrow_135_small.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/arrow_135_small.png
rename to interface/web/themes/default-304/icons/x16/arrow_135_small.png
diff --git a/interface/web/themes/default-v2/icons/x16/arrow_180.png b/interface/web/themes/default-304/icons/x16/arrow_180.png
similarity index 100%
rename from interface/web/themes/default-v2/icons/x16/arrow_180.png
rename to interface/web/themes/default-304/icons/x16/arrow_180.png
diff --git a/interface/web/themes/default/icons/x16/arrow_180_small.png b/interface/web/themes/default-304/icons/x16/arrow_180_small.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/arrow_180_small.png
rename to interface/web/themes/default-304/icons/x16/arrow_180_small.png
diff --git a/interface/web/themes/default/icons/x16/arrow_225.png b/interface/web/themes/default-304/icons/x16/arrow_225.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/arrow_225.png
rename to interface/web/themes/default-304/icons/x16/arrow_225.png
diff --git a/interface/web/themes/default/icons/x16/arrow_225_small.png b/interface/web/themes/default-304/icons/x16/arrow_225_small.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/arrow_225_small.png
rename to interface/web/themes/default-304/icons/x16/arrow_225_small.png
diff --git a/interface/web/themes/default/icons/x16/arrow_270.png b/interface/web/themes/default-304/icons/x16/arrow_270.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/arrow_270.png
rename to interface/web/themes/default-304/icons/x16/arrow_270.png
diff --git a/interface/web/themes/default/icons/x16/arrow_270_small.png b/interface/web/themes/default-304/icons/x16/arrow_270_small.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/arrow_270_small.png
rename to interface/web/themes/default-304/icons/x16/arrow_270_small.png
diff --git a/interface/web/themes/default/icons/x16/arrow_315.png b/interface/web/themes/default-304/icons/x16/arrow_315.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/arrow_315.png
rename to interface/web/themes/default-304/icons/x16/arrow_315.png
diff --git a/interface/web/themes/default/icons/x16/arrow_315_small.png b/interface/web/themes/default-304/icons/x16/arrow_315_small.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/arrow_315_small.png
rename to interface/web/themes/default-304/icons/x16/arrow_315_small.png
diff --git a/interface/web/themes/default/icons/x16/arrow_circle.png b/interface/web/themes/default-304/icons/x16/arrow_circle.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/arrow_circle.png
rename to interface/web/themes/default-304/icons/x16/arrow_circle.png
diff --git a/interface/web/themes/default/icons/x16/arrow_circle_135.png b/interface/web/themes/default-304/icons/x16/arrow_circle_135.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/arrow_circle_135.png
rename to interface/web/themes/default-304/icons/x16/arrow_circle_135.png
diff --git a/interface/web/themes/default/icons/x16/arrow_circle_225.png b/interface/web/themes/default-304/icons/x16/arrow_circle_225.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/arrow_circle_225.png
rename to interface/web/themes/default-304/icons/x16/arrow_circle_225.png
diff --git a/interface/web/themes/default/icons/x16/arrow_circle_315.png b/interface/web/themes/default-304/icons/x16/arrow_circle_315.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/arrow_circle_315.png
rename to interface/web/themes/default-304/icons/x16/arrow_circle_315.png
diff --git a/interface/web/themes/default/icons/x16/arrow_circle_double.png b/interface/web/themes/default-304/icons/x16/arrow_circle_double.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/arrow_circle_double.png
rename to interface/web/themes/default-304/icons/x16/arrow_circle_double.png
diff --git a/interface/web/themes/default/icons/x16/arrow_circle_double_135.png b/interface/web/themes/default-304/icons/x16/arrow_circle_double_135.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/arrow_circle_double_135.png
rename to interface/web/themes/default-304/icons/x16/arrow_circle_double_135.png
diff --git a/interface/web/themes/default/icons/x16/arrow_skip.png b/interface/web/themes/default-304/icons/x16/arrow_skip.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/arrow_skip.png
rename to interface/web/themes/default-304/icons/x16/arrow_skip.png
diff --git a/interface/web/themes/default/icons/x16/arrow_skip_090.png b/interface/web/themes/default-304/icons/x16/arrow_skip_090.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/arrow_skip_090.png
rename to interface/web/themes/default-304/icons/x16/arrow_skip_090.png
diff --git a/interface/web/themes/default/icons/x16/arrow_skip_180.png b/interface/web/themes/default-304/icons/x16/arrow_skip_180.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/arrow_skip_180.png
rename to interface/web/themes/default-304/icons/x16/arrow_skip_180.png
diff --git a/interface/web/themes/default/icons/x16/arrow_skip_270.png b/interface/web/themes/default-304/icons/x16/arrow_skip_270.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/arrow_skip_270.png
rename to interface/web/themes/default-304/icons/x16/arrow_skip_270.png
diff --git a/interface/web/themes/default-v2/icons/x16/arrow_stop.png b/interface/web/themes/default-304/icons/x16/arrow_stop.png
similarity index 100%
rename from interface/web/themes/default-v2/icons/x16/arrow_stop.png
rename to interface/web/themes/default-304/icons/x16/arrow_stop.png
diff --git a/interface/web/themes/default/icons/x16/arrow_stop_090.png b/interface/web/themes/default-304/icons/x16/arrow_stop_090.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/arrow_stop_090.png
rename to interface/web/themes/default-304/icons/x16/arrow_stop_090.png
diff --git a/interface/web/themes/default-v2/icons/x16/arrow_stop_180.png b/interface/web/themes/default-304/icons/x16/arrow_stop_180.png
similarity index 100%
rename from interface/web/themes/default-v2/icons/x16/arrow_stop_180.png
rename to interface/web/themes/default-304/icons/x16/arrow_stop_180.png
diff --git a/interface/web/themes/default/icons/x16/arrow_stop_270.png b/interface/web/themes/default-304/icons/x16/arrow_stop_270.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/arrow_stop_270.png
rename to interface/web/themes/default-304/icons/x16/arrow_stop_270.png
diff --git a/interface/web/themes/default/icons/x16/auction_hammer.png b/interface/web/themes/default-304/icons/x16/auction_hammer.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/auction_hammer.png
rename to interface/web/themes/default-304/icons/x16/auction_hammer.png
diff --git a/interface/web/themes/default/icons/x16/auction_hammer__arrow.png b/interface/web/themes/default-304/icons/x16/auction_hammer__arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/auction_hammer__arrow.png
rename to interface/web/themes/default-304/icons/x16/auction_hammer__arrow.png
diff --git a/interface/web/themes/default/icons/x16/auction_hammer__exclamation.png b/interface/web/themes/default-304/icons/x16/auction_hammer__exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/auction_hammer__exclamation.png
rename to interface/web/themes/default-304/icons/x16/auction_hammer__exclamation.png
diff --git a/interface/web/themes/default/icons/x16/auction_hammer__minus.png b/interface/web/themes/default-304/icons/x16/auction_hammer__minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/auction_hammer__minus.png
rename to interface/web/themes/default-304/icons/x16/auction_hammer__minus.png
diff --git a/interface/web/themes/default/icons/x16/auction_hammer__pencil.png b/interface/web/themes/default-304/icons/x16/auction_hammer__pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/auction_hammer__pencil.png
rename to interface/web/themes/default-304/icons/x16/auction_hammer__pencil.png
diff --git a/interface/web/themes/default/icons/x16/auction_hammer__plus.png b/interface/web/themes/default-304/icons/x16/auction_hammer__plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/auction_hammer__plus.png
rename to interface/web/themes/default-304/icons/x16/auction_hammer__plus.png
diff --git a/interface/web/themes/default/icons/x16/auction_hammer_gavel.png b/interface/web/themes/default-304/icons/x16/auction_hammer_gavel.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/auction_hammer_gavel.png
rename to interface/web/themes/default-304/icons/x16/auction_hammer_gavel.png
diff --git a/interface/web/themes/default/icons/x16/balloon.png b/interface/web/themes/default-304/icons/x16/balloon.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/balloon.png
rename to interface/web/themes/default-304/icons/x16/balloon.png
diff --git a/interface/web/themes/default/icons/x16/balloon__arrow.png b/interface/web/themes/default-304/icons/x16/balloon__arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/balloon__arrow.png
rename to interface/web/themes/default-304/icons/x16/balloon__arrow.png
diff --git a/interface/web/themes/default/icons/x16/balloon__exclamation.png b/interface/web/themes/default-304/icons/x16/balloon__exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/balloon__exclamation.png
rename to interface/web/themes/default-304/icons/x16/balloon__exclamation.png
diff --git a/interface/web/themes/default/icons/x16/balloon__minus.png b/interface/web/themes/default-304/icons/x16/balloon__minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/balloon__minus.png
rename to interface/web/themes/default-304/icons/x16/balloon__minus.png
diff --git a/interface/web/themes/default/icons/x16/balloon__pencil.png b/interface/web/themes/default-304/icons/x16/balloon__pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/balloon__pencil.png
rename to interface/web/themes/default-304/icons/x16/balloon__pencil.png
diff --git a/interface/web/themes/default/icons/x16/balloon__plus.png b/interface/web/themes/default-304/icons/x16/balloon__plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/balloon__plus.png
rename to interface/web/themes/default-304/icons/x16/balloon__plus.png
diff --git a/interface/web/themes/default/icons/x16/balloon_left.png b/interface/web/themes/default-304/icons/x16/balloon_left.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/balloon_left.png
rename to interface/web/themes/default-304/icons/x16/balloon_left.png
diff --git a/interface/web/themes/default/icons/x16/balloon_small.png b/interface/web/themes/default-304/icons/x16/balloon_small.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/balloon_small.png
rename to interface/web/themes/default-304/icons/x16/balloon_small.png
diff --git a/interface/web/themes/default/icons/x16/balloon_small_left.png b/interface/web/themes/default-304/icons/x16/balloon_small_left.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/balloon_small_left.png
rename to interface/web/themes/default-304/icons/x16/balloon_small_left.png
diff --git a/interface/web/themes/default/icons/x16/balloons.png b/interface/web/themes/default-304/icons/x16/balloons.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/balloons.png
rename to interface/web/themes/default-304/icons/x16/balloons.png
diff --git a/interface/web/themes/default/icons/x16/balloons_arrow.png b/interface/web/themes/default-304/icons/x16/balloons_arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/balloons_arrow.png
rename to interface/web/themes/default-304/icons/x16/balloons_arrow.png
diff --git a/interface/web/themes/default/icons/x16/balloons_exclamation.png b/interface/web/themes/default-304/icons/x16/balloons_exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/balloons_exclamation.png
rename to interface/web/themes/default-304/icons/x16/balloons_exclamation.png
diff --git a/interface/web/themes/default/icons/x16/balloons_minus.png b/interface/web/themes/default-304/icons/x16/balloons_minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/balloons_minus.png
rename to interface/web/themes/default-304/icons/x16/balloons_minus.png
diff --git a/interface/web/themes/default/icons/x16/balloons_pencil.png b/interface/web/themes/default-304/icons/x16/balloons_pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/balloons_pencil.png
rename to interface/web/themes/default-304/icons/x16/balloons_pencil.png
diff --git a/interface/web/themes/default/icons/x16/balloons_plus.png b/interface/web/themes/default-304/icons/x16/balloons_plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/balloons_plus.png
rename to interface/web/themes/default-304/icons/x16/balloons_plus.png
diff --git a/interface/web/themes/default/icons/x16/bandaid.png b/interface/web/themes/default-304/icons/x16/bandaid.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/bandaid.png
rename to interface/web/themes/default-304/icons/x16/bandaid.png
diff --git a/interface/web/themes/default/icons/x16/bandaid_arrow.png b/interface/web/themes/default-304/icons/x16/bandaid_arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/bandaid_arrow.png
rename to interface/web/themes/default-304/icons/x16/bandaid_arrow.png
diff --git a/interface/web/themes/default/icons/x16/bandaid_exclamation.png b/interface/web/themes/default-304/icons/x16/bandaid_exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/bandaid_exclamation.png
rename to interface/web/themes/default-304/icons/x16/bandaid_exclamation.png
diff --git a/interface/web/themes/default/icons/x16/bandaid_minus.png b/interface/web/themes/default-304/icons/x16/bandaid_minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/bandaid_minus.png
rename to interface/web/themes/default-304/icons/x16/bandaid_minus.png
diff --git a/interface/web/themes/default/icons/x16/bandaid_pencil.png b/interface/web/themes/default-304/icons/x16/bandaid_pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/bandaid_pencil.png
rename to interface/web/themes/default-304/icons/x16/bandaid_pencil.png
diff --git a/interface/web/themes/default/icons/x16/bandaid_plus.png b/interface/web/themes/default-304/icons/x16/bandaid_plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/bandaid_plus.png
rename to interface/web/themes/default-304/icons/x16/bandaid_plus.png
diff --git a/interface/web/themes/default/icons/x16/bandaid_small.png b/interface/web/themes/default-304/icons/x16/bandaid_small.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/bandaid_small.png
rename to interface/web/themes/default-304/icons/x16/bandaid_small.png
diff --git a/interface/web/themes/default/icons/x16/bank.png b/interface/web/themes/default-304/icons/x16/bank.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/bank.png
rename to interface/web/themes/default-304/icons/x16/bank.png
diff --git a/interface/web/themes/default/icons/x16/bank_arrow.png b/interface/web/themes/default-304/icons/x16/bank_arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/bank_arrow.png
rename to interface/web/themes/default-304/icons/x16/bank_arrow.png
diff --git a/interface/web/themes/default/icons/x16/bank_exclamation.png b/interface/web/themes/default-304/icons/x16/bank_exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/bank_exclamation.png
rename to interface/web/themes/default-304/icons/x16/bank_exclamation.png
diff --git a/interface/web/themes/default/icons/x16/bank_minus.png b/interface/web/themes/default-304/icons/x16/bank_minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/bank_minus.png
rename to interface/web/themes/default-304/icons/x16/bank_minus.png
diff --git a/interface/web/themes/default/icons/x16/bank_pencil.png b/interface/web/themes/default-304/icons/x16/bank_pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/bank_pencil.png
rename to interface/web/themes/default-304/icons/x16/bank_pencil.png
diff --git a/interface/web/themes/default/icons/x16/bank_plus.png b/interface/web/themes/default-304/icons/x16/bank_plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/bank_plus.png
rename to interface/web/themes/default-304/icons/x16/bank_plus.png
diff --git a/interface/web/themes/default/icons/x16/bell.png b/interface/web/themes/default-304/icons/x16/bell.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/bell.png
rename to interface/web/themes/default-304/icons/x16/bell.png
diff --git a/interface/web/themes/default/icons/x16/bell__arrow.png b/interface/web/themes/default-304/icons/x16/bell__arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/bell__arrow.png
rename to interface/web/themes/default-304/icons/x16/bell__arrow.png
diff --git a/interface/web/themes/default/icons/x16/bell__exclamation.png b/interface/web/themes/default-304/icons/x16/bell__exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/bell__exclamation.png
rename to interface/web/themes/default-304/icons/x16/bell__exclamation.png
diff --git a/interface/web/themes/default/icons/x16/bell__minus.png b/interface/web/themes/default-304/icons/x16/bell__minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/bell__minus.png
rename to interface/web/themes/default-304/icons/x16/bell__minus.png
diff --git a/interface/web/themes/default/icons/x16/bell__pencil.png b/interface/web/themes/default-304/icons/x16/bell__pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/bell__pencil.png
rename to interface/web/themes/default-304/icons/x16/bell__pencil.png
diff --git a/interface/web/themes/default/icons/x16/bell__plus.png b/interface/web/themes/default-304/icons/x16/bell__plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/bell__plus.png
rename to interface/web/themes/default-304/icons/x16/bell__plus.png
diff --git a/interface/web/themes/default/icons/x16/bell_disable.png b/interface/web/themes/default-304/icons/x16/bell_disable.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/bell_disable.png
rename to interface/web/themes/default-304/icons/x16/bell_disable.png
diff --git a/interface/web/themes/default/icons/x16/bin.png b/interface/web/themes/default-304/icons/x16/bin.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/bin.png
rename to interface/web/themes/default-304/icons/x16/bin.png
diff --git a/interface/web/themes/default/icons/x16/bin__arrow.png b/interface/web/themes/default-304/icons/x16/bin__arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/bin__arrow.png
rename to interface/web/themes/default-304/icons/x16/bin__arrow.png
diff --git a/interface/web/themes/default/icons/x16/bin__exclamation.png b/interface/web/themes/default-304/icons/x16/bin__exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/bin__exclamation.png
rename to interface/web/themes/default-304/icons/x16/bin__exclamation.png
diff --git a/interface/web/themes/default/icons/x16/bin__minus.png b/interface/web/themes/default-304/icons/x16/bin__minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/bin__minus.png
rename to interface/web/themes/default-304/icons/x16/bin__minus.png
diff --git a/interface/web/themes/default/icons/x16/bin__pencil.png b/interface/web/themes/default-304/icons/x16/bin__pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/bin__pencil.png
rename to interface/web/themes/default-304/icons/x16/bin__pencil.png
diff --git a/interface/web/themes/default/icons/x16/bin__plus.png b/interface/web/themes/default-304/icons/x16/bin__plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/bin__plus.png
rename to interface/web/themes/default-304/icons/x16/bin__plus.png
diff --git a/interface/web/themes/default/icons/x16/bin_full.png b/interface/web/themes/default-304/icons/x16/bin_full.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/bin_full.png
rename to interface/web/themes/default-304/icons/x16/bin_full.png
diff --git a/interface/web/themes/default/icons/x16/binocular.png b/interface/web/themes/default-304/icons/x16/binocular.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/binocular.png
rename to interface/web/themes/default-304/icons/x16/binocular.png
diff --git a/interface/web/themes/default/icons/x16/binocular_arrow.png b/interface/web/themes/default-304/icons/x16/binocular_arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/binocular_arrow.png
rename to interface/web/themes/default-304/icons/x16/binocular_arrow.png
diff --git a/interface/web/themes/default/icons/x16/binocular_exclamation.png b/interface/web/themes/default-304/icons/x16/binocular_exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/binocular_exclamation.png
rename to interface/web/themes/default-304/icons/x16/binocular_exclamation.png
diff --git a/interface/web/themes/default/icons/x16/binocular_minus.png b/interface/web/themes/default-304/icons/x16/binocular_minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/binocular_minus.png
rename to interface/web/themes/default-304/icons/x16/binocular_minus.png
diff --git a/interface/web/themes/default/icons/x16/binocular_pencil.png b/interface/web/themes/default-304/icons/x16/binocular_pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/binocular_pencil.png
rename to interface/web/themes/default-304/icons/x16/binocular_pencil.png
diff --git a/interface/web/themes/default/icons/x16/binocular_plus.png b/interface/web/themes/default-304/icons/x16/binocular_plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/binocular_plus.png
rename to interface/web/themes/default-304/icons/x16/binocular_plus.png
diff --git a/interface/web/themes/default/icons/x16/blog.png b/interface/web/themes/default-304/icons/x16/blog.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/blog.png
rename to interface/web/themes/default-304/icons/x16/blog.png
diff --git a/interface/web/themes/default/icons/x16/blog__arrow.png b/interface/web/themes/default-304/icons/x16/blog__arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/blog__arrow.png
rename to interface/web/themes/default-304/icons/x16/blog__arrow.png
diff --git a/interface/web/themes/default/icons/x16/blog__exclamation.png b/interface/web/themes/default-304/icons/x16/blog__exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/blog__exclamation.png
rename to interface/web/themes/default-304/icons/x16/blog__exclamation.png
diff --git a/interface/web/themes/default/icons/x16/blog__minus.png b/interface/web/themes/default-304/icons/x16/blog__minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/blog__minus.png
rename to interface/web/themes/default-304/icons/x16/blog__minus.png
diff --git a/interface/web/themes/default/icons/x16/blog__pencil.png b/interface/web/themes/default-304/icons/x16/blog__pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/blog__pencil.png
rename to interface/web/themes/default-304/icons/x16/blog__pencil.png
diff --git a/interface/web/themes/default/icons/x16/blog__plus.png b/interface/web/themes/default-304/icons/x16/blog__plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/blog__plus.png
rename to interface/web/themes/default-304/icons/x16/blog__plus.png
diff --git a/interface/web/themes/default/icons/x16/blog_blue.png b/interface/web/themes/default-304/icons/x16/blog_blue.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/blog_blue.png
rename to interface/web/themes/default-304/icons/x16/blog_blue.png
diff --git a/interface/web/themes/default/icons/x16/blogs.png b/interface/web/themes/default-304/icons/x16/blogs.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/blogs.png
rename to interface/web/themes/default-304/icons/x16/blogs.png
diff --git a/interface/web/themes/default/icons/x16/blogs_arrow.png b/interface/web/themes/default-304/icons/x16/blogs_arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/blogs_arrow.png
rename to interface/web/themes/default-304/icons/x16/blogs_arrow.png
diff --git a/interface/web/themes/default/icons/x16/blogs_exclamation.png b/interface/web/themes/default-304/icons/x16/blogs_exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/blogs_exclamation.png
rename to interface/web/themes/default-304/icons/x16/blogs_exclamation.png
diff --git a/interface/web/themes/default/icons/x16/blogs_minus.png b/interface/web/themes/default-304/icons/x16/blogs_minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/blogs_minus.png
rename to interface/web/themes/default-304/icons/x16/blogs_minus.png
diff --git a/interface/web/themes/default/icons/x16/blogs_pencil.png b/interface/web/themes/default-304/icons/x16/blogs_pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/blogs_pencil.png
rename to interface/web/themes/default-304/icons/x16/blogs_pencil.png
diff --git a/interface/web/themes/default/icons/x16/blogs_plus.png b/interface/web/themes/default-304/icons/x16/blogs_plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/blogs_plus.png
rename to interface/web/themes/default-304/icons/x16/blogs_plus.png
diff --git a/interface/web/themes/default/icons/x16/blogs_stack.png b/interface/web/themes/default-304/icons/x16/blogs_stack.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/blogs_stack.png
rename to interface/web/themes/default-304/icons/x16/blogs_stack.png
diff --git a/interface/web/themes/default/icons/x16/book.png b/interface/web/themes/default-304/icons/x16/book.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/book.png
rename to interface/web/themes/default-304/icons/x16/book.png
diff --git a/interface/web/themes/default/icons/x16/book__arrow.png b/interface/web/themes/default-304/icons/x16/book__arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/book__arrow.png
rename to interface/web/themes/default-304/icons/x16/book__arrow.png
diff --git a/interface/web/themes/default/icons/x16/book__exclamation.png b/interface/web/themes/default-304/icons/x16/book__exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/book__exclamation.png
rename to interface/web/themes/default-304/icons/x16/book__exclamation.png
diff --git a/interface/web/themes/default/icons/x16/book__minus.png b/interface/web/themes/default-304/icons/x16/book__minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/book__minus.png
rename to interface/web/themes/default-304/icons/x16/book__minus.png
diff --git a/interface/web/themes/default/icons/x16/book__pencil.png b/interface/web/themes/default-304/icons/x16/book__pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/book__pencil.png
rename to interface/web/themes/default-304/icons/x16/book__pencil.png
diff --git a/interface/web/themes/default/icons/x16/book__plus.png b/interface/web/themes/default-304/icons/x16/book__plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/book__plus.png
rename to interface/web/themes/default-304/icons/x16/book__plus.png
diff --git a/interface/web/themes/default/icons/x16/book_brown.png b/interface/web/themes/default-304/icons/x16/book_brown.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/book_brown.png
rename to interface/web/themes/default-304/icons/x16/book_brown.png
diff --git a/interface/web/themes/default/icons/x16/book_small.png b/interface/web/themes/default-304/icons/x16/book_small.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/book_small.png
rename to interface/web/themes/default-304/icons/x16/book_small.png
diff --git a/interface/web/themes/default/icons/x16/book_small_brown.png b/interface/web/themes/default-304/icons/x16/book_small_brown.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/book_small_brown.png
rename to interface/web/themes/default-304/icons/x16/book_small_brown.png
diff --git a/interface/web/themes/default/icons/x16/bookmark.png b/interface/web/themes/default-304/icons/x16/bookmark.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/bookmark.png
rename to interface/web/themes/default-304/icons/x16/bookmark.png
diff --git a/interface/web/themes/default/icons/x16/bookmark__arrow.png b/interface/web/themes/default-304/icons/x16/bookmark__arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/bookmark__arrow.png
rename to interface/web/themes/default-304/icons/x16/bookmark__arrow.png
diff --git a/interface/web/themes/default/icons/x16/bookmark__exclamation.png b/interface/web/themes/default-304/icons/x16/bookmark__exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/bookmark__exclamation.png
rename to interface/web/themes/default-304/icons/x16/bookmark__exclamation.png
diff --git a/interface/web/themes/default/icons/x16/bookmark__minus.png b/interface/web/themes/default-304/icons/x16/bookmark__minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/bookmark__minus.png
rename to interface/web/themes/default-304/icons/x16/bookmark__minus.png
diff --git a/interface/web/themes/default/icons/x16/bookmark__pencil.png b/interface/web/themes/default-304/icons/x16/bookmark__pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/bookmark__pencil.png
rename to interface/web/themes/default-304/icons/x16/bookmark__pencil.png
diff --git a/interface/web/themes/default/icons/x16/bookmark__plus.png b/interface/web/themes/default-304/icons/x16/bookmark__plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/bookmark__plus.png
rename to interface/web/themes/default-304/icons/x16/bookmark__plus.png
diff --git a/interface/web/themes/default/icons/x16/bookmark__small.png b/interface/web/themes/default-304/icons/x16/bookmark__small.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/bookmark__small.png
rename to interface/web/themes/default-304/icons/x16/bookmark__small.png
diff --git a/interface/web/themes/default/icons/x16/bookmark_book.png b/interface/web/themes/default-304/icons/x16/bookmark_book.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/bookmark_book.png
rename to interface/web/themes/default-304/icons/x16/bookmark_book.png
diff --git a/interface/web/themes/default/icons/x16/bookmark_book_arrow.png b/interface/web/themes/default-304/icons/x16/bookmark_book_arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/bookmark_book_arrow.png
rename to interface/web/themes/default-304/icons/x16/bookmark_book_arrow.png
diff --git a/interface/web/themes/default/icons/x16/bookmark_book_exclamation.png b/interface/web/themes/default-304/icons/x16/bookmark_book_exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/bookmark_book_exclamation.png
rename to interface/web/themes/default-304/icons/x16/bookmark_book_exclamation.png
diff --git a/interface/web/themes/default/icons/x16/bookmark_book_minus.png b/interface/web/themes/default-304/icons/x16/bookmark_book_minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/bookmark_book_minus.png
rename to interface/web/themes/default-304/icons/x16/bookmark_book_minus.png
diff --git a/interface/web/themes/default/icons/x16/bookmark_book_pencil.png b/interface/web/themes/default-304/icons/x16/bookmark_book_pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/bookmark_book_pencil.png
rename to interface/web/themes/default-304/icons/x16/bookmark_book_pencil.png
diff --git a/interface/web/themes/default/icons/x16/bookmark_book_plus.png b/interface/web/themes/default-304/icons/x16/bookmark_book_plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/bookmark_book_plus.png
rename to interface/web/themes/default-304/icons/x16/bookmark_book_plus.png
diff --git a/interface/web/themes/default/icons/x16/bookmark_document.png b/interface/web/themes/default-304/icons/x16/bookmark_document.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/bookmark_document.png
rename to interface/web/themes/default-304/icons/x16/bookmark_document.png
diff --git a/interface/web/themes/default/icons/x16/bookmark_document_arrow.png b/interface/web/themes/default-304/icons/x16/bookmark_document_arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/bookmark_document_arrow.png
rename to interface/web/themes/default-304/icons/x16/bookmark_document_arrow.png
diff --git a/interface/web/themes/default/icons/x16/bookmark_document_exclamation.png b/interface/web/themes/default-304/icons/x16/bookmark_document_exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/bookmark_document_exclamation.png
rename to interface/web/themes/default-304/icons/x16/bookmark_document_exclamation.png
diff --git a/interface/web/themes/default/icons/x16/bookmark_document_minus.png b/interface/web/themes/default-304/icons/x16/bookmark_document_minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/bookmark_document_minus.png
rename to interface/web/themes/default-304/icons/x16/bookmark_document_minus.png
diff --git a/interface/web/themes/default/icons/x16/bookmark_document_pencil.png b/interface/web/themes/default-304/icons/x16/bookmark_document_pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/bookmark_document_pencil.png
rename to interface/web/themes/default-304/icons/x16/bookmark_document_pencil.png
diff --git a/interface/web/themes/default/icons/x16/bookmark_document_plus.png b/interface/web/themes/default-304/icons/x16/bookmark_document_plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/bookmark_document_plus.png
rename to interface/web/themes/default-304/icons/x16/bookmark_document_plus.png
diff --git a/interface/web/themes/default/icons/x16/bookmark_folder.png b/interface/web/themes/default-304/icons/x16/bookmark_folder.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/bookmark_folder.png
rename to interface/web/themes/default-304/icons/x16/bookmark_folder.png
diff --git a/interface/web/themes/default/icons/x16/bookmark_folder_arrow.png b/interface/web/themes/default-304/icons/x16/bookmark_folder_arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/bookmark_folder_arrow.png
rename to interface/web/themes/default-304/icons/x16/bookmark_folder_arrow.png
diff --git a/interface/web/themes/default/icons/x16/bookmark_folder_exclamation.png b/interface/web/themes/default-304/icons/x16/bookmark_folder_exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/bookmark_folder_exclamation.png
rename to interface/web/themes/default-304/icons/x16/bookmark_folder_exclamation.png
diff --git a/interface/web/themes/default/icons/x16/bookmark_folder_minus.png b/interface/web/themes/default-304/icons/x16/bookmark_folder_minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/bookmark_folder_minus.png
rename to interface/web/themes/default-304/icons/x16/bookmark_folder_minus.png
diff --git a/interface/web/themes/default/icons/x16/bookmark_folder_pencil.png b/interface/web/themes/default-304/icons/x16/bookmark_folder_pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/bookmark_folder_pencil.png
rename to interface/web/themes/default-304/icons/x16/bookmark_folder_pencil.png
diff --git a/interface/web/themes/default/icons/x16/bookmark_folder_plus.png b/interface/web/themes/default-304/icons/x16/bookmark_folder_plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/bookmark_folder_plus.png
rename to interface/web/themes/default-304/icons/x16/bookmark_folder_plus.png
diff --git a/interface/web/themes/default/icons/x16/books.png b/interface/web/themes/default-304/icons/x16/books.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/books.png
rename to interface/web/themes/default-304/icons/x16/books.png
diff --git a/interface/web/themes/default/icons/x16/books__arrow.png b/interface/web/themes/default-304/icons/x16/books__arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/books__arrow.png
rename to interface/web/themes/default-304/icons/x16/books__arrow.png
diff --git a/interface/web/themes/default/icons/x16/books__exclamation.png b/interface/web/themes/default-304/icons/x16/books__exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/books__exclamation.png
rename to interface/web/themes/default-304/icons/x16/books__exclamation.png
diff --git a/interface/web/themes/default/icons/x16/books__minus.png b/interface/web/themes/default-304/icons/x16/books__minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/books__minus.png
rename to interface/web/themes/default-304/icons/x16/books__minus.png
diff --git a/interface/web/themes/default/icons/x16/books__pencil.png b/interface/web/themes/default-304/icons/x16/books__pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/books__pencil.png
rename to interface/web/themes/default-304/icons/x16/books__pencil.png
diff --git a/interface/web/themes/default/icons/x16/books__plus.png b/interface/web/themes/default-304/icons/x16/books__plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/books__plus.png
rename to interface/web/themes/default-304/icons/x16/books__plus.png
diff --git a/interface/web/themes/default/icons/x16/books_brown.png b/interface/web/themes/default-304/icons/x16/books_brown.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/books_brown.png
rename to interface/web/themes/default-304/icons/x16/books_brown.png
diff --git a/interface/web/themes/default/icons/x16/books_stack.png b/interface/web/themes/default-304/icons/x16/books_stack.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/books_stack.png
rename to interface/web/themes/default-304/icons/x16/books_stack.png
diff --git a/interface/web/themes/default/icons/x16/box.png b/interface/web/themes/default-304/icons/x16/box.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/box.png
rename to interface/web/themes/default-304/icons/x16/box.png
diff --git a/interface/web/themes/default/icons/x16/box__arrow.png b/interface/web/themes/default-304/icons/x16/box__arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/box__arrow.png
rename to interface/web/themes/default-304/icons/x16/box__arrow.png
diff --git a/interface/web/themes/default/icons/x16/box__exclamation.png b/interface/web/themes/default-304/icons/x16/box__exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/box__exclamation.png
rename to interface/web/themes/default-304/icons/x16/box__exclamation.png
diff --git a/interface/web/themes/default/icons/x16/box__minus.png b/interface/web/themes/default-304/icons/x16/box__minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/box__minus.png
rename to interface/web/themes/default-304/icons/x16/box__minus.png
diff --git a/interface/web/themes/default/icons/x16/box__pencil.png b/interface/web/themes/default-304/icons/x16/box__pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/box__pencil.png
rename to interface/web/themes/default-304/icons/x16/box__pencil.png
diff --git a/interface/web/themes/default/icons/x16/box__plus.png b/interface/web/themes/default-304/icons/x16/box__plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/box__plus.png
rename to interface/web/themes/default-304/icons/x16/box__plus.png
diff --git a/interface/web/themes/default/icons/x16/box_label.png b/interface/web/themes/default-304/icons/x16/box_label.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/box_label.png
rename to interface/web/themes/default-304/icons/x16/box_label.png
diff --git a/interface/web/themes/default/icons/x16/briefcase.png b/interface/web/themes/default-304/icons/x16/briefcase.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/briefcase.png
rename to interface/web/themes/default-304/icons/x16/briefcase.png
diff --git a/interface/web/themes/default/icons/x16/briefcase_arrow.png b/interface/web/themes/default-304/icons/x16/briefcase_arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/briefcase_arrow.png
rename to interface/web/themes/default-304/icons/x16/briefcase_arrow.png
diff --git a/interface/web/themes/default/icons/x16/briefcase_exclamation.png b/interface/web/themes/default-304/icons/x16/briefcase_exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/briefcase_exclamation.png
rename to interface/web/themes/default-304/icons/x16/briefcase_exclamation.png
diff --git a/interface/web/themes/default/icons/x16/briefcase_minus.png b/interface/web/themes/default-304/icons/x16/briefcase_minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/briefcase_minus.png
rename to interface/web/themes/default-304/icons/x16/briefcase_minus.png
diff --git a/interface/web/themes/default/icons/x16/briefcase_pencil.png b/interface/web/themes/default-304/icons/x16/briefcase_pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/briefcase_pencil.png
rename to interface/web/themes/default-304/icons/x16/briefcase_pencil.png
diff --git a/interface/web/themes/default/icons/x16/briefcase_plus.png b/interface/web/themes/default-304/icons/x16/briefcase_plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/briefcase_plus.png
rename to interface/web/themes/default-304/icons/x16/briefcase_plus.png
diff --git a/interface/web/themes/default/icons/x16/broom.png b/interface/web/themes/default-304/icons/x16/broom.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/broom.png
rename to interface/web/themes/default-304/icons/x16/broom.png
diff --git a/interface/web/themes/default/icons/x16/broom_arrow.png b/interface/web/themes/default-304/icons/x16/broom_arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/broom_arrow.png
rename to interface/web/themes/default-304/icons/x16/broom_arrow.png
diff --git a/interface/web/themes/default/icons/x16/broom_exclamation.png b/interface/web/themes/default-304/icons/x16/broom_exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/broom_exclamation.png
rename to interface/web/themes/default-304/icons/x16/broom_exclamation.png
diff --git a/interface/web/themes/default/icons/x16/broom_minus.png b/interface/web/themes/default-304/icons/x16/broom_minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/broom_minus.png
rename to interface/web/themes/default-304/icons/x16/broom_minus.png
diff --git a/interface/web/themes/default/icons/x16/broom_pencil.png b/interface/web/themes/default-304/icons/x16/broom_pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/broom_pencil.png
rename to interface/web/themes/default-304/icons/x16/broom_pencil.png
diff --git a/interface/web/themes/default/icons/x16/broom_plus.png b/interface/web/themes/default-304/icons/x16/broom_plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/broom_plus.png
rename to interface/web/themes/default-304/icons/x16/broom_plus.png
diff --git a/interface/web/themes/default/icons/x16/calculator.png b/interface/web/themes/default-304/icons/x16/calculator.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/calculator.png
rename to interface/web/themes/default-304/icons/x16/calculator.png
diff --git a/interface/web/themes/default/icons/x16/calculator_arrow.png b/interface/web/themes/default-304/icons/x16/calculator_arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/calculator_arrow.png
rename to interface/web/themes/default-304/icons/x16/calculator_arrow.png
diff --git a/interface/web/themes/default/icons/x16/calculator_exclamation.png b/interface/web/themes/default-304/icons/x16/calculator_exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/calculator_exclamation.png
rename to interface/web/themes/default-304/icons/x16/calculator_exclamation.png
diff --git a/interface/web/themes/default/icons/x16/calculator_minus.png b/interface/web/themes/default-304/icons/x16/calculator_minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/calculator_minus.png
rename to interface/web/themes/default-304/icons/x16/calculator_minus.png
diff --git a/interface/web/themes/default/icons/x16/calculator_pencil.png b/interface/web/themes/default-304/icons/x16/calculator_pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/calculator_pencil.png
rename to interface/web/themes/default-304/icons/x16/calculator_pencil.png
diff --git a/interface/web/themes/default/icons/x16/calculator_plus.png b/interface/web/themes/default-304/icons/x16/calculator_plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/calculator_plus.png
rename to interface/web/themes/default-304/icons/x16/calculator_plus.png
diff --git a/interface/web/themes/default/icons/x16/calendar.png b/interface/web/themes/default-304/icons/x16/calendar.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/calendar.png
rename to interface/web/themes/default-304/icons/x16/calendar.png
diff --git a/interface/web/themes/default/icons/x16/calendar__arrow.png b/interface/web/themes/default-304/icons/x16/calendar__arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/calendar__arrow.png
rename to interface/web/themes/default-304/icons/x16/calendar__arrow.png
diff --git a/interface/web/themes/default/icons/x16/calendar__exclamation.png b/interface/web/themes/default-304/icons/x16/calendar__exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/calendar__exclamation.png
rename to interface/web/themes/default-304/icons/x16/calendar__exclamation.png
diff --git a/interface/web/themes/default/icons/x16/calendar__minus.png b/interface/web/themes/default-304/icons/x16/calendar__minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/calendar__minus.png
rename to interface/web/themes/default-304/icons/x16/calendar__minus.png
diff --git a/interface/web/themes/default/icons/x16/calendar__pencil.png b/interface/web/themes/default-304/icons/x16/calendar__pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/calendar__pencil.png
rename to interface/web/themes/default-304/icons/x16/calendar__pencil.png
diff --git a/interface/web/themes/default/icons/x16/calendar__plus.png b/interface/web/themes/default-304/icons/x16/calendar__plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/calendar__plus.png
rename to interface/web/themes/default-304/icons/x16/calendar__plus.png
diff --git a/interface/web/themes/default/icons/x16/calendar_day.png b/interface/web/themes/default-304/icons/x16/calendar_day.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/calendar_day.png
rename to interface/web/themes/default-304/icons/x16/calendar_day.png
diff --git a/interface/web/themes/default/icons/x16/calendar_month.png b/interface/web/themes/default-304/icons/x16/calendar_month.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/calendar_month.png
rename to interface/web/themes/default-304/icons/x16/calendar_month.png
diff --git a/interface/web/themes/default/icons/x16/camera.png b/interface/web/themes/default-304/icons/x16/camera.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/camera.png
rename to interface/web/themes/default-304/icons/x16/camera.png
diff --git a/interface/web/themes/default/icons/x16/camera__arrow.png b/interface/web/themes/default-304/icons/x16/camera__arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/camera__arrow.png
rename to interface/web/themes/default-304/icons/x16/camera__arrow.png
diff --git a/interface/web/themes/default/icons/x16/camera__exclamation.png b/interface/web/themes/default-304/icons/x16/camera__exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/camera__exclamation.png
rename to interface/web/themes/default-304/icons/x16/camera__exclamation.png
diff --git a/interface/web/themes/default/icons/x16/camera__minus.png b/interface/web/themes/default-304/icons/x16/camera__minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/camera__minus.png
rename to interface/web/themes/default-304/icons/x16/camera__minus.png
diff --git a/interface/web/themes/default/icons/x16/camera__pencil.png b/interface/web/themes/default-304/icons/x16/camera__pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/camera__pencil.png
rename to interface/web/themes/default-304/icons/x16/camera__pencil.png
diff --git a/interface/web/themes/default/icons/x16/camera__plus.png b/interface/web/themes/default-304/icons/x16/camera__plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/camera__plus.png
rename to interface/web/themes/default-304/icons/x16/camera__plus.png
diff --git a/interface/web/themes/default/icons/x16/camera_black.png b/interface/web/themes/default-304/icons/x16/camera_black.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/camera_black.png
rename to interface/web/themes/default-304/icons/x16/camera_black.png
diff --git a/interface/web/themes/default/icons/x16/camera_small.png b/interface/web/themes/default-304/icons/x16/camera_small.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/camera_small.png
rename to interface/web/themes/default-304/icons/x16/camera_small.png
diff --git a/interface/web/themes/default/icons/x16/camera_small_black.png b/interface/web/themes/default-304/icons/x16/camera_small_black.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/camera_small_black.png
rename to interface/web/themes/default-304/icons/x16/camera_small_black.png
diff --git a/interface/web/themes/default/icons/x16/card.png b/interface/web/themes/default-304/icons/x16/card.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/card.png
rename to interface/web/themes/default-304/icons/x16/card.png
diff --git a/interface/web/themes/default/icons/x16/card__arrow.png b/interface/web/themes/default-304/icons/x16/card__arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/card__arrow.png
rename to interface/web/themes/default-304/icons/x16/card__arrow.png
diff --git a/interface/web/themes/default/icons/x16/card__exclamation.png b/interface/web/themes/default-304/icons/x16/card__exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/card__exclamation.png
rename to interface/web/themes/default-304/icons/x16/card__exclamation.png
diff --git a/interface/web/themes/default/icons/x16/card__minus.png b/interface/web/themes/default-304/icons/x16/card__minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/card__minus.png
rename to interface/web/themes/default-304/icons/x16/card__minus.png
diff --git a/interface/web/themes/default/icons/x16/card__pencil.png b/interface/web/themes/default-304/icons/x16/card__pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/card__pencil.png
rename to interface/web/themes/default-304/icons/x16/card__pencil.png
diff --git a/interface/web/themes/default/icons/x16/card__plus.png b/interface/web/themes/default-304/icons/x16/card__plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/card__plus.png
rename to interface/web/themes/default-304/icons/x16/card__plus.png
diff --git a/interface/web/themes/default/icons/x16/card_address.png b/interface/web/themes/default-304/icons/x16/card_address.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/card_address.png
rename to interface/web/themes/default-304/icons/x16/card_address.png
diff --git a/interface/web/themes/default/icons/x16/card_small.png b/interface/web/themes/default-304/icons/x16/card_small.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/card_small.png
rename to interface/web/themes/default-304/icons/x16/card_small.png
diff --git a/interface/web/themes/default/icons/x16/cards.png b/interface/web/themes/default-304/icons/x16/cards.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/cards.png
rename to interface/web/themes/default-304/icons/x16/cards.png
diff --git a/interface/web/themes/default/icons/x16/cards__arrow.png b/interface/web/themes/default-304/icons/x16/cards__arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/cards__arrow.png
rename to interface/web/themes/default-304/icons/x16/cards__arrow.png
diff --git a/interface/web/themes/default/icons/x16/cards__exclamation.png b/interface/web/themes/default-304/icons/x16/cards__exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/cards__exclamation.png
rename to interface/web/themes/default-304/icons/x16/cards__exclamation.png
diff --git a/interface/web/themes/default/icons/x16/cards__minus.png b/interface/web/themes/default-304/icons/x16/cards__minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/cards__minus.png
rename to interface/web/themes/default-304/icons/x16/cards__minus.png
diff --git a/interface/web/themes/default/icons/x16/cards__pencil.png b/interface/web/themes/default-304/icons/x16/cards__pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/cards__pencil.png
rename to interface/web/themes/default-304/icons/x16/cards__pencil.png
diff --git a/interface/web/themes/default/icons/x16/cards__plus.png b/interface/web/themes/default-304/icons/x16/cards__plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/cards__plus.png
rename to interface/web/themes/default-304/icons/x16/cards__plus.png
diff --git a/interface/web/themes/default/icons/x16/cards_address.png b/interface/web/themes/default-304/icons/x16/cards_address.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/cards_address.png
rename to interface/web/themes/default-304/icons/x16/cards_address.png
diff --git a/interface/web/themes/default/icons/x16/cards_stack.png b/interface/web/themes/default-304/icons/x16/cards_stack.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/cards_stack.png
rename to interface/web/themes/default-304/icons/x16/cards_stack.png
diff --git a/interface/web/themes/default/icons/x16/cassette.png b/interface/web/themes/default-304/icons/x16/cassette.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/cassette.png
rename to interface/web/themes/default-304/icons/x16/cassette.png
diff --git a/interface/web/themes/default/icons/x16/cassette_arrow.png b/interface/web/themes/default-304/icons/x16/cassette_arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/cassette_arrow.png
rename to interface/web/themes/default-304/icons/x16/cassette_arrow.png
diff --git a/interface/web/themes/default/icons/x16/cassette_exclamation.png b/interface/web/themes/default-304/icons/x16/cassette_exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/cassette_exclamation.png
rename to interface/web/themes/default-304/icons/x16/cassette_exclamation.png
diff --git a/interface/web/themes/default/icons/x16/cassette_minus.png b/interface/web/themes/default-304/icons/x16/cassette_minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/cassette_minus.png
rename to interface/web/themes/default-304/icons/x16/cassette_minus.png
diff --git a/interface/web/themes/default/icons/x16/cassette_pencil.png b/interface/web/themes/default-304/icons/x16/cassette_pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/cassette_pencil.png
rename to interface/web/themes/default-304/icons/x16/cassette_pencil.png
diff --git a/interface/web/themes/default/icons/x16/cassette_plus.png b/interface/web/themes/default-304/icons/x16/cassette_plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/cassette_plus.png
rename to interface/web/themes/default-304/icons/x16/cassette_plus.png
diff --git a/interface/web/themes/default/icons/x16/cassette_small.png b/interface/web/themes/default-304/icons/x16/cassette_small.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/cassette_small.png
rename to interface/web/themes/default-304/icons/x16/cassette_small.png
diff --git a/interface/web/themes/default/icons/x16/chain.png b/interface/web/themes/default-304/icons/x16/chain.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/chain.png
rename to interface/web/themes/default-304/icons/x16/chain.png
diff --git a/interface/web/themes/default/icons/x16/chain_arrow.png b/interface/web/themes/default-304/icons/x16/chain_arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/chain_arrow.png
rename to interface/web/themes/default-304/icons/x16/chain_arrow.png
diff --git a/interface/web/themes/default/icons/x16/chain_exclamation.png b/interface/web/themes/default-304/icons/x16/chain_exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/chain_exclamation.png
rename to interface/web/themes/default-304/icons/x16/chain_exclamation.png
diff --git a/interface/web/themes/default/icons/x16/chain_minus.png b/interface/web/themes/default-304/icons/x16/chain_minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/chain_minus.png
rename to interface/web/themes/default-304/icons/x16/chain_minus.png
diff --git a/interface/web/themes/default/icons/x16/chain_pencil.png b/interface/web/themes/default-304/icons/x16/chain_pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/chain_pencil.png
rename to interface/web/themes/default-304/icons/x16/chain_pencil.png
diff --git a/interface/web/themes/default/icons/x16/chain_plus.png b/interface/web/themes/default-304/icons/x16/chain_plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/chain_plus.png
rename to interface/web/themes/default-304/icons/x16/chain_plus.png
diff --git a/interface/web/themes/default/icons/x16/chain_small.png b/interface/web/themes/default-304/icons/x16/chain_small.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/chain_small.png
rename to interface/web/themes/default-304/icons/x16/chain_small.png
diff --git a/interface/web/themes/default/icons/x16/chain_unchain.png b/interface/web/themes/default-304/icons/x16/chain_unchain.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/chain_unchain.png
rename to interface/web/themes/default-304/icons/x16/chain_unchain.png
diff --git a/interface/web/themes/default/icons/x16/clipboard.png b/interface/web/themes/default-304/icons/x16/clipboard.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/clipboard.png
rename to interface/web/themes/default-304/icons/x16/clipboard.png
diff --git a/interface/web/themes/default/icons/x16/clipboard__arrow.png b/interface/web/themes/default-304/icons/x16/clipboard__arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/clipboard__arrow.png
rename to interface/web/themes/default-304/icons/x16/clipboard__arrow.png
diff --git a/interface/web/themes/default/icons/x16/clipboard__exclamation.png b/interface/web/themes/default-304/icons/x16/clipboard__exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/clipboard__exclamation.png
rename to interface/web/themes/default-304/icons/x16/clipboard__exclamation.png
diff --git a/interface/web/themes/default/icons/x16/clipboard__minus.png b/interface/web/themes/default-304/icons/x16/clipboard__minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/clipboard__minus.png
rename to interface/web/themes/default-304/icons/x16/clipboard__minus.png
diff --git a/interface/web/themes/default/icons/x16/clipboard__pencil.png b/interface/web/themes/default-304/icons/x16/clipboard__pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/clipboard__pencil.png
rename to interface/web/themes/default-304/icons/x16/clipboard__pencil.png
diff --git a/interface/web/themes/default/icons/x16/clipboard__plus.png b/interface/web/themes/default-304/icons/x16/clipboard__plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/clipboard__plus.png
rename to interface/web/themes/default-304/icons/x16/clipboard__plus.png
diff --git a/interface/web/themes/default/icons/x16/clipboard_empty.png b/interface/web/themes/default-304/icons/x16/clipboard_empty.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/clipboard_empty.png
rename to interface/web/themes/default-304/icons/x16/clipboard_empty.png
diff --git a/interface/web/themes/default/icons/x16/clipboard_text.png b/interface/web/themes/default-304/icons/x16/clipboard_text.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/clipboard_text.png
rename to interface/web/themes/default-304/icons/x16/clipboard_text.png
diff --git a/interface/web/themes/default/icons/x16/clock.png b/interface/web/themes/default-304/icons/x16/clock.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/clock.png
rename to interface/web/themes/default-304/icons/x16/clock.png
diff --git a/interface/web/themes/default/icons/x16/clock__arrow.png b/interface/web/themes/default-304/icons/x16/clock__arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/clock__arrow.png
rename to interface/web/themes/default-304/icons/x16/clock__arrow.png
diff --git a/interface/web/themes/default/icons/x16/clock__exclamation.png b/interface/web/themes/default-304/icons/x16/clock__exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/clock__exclamation.png
rename to interface/web/themes/default-304/icons/x16/clock__exclamation.png
diff --git a/interface/web/themes/default/icons/x16/clock__minus.png b/interface/web/themes/default-304/icons/x16/clock__minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/clock__minus.png
rename to interface/web/themes/default-304/icons/x16/clock__minus.png
diff --git a/interface/web/themes/default/icons/x16/clock__pencil.png b/interface/web/themes/default-304/icons/x16/clock__pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/clock__pencil.png
rename to interface/web/themes/default-304/icons/x16/clock__pencil.png
diff --git a/interface/web/themes/default/icons/x16/clock__plus.png b/interface/web/themes/default-304/icons/x16/clock__plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/clock__plus.png
rename to interface/web/themes/default-304/icons/x16/clock__plus.png
diff --git a/interface/web/themes/default/icons/x16/clock_fill.png b/interface/web/themes/default-304/icons/x16/clock_fill.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/clock_fill.png
rename to interface/web/themes/default-304/icons/x16/clock_fill.png
diff --git a/interface/web/themes/default/icons/x16/clock_frame.png b/interface/web/themes/default-304/icons/x16/clock_frame.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/clock_frame.png
rename to interface/web/themes/default-304/icons/x16/clock_frame.png
diff --git a/interface/web/themes/default/icons/x16/clock_small.png b/interface/web/themes/default-304/icons/x16/clock_small.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/clock_small.png
rename to interface/web/themes/default-304/icons/x16/clock_small.png
diff --git a/interface/web/themes/default/icons/x16/color.png b/interface/web/themes/default-304/icons/x16/color.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/color.png
rename to interface/web/themes/default-304/icons/x16/color.png
diff --git a/interface/web/themes/default/icons/x16/color_arrow.png b/interface/web/themes/default-304/icons/x16/color_arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/color_arrow.png
rename to interface/web/themes/default-304/icons/x16/color_arrow.png
diff --git a/interface/web/themes/default/icons/x16/color_exclamation.png b/interface/web/themes/default-304/icons/x16/color_exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/color_exclamation.png
rename to interface/web/themes/default-304/icons/x16/color_exclamation.png
diff --git a/interface/web/themes/default/icons/x16/color_minus.png b/interface/web/themes/default-304/icons/x16/color_minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/color_minus.png
rename to interface/web/themes/default-304/icons/x16/color_minus.png
diff --git a/interface/web/themes/default/icons/x16/color_pencil.png b/interface/web/themes/default-304/icons/x16/color_pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/color_pencil.png
rename to interface/web/themes/default-304/icons/x16/color_pencil.png
diff --git a/interface/web/themes/default/icons/x16/color_plus.png b/interface/web/themes/default-304/icons/x16/color_plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/color_plus.png
rename to interface/web/themes/default-304/icons/x16/color_plus.png
diff --git a/interface/web/themes/default/icons/x16/color_small.png b/interface/web/themes/default-304/icons/x16/color_small.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/color_small.png
rename to interface/web/themes/default-304/icons/x16/color_small.png
diff --git a/interface/web/themes/default/icons/x16/contrast.png b/interface/web/themes/default-304/icons/x16/contrast.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/contrast.png
rename to interface/web/themes/default-304/icons/x16/contrast.png
diff --git a/interface/web/themes/default/icons/x16/contrast__arrow.png b/interface/web/themes/default-304/icons/x16/contrast__arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/contrast__arrow.png
rename to interface/web/themes/default-304/icons/x16/contrast__arrow.png
diff --git a/interface/web/themes/default/icons/x16/contrast__exclamation.png b/interface/web/themes/default-304/icons/x16/contrast__exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/contrast__exclamation.png
rename to interface/web/themes/default-304/icons/x16/contrast__exclamation.png
diff --git a/interface/web/themes/default/icons/x16/contrast__minus.png b/interface/web/themes/default-304/icons/x16/contrast__minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/contrast__minus.png
rename to interface/web/themes/default-304/icons/x16/contrast__minus.png
diff --git a/interface/web/themes/default/icons/x16/contrast__pencil.png b/interface/web/themes/default-304/icons/x16/contrast__pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/contrast__pencil.png
rename to interface/web/themes/default-304/icons/x16/contrast__pencil.png
diff --git a/interface/web/themes/default/icons/x16/contrast__plus.png b/interface/web/themes/default-304/icons/x16/contrast__plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/contrast__plus.png
rename to interface/web/themes/default-304/icons/x16/contrast__plus.png
diff --git a/interface/web/themes/default/icons/x16/contrast_low.png b/interface/web/themes/default-304/icons/x16/contrast_low.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/contrast_low.png
rename to interface/web/themes/default-304/icons/x16/contrast_low.png
diff --git a/interface/web/themes/default/icons/x16/contrast_small.png b/interface/web/themes/default-304/icons/x16/contrast_small.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/contrast_small.png
rename to interface/web/themes/default-304/icons/x16/contrast_small.png
diff --git a/interface/web/themes/default/icons/x16/contrast_small_low.png b/interface/web/themes/default-304/icons/x16/contrast_small_low.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/contrast_small_low.png
rename to interface/web/themes/default-304/icons/x16/contrast_small_low.png
diff --git a/interface/web/themes/default/icons/x16/cross.png b/interface/web/themes/default-304/icons/x16/cross.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/cross.png
rename to interface/web/themes/default-304/icons/x16/cross.png
diff --git a/interface/web/themes/default-v2/icons/x16/cross_circle.png b/interface/web/themes/default-304/icons/x16/cross_circle.png
similarity index 100%
rename from interface/web/themes/default-v2/icons/x16/cross_circle.png
rename to interface/web/themes/default-304/icons/x16/cross_circle.png
diff --git a/interface/web/themes/default/icons/x16/cross_circle_frame.png b/interface/web/themes/default-304/icons/x16/cross_circle_frame.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/cross_circle_frame.png
rename to interface/web/themes/default-304/icons/x16/cross_circle_frame.png
diff --git a/interface/web/themes/default/icons/x16/cross_shield.png b/interface/web/themes/default-304/icons/x16/cross_shield.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/cross_shield.png
rename to interface/web/themes/default-304/icons/x16/cross_shield.png
diff --git a/interface/web/themes/default/icons/x16/cross_small.png b/interface/web/themes/default-304/icons/x16/cross_small.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/cross_small.png
rename to interface/web/themes/default-304/icons/x16/cross_small.png
diff --git a/interface/web/themes/default/icons/x16/cross_small_circle.png b/interface/web/themes/default-304/icons/x16/cross_small_circle.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/cross_small_circle.png
rename to interface/web/themes/default-304/icons/x16/cross_small_circle.png
diff --git a/interface/web/themes/default/icons/x16/crown.png b/interface/web/themes/default-304/icons/x16/crown.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/crown.png
rename to interface/web/themes/default-304/icons/x16/crown.png
diff --git a/interface/web/themes/default/icons/x16/crown__arrow.png b/interface/web/themes/default-304/icons/x16/crown__arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/crown__arrow.png
rename to interface/web/themes/default-304/icons/x16/crown__arrow.png
diff --git a/interface/web/themes/default/icons/x16/crown__exclamation.png b/interface/web/themes/default-304/icons/x16/crown__exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/crown__exclamation.png
rename to interface/web/themes/default-304/icons/x16/crown__exclamation.png
diff --git a/interface/web/themes/default/icons/x16/crown__minus.png b/interface/web/themes/default-304/icons/x16/crown__minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/crown__minus.png
rename to interface/web/themes/default-304/icons/x16/crown__minus.png
diff --git a/interface/web/themes/default/icons/x16/crown__pencil.png b/interface/web/themes/default-304/icons/x16/crown__pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/crown__pencil.png
rename to interface/web/themes/default-304/icons/x16/crown__pencil.png
diff --git a/interface/web/themes/default/icons/x16/crown__plus.png b/interface/web/themes/default-304/icons/x16/crown__plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/crown__plus.png
rename to interface/web/themes/default-304/icons/x16/crown__plus.png
diff --git a/interface/web/themes/default/icons/x16/crown_bronze.png b/interface/web/themes/default-304/icons/x16/crown_bronze.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/crown_bronze.png
rename to interface/web/themes/default-304/icons/x16/crown_bronze.png
diff --git a/interface/web/themes/default/icons/x16/crown_silver.png b/interface/web/themes/default-304/icons/x16/crown_silver.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/crown_silver.png
rename to interface/web/themes/default-304/icons/x16/crown_silver.png
diff --git a/interface/web/themes/default/icons/x16/database.png b/interface/web/themes/default-304/icons/x16/database.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/database.png
rename to interface/web/themes/default-304/icons/x16/database.png
diff --git a/interface/web/themes/default/icons/x16/database_arrow.png b/interface/web/themes/default-304/icons/x16/database_arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/database_arrow.png
rename to interface/web/themes/default-304/icons/x16/database_arrow.png
diff --git a/interface/web/themes/default/icons/x16/database_exclamation.png b/interface/web/themes/default-304/icons/x16/database_exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/database_exclamation.png
rename to interface/web/themes/default-304/icons/x16/database_exclamation.png
diff --git a/interface/web/themes/default/icons/x16/database_minus.png b/interface/web/themes/default-304/icons/x16/database_minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/database_minus.png
rename to interface/web/themes/default-304/icons/x16/database_minus.png
diff --git a/interface/web/themes/default/icons/x16/database_pencil.png b/interface/web/themes/default-304/icons/x16/database_pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/database_pencil.png
rename to interface/web/themes/default-304/icons/x16/database_pencil.png
diff --git a/interface/web/themes/default/icons/x16/database_plus.png b/interface/web/themes/default-304/icons/x16/database_plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/database_plus.png
rename to interface/web/themes/default-304/icons/x16/database_plus.png
diff --git a/interface/web/themes/default/icons/x16/database_small.png b/interface/web/themes/default-304/icons/x16/database_small.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/database_small.png
rename to interface/web/themes/default-304/icons/x16/database_small.png
diff --git a/interface/web/themes/default/icons/x16/databases.png b/interface/web/themes/default-304/icons/x16/databases.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/databases.png
rename to interface/web/themes/default-304/icons/x16/databases.png
diff --git a/interface/web/themes/default/icons/x16/databases_arrow.png b/interface/web/themes/default-304/icons/x16/databases_arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/databases_arrow.png
rename to interface/web/themes/default-304/icons/x16/databases_arrow.png
diff --git a/interface/web/themes/default/icons/x16/databases_exclamation.png b/interface/web/themes/default-304/icons/x16/databases_exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/databases_exclamation.png
rename to interface/web/themes/default-304/icons/x16/databases_exclamation.png
diff --git a/interface/web/themes/default/icons/x16/databases_minus.png b/interface/web/themes/default-304/icons/x16/databases_minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/databases_minus.png
rename to interface/web/themes/default-304/icons/x16/databases_minus.png
diff --git a/interface/web/themes/default/icons/x16/databases_pencil.png b/interface/web/themes/default-304/icons/x16/databases_pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/databases_pencil.png
rename to interface/web/themes/default-304/icons/x16/databases_pencil.png
diff --git a/interface/web/themes/default/icons/x16/databases_plus.png b/interface/web/themes/default-304/icons/x16/databases_plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/databases_plus.png
rename to interface/web/themes/default-304/icons/x16/databases_plus.png
diff --git a/interface/web/themes/default/icons/x16/disc.png b/interface/web/themes/default-304/icons/x16/disc.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/disc.png
rename to interface/web/themes/default-304/icons/x16/disc.png
diff --git a/interface/web/themes/default/icons/x16/disc_arrow.png b/interface/web/themes/default-304/icons/x16/disc_arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/disc_arrow.png
rename to interface/web/themes/default-304/icons/x16/disc_arrow.png
diff --git a/interface/web/themes/default/icons/x16/disc_exclamation.png b/interface/web/themes/default-304/icons/x16/disc_exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/disc_exclamation.png
rename to interface/web/themes/default-304/icons/x16/disc_exclamation.png
diff --git a/interface/web/themes/default/icons/x16/disc_minus.png b/interface/web/themes/default-304/icons/x16/disc_minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/disc_minus.png
rename to interface/web/themes/default-304/icons/x16/disc_minus.png
diff --git a/interface/web/themes/default/icons/x16/disc_pencil.png b/interface/web/themes/default-304/icons/x16/disc_pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/disc_pencil.png
rename to interface/web/themes/default-304/icons/x16/disc_pencil.png
diff --git a/interface/web/themes/default/icons/x16/disc_plus.png b/interface/web/themes/default-304/icons/x16/disc_plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/disc_plus.png
rename to interface/web/themes/default-304/icons/x16/disc_plus.png
diff --git a/interface/web/themes/default/icons/x16/disc_small.png b/interface/web/themes/default-304/icons/x16/disc_small.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/disc_small.png
rename to interface/web/themes/default-304/icons/x16/disc_small.png
diff --git a/interface/web/themes/default/icons/x16/discs.png b/interface/web/themes/default-304/icons/x16/discs.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/discs.png
rename to interface/web/themes/default-304/icons/x16/discs.png
diff --git a/interface/web/themes/default/icons/x16/discs_arrow.png b/interface/web/themes/default-304/icons/x16/discs_arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/discs_arrow.png
rename to interface/web/themes/default-304/icons/x16/discs_arrow.png
diff --git a/interface/web/themes/default/icons/x16/discs_exclamation.png b/interface/web/themes/default-304/icons/x16/discs_exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/discs_exclamation.png
rename to interface/web/themes/default-304/icons/x16/discs_exclamation.png
diff --git a/interface/web/themes/default/icons/x16/discs_minus.png b/interface/web/themes/default-304/icons/x16/discs_minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/discs_minus.png
rename to interface/web/themes/default-304/icons/x16/discs_minus.png
diff --git a/interface/web/themes/default/icons/x16/discs_pencil.png b/interface/web/themes/default-304/icons/x16/discs_pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/discs_pencil.png
rename to interface/web/themes/default-304/icons/x16/discs_pencil.png
diff --git a/interface/web/themes/default/icons/x16/discs_plus.png b/interface/web/themes/default-304/icons/x16/discs_plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/discs_plus.png
rename to interface/web/themes/default-304/icons/x16/discs_plus.png
diff --git a/interface/web/themes/default/icons/x16/disk.png b/interface/web/themes/default-304/icons/x16/disk.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/disk.png
rename to interface/web/themes/default-304/icons/x16/disk.png
diff --git a/interface/web/themes/default/icons/x16/disk__arrow.png b/interface/web/themes/default-304/icons/x16/disk__arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/disk__arrow.png
rename to interface/web/themes/default-304/icons/x16/disk__arrow.png
diff --git a/interface/web/themes/default/icons/x16/disk__exclamation.png b/interface/web/themes/default-304/icons/x16/disk__exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/disk__exclamation.png
rename to interface/web/themes/default-304/icons/x16/disk__exclamation.png
diff --git a/interface/web/themes/default/icons/x16/disk__minus.png b/interface/web/themes/default-304/icons/x16/disk__minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/disk__minus.png
rename to interface/web/themes/default-304/icons/x16/disk__minus.png
diff --git a/interface/web/themes/default/icons/x16/disk__pencil.png b/interface/web/themes/default-304/icons/x16/disk__pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/disk__pencil.png
rename to interface/web/themes/default-304/icons/x16/disk__pencil.png
diff --git a/interface/web/themes/default/icons/x16/disk__plus.png b/interface/web/themes/default-304/icons/x16/disk__plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/disk__plus.png
rename to interface/web/themes/default-304/icons/x16/disk__plus.png
diff --git a/interface/web/themes/default/icons/x16/disk_black.png b/interface/web/themes/default-304/icons/x16/disk_black.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/disk_black.png
rename to interface/web/themes/default-304/icons/x16/disk_black.png
diff --git a/interface/web/themes/default/icons/x16/disk_small.png b/interface/web/themes/default-304/icons/x16/disk_small.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/disk_small.png
rename to interface/web/themes/default-304/icons/x16/disk_small.png
diff --git a/interface/web/themes/default/icons/x16/disk_small_black.png b/interface/web/themes/default-304/icons/x16/disk_small_black.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/disk_small_black.png
rename to interface/web/themes/default-304/icons/x16/disk_small_black.png
diff --git a/interface/web/themes/default/icons/x16/disks.png b/interface/web/themes/default-304/icons/x16/disks.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/disks.png
rename to interface/web/themes/default-304/icons/x16/disks.png
diff --git a/interface/web/themes/default/icons/x16/disks__arrow.png b/interface/web/themes/default-304/icons/x16/disks__arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/disks__arrow.png
rename to interface/web/themes/default-304/icons/x16/disks__arrow.png
diff --git a/interface/web/themes/default/icons/x16/disks__exclamation.png b/interface/web/themes/default-304/icons/x16/disks__exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/disks__exclamation.png
rename to interface/web/themes/default-304/icons/x16/disks__exclamation.png
diff --git a/interface/web/themes/default/icons/x16/disks__minus.png b/interface/web/themes/default-304/icons/x16/disks__minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/disks__minus.png
rename to interface/web/themes/default-304/icons/x16/disks__minus.png
diff --git a/interface/web/themes/default/icons/x16/disks__pencil.png b/interface/web/themes/default-304/icons/x16/disks__pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/disks__pencil.png
rename to interface/web/themes/default-304/icons/x16/disks__pencil.png
diff --git a/interface/web/themes/default/icons/x16/disks__plus.png b/interface/web/themes/default-304/icons/x16/disks__plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/disks__plus.png
rename to interface/web/themes/default-304/icons/x16/disks__plus.png
diff --git a/interface/web/themes/default/icons/x16/disks_black.png b/interface/web/themes/default-304/icons/x16/disks_black.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/disks_black.png
rename to interface/web/themes/default-304/icons/x16/disks_black.png
diff --git a/interface/web/themes/default/icons/x16/document.png b/interface/web/themes/default-304/icons/x16/document.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/document.png
rename to interface/web/themes/default-304/icons/x16/document.png
diff --git a/interface/web/themes/default/icons/x16/document__arrow.png b/interface/web/themes/default-304/icons/x16/document__arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/document__arrow.png
rename to interface/web/themes/default-304/icons/x16/document__arrow.png
diff --git a/interface/web/themes/default/icons/x16/document__exclamation.png b/interface/web/themes/default-304/icons/x16/document__exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/document__exclamation.png
rename to interface/web/themes/default-304/icons/x16/document__exclamation.png
diff --git a/interface/web/themes/default/icons/x16/document__minus.png b/interface/web/themes/default-304/icons/x16/document__minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/document__minus.png
rename to interface/web/themes/default-304/icons/x16/document__minus.png
diff --git a/interface/web/themes/default/icons/x16/document__pencil.png b/interface/web/themes/default-304/icons/x16/document__pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/document__pencil.png
rename to interface/web/themes/default-304/icons/x16/document__pencil.png
diff --git a/interface/web/themes/default/icons/x16/document__plus.png b/interface/web/themes/default-304/icons/x16/document__plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/document__plus.png
rename to interface/web/themes/default-304/icons/x16/document__plus.png
diff --git a/interface/web/themes/default/icons/x16/document_horizontal.png b/interface/web/themes/default-304/icons/x16/document_horizontal.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/document_horizontal.png
rename to interface/web/themes/default-304/icons/x16/document_horizontal.png
diff --git a/interface/web/themes/default/icons/x16/document_horizontal_text.png b/interface/web/themes/default-304/icons/x16/document_horizontal_text.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/document_horizontal_text.png
rename to interface/web/themes/default-304/icons/x16/document_horizontal_text.png
diff --git a/interface/web/themes/default/icons/x16/document_music.png b/interface/web/themes/default-304/icons/x16/document_music.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/document_music.png
rename to interface/web/themes/default-304/icons/x16/document_music.png
diff --git a/interface/web/themes/default/icons/x16/document_music_playlist.png b/interface/web/themes/default-304/icons/x16/document_music_playlist.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/document_music_playlist.png
rename to interface/web/themes/default-304/icons/x16/document_music_playlist.png
diff --git a/interface/web/themes/default/icons/x16/document_shred.png b/interface/web/themes/default-304/icons/x16/document_shred.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/document_shred.png
rename to interface/web/themes/default-304/icons/x16/document_shred.png
diff --git a/interface/web/themes/default/icons/x16/document_small.png b/interface/web/themes/default-304/icons/x16/document_small.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/document_small.png
rename to interface/web/themes/default-304/icons/x16/document_small.png
diff --git a/interface/web/themes/default/icons/x16/document_text.png b/interface/web/themes/default-304/icons/x16/document_text.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/document_text.png
rename to interface/web/themes/default-304/icons/x16/document_text.png
diff --git a/interface/web/themes/default/icons/x16/document_text_image.png b/interface/web/themes/default-304/icons/x16/document_text_image.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/document_text_image.png
rename to interface/web/themes/default-304/icons/x16/document_text_image.png
diff --git a/interface/web/themes/default/icons/x16/document_zipper.png b/interface/web/themes/default-304/icons/x16/document_zipper.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/document_zipper.png
rename to interface/web/themes/default-304/icons/x16/document_zipper.png
diff --git a/interface/web/themes/default/icons/x16/documents.png b/interface/web/themes/default-304/icons/x16/documents.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/documents.png
rename to interface/web/themes/default-304/icons/x16/documents.png
diff --git a/interface/web/themes/default/icons/x16/documents_arrow.png b/interface/web/themes/default-304/icons/x16/documents_arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/documents_arrow.png
rename to interface/web/themes/default-304/icons/x16/documents_arrow.png
diff --git a/interface/web/themes/default/icons/x16/documents_exclamation.png b/interface/web/themes/default-304/icons/x16/documents_exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/documents_exclamation.png
rename to interface/web/themes/default-304/icons/x16/documents_exclamation.png
diff --git a/interface/web/themes/default/icons/x16/documents_minus.png b/interface/web/themes/default-304/icons/x16/documents_minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/documents_minus.png
rename to interface/web/themes/default-304/icons/x16/documents_minus.png
diff --git a/interface/web/themes/default/icons/x16/documents_pencil.png b/interface/web/themes/default-304/icons/x16/documents_pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/documents_pencil.png
rename to interface/web/themes/default-304/icons/x16/documents_pencil.png
diff --git a/interface/web/themes/default/icons/x16/documents_plus.png b/interface/web/themes/default-304/icons/x16/documents_plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/documents_plus.png
rename to interface/web/themes/default-304/icons/x16/documents_plus.png
diff --git a/interface/web/themes/default/icons/x16/documents_stack.png b/interface/web/themes/default-304/icons/x16/documents_stack.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/documents_stack.png
rename to interface/web/themes/default-304/icons/x16/documents_stack.png
diff --git a/interface/web/themes/default/icons/x16/documents_text.png b/interface/web/themes/default-304/icons/x16/documents_text.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/documents_text.png
rename to interface/web/themes/default-304/icons/x16/documents_text.png
diff --git a/interface/web/themes/default/icons/x16/door.png b/interface/web/themes/default-304/icons/x16/door.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/door.png
rename to interface/web/themes/default-304/icons/x16/door.png
diff --git a/interface/web/themes/default/icons/x16/door_arrow.png b/interface/web/themes/default-304/icons/x16/door_arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/door_arrow.png
rename to interface/web/themes/default-304/icons/x16/door_arrow.png
diff --git a/interface/web/themes/default/icons/x16/door_exclamation.png b/interface/web/themes/default-304/icons/x16/door_exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/door_exclamation.png
rename to interface/web/themes/default-304/icons/x16/door_exclamation.png
diff --git a/interface/web/themes/default/icons/x16/door_minus.png b/interface/web/themes/default-304/icons/x16/door_minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/door_minus.png
rename to interface/web/themes/default-304/icons/x16/door_minus.png
diff --git a/interface/web/themes/default/icons/x16/door_pencil.png b/interface/web/themes/default-304/icons/x16/door_pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/door_pencil.png
rename to interface/web/themes/default-304/icons/x16/door_pencil.png
diff --git a/interface/web/themes/default/icons/x16/door_plus.png b/interface/web/themes/default-304/icons/x16/door_plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/door_plus.png
rename to interface/web/themes/default-304/icons/x16/door_plus.png
diff --git a/interface/web/themes/default/icons/x16/drawer.png b/interface/web/themes/default-304/icons/x16/drawer.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/drawer.png
rename to interface/web/themes/default-304/icons/x16/drawer.png
diff --git a/interface/web/themes/default/icons/x16/drawer_arrow.png b/interface/web/themes/default-304/icons/x16/drawer_arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/drawer_arrow.png
rename to interface/web/themes/default-304/icons/x16/drawer_arrow.png
diff --git a/interface/web/themes/default/icons/x16/drawer_exclamation.png b/interface/web/themes/default-304/icons/x16/drawer_exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/drawer_exclamation.png
rename to interface/web/themes/default-304/icons/x16/drawer_exclamation.png
diff --git a/interface/web/themes/default/icons/x16/drawer_minus.png b/interface/web/themes/default-304/icons/x16/drawer_minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/drawer_minus.png
rename to interface/web/themes/default-304/icons/x16/drawer_minus.png
diff --git a/interface/web/themes/default/icons/x16/drawer_pencil.png b/interface/web/themes/default-304/icons/x16/drawer_pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/drawer_pencil.png
rename to interface/web/themes/default-304/icons/x16/drawer_pencil.png
diff --git a/interface/web/themes/default/icons/x16/drawer_plus.png b/interface/web/themes/default-304/icons/x16/drawer_plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/drawer_plus.png
rename to interface/web/themes/default-304/icons/x16/drawer_plus.png
diff --git a/interface/web/themes/default/icons/x16/drill.png b/interface/web/themes/default-304/icons/x16/drill.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/drill.png
rename to interface/web/themes/default-304/icons/x16/drill.png
diff --git a/interface/web/themes/default/icons/x16/drill_arrow.png b/interface/web/themes/default-304/icons/x16/drill_arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/drill_arrow.png
rename to interface/web/themes/default-304/icons/x16/drill_arrow.png
diff --git a/interface/web/themes/default/icons/x16/drill_exclamation.png b/interface/web/themes/default-304/icons/x16/drill_exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/drill_exclamation.png
rename to interface/web/themes/default-304/icons/x16/drill_exclamation.png
diff --git a/interface/web/themes/default/icons/x16/drill_minus.png b/interface/web/themes/default-304/icons/x16/drill_minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/drill_minus.png
rename to interface/web/themes/default-304/icons/x16/drill_minus.png
diff --git a/interface/web/themes/default/icons/x16/drill_pencil.png b/interface/web/themes/default-304/icons/x16/drill_pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/drill_pencil.png
rename to interface/web/themes/default-304/icons/x16/drill_pencil.png
diff --git a/interface/web/themes/default/icons/x16/drill_plus.png b/interface/web/themes/default-304/icons/x16/drill_plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/drill_plus.png
rename to interface/web/themes/default-304/icons/x16/drill_plus.png
diff --git a/interface/web/themes/default/icons/x16/envelope.png b/interface/web/themes/default-304/icons/x16/envelope.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/envelope.png
rename to interface/web/themes/default-304/icons/x16/envelope.png
diff --git a/interface/web/themes/default/icons/x16/envelope_arrow.png b/interface/web/themes/default-304/icons/x16/envelope_arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/envelope_arrow.png
rename to interface/web/themes/default-304/icons/x16/envelope_arrow.png
diff --git a/interface/web/themes/default/icons/x16/envelope_exclamation.png b/interface/web/themes/default-304/icons/x16/envelope_exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/envelope_exclamation.png
rename to interface/web/themes/default-304/icons/x16/envelope_exclamation.png
diff --git a/interface/web/themes/default/icons/x16/envelope_minus.png b/interface/web/themes/default-304/icons/x16/envelope_minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/envelope_minus.png
rename to interface/web/themes/default-304/icons/x16/envelope_minus.png
diff --git a/interface/web/themes/default/icons/x16/envelope_pencil.png b/interface/web/themes/default-304/icons/x16/envelope_pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/envelope_pencil.png
rename to interface/web/themes/default-304/icons/x16/envelope_pencil.png
diff --git a/interface/web/themes/default/icons/x16/envelope_plus.png b/interface/web/themes/default-304/icons/x16/envelope_plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/envelope_plus.png
rename to interface/web/themes/default-304/icons/x16/envelope_plus.png
diff --git a/interface/web/themes/default/icons/x16/equalizer.png b/interface/web/themes/default-304/icons/x16/equalizer.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/equalizer.png
rename to interface/web/themes/default-304/icons/x16/equalizer.png
diff --git a/interface/web/themes/default/icons/x16/equalizer_arrow.png b/interface/web/themes/default-304/icons/x16/equalizer_arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/equalizer_arrow.png
rename to interface/web/themes/default-304/icons/x16/equalizer_arrow.png
diff --git a/interface/web/themes/default/icons/x16/equalizer_exclamation.png b/interface/web/themes/default-304/icons/x16/equalizer_exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/equalizer_exclamation.png
rename to interface/web/themes/default-304/icons/x16/equalizer_exclamation.png
diff --git a/interface/web/themes/default/icons/x16/equalizer_minus.png b/interface/web/themes/default-304/icons/x16/equalizer_minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/equalizer_minus.png
rename to interface/web/themes/default-304/icons/x16/equalizer_minus.png
diff --git a/interface/web/themes/default/icons/x16/equalizer_pencil.png b/interface/web/themes/default-304/icons/x16/equalizer_pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/equalizer_pencil.png
rename to interface/web/themes/default-304/icons/x16/equalizer_pencil.png
diff --git a/interface/web/themes/default/icons/x16/equalizer_plus.png b/interface/web/themes/default-304/icons/x16/equalizer_plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/equalizer_plus.png
rename to interface/web/themes/default-304/icons/x16/equalizer_plus.png
diff --git a/interface/web/themes/default/icons/x16/eraser.png b/interface/web/themes/default-304/icons/x16/eraser.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/eraser.png
rename to interface/web/themes/default-304/icons/x16/eraser.png
diff --git a/interface/web/themes/default/icons/x16/eraser_arrow.png b/interface/web/themes/default-304/icons/x16/eraser_arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/eraser_arrow.png
rename to interface/web/themes/default-304/icons/x16/eraser_arrow.png
diff --git a/interface/web/themes/default/icons/x16/eraser_exclamation.png b/interface/web/themes/default-304/icons/x16/eraser_exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/eraser_exclamation.png
rename to interface/web/themes/default-304/icons/x16/eraser_exclamation.png
diff --git a/interface/web/themes/default/icons/x16/eraser_minus.png b/interface/web/themes/default-304/icons/x16/eraser_minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/eraser_minus.png
rename to interface/web/themes/default-304/icons/x16/eraser_minus.png
diff --git a/interface/web/themes/default/icons/x16/eraser_pencil.png b/interface/web/themes/default-304/icons/x16/eraser_pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/eraser_pencil.png
rename to interface/web/themes/default-304/icons/x16/eraser_pencil.png
diff --git a/interface/web/themes/default/icons/x16/eraser_plus.png b/interface/web/themes/default-304/icons/x16/eraser_plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/eraser_plus.png
rename to interface/web/themes/default-304/icons/x16/eraser_plus.png
diff --git a/interface/web/themes/default/icons/x16/exclamation.png b/interface/web/themes/default-304/icons/x16/exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/exclamation.png
rename to interface/web/themes/default-304/icons/x16/exclamation.png
diff --git a/interface/web/themes/default/icons/x16/exclamation_frame.png b/interface/web/themes/default-304/icons/x16/exclamation_frame.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/exclamation_frame.png
rename to interface/web/themes/default-304/icons/x16/exclamation_frame.png
diff --git a/interface/web/themes/default/icons/x16/exclamation_shield.png b/interface/web/themes/default-304/icons/x16/exclamation_shield.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/exclamation_shield.png
rename to interface/web/themes/default-304/icons/x16/exclamation_shield.png
diff --git a/interface/web/themes/default/icons/x16/exclamation_small.png b/interface/web/themes/default-304/icons/x16/exclamation_small.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/exclamation_small.png
rename to interface/web/themes/default-304/icons/x16/exclamation_small.png
diff --git a/interface/web/themes/default/icons/x16/feed.png b/interface/web/themes/default-304/icons/x16/feed.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/feed.png
rename to interface/web/themes/default-304/icons/x16/feed.png
diff --git a/interface/web/themes/default/icons/x16/feed__arrow.png b/interface/web/themes/default-304/icons/x16/feed__arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/feed__arrow.png
rename to interface/web/themes/default-304/icons/x16/feed__arrow.png
diff --git a/interface/web/themes/default/icons/x16/feed__exclamation.png b/interface/web/themes/default-304/icons/x16/feed__exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/feed__exclamation.png
rename to interface/web/themes/default-304/icons/x16/feed__exclamation.png
diff --git a/interface/web/themes/default/icons/x16/feed__minus.png b/interface/web/themes/default-304/icons/x16/feed__minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/feed__minus.png
rename to interface/web/themes/default-304/icons/x16/feed__minus.png
diff --git a/interface/web/themes/default/icons/x16/feed__pencil.png b/interface/web/themes/default-304/icons/x16/feed__pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/feed__pencil.png
rename to interface/web/themes/default-304/icons/x16/feed__pencil.png
diff --git a/interface/web/themes/default/icons/x16/feed__plus.png b/interface/web/themes/default-304/icons/x16/feed__plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/feed__plus.png
rename to interface/web/themes/default-304/icons/x16/feed__plus.png
diff --git a/interface/web/themes/default/icons/x16/feed_balloon.png b/interface/web/themes/default-304/icons/x16/feed_balloon.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/feed_balloon.png
rename to interface/web/themes/default-304/icons/x16/feed_balloon.png
diff --git a/interface/web/themes/default/icons/x16/feed_small.png b/interface/web/themes/default-304/icons/x16/feed_small.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/feed_small.png
rename to interface/web/themes/default-304/icons/x16/feed_small.png
diff --git a/interface/web/themes/default/icons/x16/film.png b/interface/web/themes/default-304/icons/x16/film.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/film.png
rename to interface/web/themes/default-304/icons/x16/film.png
diff --git a/interface/web/themes/default/icons/x16/film_arrow.png b/interface/web/themes/default-304/icons/x16/film_arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/film_arrow.png
rename to interface/web/themes/default-304/icons/x16/film_arrow.png
diff --git a/interface/web/themes/default/icons/x16/film_exclamation.png b/interface/web/themes/default-304/icons/x16/film_exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/film_exclamation.png
rename to interface/web/themes/default-304/icons/x16/film_exclamation.png
diff --git a/interface/web/themes/default/icons/x16/film_minus.png b/interface/web/themes/default-304/icons/x16/film_minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/film_minus.png
rename to interface/web/themes/default-304/icons/x16/film_minus.png
diff --git a/interface/web/themes/default/icons/x16/film_pencil.png b/interface/web/themes/default-304/icons/x16/film_pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/film_pencil.png
rename to interface/web/themes/default-304/icons/x16/film_pencil.png
diff --git a/interface/web/themes/default/icons/x16/film_plus.png b/interface/web/themes/default-304/icons/x16/film_plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/film_plus.png
rename to interface/web/themes/default-304/icons/x16/film_plus.png
diff --git a/interface/web/themes/default/icons/x16/film_small.png b/interface/web/themes/default-304/icons/x16/film_small.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/film_small.png
rename to interface/web/themes/default-304/icons/x16/film_small.png
diff --git a/interface/web/themes/default/icons/x16/films.png b/interface/web/themes/default-304/icons/x16/films.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/films.png
rename to interface/web/themes/default-304/icons/x16/films.png
diff --git a/interface/web/themes/default/icons/x16/films_arrow.png b/interface/web/themes/default-304/icons/x16/films_arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/films_arrow.png
rename to interface/web/themes/default-304/icons/x16/films_arrow.png
diff --git a/interface/web/themes/default/icons/x16/films_exclamation.png b/interface/web/themes/default-304/icons/x16/films_exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/films_exclamation.png
rename to interface/web/themes/default-304/icons/x16/films_exclamation.png
diff --git a/interface/web/themes/default/icons/x16/films_minus.png b/interface/web/themes/default-304/icons/x16/films_minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/films_minus.png
rename to interface/web/themes/default-304/icons/x16/films_minus.png
diff --git a/interface/web/themes/default/icons/x16/films_pencil.png b/interface/web/themes/default-304/icons/x16/films_pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/films_pencil.png
rename to interface/web/themes/default-304/icons/x16/films_pencil.png
diff --git a/interface/web/themes/default/icons/x16/films_plus.png b/interface/web/themes/default-304/icons/x16/films_plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/films_plus.png
rename to interface/web/themes/default-304/icons/x16/films_plus.png
diff --git a/interface/web/themes/default/icons/x16/flag.png b/interface/web/themes/default-304/icons/x16/flag.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/flag.png
rename to interface/web/themes/default-304/icons/x16/flag.png
diff --git a/interface/web/themes/default/icons/x16/flag_arrow.png b/interface/web/themes/default-304/icons/x16/flag_arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/flag_arrow.png
rename to interface/web/themes/default-304/icons/x16/flag_arrow.png
diff --git a/interface/web/themes/default/icons/x16/flag_exclamation.png b/interface/web/themes/default-304/icons/x16/flag_exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/flag_exclamation.png
rename to interface/web/themes/default-304/icons/x16/flag_exclamation.png
diff --git a/interface/web/themes/default/icons/x16/flag_minus.png b/interface/web/themes/default-304/icons/x16/flag_minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/flag_minus.png
rename to interface/web/themes/default-304/icons/x16/flag_minus.png
diff --git a/interface/web/themes/default/icons/x16/flag_pencil.png b/interface/web/themes/default-304/icons/x16/flag_pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/flag_pencil.png
rename to interface/web/themes/default-304/icons/x16/flag_pencil.png
diff --git a/interface/web/themes/default/icons/x16/flag_plus.png b/interface/web/themes/default-304/icons/x16/flag_plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/flag_plus.png
rename to interface/web/themes/default-304/icons/x16/flag_plus.png
diff --git a/interface/web/themes/default/icons/x16/folder.png b/interface/web/themes/default-304/icons/x16/folder.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/folder.png
rename to interface/web/themes/default-304/icons/x16/folder.png
diff --git a/interface/web/themes/default/icons/x16/folder__arrow.png b/interface/web/themes/default-304/icons/x16/folder__arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/folder__arrow.png
rename to interface/web/themes/default-304/icons/x16/folder__arrow.png
diff --git a/interface/web/themes/default/icons/x16/folder__exclamation.png b/interface/web/themes/default-304/icons/x16/folder__exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/folder__exclamation.png
rename to interface/web/themes/default-304/icons/x16/folder__exclamation.png
diff --git a/interface/web/themes/default/icons/x16/folder__minus.png b/interface/web/themes/default-304/icons/x16/folder__minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/folder__minus.png
rename to interface/web/themes/default-304/icons/x16/folder__minus.png
diff --git a/interface/web/themes/default/icons/x16/folder__pencil.png b/interface/web/themes/default-304/icons/x16/folder__pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/folder__pencil.png
rename to interface/web/themes/default-304/icons/x16/folder__pencil.png
diff --git a/interface/web/themes/default/icons/x16/folder__plus.png b/interface/web/themes/default-304/icons/x16/folder__plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/folder__plus.png
rename to interface/web/themes/default-304/icons/x16/folder__plus.png
diff --git a/interface/web/themes/default/icons/x16/folder_open.png b/interface/web/themes/default-304/icons/x16/folder_open.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/folder_open.png
rename to interface/web/themes/default-304/icons/x16/folder_open.png
diff --git a/interface/web/themes/default/icons/x16/folder_open_document.png b/interface/web/themes/default-304/icons/x16/folder_open_document.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/folder_open_document.png
rename to interface/web/themes/default-304/icons/x16/folder_open_document.png
diff --git a/interface/web/themes/default/icons/x16/folder_open_document_music.png b/interface/web/themes/default-304/icons/x16/folder_open_document_music.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/folder_open_document_music.png
rename to interface/web/themes/default-304/icons/x16/folder_open_document_music.png
diff --git a/interface/web/themes/default/icons/x16/folder_open_document_music_playlist.png b/interface/web/themes/default-304/icons/x16/folder_open_document_music_playlist.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/folder_open_document_music_playlist.png
rename to interface/web/themes/default-304/icons/x16/folder_open_document_music_playlist.png
diff --git a/interface/web/themes/default/icons/x16/folder_open_document_text.png b/interface/web/themes/default-304/icons/x16/folder_open_document_text.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/folder_open_document_text.png
rename to interface/web/themes/default-304/icons/x16/folder_open_document_text.png
diff --git a/interface/web/themes/default/icons/x16/folder_open_film.png b/interface/web/themes/default-304/icons/x16/folder_open_film.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/folder_open_film.png
rename to interface/web/themes/default-304/icons/x16/folder_open_film.png
diff --git a/interface/web/themes/default/icons/x16/folder_open_image.png b/interface/web/themes/default-304/icons/x16/folder_open_image.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/folder_open_image.png
rename to interface/web/themes/default-304/icons/x16/folder_open_image.png
diff --git a/interface/web/themes/default/icons/x16/folder_shred.png b/interface/web/themes/default-304/icons/x16/folder_shred.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/folder_shred.png
rename to interface/web/themes/default-304/icons/x16/folder_shred.png
diff --git a/interface/web/themes/default/icons/x16/folder_small.png b/interface/web/themes/default-304/icons/x16/folder_small.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/folder_small.png
rename to interface/web/themes/default-304/icons/x16/folder_small.png
diff --git a/interface/web/themes/default/icons/x16/folder_zipper.png b/interface/web/themes/default-304/icons/x16/folder_zipper.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/folder_zipper.png
rename to interface/web/themes/default-304/icons/x16/folder_zipper.png
diff --git a/interface/web/themes/default/icons/x16/folders.png b/interface/web/themes/default-304/icons/x16/folders.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/folders.png
rename to interface/web/themes/default-304/icons/x16/folders.png
diff --git a/interface/web/themes/default/icons/x16/folders_arrow.png b/interface/web/themes/default-304/icons/x16/folders_arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/folders_arrow.png
rename to interface/web/themes/default-304/icons/x16/folders_arrow.png
diff --git a/interface/web/themes/default/icons/x16/folders_exclamation.png b/interface/web/themes/default-304/icons/x16/folders_exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/folders_exclamation.png
rename to interface/web/themes/default-304/icons/x16/folders_exclamation.png
diff --git a/interface/web/themes/default/icons/x16/folders_minus.png b/interface/web/themes/default-304/icons/x16/folders_minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/folders_minus.png
rename to interface/web/themes/default-304/icons/x16/folders_minus.png
diff --git a/interface/web/themes/default/icons/x16/folders_pencil.png b/interface/web/themes/default-304/icons/x16/folders_pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/folders_pencil.png
rename to interface/web/themes/default-304/icons/x16/folders_pencil.png
diff --git a/interface/web/themes/default/icons/x16/folders_plus.png b/interface/web/themes/default-304/icons/x16/folders_plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/folders_plus.png
rename to interface/web/themes/default-304/icons/x16/folders_plus.png
diff --git a/interface/web/themes/default/icons/x16/folders_stack.png b/interface/web/themes/default-304/icons/x16/folders_stack.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/folders_stack.png
rename to interface/web/themes/default-304/icons/x16/folders_stack.png
diff --git a/interface/web/themes/default/icons/x16/funnel.png b/interface/web/themes/default-304/icons/x16/funnel.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/funnel.png
rename to interface/web/themes/default-304/icons/x16/funnel.png
diff --git a/interface/web/themes/default/icons/x16/funnel_arrow.png b/interface/web/themes/default-304/icons/x16/funnel_arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/funnel_arrow.png
rename to interface/web/themes/default-304/icons/x16/funnel_arrow.png
diff --git a/interface/web/themes/default/icons/x16/funnel_exclamation.png b/interface/web/themes/default-304/icons/x16/funnel_exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/funnel_exclamation.png
rename to interface/web/themes/default-304/icons/x16/funnel_exclamation.png
diff --git a/interface/web/themes/default/icons/x16/funnel_minus.png b/interface/web/themes/default-304/icons/x16/funnel_minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/funnel_minus.png
rename to interface/web/themes/default-304/icons/x16/funnel_minus.png
diff --git a/interface/web/themes/default/icons/x16/funnel_pencil.png b/interface/web/themes/default-304/icons/x16/funnel_pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/funnel_pencil.png
rename to interface/web/themes/default-304/icons/x16/funnel_pencil.png
diff --git a/interface/web/themes/default/icons/x16/funnel_plus.png b/interface/web/themes/default-304/icons/x16/funnel_plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/funnel_plus.png
rename to interface/web/themes/default-304/icons/x16/funnel_plus.png
diff --git a/interface/web/themes/default/icons/x16/funnel_small.png b/interface/web/themes/default-304/icons/x16/funnel_small.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/funnel_small.png
rename to interface/web/themes/default-304/icons/x16/funnel_small.png
diff --git a/interface/web/themes/default/icons/x16/gear.png b/interface/web/themes/default-304/icons/x16/gear.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/gear.png
rename to interface/web/themes/default-304/icons/x16/gear.png
diff --git a/interface/web/themes/default/icons/x16/gear__arrow.png b/interface/web/themes/default-304/icons/x16/gear__arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/gear__arrow.png
rename to interface/web/themes/default-304/icons/x16/gear__arrow.png
diff --git a/interface/web/themes/default/icons/x16/gear__exclamation.png b/interface/web/themes/default-304/icons/x16/gear__exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/gear__exclamation.png
rename to interface/web/themes/default-304/icons/x16/gear__exclamation.png
diff --git a/interface/web/themes/default/icons/x16/gear__minus.png b/interface/web/themes/default-304/icons/x16/gear__minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/gear__minus.png
rename to interface/web/themes/default-304/icons/x16/gear__minus.png
diff --git a/interface/web/themes/default/icons/x16/gear__pencil.png b/interface/web/themes/default-304/icons/x16/gear__pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/gear__pencil.png
rename to interface/web/themes/default-304/icons/x16/gear__pencil.png
diff --git a/interface/web/themes/default/icons/x16/gear__plus.png b/interface/web/themes/default-304/icons/x16/gear__plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/gear__plus.png
rename to interface/web/themes/default-304/icons/x16/gear__plus.png
diff --git a/interface/web/themes/default/icons/x16/gear_disable.png b/interface/web/themes/default-304/icons/x16/gear_disable.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/gear_disable.png
rename to interface/web/themes/default-304/icons/x16/gear_disable.png
diff --git a/interface/web/themes/default/icons/x16/gear_small.png b/interface/web/themes/default-304/icons/x16/gear_small.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/gear_small.png
rename to interface/web/themes/default-304/icons/x16/gear_small.png
diff --git a/interface/web/themes/default/icons/x16/hammer.png b/interface/web/themes/default-304/icons/x16/hammer.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/hammer.png
rename to interface/web/themes/default-304/icons/x16/hammer.png
diff --git a/interface/web/themes/default/icons/x16/hammer__arrow.png b/interface/web/themes/default-304/icons/x16/hammer__arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/hammer__arrow.png
rename to interface/web/themes/default-304/icons/x16/hammer__arrow.png
diff --git a/interface/web/themes/default/icons/x16/hammer__exclamation.png b/interface/web/themes/default-304/icons/x16/hammer__exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/hammer__exclamation.png
rename to interface/web/themes/default-304/icons/x16/hammer__exclamation.png
diff --git a/interface/web/themes/default/icons/x16/hammer__minus.png b/interface/web/themes/default-304/icons/x16/hammer__minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/hammer__minus.png
rename to interface/web/themes/default-304/icons/x16/hammer__minus.png
diff --git a/interface/web/themes/default/icons/x16/hammer__pencil.png b/interface/web/themes/default-304/icons/x16/hammer__pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/hammer__pencil.png
rename to interface/web/themes/default-304/icons/x16/hammer__pencil.png
diff --git a/interface/web/themes/default/icons/x16/hammer__plus.png b/interface/web/themes/default-304/icons/x16/hammer__plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/hammer__plus.png
rename to interface/web/themes/default-304/icons/x16/hammer__plus.png
diff --git a/interface/web/themes/default/icons/x16/hammer_left.png b/interface/web/themes/default-304/icons/x16/hammer_left.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/hammer_left.png
rename to interface/web/themes/default-304/icons/x16/hammer_left.png
diff --git a/interface/web/themes/default/icons/x16/hammer_screwdriver.png b/interface/web/themes/default-304/icons/x16/hammer_screwdriver.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/hammer_screwdriver.png
rename to interface/web/themes/default-304/icons/x16/hammer_screwdriver.png
diff --git a/interface/web/themes/default/icons/x16/heart.png b/interface/web/themes/default-304/icons/x16/heart.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/heart.png
rename to interface/web/themes/default-304/icons/x16/heart.png
diff --git a/interface/web/themes/default/icons/x16/heart__arrow.png b/interface/web/themes/default-304/icons/x16/heart__arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/heart__arrow.png
rename to interface/web/themes/default-304/icons/x16/heart__arrow.png
diff --git a/interface/web/themes/default/icons/x16/heart__exclamation.png b/interface/web/themes/default-304/icons/x16/heart__exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/heart__exclamation.png
rename to interface/web/themes/default-304/icons/x16/heart__exclamation.png
diff --git a/interface/web/themes/default/icons/x16/heart__minus.png b/interface/web/themes/default-304/icons/x16/heart__minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/heart__minus.png
rename to interface/web/themes/default-304/icons/x16/heart__minus.png
diff --git a/interface/web/themes/default/icons/x16/heart__pencil.png b/interface/web/themes/default-304/icons/x16/heart__pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/heart__pencil.png
rename to interface/web/themes/default-304/icons/x16/heart__pencil.png
diff --git a/interface/web/themes/default/icons/x16/heart__plus.png b/interface/web/themes/default-304/icons/x16/heart__plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/heart__plus.png
rename to interface/web/themes/default-304/icons/x16/heart__plus.png
diff --git a/interface/web/themes/default/icons/x16/heart_break.png b/interface/web/themes/default-304/icons/x16/heart_break.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/heart_break.png
rename to interface/web/themes/default-304/icons/x16/heart_break.png
diff --git a/interface/web/themes/default/icons/x16/heart_empty.png b/interface/web/themes/default-304/icons/x16/heart_empty.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/heart_empty.png
rename to interface/web/themes/default-304/icons/x16/heart_empty.png
diff --git a/interface/web/themes/default/icons/x16/heart_half.png b/interface/web/themes/default-304/icons/x16/heart_half.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/heart_half.png
rename to interface/web/themes/default-304/icons/x16/heart_half.png
diff --git a/interface/web/themes/default/icons/x16/heart_small.png b/interface/web/themes/default-304/icons/x16/heart_small.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/heart_small.png
rename to interface/web/themes/default-304/icons/x16/heart_small.png
diff --git a/interface/web/themes/default/icons/x16/heart_small_empty.png b/interface/web/themes/default-304/icons/x16/heart_small_empty.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/heart_small_empty.png
rename to interface/web/themes/default-304/icons/x16/heart_small_empty.png
diff --git a/interface/web/themes/default/icons/x16/heart_small_half.png b/interface/web/themes/default-304/icons/x16/heart_small_half.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/heart_small_half.png
rename to interface/web/themes/default-304/icons/x16/heart_small_half.png
diff --git a/interface/web/themes/default/icons/x16/home.png b/interface/web/themes/default-304/icons/x16/home.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/home.png
rename to interface/web/themes/default-304/icons/x16/home.png
diff --git a/interface/web/themes/default/icons/x16/home_arrow.png b/interface/web/themes/default-304/icons/x16/home_arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/home_arrow.png
rename to interface/web/themes/default-304/icons/x16/home_arrow.png
diff --git a/interface/web/themes/default/icons/x16/home_exclamation.png b/interface/web/themes/default-304/icons/x16/home_exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/home_exclamation.png
rename to interface/web/themes/default-304/icons/x16/home_exclamation.png
diff --git a/interface/web/themes/default/icons/x16/home_minus.png b/interface/web/themes/default-304/icons/x16/home_minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/home_minus.png
rename to interface/web/themes/default-304/icons/x16/home_minus.png
diff --git a/interface/web/themes/default/icons/x16/home_pencil.png b/interface/web/themes/default-304/icons/x16/home_pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/home_pencil.png
rename to interface/web/themes/default-304/icons/x16/home_pencil.png
diff --git a/interface/web/themes/default/icons/x16/home_plus.png b/interface/web/themes/default-304/icons/x16/home_plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/home_plus.png
rename to interface/web/themes/default-304/icons/x16/home_plus.png
diff --git a/interface/web/themes/default/icons/x16/home_small.png b/interface/web/themes/default-304/icons/x16/home_small.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/home_small.png
rename to interface/web/themes/default-304/icons/x16/home_small.png
diff --git a/interface/web/themes/default/icons/x16/image.png b/interface/web/themes/default-304/icons/x16/image.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/image.png
rename to interface/web/themes/default-304/icons/x16/image.png
diff --git a/interface/web/themes/default/icons/x16/image_arrow.png b/interface/web/themes/default-304/icons/x16/image_arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/image_arrow.png
rename to interface/web/themes/default-304/icons/x16/image_arrow.png
diff --git a/interface/web/themes/default/icons/x16/image_exclamation.png b/interface/web/themes/default-304/icons/x16/image_exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/image_exclamation.png
rename to interface/web/themes/default-304/icons/x16/image_exclamation.png
diff --git a/interface/web/themes/default/icons/x16/image_minus.png b/interface/web/themes/default-304/icons/x16/image_minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/image_minus.png
rename to interface/web/themes/default-304/icons/x16/image_minus.png
diff --git a/interface/web/themes/default/icons/x16/image_pencil.png b/interface/web/themes/default-304/icons/x16/image_pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/image_pencil.png
rename to interface/web/themes/default-304/icons/x16/image_pencil.png
diff --git a/interface/web/themes/default/icons/x16/image_plus.png b/interface/web/themes/default-304/icons/x16/image_plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/image_plus.png
rename to interface/web/themes/default-304/icons/x16/image_plus.png
diff --git a/interface/web/themes/default/icons/x16/image_resize.png b/interface/web/themes/default-304/icons/x16/image_resize.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/image_resize.png
rename to interface/web/themes/default-304/icons/x16/image_resize.png
diff --git a/interface/web/themes/default/icons/x16/image_resize_actual.png b/interface/web/themes/default-304/icons/x16/image_resize_actual.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/image_resize_actual.png
rename to interface/web/themes/default-304/icons/x16/image_resize_actual.png
diff --git a/interface/web/themes/default/icons/x16/image_small.png b/interface/web/themes/default-304/icons/x16/image_small.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/image_small.png
rename to interface/web/themes/default-304/icons/x16/image_small.png
diff --git a/interface/web/themes/default/icons/x16/image_small_sunset.png b/interface/web/themes/default-304/icons/x16/image_small_sunset.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/image_small_sunset.png
rename to interface/web/themes/default-304/icons/x16/image_small_sunset.png
diff --git a/interface/web/themes/default/icons/x16/image_sunset.png b/interface/web/themes/default-304/icons/x16/image_sunset.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/image_sunset.png
rename to interface/web/themes/default-304/icons/x16/image_sunset.png
diff --git a/interface/web/themes/default/icons/x16/images.png b/interface/web/themes/default-304/icons/x16/images.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/images.png
rename to interface/web/themes/default-304/icons/x16/images.png
diff --git a/interface/web/themes/default/icons/x16/images_arrow.png b/interface/web/themes/default-304/icons/x16/images_arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/images_arrow.png
rename to interface/web/themes/default-304/icons/x16/images_arrow.png
diff --git a/interface/web/themes/default/icons/x16/images_exclamation.png b/interface/web/themes/default-304/icons/x16/images_exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/images_exclamation.png
rename to interface/web/themes/default-304/icons/x16/images_exclamation.png
diff --git a/interface/web/themes/default/icons/x16/images_minus.png b/interface/web/themes/default-304/icons/x16/images_minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/images_minus.png
rename to interface/web/themes/default-304/icons/x16/images_minus.png
diff --git a/interface/web/themes/default/icons/x16/images_pencil.png b/interface/web/themes/default-304/icons/x16/images_pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/images_pencil.png
rename to interface/web/themes/default-304/icons/x16/images_pencil.png
diff --git a/interface/web/themes/default/icons/x16/images_plus.png b/interface/web/themes/default-304/icons/x16/images_plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/images_plus.png
rename to interface/web/themes/default-304/icons/x16/images_plus.png
diff --git a/interface/web/themes/default/icons/x16/images_stack.png b/interface/web/themes/default-304/icons/x16/images_stack.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/images_stack.png
rename to interface/web/themes/default-304/icons/x16/images_stack.png
diff --git a/interface/web/themes/default/icons/x16/inbox.png b/interface/web/themes/default-304/icons/x16/inbox.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/inbox.png
rename to interface/web/themes/default-304/icons/x16/inbox.png
diff --git a/interface/web/themes/default/icons/x16/inbox_arrow.png b/interface/web/themes/default-304/icons/x16/inbox_arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/inbox_arrow.png
rename to interface/web/themes/default-304/icons/x16/inbox_arrow.png
diff --git a/interface/web/themes/default/icons/x16/inbox_exclamation.png b/interface/web/themes/default-304/icons/x16/inbox_exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/inbox_exclamation.png
rename to interface/web/themes/default-304/icons/x16/inbox_exclamation.png
diff --git a/interface/web/themes/default/icons/x16/inbox_minus.png b/interface/web/themes/default-304/icons/x16/inbox_minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/inbox_minus.png
rename to interface/web/themes/default-304/icons/x16/inbox_minus.png
diff --git a/interface/web/themes/default/icons/x16/inbox_pencil.png b/interface/web/themes/default-304/icons/x16/inbox_pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/inbox_pencil.png
rename to interface/web/themes/default-304/icons/x16/inbox_pencil.png
diff --git a/interface/web/themes/default/icons/x16/inbox_plus.png b/interface/web/themes/default-304/icons/x16/inbox_plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/inbox_plus.png
rename to interface/web/themes/default-304/icons/x16/inbox_plus.png
diff --git a/interface/web/themes/default/icons/x16/information.png b/interface/web/themes/default-304/icons/x16/information.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/information.png
rename to interface/web/themes/default-304/icons/x16/information.png
diff --git a/interface/web/themes/default/icons/x16/information_frame.png b/interface/web/themes/default-304/icons/x16/information_frame.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/information_frame.png
rename to interface/web/themes/default-304/icons/x16/information_frame.png
diff --git a/interface/web/themes/default/icons/x16/information_shield.png b/interface/web/themes/default-304/icons/x16/information_shield.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/information_shield.png
rename to interface/web/themes/default-304/icons/x16/information_shield.png
diff --git a/interface/web/themes/default/icons/x16/information_small.png b/interface/web/themes/default-304/icons/x16/information_small.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/information_small.png
rename to interface/web/themes/default-304/icons/x16/information_small.png
diff --git a/interface/web/themes/default/icons/x16/key.png b/interface/web/themes/default-304/icons/x16/key.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/key.png
rename to interface/web/themes/default-304/icons/x16/key.png
diff --git a/interface/web/themes/default/icons/x16/key__arrow.png b/interface/web/themes/default-304/icons/x16/key__arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/key__arrow.png
rename to interface/web/themes/default-304/icons/x16/key__arrow.png
diff --git a/interface/web/themes/default/icons/x16/key__exclamation.png b/interface/web/themes/default-304/icons/x16/key__exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/key__exclamation.png
rename to interface/web/themes/default-304/icons/x16/key__exclamation.png
diff --git a/interface/web/themes/default/icons/x16/key__minus.png b/interface/web/themes/default-304/icons/x16/key__minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/key__minus.png
rename to interface/web/themes/default-304/icons/x16/key__minus.png
diff --git a/interface/web/themes/default/icons/x16/key__pencil.png b/interface/web/themes/default-304/icons/x16/key__pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/key__pencil.png
rename to interface/web/themes/default-304/icons/x16/key__pencil.png
diff --git a/interface/web/themes/default/icons/x16/key__plus.png b/interface/web/themes/default-304/icons/x16/key__plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/key__plus.png
rename to interface/web/themes/default-304/icons/x16/key__plus.png
diff --git a/interface/web/themes/default/icons/x16/key_disable.png b/interface/web/themes/default-304/icons/x16/key_disable.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/key_disable.png
rename to interface/web/themes/default-304/icons/x16/key_disable.png
diff --git a/interface/web/themes/default/icons/x16/layout.png b/interface/web/themes/default-304/icons/x16/layout.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/layout.png
rename to interface/web/themes/default-304/icons/x16/layout.png
diff --git a/interface/web/themes/default/icons/x16/layout_2.png b/interface/web/themes/default-304/icons/x16/layout_2.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/layout_2.png
rename to interface/web/themes/default-304/icons/x16/layout_2.png
diff --git a/interface/web/themes/default/icons/x16/layout_2_equal.png b/interface/web/themes/default-304/icons/x16/layout_2_equal.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/layout_2_equal.png
rename to interface/web/themes/default-304/icons/x16/layout_2_equal.png
diff --git a/interface/web/themes/default/icons/x16/layout_3.png b/interface/web/themes/default-304/icons/x16/layout_3.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/layout_3.png
rename to interface/web/themes/default-304/icons/x16/layout_3.png
diff --git a/interface/web/themes/default/icons/x16/layout_3_mix.png b/interface/web/themes/default-304/icons/x16/layout_3_mix.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/layout_3_mix.png
rename to interface/web/themes/default-304/icons/x16/layout_3_mix.png
diff --git a/interface/web/themes/default/icons/x16/layout_header.png b/interface/web/themes/default-304/icons/x16/layout_header.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/layout_header.png
rename to interface/web/themes/default-304/icons/x16/layout_header.png
diff --git a/interface/web/themes/default/icons/x16/layout_header_2.png b/interface/web/themes/default-304/icons/x16/layout_header_2.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/layout_header_2.png
rename to interface/web/themes/default-304/icons/x16/layout_header_2.png
diff --git a/interface/web/themes/default/icons/x16/layout_header_2_equal.png b/interface/web/themes/default-304/icons/x16/layout_header_2_equal.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/layout_header_2_equal.png
rename to interface/web/themes/default-304/icons/x16/layout_header_2_equal.png
diff --git a/interface/web/themes/default/icons/x16/layout_header_3.png b/interface/web/themes/default-304/icons/x16/layout_header_3.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/layout_header_3.png
rename to interface/web/themes/default-304/icons/x16/layout_header_3.png
diff --git a/interface/web/themes/default/icons/x16/layout_header_3_mix.png b/interface/web/themes/default-304/icons/x16/layout_header_3_mix.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/layout_header_3_mix.png
rename to interface/web/themes/default-304/icons/x16/layout_header_3_mix.png
diff --git a/interface/web/themes/default/icons/x16/layout_header_footer.png b/interface/web/themes/default-304/icons/x16/layout_header_footer.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/layout_header_footer.png
rename to interface/web/themes/default-304/icons/x16/layout_header_footer.png
diff --git a/interface/web/themes/default/icons/x16/layout_header_footer_2.png b/interface/web/themes/default-304/icons/x16/layout_header_footer_2.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/layout_header_footer_2.png
rename to interface/web/themes/default-304/icons/x16/layout_header_footer_2.png
diff --git a/interface/web/themes/default/icons/x16/layout_header_footer_2_equal.png b/interface/web/themes/default-304/icons/x16/layout_header_footer_2_equal.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/layout_header_footer_2_equal.png
rename to interface/web/themes/default-304/icons/x16/layout_header_footer_2_equal.png
diff --git a/interface/web/themes/default/icons/x16/layout_header_footer_3.png b/interface/web/themes/default-304/icons/x16/layout_header_footer_3.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/layout_header_footer_3.png
rename to interface/web/themes/default-304/icons/x16/layout_header_footer_3.png
diff --git a/interface/web/themes/default/icons/x16/layout_header_footer_3_mix.png b/interface/web/themes/default-304/icons/x16/layout_header_footer_3_mix.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/layout_header_footer_3_mix.png
rename to interface/web/themes/default-304/icons/x16/layout_header_footer_3_mix.png
diff --git a/interface/web/themes/default/icons/x16/layout_join.png b/interface/web/themes/default-304/icons/x16/layout_join.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/layout_join.png
rename to interface/web/themes/default-304/icons/x16/layout_join.png
diff --git a/interface/web/themes/default/icons/x16/layout_split.png b/interface/web/themes/default-304/icons/x16/layout_split.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/layout_split.png
rename to interface/web/themes/default-304/icons/x16/layout_split.png
diff --git a/interface/web/themes/default/icons/x16/lifebuoy.png b/interface/web/themes/default-304/icons/x16/lifebuoy.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/lifebuoy.png
rename to interface/web/themes/default-304/icons/x16/lifebuoy.png
diff --git a/interface/web/themes/default/icons/x16/lifebuoy_arrow.png b/interface/web/themes/default-304/icons/x16/lifebuoy_arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/lifebuoy_arrow.png
rename to interface/web/themes/default-304/icons/x16/lifebuoy_arrow.png
diff --git a/interface/web/themes/default/icons/x16/lifebuoy_exclamation.png b/interface/web/themes/default-304/icons/x16/lifebuoy_exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/lifebuoy_exclamation.png
rename to interface/web/themes/default-304/icons/x16/lifebuoy_exclamation.png
diff --git a/interface/web/themes/default/icons/x16/lifebuoy_minus.png b/interface/web/themes/default-304/icons/x16/lifebuoy_minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/lifebuoy_minus.png
rename to interface/web/themes/default-304/icons/x16/lifebuoy_minus.png
diff --git a/interface/web/themes/default/icons/x16/lifebuoy_pencil.png b/interface/web/themes/default-304/icons/x16/lifebuoy_pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/lifebuoy_pencil.png
rename to interface/web/themes/default-304/icons/x16/lifebuoy_pencil.png
diff --git a/interface/web/themes/default/icons/x16/lifebuoy_plus.png b/interface/web/themes/default-304/icons/x16/lifebuoy_plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/lifebuoy_plus.png
rename to interface/web/themes/default-304/icons/x16/lifebuoy_plus.png
diff --git a/interface/web/themes/default/icons/x16/light_bulb.png b/interface/web/themes/default-304/icons/x16/light_bulb.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/light_bulb.png
rename to interface/web/themes/default-304/icons/x16/light_bulb.png
diff --git a/interface/web/themes/default/icons/x16/light_bulb__arrow.png b/interface/web/themes/default-304/icons/x16/light_bulb__arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/light_bulb__arrow.png
rename to interface/web/themes/default-304/icons/x16/light_bulb__arrow.png
diff --git a/interface/web/themes/default/icons/x16/light_bulb__exclamation.png b/interface/web/themes/default-304/icons/x16/light_bulb__exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/light_bulb__exclamation.png
rename to interface/web/themes/default-304/icons/x16/light_bulb__exclamation.png
diff --git a/interface/web/themes/default/icons/x16/light_bulb__minus.png b/interface/web/themes/default-304/icons/x16/light_bulb__minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/light_bulb__minus.png
rename to interface/web/themes/default-304/icons/x16/light_bulb__minus.png
diff --git a/interface/web/themes/default/icons/x16/light_bulb__pencil.png b/interface/web/themes/default-304/icons/x16/light_bulb__pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/light_bulb__pencil.png
rename to interface/web/themes/default-304/icons/x16/light_bulb__pencil.png
diff --git a/interface/web/themes/default/icons/x16/light_bulb__plus.png b/interface/web/themes/default-304/icons/x16/light_bulb__plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/light_bulb__plus.png
rename to interface/web/themes/default-304/icons/x16/light_bulb__plus.png
diff --git a/interface/web/themes/default/icons/x16/light_bulb_off.png b/interface/web/themes/default-304/icons/x16/light_bulb_off.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/light_bulb_off.png
rename to interface/web/themes/default-304/icons/x16/light_bulb_off.png
diff --git a/interface/web/themes/default/icons/x16/light_bulb_small.png b/interface/web/themes/default-304/icons/x16/light_bulb_small.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/light_bulb_small.png
rename to interface/web/themes/default-304/icons/x16/light_bulb_small.png
diff --git a/interface/web/themes/default/icons/x16/light_bulb_small_off.png b/interface/web/themes/default-304/icons/x16/light_bulb_small_off.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/light_bulb_small_off.png
rename to interface/web/themes/default-304/icons/x16/light_bulb_small_off.png
diff --git a/interface/web/themes/default/icons/x16/lightning.png b/interface/web/themes/default-304/icons/x16/lightning.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/lightning.png
rename to interface/web/themes/default-304/icons/x16/lightning.png
diff --git a/interface/web/themes/default/icons/x16/lightning__arrow.png b/interface/web/themes/default-304/icons/x16/lightning__arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/lightning__arrow.png
rename to interface/web/themes/default-304/icons/x16/lightning__arrow.png
diff --git a/interface/web/themes/default/icons/x16/lightning__exclamation.png b/interface/web/themes/default-304/icons/x16/lightning__exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/lightning__exclamation.png
rename to interface/web/themes/default-304/icons/x16/lightning__exclamation.png
diff --git a/interface/web/themes/default/icons/x16/lightning__minus.png b/interface/web/themes/default-304/icons/x16/lightning__minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/lightning__minus.png
rename to interface/web/themes/default-304/icons/x16/lightning__minus.png
diff --git a/interface/web/themes/default/icons/x16/lightning__pencil.png b/interface/web/themes/default-304/icons/x16/lightning__pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/lightning__pencil.png
rename to interface/web/themes/default-304/icons/x16/lightning__pencil.png
diff --git a/interface/web/themes/default/icons/x16/lightning__plus.png b/interface/web/themes/default-304/icons/x16/lightning__plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/lightning__plus.png
rename to interface/web/themes/default-304/icons/x16/lightning__plus.png
diff --git a/interface/web/themes/default/icons/x16/lightning_disable.png b/interface/web/themes/default-304/icons/x16/lightning_disable.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/lightning_disable.png
rename to interface/web/themes/default-304/icons/x16/lightning_disable.png
diff --git a/interface/web/themes/default/icons/x16/lightning_small.png b/interface/web/themes/default-304/icons/x16/lightning_small.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/lightning_small.png
rename to interface/web/themes/default-304/icons/x16/lightning_small.png
diff --git a/interface/web/themes/default-v2/images/loading.gif b/interface/web/themes/default-304/icons/x16/loading.gif
similarity index 100%
rename from interface/web/themes/default-v2/images/loading.gif
rename to interface/web/themes/default-304/icons/x16/loading.gif
diff --git a/interface/web/themes/default/icons/x16/lock.png b/interface/web/themes/default-304/icons/x16/lock.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/lock.png
rename to interface/web/themes/default-304/icons/x16/lock.png
diff --git a/interface/web/themes/default/icons/x16/lock__arrow.png b/interface/web/themes/default-304/icons/x16/lock__arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/lock__arrow.png
rename to interface/web/themes/default-304/icons/x16/lock__arrow.png
diff --git a/interface/web/themes/default/icons/x16/lock__exclamation.png b/interface/web/themes/default-304/icons/x16/lock__exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/lock__exclamation.png
rename to interface/web/themes/default-304/icons/x16/lock__exclamation.png
diff --git a/interface/web/themes/default/icons/x16/lock__minus.png b/interface/web/themes/default-304/icons/x16/lock__minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/lock__minus.png
rename to interface/web/themes/default-304/icons/x16/lock__minus.png
diff --git a/interface/web/themes/default/icons/x16/lock__pencil.png b/interface/web/themes/default-304/icons/x16/lock__pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/lock__pencil.png
rename to interface/web/themes/default-304/icons/x16/lock__pencil.png
diff --git a/interface/web/themes/default/icons/x16/lock__plus.png b/interface/web/themes/default-304/icons/x16/lock__plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/lock__plus.png
rename to interface/web/themes/default-304/icons/x16/lock__plus.png
diff --git a/interface/web/themes/default/icons/x16/lock_disable.png b/interface/web/themes/default-304/icons/x16/lock_disable.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/lock_disable.png
rename to interface/web/themes/default-304/icons/x16/lock_disable.png
diff --git a/interface/web/themes/default/icons/x16/lock_small.png b/interface/web/themes/default-304/icons/x16/lock_small.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/lock_small.png
rename to interface/web/themes/default-304/icons/x16/lock_small.png
diff --git a/interface/web/themes/default/icons/x16/lock_unlock.png b/interface/web/themes/default-304/icons/x16/lock_unlock.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/lock_unlock.png
rename to interface/web/themes/default-304/icons/x16/lock_unlock.png
diff --git a/interface/web/themes/default/icons/x16/logout.png b/interface/web/themes/default-304/icons/x16/logout.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/logout.png
rename to interface/web/themes/default-304/icons/x16/logout.png
diff --git a/interface/web/themes/default/icons/x16/magnet.png b/interface/web/themes/default-304/icons/x16/magnet.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/magnet.png
rename to interface/web/themes/default-304/icons/x16/magnet.png
diff --git a/interface/web/themes/default/icons/x16/magnet__arrow.png b/interface/web/themes/default-304/icons/x16/magnet__arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/magnet__arrow.png
rename to interface/web/themes/default-304/icons/x16/magnet__arrow.png
diff --git a/interface/web/themes/default/icons/x16/magnet__exclamation.png b/interface/web/themes/default-304/icons/x16/magnet__exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/magnet__exclamation.png
rename to interface/web/themes/default-304/icons/x16/magnet__exclamation.png
diff --git a/interface/web/themes/default/icons/x16/magnet__minus.png b/interface/web/themes/default-304/icons/x16/magnet__minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/magnet__minus.png
rename to interface/web/themes/default-304/icons/x16/magnet__minus.png
diff --git a/interface/web/themes/default/icons/x16/magnet__pencil.png b/interface/web/themes/default-304/icons/x16/magnet__pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/magnet__pencil.png
rename to interface/web/themes/default-304/icons/x16/magnet__pencil.png
diff --git a/interface/web/themes/default/icons/x16/magnet__plus.png b/interface/web/themes/default-304/icons/x16/magnet__plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/magnet__plus.png
rename to interface/web/themes/default-304/icons/x16/magnet__plus.png
diff --git a/interface/web/themes/default/icons/x16/magnet_disable.png b/interface/web/themes/default-304/icons/x16/magnet_disable.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/magnet_disable.png
rename to interface/web/themes/default-304/icons/x16/magnet_disable.png
diff --git a/interface/web/themes/default/icons/x16/magnet_small.png b/interface/web/themes/default-304/icons/x16/magnet_small.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/magnet_small.png
rename to interface/web/themes/default-304/icons/x16/magnet_small.png
diff --git a/interface/web/themes/default/icons/x16/magnifier.png b/interface/web/themes/default-304/icons/x16/magnifier.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/magnifier.png
rename to interface/web/themes/default-304/icons/x16/magnifier.png
diff --git a/interface/web/themes/default/icons/x16/magnifier__arrow.png b/interface/web/themes/default-304/icons/x16/magnifier__arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/magnifier__arrow.png
rename to interface/web/themes/default-304/icons/x16/magnifier__arrow.png
diff --git a/interface/web/themes/default/icons/x16/magnifier__exclamation.png b/interface/web/themes/default-304/icons/x16/magnifier__exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/magnifier__exclamation.png
rename to interface/web/themes/default-304/icons/x16/magnifier__exclamation.png
diff --git a/interface/web/themes/default/icons/x16/magnifier__minus.png b/interface/web/themes/default-304/icons/x16/magnifier__minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/magnifier__minus.png
rename to interface/web/themes/default-304/icons/x16/magnifier__minus.png
diff --git a/interface/web/themes/default/icons/x16/magnifier__pencil.png b/interface/web/themes/default-304/icons/x16/magnifier__pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/magnifier__pencil.png
rename to interface/web/themes/default-304/icons/x16/magnifier__pencil.png
diff --git a/interface/web/themes/default/icons/x16/magnifier__plus.png b/interface/web/themes/default-304/icons/x16/magnifier__plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/magnifier__plus.png
rename to interface/web/themes/default-304/icons/x16/magnifier__plus.png
diff --git a/interface/web/themes/default/icons/x16/magnifier_left.png b/interface/web/themes/default-304/icons/x16/magnifier_left.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/magnifier_left.png
rename to interface/web/themes/default-304/icons/x16/magnifier_left.png
diff --git a/interface/web/themes/default/icons/x16/magnifier_medium.png b/interface/web/themes/default-304/icons/x16/magnifier_medium.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/magnifier_medium.png
rename to interface/web/themes/default-304/icons/x16/magnifier_medium.png
diff --git a/interface/web/themes/default/icons/x16/magnifier_medium_left.png b/interface/web/themes/default-304/icons/x16/magnifier_medium_left.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/magnifier_medium_left.png
rename to interface/web/themes/default-304/icons/x16/magnifier_medium_left.png
diff --git a/interface/web/themes/default/icons/x16/magnifier_small.png b/interface/web/themes/default-304/icons/x16/magnifier_small.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/magnifier_small.png
rename to interface/web/themes/default-304/icons/x16/magnifier_small.png
diff --git a/interface/web/themes/default/icons/x16/magnifier_zoom.png b/interface/web/themes/default-304/icons/x16/magnifier_zoom.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/magnifier_zoom.png
rename to interface/web/themes/default-304/icons/x16/magnifier_zoom.png
diff --git a/interface/web/themes/default/icons/x16/magnifier_zoom_actual.png b/interface/web/themes/default-304/icons/x16/magnifier_zoom_actual.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/magnifier_zoom_actual.png
rename to interface/web/themes/default-304/icons/x16/magnifier_zoom_actual.png
diff --git a/interface/web/themes/default/icons/x16/magnifier_zoom_fit.png b/interface/web/themes/default-304/icons/x16/magnifier_zoom_fit.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/magnifier_zoom_fit.png
rename to interface/web/themes/default-304/icons/x16/magnifier_zoom_fit.png
diff --git a/interface/web/themes/default/icons/x16/magnifier_zoom_out.png b/interface/web/themes/default-304/icons/x16/magnifier_zoom_out.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/magnifier_zoom_out.png
rename to interface/web/themes/default-304/icons/x16/magnifier_zoom_out.png
diff --git a/interface/web/themes/default/icons/x16/mail.png b/interface/web/themes/default-304/icons/x16/mail.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/mail.png
rename to interface/web/themes/default-304/icons/x16/mail.png
diff --git a/interface/web/themes/default/icons/x16/mail__arrow.png b/interface/web/themes/default-304/icons/x16/mail__arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/mail__arrow.png
rename to interface/web/themes/default-304/icons/x16/mail__arrow.png
diff --git a/interface/web/themes/default/icons/x16/mail__exclamation.png b/interface/web/themes/default-304/icons/x16/mail__exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/mail__exclamation.png
rename to interface/web/themes/default-304/icons/x16/mail__exclamation.png
diff --git a/interface/web/themes/default/icons/x16/mail__minus.png b/interface/web/themes/default-304/icons/x16/mail__minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/mail__minus.png
rename to interface/web/themes/default-304/icons/x16/mail__minus.png
diff --git a/interface/web/themes/default/icons/x16/mail__pencil.png b/interface/web/themes/default-304/icons/x16/mail__pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/mail__pencil.png
rename to interface/web/themes/default-304/icons/x16/mail__pencil.png
diff --git a/interface/web/themes/default/icons/x16/mail__plus.png b/interface/web/themes/default-304/icons/x16/mail__plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/mail__plus.png
rename to interface/web/themes/default-304/icons/x16/mail__plus.png
diff --git a/interface/web/themes/default/icons/x16/mail_open.png b/interface/web/themes/default-304/icons/x16/mail_open.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/mail_open.png
rename to interface/web/themes/default-304/icons/x16/mail_open.png
diff --git a/interface/web/themes/default/icons/x16/mail_open_document.png b/interface/web/themes/default-304/icons/x16/mail_open_document.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/mail_open_document.png
rename to interface/web/themes/default-304/icons/x16/mail_open_document.png
diff --git a/interface/web/themes/default/icons/x16/mail_open_film.png b/interface/web/themes/default-304/icons/x16/mail_open_film.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/mail_open_film.png
rename to interface/web/themes/default-304/icons/x16/mail_open_film.png
diff --git a/interface/web/themes/default/icons/x16/mail_open_image.png b/interface/web/themes/default-304/icons/x16/mail_open_image.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/mail_open_image.png
rename to interface/web/themes/default-304/icons/x16/mail_open_image.png
diff --git a/interface/web/themes/default/icons/x16/mail_small.png b/interface/web/themes/default-304/icons/x16/mail_small.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/mail_small.png
rename to interface/web/themes/default-304/icons/x16/mail_small.png
diff --git a/interface/web/themes/default/icons/x16/mails.png b/interface/web/themes/default-304/icons/x16/mails.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/mails.png
rename to interface/web/themes/default-304/icons/x16/mails.png
diff --git a/interface/web/themes/default/icons/x16/mails_arrow.png b/interface/web/themes/default-304/icons/x16/mails_arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/mails_arrow.png
rename to interface/web/themes/default-304/icons/x16/mails_arrow.png
diff --git a/interface/web/themes/default/icons/x16/mails_exclamation.png b/interface/web/themes/default-304/icons/x16/mails_exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/mails_exclamation.png
rename to interface/web/themes/default-304/icons/x16/mails_exclamation.png
diff --git a/interface/web/themes/default/icons/x16/mails_minus.png b/interface/web/themes/default-304/icons/x16/mails_minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/mails_minus.png
rename to interface/web/themes/default-304/icons/x16/mails_minus.png
diff --git a/interface/web/themes/default/icons/x16/mails_pencil.png b/interface/web/themes/default-304/icons/x16/mails_pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/mails_pencil.png
rename to interface/web/themes/default-304/icons/x16/mails_pencil.png
diff --git a/interface/web/themes/default/icons/x16/mails_plus.png b/interface/web/themes/default-304/icons/x16/mails_plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/mails_plus.png
rename to interface/web/themes/default-304/icons/x16/mails_plus.png
diff --git a/interface/web/themes/default/icons/x16/mails_stack.png b/interface/web/themes/default-304/icons/x16/mails_stack.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/mails_stack.png
rename to interface/web/themes/default-304/icons/x16/mails_stack.png
diff --git a/interface/web/themes/default/icons/x16/media_player.png b/interface/web/themes/default-304/icons/x16/media_player.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/media_player.png
rename to interface/web/themes/default-304/icons/x16/media_player.png
diff --git a/interface/web/themes/default/icons/x16/media_player__arrow.png b/interface/web/themes/default-304/icons/x16/media_player__arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/media_player__arrow.png
rename to interface/web/themes/default-304/icons/x16/media_player__arrow.png
diff --git a/interface/web/themes/default/icons/x16/media_player__exclamation.png b/interface/web/themes/default-304/icons/x16/media_player__exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/media_player__exclamation.png
rename to interface/web/themes/default-304/icons/x16/media_player__exclamation.png
diff --git a/interface/web/themes/default/icons/x16/media_player__minus.png b/interface/web/themes/default-304/icons/x16/media_player__minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/media_player__minus.png
rename to interface/web/themes/default-304/icons/x16/media_player__minus.png
diff --git a/interface/web/themes/default/icons/x16/media_player__pencil.png b/interface/web/themes/default-304/icons/x16/media_player__pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/media_player__pencil.png
rename to interface/web/themes/default-304/icons/x16/media_player__pencil.png
diff --git a/interface/web/themes/default/icons/x16/media_player__plus.png b/interface/web/themes/default-304/icons/x16/media_player__plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/media_player__plus.png
rename to interface/web/themes/default-304/icons/x16/media_player__plus.png
diff --git a/interface/web/themes/default/icons/x16/media_player_black.png b/interface/web/themes/default-304/icons/x16/media_player_black.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/media_player_black.png
rename to interface/web/themes/default-304/icons/x16/media_player_black.png
diff --git a/interface/web/themes/default/icons/x16/media_player_medium.png b/interface/web/themes/default-304/icons/x16/media_player_medium.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/media_player_medium.png
rename to interface/web/themes/default-304/icons/x16/media_player_medium.png
diff --git a/interface/web/themes/default/icons/x16/media_player_medium_black.png b/interface/web/themes/default-304/icons/x16/media_player_medium_black.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/media_player_medium_black.png
rename to interface/web/themes/default-304/icons/x16/media_player_medium_black.png
diff --git a/interface/web/themes/default/icons/x16/media_player_medium_blue.png b/interface/web/themes/default-304/icons/x16/media_player_medium_blue.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/media_player_medium_blue.png
rename to interface/web/themes/default-304/icons/x16/media_player_medium_blue.png
diff --git a/interface/web/themes/default/icons/x16/media_player_medium_green.png b/interface/web/themes/default-304/icons/x16/media_player_medium_green.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/media_player_medium_green.png
rename to interface/web/themes/default-304/icons/x16/media_player_medium_green.png
diff --git a/interface/web/themes/default/icons/x16/media_player_medium_pink.png b/interface/web/themes/default-304/icons/x16/media_player_medium_pink.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/media_player_medium_pink.png
rename to interface/web/themes/default-304/icons/x16/media_player_medium_pink.png
diff --git a/interface/web/themes/default/icons/x16/media_player_medium_red.png b/interface/web/themes/default-304/icons/x16/media_player_medium_red.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/media_player_medium_red.png
rename to interface/web/themes/default-304/icons/x16/media_player_medium_red.png
diff --git a/interface/web/themes/default/icons/x16/media_player_small.png b/interface/web/themes/default-304/icons/x16/media_player_small.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/media_player_small.png
rename to interface/web/themes/default-304/icons/x16/media_player_small.png
diff --git a/interface/web/themes/default/icons/x16/media_player_small_blue.png b/interface/web/themes/default-304/icons/x16/media_player_small_blue.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/media_player_small_blue.png
rename to interface/web/themes/default-304/icons/x16/media_player_small_blue.png
diff --git a/interface/web/themes/default/icons/x16/media_player_small_green.png b/interface/web/themes/default-304/icons/x16/media_player_small_green.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/media_player_small_green.png
rename to interface/web/themes/default-304/icons/x16/media_player_small_green.png
diff --git a/interface/web/themes/default/icons/x16/media_player_small_purple.png b/interface/web/themes/default-304/icons/x16/media_player_small_purple.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/media_player_small_purple.png
rename to interface/web/themes/default-304/icons/x16/media_player_small_purple.png
diff --git a/interface/web/themes/default/icons/x16/media_player_small_red.png b/interface/web/themes/default-304/icons/x16/media_player_small_red.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/media_player_small_red.png
rename to interface/web/themes/default-304/icons/x16/media_player_small_red.png
diff --git a/interface/web/themes/default/icons/x16/media_players.png b/interface/web/themes/default-304/icons/x16/media_players.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/media_players.png
rename to interface/web/themes/default-304/icons/x16/media_players.png
diff --git a/interface/web/themes/default/icons/x16/media_players_arrow.png b/interface/web/themes/default-304/icons/x16/media_players_arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/media_players_arrow.png
rename to interface/web/themes/default-304/icons/x16/media_players_arrow.png
diff --git a/interface/web/themes/default/icons/x16/media_players_exclamation.png b/interface/web/themes/default-304/icons/x16/media_players_exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/media_players_exclamation.png
rename to interface/web/themes/default-304/icons/x16/media_players_exclamation.png
diff --git a/interface/web/themes/default/icons/x16/media_players_minus.png b/interface/web/themes/default-304/icons/x16/media_players_minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/media_players_minus.png
rename to interface/web/themes/default-304/icons/x16/media_players_minus.png
diff --git a/interface/web/themes/default/icons/x16/media_players_pencil.png b/interface/web/themes/default-304/icons/x16/media_players_pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/media_players_pencil.png
rename to interface/web/themes/default-304/icons/x16/media_players_pencil.png
diff --git a/interface/web/themes/default/icons/x16/media_players_plus.png b/interface/web/themes/default-304/icons/x16/media_players_plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/media_players_plus.png
rename to interface/web/themes/default-304/icons/x16/media_players_plus.png
diff --git a/interface/web/themes/default/icons/x16/microphone.png b/interface/web/themes/default-304/icons/x16/microphone.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/microphone.png
rename to interface/web/themes/default-304/icons/x16/microphone.png
diff --git a/interface/web/themes/default/icons/x16/microphone_arrow.png b/interface/web/themes/default-304/icons/x16/microphone_arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/microphone_arrow.png
rename to interface/web/themes/default-304/icons/x16/microphone_arrow.png
diff --git a/interface/web/themes/default/icons/x16/microphone_exclamation.png b/interface/web/themes/default-304/icons/x16/microphone_exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/microphone_exclamation.png
rename to interface/web/themes/default-304/icons/x16/microphone_exclamation.png
diff --git a/interface/web/themes/default/icons/x16/microphone_minus.png b/interface/web/themes/default-304/icons/x16/microphone_minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/microphone_minus.png
rename to interface/web/themes/default-304/icons/x16/microphone_minus.png
diff --git a/interface/web/themes/default/icons/x16/microphone_pencil.png b/interface/web/themes/default-304/icons/x16/microphone_pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/microphone_pencil.png
rename to interface/web/themes/default-304/icons/x16/microphone_pencil.png
diff --git a/interface/web/themes/default/icons/x16/microphone_plus.png b/interface/web/themes/default-304/icons/x16/microphone_plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/microphone_plus.png
rename to interface/web/themes/default-304/icons/x16/microphone_plus.png
diff --git a/interface/web/themes/default/icons/x16/minus.png b/interface/web/themes/default-304/icons/x16/minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/minus.png
rename to interface/web/themes/default-304/icons/x16/minus.png
diff --git a/interface/web/themes/default/icons/x16/minus_circle.png b/interface/web/themes/default-304/icons/x16/minus_circle.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/minus_circle.png
rename to interface/web/themes/default-304/icons/x16/minus_circle.png
diff --git a/interface/web/themes/default/icons/x16/minus_circle_frame.png b/interface/web/themes/default-304/icons/x16/minus_circle_frame.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/minus_circle_frame.png
rename to interface/web/themes/default-304/icons/x16/minus_circle_frame.png
diff --git a/interface/web/themes/default/icons/x16/minus_shield.png b/interface/web/themes/default-304/icons/x16/minus_shield.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/minus_shield.png
rename to interface/web/themes/default-304/icons/x16/minus_shield.png
diff --git a/interface/web/themes/default/icons/x16/minus_small.png b/interface/web/themes/default-304/icons/x16/minus_small.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/minus_small.png
rename to interface/web/themes/default-304/icons/x16/minus_small.png
diff --git a/interface/web/themes/default/icons/x16/minus_small_circle.png b/interface/web/themes/default-304/icons/x16/minus_small_circle.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/minus_small_circle.png
rename to interface/web/themes/default-304/icons/x16/minus_small_circle.png
diff --git a/interface/web/themes/default/icons/x16/music.png b/interface/web/themes/default-304/icons/x16/music.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/music.png
rename to interface/web/themes/default-304/icons/x16/music.png
diff --git a/interface/web/themes/default/icons/x16/music_arrow.png b/interface/web/themes/default-304/icons/x16/music_arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/music_arrow.png
rename to interface/web/themes/default-304/icons/x16/music_arrow.png
diff --git a/interface/web/themes/default/icons/x16/music_exclamation.png b/interface/web/themes/default-304/icons/x16/music_exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/music_exclamation.png
rename to interface/web/themes/default-304/icons/x16/music_exclamation.png
diff --git a/interface/web/themes/default/icons/x16/music_minus.png b/interface/web/themes/default-304/icons/x16/music_minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/music_minus.png
rename to interface/web/themes/default-304/icons/x16/music_minus.png
diff --git a/interface/web/themes/default/icons/x16/music_pencil.png b/interface/web/themes/default-304/icons/x16/music_pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/music_pencil.png
rename to interface/web/themes/default-304/icons/x16/music_pencil.png
diff --git a/interface/web/themes/default/icons/x16/music_plus.png b/interface/web/themes/default-304/icons/x16/music_plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/music_plus.png
rename to interface/web/themes/default-304/icons/x16/music_plus.png
diff --git a/interface/web/themes/default/icons/x16/music_small.png b/interface/web/themes/default-304/icons/x16/music_small.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/music_small.png
rename to interface/web/themes/default-304/icons/x16/music_small.png
diff --git a/interface/web/themes/default/icons/x16/newspaper.png b/interface/web/themes/default-304/icons/x16/newspaper.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/newspaper.png
rename to interface/web/themes/default-304/icons/x16/newspaper.png
diff --git a/interface/web/themes/default/icons/x16/newspaper_arrow.png b/interface/web/themes/default-304/icons/x16/newspaper_arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/newspaper_arrow.png
rename to interface/web/themes/default-304/icons/x16/newspaper_arrow.png
diff --git a/interface/web/themes/default/icons/x16/newspaper_exclamation.png b/interface/web/themes/default-304/icons/x16/newspaper_exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/newspaper_exclamation.png
rename to interface/web/themes/default-304/icons/x16/newspaper_exclamation.png
diff --git a/interface/web/themes/default/icons/x16/newspaper_minus.png b/interface/web/themes/default-304/icons/x16/newspaper_minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/newspaper_minus.png
rename to interface/web/themes/default-304/icons/x16/newspaper_minus.png
diff --git a/interface/web/themes/default/icons/x16/newspaper_pencil.png b/interface/web/themes/default-304/icons/x16/newspaper_pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/newspaper_pencil.png
rename to interface/web/themes/default-304/icons/x16/newspaper_pencil.png
diff --git a/interface/web/themes/default/icons/x16/newspaper_plus.png b/interface/web/themes/default-304/icons/x16/newspaper_plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/newspaper_plus.png
rename to interface/web/themes/default-304/icons/x16/newspaper_plus.png
diff --git a/interface/web/themes/default/icons/x16/newspapers.png b/interface/web/themes/default-304/icons/x16/newspapers.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/newspapers.png
rename to interface/web/themes/default-304/icons/x16/newspapers.png
diff --git a/interface/web/themes/default/icons/x16/newspapers_arrow.png b/interface/web/themes/default-304/icons/x16/newspapers_arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/newspapers_arrow.png
rename to interface/web/themes/default-304/icons/x16/newspapers_arrow.png
diff --git a/interface/web/themes/default/icons/x16/newspapers_exclamation.png b/interface/web/themes/default-304/icons/x16/newspapers_exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/newspapers_exclamation.png
rename to interface/web/themes/default-304/icons/x16/newspapers_exclamation.png
diff --git a/interface/web/themes/default/icons/x16/newspapers_minus.png b/interface/web/themes/default-304/icons/x16/newspapers_minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/newspapers_minus.png
rename to interface/web/themes/default-304/icons/x16/newspapers_minus.png
diff --git a/interface/web/themes/default/icons/x16/newspapers_pencil.png b/interface/web/themes/default-304/icons/x16/newspapers_pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/newspapers_pencil.png
rename to interface/web/themes/default-304/icons/x16/newspapers_pencil.png
diff --git a/interface/web/themes/default/icons/x16/newspapers_plus.png b/interface/web/themes/default-304/icons/x16/newspapers_plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/newspapers_plus.png
rename to interface/web/themes/default-304/icons/x16/newspapers_plus.png
diff --git a/interface/web/themes/default/icons/x16/notebook.png b/interface/web/themes/default-304/icons/x16/notebook.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/notebook.png
rename to interface/web/themes/default-304/icons/x16/notebook.png
diff --git a/interface/web/themes/default/icons/x16/notebook_arrow.png b/interface/web/themes/default-304/icons/x16/notebook_arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/notebook_arrow.png
rename to interface/web/themes/default-304/icons/x16/notebook_arrow.png
diff --git a/interface/web/themes/default/icons/x16/notebook_exclamation.png b/interface/web/themes/default-304/icons/x16/notebook_exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/notebook_exclamation.png
rename to interface/web/themes/default-304/icons/x16/notebook_exclamation.png
diff --git a/interface/web/themes/default/icons/x16/notebook_minus.png b/interface/web/themes/default-304/icons/x16/notebook_minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/notebook_minus.png
rename to interface/web/themes/default-304/icons/x16/notebook_minus.png
diff --git a/interface/web/themes/default/icons/x16/notebook_pencil.png b/interface/web/themes/default-304/icons/x16/notebook_pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/notebook_pencil.png
rename to interface/web/themes/default-304/icons/x16/notebook_pencil.png
diff --git a/interface/web/themes/default/icons/x16/notebook_plus.png b/interface/web/themes/default-304/icons/x16/notebook_plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/notebook_plus.png
rename to interface/web/themes/default-304/icons/x16/notebook_plus.png
diff --git a/interface/web/themes/default/icons/x16/notebooks.png b/interface/web/themes/default-304/icons/x16/notebooks.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/notebooks.png
rename to interface/web/themes/default-304/icons/x16/notebooks.png
diff --git a/interface/web/themes/default/icons/x16/notebooks_arrow.png b/interface/web/themes/default-304/icons/x16/notebooks_arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/notebooks_arrow.png
rename to interface/web/themes/default-304/icons/x16/notebooks_arrow.png
diff --git a/interface/web/themes/default/icons/x16/notebooks_exclamation.png b/interface/web/themes/default-304/icons/x16/notebooks_exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/notebooks_exclamation.png
rename to interface/web/themes/default-304/icons/x16/notebooks_exclamation.png
diff --git a/interface/web/themes/default/icons/x16/notebooks_minus.png b/interface/web/themes/default-304/icons/x16/notebooks_minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/notebooks_minus.png
rename to interface/web/themes/default-304/icons/x16/notebooks_minus.png
diff --git a/interface/web/themes/default/icons/x16/notebooks_pencil.png b/interface/web/themes/default-304/icons/x16/notebooks_pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/notebooks_pencil.png
rename to interface/web/themes/default-304/icons/x16/notebooks_pencil.png
diff --git a/interface/web/themes/default/icons/x16/notebooks_plus.png b/interface/web/themes/default-304/icons/x16/notebooks_plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/notebooks_plus.png
rename to interface/web/themes/default-304/icons/x16/notebooks_plus.png
diff --git a/interface/web/themes/default/icons/x16/paint_can.png b/interface/web/themes/default-304/icons/x16/paint_can.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/paint_can.png
rename to interface/web/themes/default-304/icons/x16/paint_can.png
diff --git a/interface/web/themes/default/icons/x16/paint_can_arrow.png b/interface/web/themes/default-304/icons/x16/paint_can_arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/paint_can_arrow.png
rename to interface/web/themes/default-304/icons/x16/paint_can_arrow.png
diff --git a/interface/web/themes/default/icons/x16/paint_can_exclamation.png b/interface/web/themes/default-304/icons/x16/paint_can_exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/paint_can_exclamation.png
rename to interface/web/themes/default-304/icons/x16/paint_can_exclamation.png
diff --git a/interface/web/themes/default/icons/x16/paint_can_minus.png b/interface/web/themes/default-304/icons/x16/paint_can_minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/paint_can_minus.png
rename to interface/web/themes/default-304/icons/x16/paint_can_minus.png
diff --git a/interface/web/themes/default/icons/x16/paint_can_pencil.png b/interface/web/themes/default-304/icons/x16/paint_can_pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/paint_can_pencil.png
rename to interface/web/themes/default-304/icons/x16/paint_can_pencil.png
diff --git a/interface/web/themes/default/icons/x16/paint_can_plus.png b/interface/web/themes/default-304/icons/x16/paint_can_plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/paint_can_plus.png
rename to interface/web/themes/default-304/icons/x16/paint_can_plus.png
diff --git a/interface/web/themes/default/icons/x16/palette.png b/interface/web/themes/default-304/icons/x16/palette.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/palette.png
rename to interface/web/themes/default-304/icons/x16/palette.png
diff --git a/interface/web/themes/default/icons/x16/palette_arrow.png b/interface/web/themes/default-304/icons/x16/palette_arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/palette_arrow.png
rename to interface/web/themes/default-304/icons/x16/palette_arrow.png
diff --git a/interface/web/themes/default/icons/x16/palette_exclamation.png b/interface/web/themes/default-304/icons/x16/palette_exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/palette_exclamation.png
rename to interface/web/themes/default-304/icons/x16/palette_exclamation.png
diff --git a/interface/web/themes/default/icons/x16/palette_minus.png b/interface/web/themes/default-304/icons/x16/palette_minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/palette_minus.png
rename to interface/web/themes/default-304/icons/x16/palette_minus.png
diff --git a/interface/web/themes/default/icons/x16/palette_pencil.png b/interface/web/themes/default-304/icons/x16/palette_pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/palette_pencil.png
rename to interface/web/themes/default-304/icons/x16/palette_pencil.png
diff --git a/interface/web/themes/default/icons/x16/palette_plus.png b/interface/web/themes/default-304/icons/x16/palette_plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/palette_plus.png
rename to interface/web/themes/default-304/icons/x16/palette_plus.png
diff --git a/interface/web/themes/default/icons/x16/paper_bag.png b/interface/web/themes/default-304/icons/x16/paper_bag.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/paper_bag.png
rename to interface/web/themes/default-304/icons/x16/paper_bag.png
diff --git a/interface/web/themes/default/icons/x16/paper_bag_arrow.png b/interface/web/themes/default-304/icons/x16/paper_bag_arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/paper_bag_arrow.png
rename to interface/web/themes/default-304/icons/x16/paper_bag_arrow.png
diff --git a/interface/web/themes/default/icons/x16/paper_bag_exclamation.png b/interface/web/themes/default-304/icons/x16/paper_bag_exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/paper_bag_exclamation.png
rename to interface/web/themes/default-304/icons/x16/paper_bag_exclamation.png
diff --git a/interface/web/themes/default/icons/x16/paper_bag_minus.png b/interface/web/themes/default-304/icons/x16/paper_bag_minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/paper_bag_minus.png
rename to interface/web/themes/default-304/icons/x16/paper_bag_minus.png
diff --git a/interface/web/themes/default/icons/x16/paper_bag_pencil.png b/interface/web/themes/default-304/icons/x16/paper_bag_pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/paper_bag_pencil.png
rename to interface/web/themes/default-304/icons/x16/paper_bag_pencil.png
diff --git a/interface/web/themes/default/icons/x16/paper_bag_plus.png b/interface/web/themes/default-304/icons/x16/paper_bag_plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/paper_bag_plus.png
rename to interface/web/themes/default-304/icons/x16/paper_bag_plus.png
diff --git a/interface/web/themes/default/icons/x16/pdf.png b/interface/web/themes/default-304/icons/x16/pdf.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/pdf.png
rename to interface/web/themes/default-304/icons/x16/pdf.png
diff --git a/interface/web/themes/default/icons/x16/pencil.png b/interface/web/themes/default-304/icons/x16/pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/pencil.png
rename to interface/web/themes/default-304/icons/x16/pencil.png
diff --git a/interface/web/themes/default/icons/x16/pencil_arrow.png b/interface/web/themes/default-304/icons/x16/pencil_arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/pencil_arrow.png
rename to interface/web/themes/default-304/icons/x16/pencil_arrow.png
diff --git a/interface/web/themes/default/icons/x16/pencil_exclamation.png b/interface/web/themes/default-304/icons/x16/pencil_exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/pencil_exclamation.png
rename to interface/web/themes/default-304/icons/x16/pencil_exclamation.png
diff --git a/interface/web/themes/default/icons/x16/pencil_minus.png b/interface/web/themes/default-304/icons/x16/pencil_minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/pencil_minus.png
rename to interface/web/themes/default-304/icons/x16/pencil_minus.png
diff --git a/interface/web/themes/default/icons/x16/pencil_plus.png b/interface/web/themes/default-304/icons/x16/pencil_plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/pencil_plus.png
rename to interface/web/themes/default-304/icons/x16/pencil_plus.png
diff --git a/interface/web/themes/default/icons/x16/pencil_small.png b/interface/web/themes/default-304/icons/x16/pencil_small.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/pencil_small.png
rename to interface/web/themes/default-304/icons/x16/pencil_small.png
diff --git a/interface/web/themes/default/icons/x16/photo_album.png b/interface/web/themes/default-304/icons/x16/photo_album.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/photo_album.png
rename to interface/web/themes/default-304/icons/x16/photo_album.png
diff --git a/interface/web/themes/default/icons/x16/photo_album__arrow.png b/interface/web/themes/default-304/icons/x16/photo_album__arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/photo_album__arrow.png
rename to interface/web/themes/default-304/icons/x16/photo_album__arrow.png
diff --git a/interface/web/themes/default/icons/x16/photo_album__exclamation.png b/interface/web/themes/default-304/icons/x16/photo_album__exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/photo_album__exclamation.png
rename to interface/web/themes/default-304/icons/x16/photo_album__exclamation.png
diff --git a/interface/web/themes/default/icons/x16/photo_album__minus.png b/interface/web/themes/default-304/icons/x16/photo_album__minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/photo_album__minus.png
rename to interface/web/themes/default-304/icons/x16/photo_album__minus.png
diff --git a/interface/web/themes/default/icons/x16/photo_album__pencil.png b/interface/web/themes/default-304/icons/x16/photo_album__pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/photo_album__pencil.png
rename to interface/web/themes/default-304/icons/x16/photo_album__pencil.png
diff --git a/interface/web/themes/default/icons/x16/photo_album__plus.png b/interface/web/themes/default-304/icons/x16/photo_album__plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/photo_album__plus.png
rename to interface/web/themes/default-304/icons/x16/photo_album__plus.png
diff --git a/interface/web/themes/default/icons/x16/photo_album_blue.png b/interface/web/themes/default-304/icons/x16/photo_album_blue.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/photo_album_blue.png
rename to interface/web/themes/default-304/icons/x16/photo_album_blue.png
diff --git a/interface/web/themes/default/icons/x16/piano.png b/interface/web/themes/default-304/icons/x16/piano.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/piano.png
rename to interface/web/themes/default-304/icons/x16/piano.png
diff --git a/interface/web/themes/default/icons/x16/piano_arrow.png b/interface/web/themes/default-304/icons/x16/piano_arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/piano_arrow.png
rename to interface/web/themes/default-304/icons/x16/piano_arrow.png
diff --git a/interface/web/themes/default/icons/x16/piano_exclamation.png b/interface/web/themes/default-304/icons/x16/piano_exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/piano_exclamation.png
rename to interface/web/themes/default-304/icons/x16/piano_exclamation.png
diff --git a/interface/web/themes/default/icons/x16/piano_minus.png b/interface/web/themes/default-304/icons/x16/piano_minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/piano_minus.png
rename to interface/web/themes/default-304/icons/x16/piano_minus.png
diff --git a/interface/web/themes/default/icons/x16/piano_pencil.png b/interface/web/themes/default-304/icons/x16/piano_pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/piano_pencil.png
rename to interface/web/themes/default-304/icons/x16/piano_pencil.png
diff --git a/interface/web/themes/default/icons/x16/piano_plus.png b/interface/web/themes/default-304/icons/x16/piano_plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/piano_plus.png
rename to interface/web/themes/default-304/icons/x16/piano_plus.png
diff --git a/interface/web/themes/default/icons/x16/picture.png b/interface/web/themes/default-304/icons/x16/picture.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/picture.png
rename to interface/web/themes/default-304/icons/x16/picture.png
diff --git a/interface/web/themes/default/icons/x16/picture_arrow.png b/interface/web/themes/default-304/icons/x16/picture_arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/picture_arrow.png
rename to interface/web/themes/default-304/icons/x16/picture_arrow.png
diff --git a/interface/web/themes/default/icons/x16/picture_exclamation.png b/interface/web/themes/default-304/icons/x16/picture_exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/picture_exclamation.png
rename to interface/web/themes/default-304/icons/x16/picture_exclamation.png
diff --git a/interface/web/themes/default/icons/x16/picture_minus.png b/interface/web/themes/default-304/icons/x16/picture_minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/picture_minus.png
rename to interface/web/themes/default-304/icons/x16/picture_minus.png
diff --git a/interface/web/themes/default/icons/x16/picture_pencil.png b/interface/web/themes/default-304/icons/x16/picture_pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/picture_pencil.png
rename to interface/web/themes/default-304/icons/x16/picture_pencil.png
diff --git a/interface/web/themes/default/icons/x16/picture_plus.png b/interface/web/themes/default-304/icons/x16/picture_plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/picture_plus.png
rename to interface/web/themes/default-304/icons/x16/picture_plus.png
diff --git a/interface/web/themes/default/icons/x16/picture_small.png b/interface/web/themes/default-304/icons/x16/picture_small.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/picture_small.png
rename to interface/web/themes/default-304/icons/x16/picture_small.png
diff --git a/interface/web/themes/default/icons/x16/picture_small_sunset.png b/interface/web/themes/default-304/icons/x16/picture_small_sunset.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/picture_small_sunset.png
rename to interface/web/themes/default-304/icons/x16/picture_small_sunset.png
diff --git a/interface/web/themes/default/icons/x16/picture_sunset.png b/interface/web/themes/default-304/icons/x16/picture_sunset.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/picture_sunset.png
rename to interface/web/themes/default-304/icons/x16/picture_sunset.png
diff --git a/interface/web/themes/default/icons/x16/pictures.png b/interface/web/themes/default-304/icons/x16/pictures.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/pictures.png
rename to interface/web/themes/default-304/icons/x16/pictures.png
diff --git a/interface/web/themes/default/icons/x16/pictures_arrow.png b/interface/web/themes/default-304/icons/x16/pictures_arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/pictures_arrow.png
rename to interface/web/themes/default-304/icons/x16/pictures_arrow.png
diff --git a/interface/web/themes/default/icons/x16/pictures_exclamation.png b/interface/web/themes/default-304/icons/x16/pictures_exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/pictures_exclamation.png
rename to interface/web/themes/default-304/icons/x16/pictures_exclamation.png
diff --git a/interface/web/themes/default/icons/x16/pictures_minus.png b/interface/web/themes/default-304/icons/x16/pictures_minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/pictures_minus.png
rename to interface/web/themes/default-304/icons/x16/pictures_minus.png
diff --git a/interface/web/themes/default/icons/x16/pictures_pencil.png b/interface/web/themes/default-304/icons/x16/pictures_pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/pictures_pencil.png
rename to interface/web/themes/default-304/icons/x16/pictures_pencil.png
diff --git a/interface/web/themes/default/icons/x16/pictures_plus.png b/interface/web/themes/default-304/icons/x16/pictures_plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/pictures_plus.png
rename to interface/web/themes/default-304/icons/x16/pictures_plus.png
diff --git a/interface/web/themes/default/icons/x16/pill.png b/interface/web/themes/default-304/icons/x16/pill.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/pill.png
rename to interface/web/themes/default-304/icons/x16/pill.png
diff --git a/interface/web/themes/default/icons/x16/pill_arrow.png b/interface/web/themes/default-304/icons/x16/pill_arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/pill_arrow.png
rename to interface/web/themes/default-304/icons/x16/pill_arrow.png
diff --git a/interface/web/themes/default/icons/x16/pill_exclamation.png b/interface/web/themes/default-304/icons/x16/pill_exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/pill_exclamation.png
rename to interface/web/themes/default-304/icons/x16/pill_exclamation.png
diff --git a/interface/web/themes/default/icons/x16/pill_minus.png b/interface/web/themes/default-304/icons/x16/pill_minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/pill_minus.png
rename to interface/web/themes/default-304/icons/x16/pill_minus.png
diff --git a/interface/web/themes/default/icons/x16/pill_pencil.png b/interface/web/themes/default-304/icons/x16/pill_pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/pill_pencil.png
rename to interface/web/themes/default-304/icons/x16/pill_pencil.png
diff --git a/interface/web/themes/default/icons/x16/pill_plus.png b/interface/web/themes/default-304/icons/x16/pill_plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/pill_plus.png
rename to interface/web/themes/default-304/icons/x16/pill_plus.png
diff --git a/interface/web/themes/default/icons/x16/pill_small.png b/interface/web/themes/default-304/icons/x16/pill_small.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/pill_small.png
rename to interface/web/themes/default-304/icons/x16/pill_small.png
diff --git a/interface/web/themes/default/icons/x16/pin.png b/interface/web/themes/default-304/icons/x16/pin.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/pin.png
rename to interface/web/themes/default-304/icons/x16/pin.png
diff --git a/interface/web/themes/default/icons/x16/pin_arrow.png b/interface/web/themes/default-304/icons/x16/pin_arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/pin_arrow.png
rename to interface/web/themes/default-304/icons/x16/pin_arrow.png
diff --git a/interface/web/themes/default/icons/x16/pin_exclamation.png b/interface/web/themes/default-304/icons/x16/pin_exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/pin_exclamation.png
rename to interface/web/themes/default-304/icons/x16/pin_exclamation.png
diff --git a/interface/web/themes/default/icons/x16/pin_minus.png b/interface/web/themes/default-304/icons/x16/pin_minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/pin_minus.png
rename to interface/web/themes/default-304/icons/x16/pin_minus.png
diff --git a/interface/web/themes/default/icons/x16/pin_pencil.png b/interface/web/themes/default-304/icons/x16/pin_pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/pin_pencil.png
rename to interface/web/themes/default-304/icons/x16/pin_pencil.png
diff --git a/interface/web/themes/default/icons/x16/pin_plus.png b/interface/web/themes/default-304/icons/x16/pin_plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/pin_plus.png
rename to interface/web/themes/default-304/icons/x16/pin_plus.png
diff --git a/interface/web/themes/default/icons/x16/pipette.png b/interface/web/themes/default-304/icons/x16/pipette.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/pipette.png
rename to interface/web/themes/default-304/icons/x16/pipette.png
diff --git a/interface/web/themes/default/icons/x16/pipette_arrow.png b/interface/web/themes/default-304/icons/x16/pipette_arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/pipette_arrow.png
rename to interface/web/themes/default-304/icons/x16/pipette_arrow.png
diff --git a/interface/web/themes/default/icons/x16/pipette_exclamation.png b/interface/web/themes/default-304/icons/x16/pipette_exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/pipette_exclamation.png
rename to interface/web/themes/default-304/icons/x16/pipette_exclamation.png
diff --git a/interface/web/themes/default/icons/x16/pipette_minus.png b/interface/web/themes/default-304/icons/x16/pipette_minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/pipette_minus.png
rename to interface/web/themes/default-304/icons/x16/pipette_minus.png
diff --git a/interface/web/themes/default/icons/x16/pipette_pencil.png b/interface/web/themes/default-304/icons/x16/pipette_pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/pipette_pencil.png
rename to interface/web/themes/default-304/icons/x16/pipette_pencil.png
diff --git a/interface/web/themes/default/icons/x16/pipette_plus.png b/interface/web/themes/default-304/icons/x16/pipette_plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/pipette_plus.png
rename to interface/web/themes/default-304/icons/x16/pipette_plus.png
diff --git a/interface/web/themes/default/icons/x16/playing_card.png b/interface/web/themes/default-304/icons/x16/playing_card.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/playing_card.png
rename to interface/web/themes/default-304/icons/x16/playing_card.png
diff --git a/interface/web/themes/default/icons/x16/playing_card_arrow.png b/interface/web/themes/default-304/icons/x16/playing_card_arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/playing_card_arrow.png
rename to interface/web/themes/default-304/icons/x16/playing_card_arrow.png
diff --git a/interface/web/themes/default/icons/x16/playing_card_exclamation.png b/interface/web/themes/default-304/icons/x16/playing_card_exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/playing_card_exclamation.png
rename to interface/web/themes/default-304/icons/x16/playing_card_exclamation.png
diff --git a/interface/web/themes/default/icons/x16/playing_card_minus.png b/interface/web/themes/default-304/icons/x16/playing_card_minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/playing_card_minus.png
rename to interface/web/themes/default-304/icons/x16/playing_card_minus.png
diff --git a/interface/web/themes/default/icons/x16/playing_card_pencil.png b/interface/web/themes/default-304/icons/x16/playing_card_pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/playing_card_pencil.png
rename to interface/web/themes/default-304/icons/x16/playing_card_pencil.png
diff --git a/interface/web/themes/default/icons/x16/playing_card_plus.png b/interface/web/themes/default-304/icons/x16/playing_card_plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/playing_card_plus.png
rename to interface/web/themes/default-304/icons/x16/playing_card_plus.png
diff --git a/interface/web/themes/default/icons/x16/plug.png b/interface/web/themes/default-304/icons/x16/plug.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/plug.png
rename to interface/web/themes/default-304/icons/x16/plug.png
diff --git a/interface/web/themes/default/icons/x16/plug_arrow.png b/interface/web/themes/default-304/icons/x16/plug_arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/plug_arrow.png
rename to interface/web/themes/default-304/icons/x16/plug_arrow.png
diff --git a/interface/web/themes/default/icons/x16/plug_exclamation.png b/interface/web/themes/default-304/icons/x16/plug_exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/plug_exclamation.png
rename to interface/web/themes/default-304/icons/x16/plug_exclamation.png
diff --git a/interface/web/themes/default/icons/x16/plug_minus.png b/interface/web/themes/default-304/icons/x16/plug_minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/plug_minus.png
rename to interface/web/themes/default-304/icons/x16/plug_minus.png
diff --git a/interface/web/themes/default/icons/x16/plug_pencil.png b/interface/web/themes/default-304/icons/x16/plug_pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/plug_pencil.png
rename to interface/web/themes/default-304/icons/x16/plug_pencil.png
diff --git a/interface/web/themes/default/icons/x16/plug_plus.png b/interface/web/themes/default-304/icons/x16/plug_plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/plug_plus.png
rename to interface/web/themes/default-304/icons/x16/plug_plus.png
diff --git a/interface/web/themes/default/icons/x16/plus.png b/interface/web/themes/default-304/icons/x16/plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/plus.png
rename to interface/web/themes/default-304/icons/x16/plus.png
diff --git a/interface/web/themes/default/icons/x16/plus_circle.png b/interface/web/themes/default-304/icons/x16/plus_circle.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/plus_circle.png
rename to interface/web/themes/default-304/icons/x16/plus_circle.png
diff --git a/interface/web/themes/default/icons/x16/plus_circle_frame.png b/interface/web/themes/default-304/icons/x16/plus_circle_frame.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/plus_circle_frame.png
rename to interface/web/themes/default-304/icons/x16/plus_circle_frame.png
diff --git a/interface/web/themes/default/icons/x16/plus_shield.png b/interface/web/themes/default-304/icons/x16/plus_shield.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/plus_shield.png
rename to interface/web/themes/default-304/icons/x16/plus_shield.png
diff --git a/interface/web/themes/default/icons/x16/plus_small.png b/interface/web/themes/default-304/icons/x16/plus_small.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/plus_small.png
rename to interface/web/themes/default-304/icons/x16/plus_small.png
diff --git a/interface/web/themes/default/icons/x16/plus_small_circle.png b/interface/web/themes/default-304/icons/x16/plus_small_circle.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/plus_small_circle.png
rename to interface/web/themes/default-304/icons/x16/plus_small_circle.png
diff --git a/interface/web/themes/default/icons/x16/printer.png b/interface/web/themes/default-304/icons/x16/printer.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/printer.png
rename to interface/web/themes/default-304/icons/x16/printer.png
diff --git a/interface/web/themes/default/icons/x16/printer__arrow.png b/interface/web/themes/default-304/icons/x16/printer__arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/printer__arrow.png
rename to interface/web/themes/default-304/icons/x16/printer__arrow.png
diff --git a/interface/web/themes/default/icons/x16/printer__exclamation.png b/interface/web/themes/default-304/icons/x16/printer__exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/printer__exclamation.png
rename to interface/web/themes/default-304/icons/x16/printer__exclamation.png
diff --git a/interface/web/themes/default/icons/x16/printer__minus.png b/interface/web/themes/default-304/icons/x16/printer__minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/printer__minus.png
rename to interface/web/themes/default-304/icons/x16/printer__minus.png
diff --git a/interface/web/themes/default/icons/x16/printer__pencil.png b/interface/web/themes/default-304/icons/x16/printer__pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/printer__pencil.png
rename to interface/web/themes/default-304/icons/x16/printer__pencil.png
diff --git a/interface/web/themes/default/icons/x16/printer__plus.png b/interface/web/themes/default-304/icons/x16/printer__plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/printer__plus.png
rename to interface/web/themes/default-304/icons/x16/printer__plus.png
diff --git a/interface/web/themes/default/icons/x16/printer_empty.png b/interface/web/themes/default-304/icons/x16/printer_empty.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/printer_empty.png
rename to interface/web/themes/default-304/icons/x16/printer_empty.png
diff --git a/interface/web/themes/default/icons/x16/printer_small.png b/interface/web/themes/default-304/icons/x16/printer_small.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/printer_small.png
rename to interface/web/themes/default-304/icons/x16/printer_small.png
diff --git a/interface/web/themes/default/icons/x16/puzzle.png b/interface/web/themes/default-304/icons/x16/puzzle.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/puzzle.png
rename to interface/web/themes/default-304/icons/x16/puzzle.png
diff --git a/interface/web/themes/default/icons/x16/puzzle__arrow.png b/interface/web/themes/default-304/icons/x16/puzzle__arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/puzzle__arrow.png
rename to interface/web/themes/default-304/icons/x16/puzzle__arrow.png
diff --git a/interface/web/themes/default/icons/x16/puzzle__exclamation.png b/interface/web/themes/default-304/icons/x16/puzzle__exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/puzzle__exclamation.png
rename to interface/web/themes/default-304/icons/x16/puzzle__exclamation.png
diff --git a/interface/web/themes/default/icons/x16/puzzle__minus.png b/interface/web/themes/default-304/icons/x16/puzzle__minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/puzzle__minus.png
rename to interface/web/themes/default-304/icons/x16/puzzle__minus.png
diff --git a/interface/web/themes/default/icons/x16/puzzle__pencil.png b/interface/web/themes/default-304/icons/x16/puzzle__pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/puzzle__pencil.png
rename to interface/web/themes/default-304/icons/x16/puzzle__pencil.png
diff --git a/interface/web/themes/default/icons/x16/puzzle__plus.png b/interface/web/themes/default-304/icons/x16/puzzle__plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/puzzle__plus.png
rename to interface/web/themes/default-304/icons/x16/puzzle__plus.png
diff --git a/interface/web/themes/default/icons/x16/puzzle_disable.png b/interface/web/themes/default-304/icons/x16/puzzle_disable.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/puzzle_disable.png
rename to interface/web/themes/default-304/icons/x16/puzzle_disable.png
diff --git a/interface/web/themes/default/icons/x16/question.png b/interface/web/themes/default-304/icons/x16/question.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/question.png
rename to interface/web/themes/default-304/icons/x16/question.png
diff --git a/interface/web/themes/default/icons/x16/question_frame.png b/interface/web/themes/default-304/icons/x16/question_frame.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/question_frame.png
rename to interface/web/themes/default-304/icons/x16/question_frame.png
diff --git a/interface/web/themes/default/icons/x16/question_shield.png b/interface/web/themes/default-304/icons/x16/question_shield.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/question_shield.png
rename to interface/web/themes/default-304/icons/x16/question_shield.png
diff --git a/interface/web/themes/default/icons/x16/question_small.png b/interface/web/themes/default-304/icons/x16/question_small.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/question_small.png
rename to interface/web/themes/default-304/icons/x16/question_small.png
diff --git a/interface/web/themes/default/icons/x16/receipt.png b/interface/web/themes/default-304/icons/x16/receipt.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/receipt.png
rename to interface/web/themes/default-304/icons/x16/receipt.png
diff --git a/interface/web/themes/default/icons/x16/receipt_arrow.png b/interface/web/themes/default-304/icons/x16/receipt_arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/receipt_arrow.png
rename to interface/web/themes/default-304/icons/x16/receipt_arrow.png
diff --git a/interface/web/themes/default/icons/x16/receipt_exclamation.png b/interface/web/themes/default-304/icons/x16/receipt_exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/receipt_exclamation.png
rename to interface/web/themes/default-304/icons/x16/receipt_exclamation.png
diff --git a/interface/web/themes/default/icons/x16/receipt_minus.png b/interface/web/themes/default-304/icons/x16/receipt_minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/receipt_minus.png
rename to interface/web/themes/default-304/icons/x16/receipt_minus.png
diff --git a/interface/web/themes/default/icons/x16/receipt_pencil.png b/interface/web/themes/default-304/icons/x16/receipt_pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/receipt_pencil.png
rename to interface/web/themes/default-304/icons/x16/receipt_pencil.png
diff --git a/interface/web/themes/default/icons/x16/receipt_plus.png b/interface/web/themes/default-304/icons/x16/receipt_plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/receipt_plus.png
rename to interface/web/themes/default-304/icons/x16/receipt_plus.png
diff --git a/interface/web/themes/default/icons/x16/receipt_shred.png b/interface/web/themes/default-304/icons/x16/receipt_shred.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/receipt_shred.png
rename to interface/web/themes/default-304/icons/x16/receipt_shred.png
diff --git a/interface/web/themes/default/icons/x16/receipt_text.png b/interface/web/themes/default-304/icons/x16/receipt_text.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/receipt_text.png
rename to interface/web/themes/default-304/icons/x16/receipt_text.png
diff --git a/interface/web/themes/default/icons/x16/receipts.png b/interface/web/themes/default-304/icons/x16/receipts.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/receipts.png
rename to interface/web/themes/default-304/icons/x16/receipts.png
diff --git a/interface/web/themes/default/icons/x16/receipts_arrow.png b/interface/web/themes/default-304/icons/x16/receipts_arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/receipts_arrow.png
rename to interface/web/themes/default-304/icons/x16/receipts_arrow.png
diff --git a/interface/web/themes/default/icons/x16/receipts_exclamation.png b/interface/web/themes/default-304/icons/x16/receipts_exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/receipts_exclamation.png
rename to interface/web/themes/default-304/icons/x16/receipts_exclamation.png
diff --git a/interface/web/themes/default/icons/x16/receipts_minus.png b/interface/web/themes/default-304/icons/x16/receipts_minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/receipts_minus.png
rename to interface/web/themes/default-304/icons/x16/receipts_minus.png
diff --git a/interface/web/themes/default/icons/x16/receipts_pencil.png b/interface/web/themes/default-304/icons/x16/receipts_pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/receipts_pencil.png
rename to interface/web/themes/default-304/icons/x16/receipts_pencil.png
diff --git a/interface/web/themes/default/icons/x16/receipts_plus.png b/interface/web/themes/default-304/icons/x16/receipts_plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/receipts_plus.png
rename to interface/web/themes/default-304/icons/x16/receipts_plus.png
diff --git a/interface/web/themes/default/icons/x16/receipts_text.png b/interface/web/themes/default-304/icons/x16/receipts_text.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/receipts_text.png
rename to interface/web/themes/default-304/icons/x16/receipts_text.png
diff --git a/interface/web/themes/default/icons/x16/report.png b/interface/web/themes/default-304/icons/x16/report.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/report.png
rename to interface/web/themes/default-304/icons/x16/report.png
diff --git a/interface/web/themes/default/icons/x16/report_arrow.png b/interface/web/themes/default-304/icons/x16/report_arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/report_arrow.png
rename to interface/web/themes/default-304/icons/x16/report_arrow.png
diff --git a/interface/web/themes/default/icons/x16/report_exclamation.png b/interface/web/themes/default-304/icons/x16/report_exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/report_exclamation.png
rename to interface/web/themes/default-304/icons/x16/report_exclamation.png
diff --git a/interface/web/themes/default/icons/x16/report_minus.png b/interface/web/themes/default-304/icons/x16/report_minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/report_minus.png
rename to interface/web/themes/default-304/icons/x16/report_minus.png
diff --git a/interface/web/themes/default/icons/x16/report_pencil.png b/interface/web/themes/default-304/icons/x16/report_pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/report_pencil.png
rename to interface/web/themes/default-304/icons/x16/report_pencil.png
diff --git a/interface/web/themes/default/icons/x16/report_plus.png b/interface/web/themes/default-304/icons/x16/report_plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/report_plus.png
rename to interface/web/themes/default-304/icons/x16/report_plus.png
diff --git a/interface/web/themes/default/icons/x16/ruler.png b/interface/web/themes/default-304/icons/x16/ruler.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/ruler.png
rename to interface/web/themes/default-304/icons/x16/ruler.png
diff --git a/interface/web/themes/default/icons/x16/ruler__arrow.png b/interface/web/themes/default-304/icons/x16/ruler__arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/ruler__arrow.png
rename to interface/web/themes/default-304/icons/x16/ruler__arrow.png
diff --git a/interface/web/themes/default/icons/x16/ruler__exclamation.png b/interface/web/themes/default-304/icons/x16/ruler__exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/ruler__exclamation.png
rename to interface/web/themes/default-304/icons/x16/ruler__exclamation.png
diff --git a/interface/web/themes/default/icons/x16/ruler__minus.png b/interface/web/themes/default-304/icons/x16/ruler__minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/ruler__minus.png
rename to interface/web/themes/default-304/icons/x16/ruler__minus.png
diff --git a/interface/web/themes/default/icons/x16/ruler__pencil.png b/interface/web/themes/default-304/icons/x16/ruler__pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/ruler__pencil.png
rename to interface/web/themes/default-304/icons/x16/ruler__pencil.png
diff --git a/interface/web/themes/default/icons/x16/ruler__plus.png b/interface/web/themes/default-304/icons/x16/ruler__plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/ruler__plus.png
rename to interface/web/themes/default-304/icons/x16/ruler__plus.png
diff --git a/interface/web/themes/default/icons/x16/ruler_crop.png b/interface/web/themes/default-304/icons/x16/ruler_crop.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/ruler_crop.png
rename to interface/web/themes/default-304/icons/x16/ruler_crop.png
diff --git a/interface/web/themes/default/icons/x16/safe.png b/interface/web/themes/default-304/icons/x16/safe.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/safe.png
rename to interface/web/themes/default-304/icons/x16/safe.png
diff --git a/interface/web/themes/default/icons/x16/safe_arrow.png b/interface/web/themes/default-304/icons/x16/safe_arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/safe_arrow.png
rename to interface/web/themes/default-304/icons/x16/safe_arrow.png
diff --git a/interface/web/themes/default/icons/x16/safe_exclamation.png b/interface/web/themes/default-304/icons/x16/safe_exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/safe_exclamation.png
rename to interface/web/themes/default-304/icons/x16/safe_exclamation.png
diff --git a/interface/web/themes/default/icons/x16/safe_minus.png b/interface/web/themes/default-304/icons/x16/safe_minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/safe_minus.png
rename to interface/web/themes/default-304/icons/x16/safe_minus.png
diff --git a/interface/web/themes/default/icons/x16/safe_pencil.png b/interface/web/themes/default-304/icons/x16/safe_pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/safe_pencil.png
rename to interface/web/themes/default-304/icons/x16/safe_pencil.png
diff --git a/interface/web/themes/default/icons/x16/safe_plus.png b/interface/web/themes/default-304/icons/x16/safe_plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/safe_plus.png
rename to interface/web/themes/default-304/icons/x16/safe_plus.png
diff --git a/interface/web/themes/default/icons/x16/screwdriver.png b/interface/web/themes/default-304/icons/x16/screwdriver.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/screwdriver.png
rename to interface/web/themes/default-304/icons/x16/screwdriver.png
diff --git a/interface/web/themes/default/icons/x16/screwdriver_arrow.png b/interface/web/themes/default-304/icons/x16/screwdriver_arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/screwdriver_arrow.png
rename to interface/web/themes/default-304/icons/x16/screwdriver_arrow.png
diff --git a/interface/web/themes/default/icons/x16/screwdriver_exclamation.png b/interface/web/themes/default-304/icons/x16/screwdriver_exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/screwdriver_exclamation.png
rename to interface/web/themes/default-304/icons/x16/screwdriver_exclamation.png
diff --git a/interface/web/themes/default/icons/x16/screwdriver_minus.png b/interface/web/themes/default-304/icons/x16/screwdriver_minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/screwdriver_minus.png
rename to interface/web/themes/default-304/icons/x16/screwdriver_minus.png
diff --git a/interface/web/themes/default/icons/x16/screwdriver_pencil.png b/interface/web/themes/default-304/icons/x16/screwdriver_pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/screwdriver_pencil.png
rename to interface/web/themes/default-304/icons/x16/screwdriver_pencil.png
diff --git a/interface/web/themes/default/icons/x16/screwdriver_plus.png b/interface/web/themes/default-304/icons/x16/screwdriver_plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/screwdriver_plus.png
rename to interface/web/themes/default-304/icons/x16/screwdriver_plus.png
diff --git a/interface/web/themes/default/icons/x16/script.png b/interface/web/themes/default-304/icons/x16/script.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/script.png
rename to interface/web/themes/default-304/icons/x16/script.png
diff --git a/interface/web/themes/default/icons/x16/script__arrow.png b/interface/web/themes/default-304/icons/x16/script__arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/script__arrow.png
rename to interface/web/themes/default-304/icons/x16/script__arrow.png
diff --git a/interface/web/themes/default/icons/x16/script__exclamation.png b/interface/web/themes/default-304/icons/x16/script__exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/script__exclamation.png
rename to interface/web/themes/default-304/icons/x16/script__exclamation.png
diff --git a/interface/web/themes/default/icons/x16/script__minus.png b/interface/web/themes/default-304/icons/x16/script__minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/script__minus.png
rename to interface/web/themes/default-304/icons/x16/script__minus.png
diff --git a/interface/web/themes/default/icons/x16/script__pencil.png b/interface/web/themes/default-304/icons/x16/script__pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/script__pencil.png
rename to interface/web/themes/default-304/icons/x16/script__pencil.png
diff --git a/interface/web/themes/default/icons/x16/script__plus.png b/interface/web/themes/default-304/icons/x16/script__plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/script__plus.png
rename to interface/web/themes/default-304/icons/x16/script__plus.png
diff --git a/interface/web/themes/default/icons/x16/script_code.png b/interface/web/themes/default-304/icons/x16/script_code.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/script_code.png
rename to interface/web/themes/default-304/icons/x16/script_code.png
diff --git a/interface/web/themes/default/icons/x16/scripts.png b/interface/web/themes/default-304/icons/x16/scripts.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/scripts.png
rename to interface/web/themes/default-304/icons/x16/scripts.png
diff --git a/interface/web/themes/default/icons/x16/scripts__arrow.png b/interface/web/themes/default-304/icons/x16/scripts__arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/scripts__arrow.png
rename to interface/web/themes/default-304/icons/x16/scripts__arrow.png
diff --git a/interface/web/themes/default/icons/x16/scripts__exclamation.png b/interface/web/themes/default-304/icons/x16/scripts__exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/scripts__exclamation.png
rename to interface/web/themes/default-304/icons/x16/scripts__exclamation.png
diff --git a/interface/web/themes/default/icons/x16/scripts__minus.png b/interface/web/themes/default-304/icons/x16/scripts__minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/scripts__minus.png
rename to interface/web/themes/default-304/icons/x16/scripts__minus.png
diff --git a/interface/web/themes/default/icons/x16/scripts__pencil.png b/interface/web/themes/default-304/icons/x16/scripts__pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/scripts__pencil.png
rename to interface/web/themes/default-304/icons/x16/scripts__pencil.png
diff --git a/interface/web/themes/default/icons/x16/scripts__plus.png b/interface/web/themes/default-304/icons/x16/scripts__plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/scripts__plus.png
rename to interface/web/themes/default-304/icons/x16/scripts__plus.png
diff --git a/interface/web/themes/default/icons/x16/scripts_code.png b/interface/web/themes/default-304/icons/x16/scripts_code.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/scripts_code.png
rename to interface/web/themes/default-304/icons/x16/scripts_code.png
diff --git a/interface/web/themes/default/icons/x16/shield.png b/interface/web/themes/default-304/icons/x16/shield.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/shield.png
rename to interface/web/themes/default-304/icons/x16/shield.png
diff --git a/interface/web/themes/default/icons/x16/shield__arrow.png b/interface/web/themes/default-304/icons/x16/shield__arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/shield__arrow.png
rename to interface/web/themes/default-304/icons/x16/shield__arrow.png
diff --git a/interface/web/themes/default/icons/x16/shield__exclamation.png b/interface/web/themes/default-304/icons/x16/shield__exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/shield__exclamation.png
rename to interface/web/themes/default-304/icons/x16/shield__exclamation.png
diff --git a/interface/web/themes/default/icons/x16/shield__minus.png b/interface/web/themes/default-304/icons/x16/shield__minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/shield__minus.png
rename to interface/web/themes/default-304/icons/x16/shield__minus.png
diff --git a/interface/web/themes/default/icons/x16/shield__pencil.png b/interface/web/themes/default-304/icons/x16/shield__pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/shield__pencil.png
rename to interface/web/themes/default-304/icons/x16/shield__pencil.png
diff --git a/interface/web/themes/default/icons/x16/shield__plus.png b/interface/web/themes/default-304/icons/x16/shield__plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/shield__plus.png
rename to interface/web/themes/default-304/icons/x16/shield__plus.png
diff --git a/interface/web/themes/default/icons/x16/shield_disable.png b/interface/web/themes/default-304/icons/x16/shield_disable.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/shield_disable.png
rename to interface/web/themes/default-304/icons/x16/shield_disable.png
diff --git a/interface/web/themes/default/icons/x16/slash.png b/interface/web/themes/default-304/icons/x16/slash.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/slash.png
rename to interface/web/themes/default-304/icons/x16/slash.png
diff --git a/interface/web/themes/default/icons/x16/slash_small.png b/interface/web/themes/default-304/icons/x16/slash_small.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/slash_small.png
rename to interface/web/themes/default-304/icons/x16/slash_small.png
diff --git a/interface/web/themes/default/icons/x16/socket.png b/interface/web/themes/default-304/icons/x16/socket.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/socket.png
rename to interface/web/themes/default-304/icons/x16/socket.png
diff --git a/interface/web/themes/default/icons/x16/socket_arrow.png b/interface/web/themes/default-304/icons/x16/socket_arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/socket_arrow.png
rename to interface/web/themes/default-304/icons/x16/socket_arrow.png
diff --git a/interface/web/themes/default/icons/x16/socket_exclamation.png b/interface/web/themes/default-304/icons/x16/socket_exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/socket_exclamation.png
rename to interface/web/themes/default-304/icons/x16/socket_exclamation.png
diff --git a/interface/web/themes/default/icons/x16/socket_minus.png b/interface/web/themes/default-304/icons/x16/socket_minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/socket_minus.png
rename to interface/web/themes/default-304/icons/x16/socket_minus.png
diff --git a/interface/web/themes/default/icons/x16/socket_pencil.png b/interface/web/themes/default-304/icons/x16/socket_pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/socket_pencil.png
rename to interface/web/themes/default-304/icons/x16/socket_pencil.png
diff --git a/interface/web/themes/default/icons/x16/socket_plus.png b/interface/web/themes/default-304/icons/x16/socket_plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/socket_plus.png
rename to interface/web/themes/default-304/icons/x16/socket_plus.png
diff --git a/interface/web/themes/default/icons/x16/sort.png b/interface/web/themes/default-304/icons/x16/sort.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/sort.png
rename to interface/web/themes/default-304/icons/x16/sort.png
diff --git a/interface/web/themes/default/icons/x16/sort__arrow.png b/interface/web/themes/default-304/icons/x16/sort__arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/sort__arrow.png
rename to interface/web/themes/default-304/icons/x16/sort__arrow.png
diff --git a/interface/web/themes/default/icons/x16/sort__exclamation.png b/interface/web/themes/default-304/icons/x16/sort__exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/sort__exclamation.png
rename to interface/web/themes/default-304/icons/x16/sort__exclamation.png
diff --git a/interface/web/themes/default/icons/x16/sort__minus.png b/interface/web/themes/default-304/icons/x16/sort__minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/sort__minus.png
rename to interface/web/themes/default-304/icons/x16/sort__minus.png
diff --git a/interface/web/themes/default/icons/x16/sort__pencil.png b/interface/web/themes/default-304/icons/x16/sort__pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/sort__pencil.png
rename to interface/web/themes/default-304/icons/x16/sort__pencil.png
diff --git a/interface/web/themes/default/icons/x16/sort__plus.png b/interface/web/themes/default-304/icons/x16/sort__plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/sort__plus.png
rename to interface/web/themes/default-304/icons/x16/sort__plus.png
diff --git a/interface/web/themes/default/icons/x16/sort_alphabet.png b/interface/web/themes/default-304/icons/x16/sort_alphabet.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/sort_alphabet.png
rename to interface/web/themes/default-304/icons/x16/sort_alphabet.png
diff --git a/interface/web/themes/default/icons/x16/sort_alphabet_descending.png b/interface/web/themes/default-304/icons/x16/sort_alphabet_descending.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/sort_alphabet_descending.png
rename to interface/web/themes/default-304/icons/x16/sort_alphabet_descending.png
diff --git a/interface/web/themes/default/icons/x16/sort_date.png b/interface/web/themes/default-304/icons/x16/sort_date.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/sort_date.png
rename to interface/web/themes/default-304/icons/x16/sort_date.png
diff --git a/interface/web/themes/default/icons/x16/sort_date_descending.png b/interface/web/themes/default-304/icons/x16/sort_date_descending.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/sort_date_descending.png
rename to interface/web/themes/default-304/icons/x16/sort_date_descending.png
diff --git a/interface/web/themes/default/icons/x16/sort_number.png b/interface/web/themes/default-304/icons/x16/sort_number.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/sort_number.png
rename to interface/web/themes/default-304/icons/x16/sort_number.png
diff --git a/interface/web/themes/default/icons/x16/sort_number_descending.png b/interface/web/themes/default-304/icons/x16/sort_number_descending.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/sort_number_descending.png
rename to interface/web/themes/default-304/icons/x16/sort_number_descending.png
diff --git a/interface/web/themes/default/icons/x16/sort_quantity.png b/interface/web/themes/default-304/icons/x16/sort_quantity.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/sort_quantity.png
rename to interface/web/themes/default-304/icons/x16/sort_quantity.png
diff --git a/interface/web/themes/default/icons/x16/sort_quantity_descending.png b/interface/web/themes/default-304/icons/x16/sort_quantity_descending.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/sort_quantity_descending.png
rename to interface/web/themes/default-304/icons/x16/sort_quantity_descending.png
diff --git a/interface/web/themes/default/icons/x16/sort_small.png b/interface/web/themes/default-304/icons/x16/sort_small.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/sort_small.png
rename to interface/web/themes/default-304/icons/x16/sort_small.png
diff --git a/interface/web/themes/default/icons/x16/stamp.png b/interface/web/themes/default-304/icons/x16/stamp.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/stamp.png
rename to interface/web/themes/default-304/icons/x16/stamp.png
diff --git a/interface/web/themes/default/icons/x16/stamp_arrow.png b/interface/web/themes/default-304/icons/x16/stamp_arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/stamp_arrow.png
rename to interface/web/themes/default-304/icons/x16/stamp_arrow.png
diff --git a/interface/web/themes/default/icons/x16/stamp_exclamation.png b/interface/web/themes/default-304/icons/x16/stamp_exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/stamp_exclamation.png
rename to interface/web/themes/default-304/icons/x16/stamp_exclamation.png
diff --git a/interface/web/themes/default/icons/x16/stamp_minus.png b/interface/web/themes/default-304/icons/x16/stamp_minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/stamp_minus.png
rename to interface/web/themes/default-304/icons/x16/stamp_minus.png
diff --git a/interface/web/themes/default/icons/x16/stamp_pencil.png b/interface/web/themes/default-304/icons/x16/stamp_pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/stamp_pencil.png
rename to interface/web/themes/default-304/icons/x16/stamp_pencil.png
diff --git a/interface/web/themes/default/icons/x16/stamp_plus.png b/interface/web/themes/default-304/icons/x16/stamp_plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/stamp_plus.png
rename to interface/web/themes/default-304/icons/x16/stamp_plus.png
diff --git a/interface/web/themes/default/icons/x16/star.png b/interface/web/themes/default-304/icons/x16/star.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/star.png
rename to interface/web/themes/default-304/icons/x16/star.png
diff --git a/interface/web/themes/default/icons/x16/star__arrow.png b/interface/web/themes/default-304/icons/x16/star__arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/star__arrow.png
rename to interface/web/themes/default-304/icons/x16/star__arrow.png
diff --git a/interface/web/themes/default/icons/x16/star__exclamation.png b/interface/web/themes/default-304/icons/x16/star__exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/star__exclamation.png
rename to interface/web/themes/default-304/icons/x16/star__exclamation.png
diff --git a/interface/web/themes/default/icons/x16/star__minus.png b/interface/web/themes/default-304/icons/x16/star__minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/star__minus.png
rename to interface/web/themes/default-304/icons/x16/star__minus.png
diff --git a/interface/web/themes/default/icons/x16/star__pencil.png b/interface/web/themes/default-304/icons/x16/star__pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/star__pencil.png
rename to interface/web/themes/default-304/icons/x16/star__pencil.png
diff --git a/interface/web/themes/default/icons/x16/star__plus.png b/interface/web/themes/default-304/icons/x16/star__plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/star__plus.png
rename to interface/web/themes/default-304/icons/x16/star__plus.png
diff --git a/interface/web/themes/default/icons/x16/star_empty.png b/interface/web/themes/default-304/icons/x16/star_empty.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/star_empty.png
rename to interface/web/themes/default-304/icons/x16/star_empty.png
diff --git a/interface/web/themes/default/icons/x16/star_half.png b/interface/web/themes/default-304/icons/x16/star_half.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/star_half.png
rename to interface/web/themes/default-304/icons/x16/star_half.png
diff --git a/interface/web/themes/default/icons/x16/star_small.png b/interface/web/themes/default-304/icons/x16/star_small.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/star_small.png
rename to interface/web/themes/default-304/icons/x16/star_small.png
diff --git a/interface/web/themes/default/icons/x16/star_small_empty.png b/interface/web/themes/default-304/icons/x16/star_small_empty.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/star_small_empty.png
rename to interface/web/themes/default-304/icons/x16/star_small_empty.png
diff --git a/interface/web/themes/default/icons/x16/star_small_half.png b/interface/web/themes/default-304/icons/x16/star_small_half.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/star_small_half.png
rename to interface/web/themes/default-304/icons/x16/star_small_half.png
diff --git a/interface/web/themes/default/icons/x16/sticky_note.png b/interface/web/themes/default-304/icons/x16/sticky_note.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/sticky_note.png
rename to interface/web/themes/default-304/icons/x16/sticky_note.png
diff --git a/interface/web/themes/default/icons/x16/sticky_note__arrow.png b/interface/web/themes/default-304/icons/x16/sticky_note__arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/sticky_note__arrow.png
rename to interface/web/themes/default-304/icons/x16/sticky_note__arrow.png
diff --git a/interface/web/themes/default/icons/x16/sticky_note__exclamation.png b/interface/web/themes/default-304/icons/x16/sticky_note__exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/sticky_note__exclamation.png
rename to interface/web/themes/default-304/icons/x16/sticky_note__exclamation.png
diff --git a/interface/web/themes/default/icons/x16/sticky_note__minus.png b/interface/web/themes/default-304/icons/x16/sticky_note__minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/sticky_note__minus.png
rename to interface/web/themes/default-304/icons/x16/sticky_note__minus.png
diff --git a/interface/web/themes/default/icons/x16/sticky_note__pencil.png b/interface/web/themes/default-304/icons/x16/sticky_note__pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/sticky_note__pencil.png
rename to interface/web/themes/default-304/icons/x16/sticky_note__pencil.png
diff --git a/interface/web/themes/default/icons/x16/sticky_note__plus.png b/interface/web/themes/default-304/icons/x16/sticky_note__plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/sticky_note__plus.png
rename to interface/web/themes/default-304/icons/x16/sticky_note__plus.png
diff --git a/interface/web/themes/default/icons/x16/sticky_note_pin.png b/interface/web/themes/default-304/icons/x16/sticky_note_pin.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/sticky_note_pin.png
rename to interface/web/themes/default-304/icons/x16/sticky_note_pin.png
diff --git a/interface/web/themes/default/icons/x16/sticky_note_shred.png b/interface/web/themes/default-304/icons/x16/sticky_note_shred.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/sticky_note_shred.png
rename to interface/web/themes/default-304/icons/x16/sticky_note_shred.png
diff --git a/interface/web/themes/default/icons/x16/sticky_note_small.png b/interface/web/themes/default-304/icons/x16/sticky_note_small.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/sticky_note_small.png
rename to interface/web/themes/default-304/icons/x16/sticky_note_small.png
diff --git a/interface/web/themes/default/icons/x16/sticky_note_small_pin.png b/interface/web/themes/default-304/icons/x16/sticky_note_small_pin.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/sticky_note_small_pin.png
rename to interface/web/themes/default-304/icons/x16/sticky_note_small_pin.png
diff --git a/interface/web/themes/default/icons/x16/sticky_note_text.png b/interface/web/themes/default-304/icons/x16/sticky_note_text.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/sticky_note_text.png
rename to interface/web/themes/default-304/icons/x16/sticky_note_text.png
diff --git a/interface/web/themes/default/icons/x16/sticky_notes.png b/interface/web/themes/default-304/icons/x16/sticky_notes.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/sticky_notes.png
rename to interface/web/themes/default-304/icons/x16/sticky_notes.png
diff --git a/interface/web/themes/default/icons/x16/sticky_notes__arrow.png b/interface/web/themes/default-304/icons/x16/sticky_notes__arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/sticky_notes__arrow.png
rename to interface/web/themes/default-304/icons/x16/sticky_notes__arrow.png
diff --git a/interface/web/themes/default/icons/x16/sticky_notes__exclamation.png b/interface/web/themes/default-304/icons/x16/sticky_notes__exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/sticky_notes__exclamation.png
rename to interface/web/themes/default-304/icons/x16/sticky_notes__exclamation.png
diff --git a/interface/web/themes/default/icons/x16/sticky_notes__minus.png b/interface/web/themes/default-304/icons/x16/sticky_notes__minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/sticky_notes__minus.png
rename to interface/web/themes/default-304/icons/x16/sticky_notes__minus.png
diff --git a/interface/web/themes/default/icons/x16/sticky_notes__pencil.png b/interface/web/themes/default-304/icons/x16/sticky_notes__pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/sticky_notes__pencil.png
rename to interface/web/themes/default-304/icons/x16/sticky_notes__pencil.png
diff --git a/interface/web/themes/default/icons/x16/sticky_notes__plus.png b/interface/web/themes/default-304/icons/x16/sticky_notes__plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/sticky_notes__plus.png
rename to interface/web/themes/default-304/icons/x16/sticky_notes__plus.png
diff --git a/interface/web/themes/default/icons/x16/sticky_notes_pin.png b/interface/web/themes/default-304/icons/x16/sticky_notes_pin.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/sticky_notes_pin.png
rename to interface/web/themes/default-304/icons/x16/sticky_notes_pin.png
diff --git a/interface/web/themes/default/icons/x16/sticky_notes_stack.png b/interface/web/themes/default-304/icons/x16/sticky_notes_stack.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/sticky_notes_stack.png
rename to interface/web/themes/default-304/icons/x16/sticky_notes_stack.png
diff --git a/interface/web/themes/default/icons/x16/sticky_notes_text.png b/interface/web/themes/default-304/icons/x16/sticky_notes_text.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/sticky_notes_text.png
rename to interface/web/themes/default-304/icons/x16/sticky_notes_text.png
diff --git a/interface/web/themes/default/icons/x16/switch.png b/interface/web/themes/default-304/icons/x16/switch.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/switch.png
rename to interface/web/themes/default-304/icons/x16/switch.png
diff --git a/interface/web/themes/default/icons/x16/switch_arrow.png b/interface/web/themes/default-304/icons/x16/switch_arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/switch_arrow.png
rename to interface/web/themes/default-304/icons/x16/switch_arrow.png
diff --git a/interface/web/themes/default/icons/x16/switch_exclamation.png b/interface/web/themes/default-304/icons/x16/switch_exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/switch_exclamation.png
rename to interface/web/themes/default-304/icons/x16/switch_exclamation.png
diff --git a/interface/web/themes/default/icons/x16/switch_minus.png b/interface/web/themes/default-304/icons/x16/switch_minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/switch_minus.png
rename to interface/web/themes/default-304/icons/x16/switch_minus.png
diff --git a/interface/web/themes/default/icons/x16/switch_pencil.png b/interface/web/themes/default-304/icons/x16/switch_pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/switch_pencil.png
rename to interface/web/themes/default-304/icons/x16/switch_pencil.png
diff --git a/interface/web/themes/default/icons/x16/switch_plus.png b/interface/web/themes/default-304/icons/x16/switch_plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/switch_plus.png
rename to interface/web/themes/default-304/icons/x16/switch_plus.png
diff --git a/interface/web/themes/default/icons/x16/table.png b/interface/web/themes/default-304/icons/x16/table.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/table.png
rename to interface/web/themes/default-304/icons/x16/table.png
diff --git a/interface/web/themes/default/icons/x16/table__arrow.png b/interface/web/themes/default-304/icons/x16/table__arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/table__arrow.png
rename to interface/web/themes/default-304/icons/x16/table__arrow.png
diff --git a/interface/web/themes/default/icons/x16/table__exclamation.png b/interface/web/themes/default-304/icons/x16/table__exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/table__exclamation.png
rename to interface/web/themes/default-304/icons/x16/table__exclamation.png
diff --git a/interface/web/themes/default/icons/x16/table__minus.png b/interface/web/themes/default-304/icons/x16/table__minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/table__minus.png
rename to interface/web/themes/default-304/icons/x16/table__minus.png
diff --git a/interface/web/themes/default/icons/x16/table__pencil.png b/interface/web/themes/default-304/icons/x16/table__pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/table__pencil.png
rename to interface/web/themes/default-304/icons/x16/table__pencil.png
diff --git a/interface/web/themes/default/icons/x16/table__plus.png b/interface/web/themes/default-304/icons/x16/table__plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/table__plus.png
rename to interface/web/themes/default-304/icons/x16/table__plus.png
diff --git a/interface/web/themes/default/icons/x16/table_delete.png b/interface/web/themes/default-304/icons/x16/table_delete.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/table_delete.png
rename to interface/web/themes/default-304/icons/x16/table_delete.png
diff --git a/interface/web/themes/default/icons/x16/table_delete_column.png b/interface/web/themes/default-304/icons/x16/table_delete_column.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/table_delete_column.png
rename to interface/web/themes/default-304/icons/x16/table_delete_column.png
diff --git a/interface/web/themes/default/icons/x16/table_insert.png b/interface/web/themes/default-304/icons/x16/table_insert.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/table_insert.png
rename to interface/web/themes/default-304/icons/x16/table_insert.png
diff --git a/interface/web/themes/default/icons/x16/table_insert_column.png b/interface/web/themes/default-304/icons/x16/table_insert_column.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/table_insert_column.png
rename to interface/web/themes/default-304/icons/x16/table_insert_column.png
diff --git a/interface/web/themes/default/icons/x16/tables.png b/interface/web/themes/default-304/icons/x16/tables.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/tables.png
rename to interface/web/themes/default-304/icons/x16/tables.png
diff --git a/interface/web/themes/default/icons/x16/tables_arrow.png b/interface/web/themes/default-304/icons/x16/tables_arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/tables_arrow.png
rename to interface/web/themes/default-304/icons/x16/tables_arrow.png
diff --git a/interface/web/themes/default/icons/x16/tables_exclamation.png b/interface/web/themes/default-304/icons/x16/tables_exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/tables_exclamation.png
rename to interface/web/themes/default-304/icons/x16/tables_exclamation.png
diff --git a/interface/web/themes/default/icons/x16/tables_minus.png b/interface/web/themes/default-304/icons/x16/tables_minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/tables_minus.png
rename to interface/web/themes/default-304/icons/x16/tables_minus.png
diff --git a/interface/web/themes/default/icons/x16/tables_pencil.png b/interface/web/themes/default-304/icons/x16/tables_pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/tables_pencil.png
rename to interface/web/themes/default-304/icons/x16/tables_pencil.png
diff --git a/interface/web/themes/default/icons/x16/tables_plus.png b/interface/web/themes/default-304/icons/x16/tables_plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/tables_plus.png
rename to interface/web/themes/default-304/icons/x16/tables_plus.png
diff --git a/interface/web/themes/default/icons/x16/tables_stacks.png b/interface/web/themes/default-304/icons/x16/tables_stacks.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/tables_stacks.png
rename to interface/web/themes/default-304/icons/x16/tables_stacks.png
diff --git a/interface/web/themes/default/icons/x16/tag.png b/interface/web/themes/default-304/icons/x16/tag.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/tag.png
rename to interface/web/themes/default-304/icons/x16/tag.png
diff --git a/interface/web/themes/default/icons/x16/tag__arrow.png b/interface/web/themes/default-304/icons/x16/tag__arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/tag__arrow.png
rename to interface/web/themes/default-304/icons/x16/tag__arrow.png
diff --git a/interface/web/themes/default/icons/x16/tag__exclamation.png b/interface/web/themes/default-304/icons/x16/tag__exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/tag__exclamation.png
rename to interface/web/themes/default-304/icons/x16/tag__exclamation.png
diff --git a/interface/web/themes/default/icons/x16/tag__minus.png b/interface/web/themes/default-304/icons/x16/tag__minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/tag__minus.png
rename to interface/web/themes/default-304/icons/x16/tag__minus.png
diff --git a/interface/web/themes/default/icons/x16/tag__pencil.png b/interface/web/themes/default-304/icons/x16/tag__pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/tag__pencil.png
rename to interface/web/themes/default-304/icons/x16/tag__pencil.png
diff --git a/interface/web/themes/default/icons/x16/tag__plus.png b/interface/web/themes/default-304/icons/x16/tag__plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/tag__plus.png
rename to interface/web/themes/default-304/icons/x16/tag__plus.png
diff --git a/interface/web/themes/default/icons/x16/tag_label.png b/interface/web/themes/default-304/icons/x16/tag_label.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/tag_label.png
rename to interface/web/themes/default-304/icons/x16/tag_label.png
diff --git a/interface/web/themes/default/icons/x16/tag_small.png b/interface/web/themes/default-304/icons/x16/tag_small.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/tag_small.png
rename to interface/web/themes/default-304/icons/x16/tag_small.png
diff --git a/interface/web/themes/default/icons/x16/tags.png b/interface/web/themes/default-304/icons/x16/tags.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/tags.png
rename to interface/web/themes/default-304/icons/x16/tags.png
diff --git a/interface/web/themes/default/icons/x16/tags__arrow.png b/interface/web/themes/default-304/icons/x16/tags__arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/tags__arrow.png
rename to interface/web/themes/default-304/icons/x16/tags__arrow.png
diff --git a/interface/web/themes/default/icons/x16/tags__exclamation.png b/interface/web/themes/default-304/icons/x16/tags__exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/tags__exclamation.png
rename to interface/web/themes/default-304/icons/x16/tags__exclamation.png
diff --git a/interface/web/themes/default/icons/x16/tags__minus.png b/interface/web/themes/default-304/icons/x16/tags__minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/tags__minus.png
rename to interface/web/themes/default-304/icons/x16/tags__minus.png
diff --git a/interface/web/themes/default/icons/x16/tags__pencil.png b/interface/web/themes/default-304/icons/x16/tags__pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/tags__pencil.png
rename to interface/web/themes/default-304/icons/x16/tags__pencil.png
diff --git a/interface/web/themes/default/icons/x16/tags__plus.png b/interface/web/themes/default-304/icons/x16/tags__plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/tags__plus.png
rename to interface/web/themes/default-304/icons/x16/tags__plus.png
diff --git a/interface/web/themes/default/icons/x16/tags_label.png b/interface/web/themes/default-304/icons/x16/tags_label.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/tags_label.png
rename to interface/web/themes/default-304/icons/x16/tags_label.png
diff --git a/interface/web/themes/default/icons/x16/tick.png b/interface/web/themes/default-304/icons/x16/tick.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/tick.png
rename to interface/web/themes/default-304/icons/x16/tick.png
diff --git a/interface/web/themes/default-v2/icons/x16/tick_circle.png b/interface/web/themes/default-304/icons/x16/tick_circle.png
similarity index 100%
rename from interface/web/themes/default-v2/icons/x16/tick_circle.png
rename to interface/web/themes/default-304/icons/x16/tick_circle.png
diff --git a/interface/web/themes/default/icons/x16/tick_circle_frame.png b/interface/web/themes/default-304/icons/x16/tick_circle_frame.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/tick_circle_frame.png
rename to interface/web/themes/default-304/icons/x16/tick_circle_frame.png
diff --git a/interface/web/themes/default/icons/x16/tick_shield.png b/interface/web/themes/default-304/icons/x16/tick_shield.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/tick_shield.png
rename to interface/web/themes/default-304/icons/x16/tick_shield.png
diff --git a/interface/web/themes/default/icons/x16/tick_small.png b/interface/web/themes/default-304/icons/x16/tick_small.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/tick_small.png
rename to interface/web/themes/default-304/icons/x16/tick_small.png
diff --git a/interface/web/themes/default/icons/x16/tick_small_circle.png b/interface/web/themes/default-304/icons/x16/tick_small_circle.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/tick_small_circle.png
rename to interface/web/themes/default-304/icons/x16/tick_small_circle.png
diff --git a/interface/web/themes/default/icons/x16/ticket.png b/interface/web/themes/default-304/icons/x16/ticket.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/ticket.png
rename to interface/web/themes/default-304/icons/x16/ticket.png
diff --git a/interface/web/themes/default/icons/x16/ticket_arrow.png b/interface/web/themes/default-304/icons/x16/ticket_arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/ticket_arrow.png
rename to interface/web/themes/default-304/icons/x16/ticket_arrow.png
diff --git a/interface/web/themes/default/icons/x16/ticket_exclamation.png b/interface/web/themes/default-304/icons/x16/ticket_exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/ticket_exclamation.png
rename to interface/web/themes/default-304/icons/x16/ticket_exclamation.png
diff --git a/interface/web/themes/default/icons/x16/ticket_minus.png b/interface/web/themes/default-304/icons/x16/ticket_minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/ticket_minus.png
rename to interface/web/themes/default-304/icons/x16/ticket_minus.png
diff --git a/interface/web/themes/default/icons/x16/ticket_pencil.png b/interface/web/themes/default-304/icons/x16/ticket_pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/ticket_pencil.png
rename to interface/web/themes/default-304/icons/x16/ticket_pencil.png
diff --git a/interface/web/themes/default/icons/x16/ticket_plus.png b/interface/web/themes/default-304/icons/x16/ticket_plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/ticket_plus.png
rename to interface/web/themes/default-304/icons/x16/ticket_plus.png
diff --git a/interface/web/themes/default/icons/x16/ticket_small.png b/interface/web/themes/default-304/icons/x16/ticket_small.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/ticket_small.png
rename to interface/web/themes/default-304/icons/x16/ticket_small.png
diff --git a/interface/web/themes/default/icons/x16/trophy.png b/interface/web/themes/default-304/icons/x16/trophy.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/trophy.png
rename to interface/web/themes/default-304/icons/x16/trophy.png
diff --git a/interface/web/themes/default/icons/x16/trophy_arrow.png b/interface/web/themes/default-304/icons/x16/trophy_arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/trophy_arrow.png
rename to interface/web/themes/default-304/icons/x16/trophy_arrow.png
diff --git a/interface/web/themes/default/icons/x16/trophy_exclamation.png b/interface/web/themes/default-304/icons/x16/trophy_exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/trophy_exclamation.png
rename to interface/web/themes/default-304/icons/x16/trophy_exclamation.png
diff --git a/interface/web/themes/default/icons/x16/trophy_minus.png b/interface/web/themes/default-304/icons/x16/trophy_minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/trophy_minus.png
rename to interface/web/themes/default-304/icons/x16/trophy_minus.png
diff --git a/interface/web/themes/default/icons/x16/trophy_pencil.png b/interface/web/themes/default-304/icons/x16/trophy_pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/trophy_pencil.png
rename to interface/web/themes/default-304/icons/x16/trophy_pencil.png
diff --git a/interface/web/themes/default/icons/x16/trophy_plus.png b/interface/web/themes/default-304/icons/x16/trophy_plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/trophy_plus.png
rename to interface/web/themes/default-304/icons/x16/trophy_plus.png
diff --git a/interface/web/themes/default/icons/x16/tux.png b/interface/web/themes/default-304/icons/x16/tux.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/tux.png
rename to interface/web/themes/default-304/icons/x16/tux.png
diff --git a/interface/web/themes/default/icons/x16/user.png b/interface/web/themes/default-304/icons/x16/user.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/user.png
rename to interface/web/themes/default-304/icons/x16/user.png
diff --git a/interface/web/themes/default/icons/x16/user_add.png b/interface/web/themes/default-304/icons/x16/user_add.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/user_add.png
rename to interface/web/themes/default-304/icons/x16/user_add.png
diff --git a/interface/web/themes/default/icons/x16/user_comment.png b/interface/web/themes/default-304/icons/x16/user_comment.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/user_comment.png
rename to interface/web/themes/default-304/icons/x16/user_comment.png
diff --git a/interface/web/themes/default/icons/x16/user_delete.png b/interface/web/themes/default-304/icons/x16/user_delete.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/user_delete.png
rename to interface/web/themes/default-304/icons/x16/user_delete.png
diff --git a/interface/web/themes/default/icons/x16/user_edit.png b/interface/web/themes/default-304/icons/x16/user_edit.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/user_edit.png
rename to interface/web/themes/default-304/icons/x16/user_edit.png
diff --git a/interface/web/themes/default/icons/x16/user_female.png b/interface/web/themes/default-304/icons/x16/user_female.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/user_female.png
rename to interface/web/themes/default-304/icons/x16/user_female.png
diff --git a/interface/web/themes/default/icons/x16/user_go.png b/interface/web/themes/default-304/icons/x16/user_go.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/user_go.png
rename to interface/web/themes/default-304/icons/x16/user_go.png
diff --git a/interface/web/themes/default/icons/x16/user_gray.png b/interface/web/themes/default-304/icons/x16/user_gray.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/user_gray.png
rename to interface/web/themes/default-304/icons/x16/user_gray.png
diff --git a/interface/web/themes/default/icons/x16/user_green.png b/interface/web/themes/default-304/icons/x16/user_green.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/user_green.png
rename to interface/web/themes/default-304/icons/x16/user_green.png
diff --git a/interface/web/themes/default/icons/x16/user_orange.png b/interface/web/themes/default-304/icons/x16/user_orange.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/user_orange.png
rename to interface/web/themes/default-304/icons/x16/user_orange.png
diff --git a/interface/web/themes/default/icons/x16/user_red.png b/interface/web/themes/default-304/icons/x16/user_red.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/user_red.png
rename to interface/web/themes/default-304/icons/x16/user_red.png
diff --git a/interface/web/themes/default/icons/x16/user_suit.png b/interface/web/themes/default-304/icons/x16/user_suit.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/user_suit.png
rename to interface/web/themes/default-304/icons/x16/user_suit.png
diff --git a/interface/web/themes/default/icons/x16/vcard.png b/interface/web/themes/default-304/icons/x16/vcard.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/vcard.png
rename to interface/web/themes/default-304/icons/x16/vcard.png
diff --git a/interface/web/themes/default/icons/x16/vcard_add.png b/interface/web/themes/default-304/icons/x16/vcard_add.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/vcard_add.png
rename to interface/web/themes/default-304/icons/x16/vcard_add.png
diff --git a/interface/web/themes/default/icons/x16/vcard_delete.png b/interface/web/themes/default-304/icons/x16/vcard_delete.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/vcard_delete.png
rename to interface/web/themes/default-304/icons/x16/vcard_delete.png
diff --git a/interface/web/themes/default/icons/x16/vcard_edit.png b/interface/web/themes/default-304/icons/x16/vcard_edit.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/vcard_edit.png
rename to interface/web/themes/default-304/icons/x16/vcard_edit.png
diff --git a/interface/web/themes/default/icons/x16/wall.png b/interface/web/themes/default-304/icons/x16/wall.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/wall.png
rename to interface/web/themes/default-304/icons/x16/wall.png
diff --git a/interface/web/themes/default/icons/x16/wall__arrow.png b/interface/web/themes/default-304/icons/x16/wall__arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/wall__arrow.png
rename to interface/web/themes/default-304/icons/x16/wall__arrow.png
diff --git a/interface/web/themes/default/icons/x16/wall__exclamation.png b/interface/web/themes/default-304/icons/x16/wall__exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/wall__exclamation.png
rename to interface/web/themes/default-304/icons/x16/wall__exclamation.png
diff --git a/interface/web/themes/default/icons/x16/wall__minus.png b/interface/web/themes/default-304/icons/x16/wall__minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/wall__minus.png
rename to interface/web/themes/default-304/icons/x16/wall__minus.png
diff --git a/interface/web/themes/default/icons/x16/wall__pencil.png b/interface/web/themes/default-304/icons/x16/wall__pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/wall__pencil.png
rename to interface/web/themes/default-304/icons/x16/wall__pencil.png
diff --git a/interface/web/themes/default/icons/x16/wall__plus.png b/interface/web/themes/default-304/icons/x16/wall__plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/wall__plus.png
rename to interface/web/themes/default-304/icons/x16/wall__plus.png
diff --git a/interface/web/themes/default/icons/x16/wall_brick.png b/interface/web/themes/default-304/icons/x16/wall_brick.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/wall_brick.png
rename to interface/web/themes/default-304/icons/x16/wall_brick.png
diff --git a/interface/web/themes/default/icons/x16/wall_disable.png b/interface/web/themes/default-304/icons/x16/wall_disable.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/wall_disable.png
rename to interface/web/themes/default-304/icons/x16/wall_disable.png
diff --git a/interface/web/themes/default/icons/x16/wall_small.png b/interface/web/themes/default-304/icons/x16/wall_small.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/wall_small.png
rename to interface/web/themes/default-304/icons/x16/wall_small.png
diff --git a/interface/web/themes/default/icons/x16/wall_small_brick.png b/interface/web/themes/default-304/icons/x16/wall_small_brick.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/wall_small_brick.png
rename to interface/web/themes/default-304/icons/x16/wall_small_brick.png
diff --git a/interface/web/themes/default/icons/x16/wallet.png b/interface/web/themes/default-304/icons/x16/wallet.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/wallet.png
rename to interface/web/themes/default-304/icons/x16/wallet.png
diff --git a/interface/web/themes/default/icons/x16/wallet_arrow.png b/interface/web/themes/default-304/icons/x16/wallet_arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/wallet_arrow.png
rename to interface/web/themes/default-304/icons/x16/wallet_arrow.png
diff --git a/interface/web/themes/default/icons/x16/wallet_exclamation.png b/interface/web/themes/default-304/icons/x16/wallet_exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/wallet_exclamation.png
rename to interface/web/themes/default-304/icons/x16/wallet_exclamation.png
diff --git a/interface/web/themes/default/icons/x16/wallet_minus.png b/interface/web/themes/default-304/icons/x16/wallet_minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/wallet_minus.png
rename to interface/web/themes/default-304/icons/x16/wallet_minus.png
diff --git a/interface/web/themes/default/icons/x16/wallet_pencil.png b/interface/web/themes/default-304/icons/x16/wallet_pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/wallet_pencil.png
rename to interface/web/themes/default-304/icons/x16/wallet_pencil.png
diff --git a/interface/web/themes/default/icons/x16/wallet_plus.png b/interface/web/themes/default-304/icons/x16/wallet_plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/wallet_plus.png
rename to interface/web/themes/default-304/icons/x16/wallet_plus.png
diff --git a/interface/web/themes/default/icons/x16/wand.png b/interface/web/themes/default-304/icons/x16/wand.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/wand.png
rename to interface/web/themes/default-304/icons/x16/wand.png
diff --git a/interface/web/themes/default/icons/x16/wand_arrow.png b/interface/web/themes/default-304/icons/x16/wand_arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/wand_arrow.png
rename to interface/web/themes/default-304/icons/x16/wand_arrow.png
diff --git a/interface/web/themes/default/icons/x16/wand_exclamation.png b/interface/web/themes/default-304/icons/x16/wand_exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/wand_exclamation.png
rename to interface/web/themes/default-304/icons/x16/wand_exclamation.png
diff --git a/interface/web/themes/default/icons/x16/wand_minus.png b/interface/web/themes/default-304/icons/x16/wand_minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/wand_minus.png
rename to interface/web/themes/default-304/icons/x16/wand_minus.png
diff --git a/interface/web/themes/default/icons/x16/wand_pencil.png b/interface/web/themes/default-304/icons/x16/wand_pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/wand_pencil.png
rename to interface/web/themes/default-304/icons/x16/wand_pencil.png
diff --git a/interface/web/themes/default/icons/x16/wand_plus.png b/interface/web/themes/default-304/icons/x16/wand_plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/wand_plus.png
rename to interface/web/themes/default-304/icons/x16/wand_plus.png
diff --git a/interface/web/themes/default/icons/x16/wrench.png b/interface/web/themes/default-304/icons/x16/wrench.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/wrench.png
rename to interface/web/themes/default-304/icons/x16/wrench.png
diff --git a/interface/web/themes/default/icons/x16/wrench_arrow.png b/interface/web/themes/default-304/icons/x16/wrench_arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/wrench_arrow.png
rename to interface/web/themes/default-304/icons/x16/wrench_arrow.png
diff --git a/interface/web/themes/default/icons/x16/wrench_exclamation.png b/interface/web/themes/default-304/icons/x16/wrench_exclamation.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/wrench_exclamation.png
rename to interface/web/themes/default-304/icons/x16/wrench_exclamation.png
diff --git a/interface/web/themes/default/icons/x16/wrench_minus.png b/interface/web/themes/default-304/icons/x16/wrench_minus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/wrench_minus.png
rename to interface/web/themes/default-304/icons/x16/wrench_minus.png
diff --git a/interface/web/themes/default/icons/x16/wrench_pencil.png b/interface/web/themes/default-304/icons/x16/wrench_pencil.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/wrench_pencil.png
rename to interface/web/themes/default-304/icons/x16/wrench_pencil.png
diff --git a/interface/web/themes/default/icons/x16/wrench_plus.png b/interface/web/themes/default-304/icons/x16/wrench_plus.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/wrench_plus.png
rename to interface/web/themes/default-304/icons/x16/wrench_plus.png
diff --git a/interface/web/themes/default/icons/x16/wrench_screwdriver.png b/interface/web/themes/default-304/icons/x16/wrench_screwdriver.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/wrench_screwdriver.png
rename to interface/web/themes/default-304/icons/x16/wrench_screwdriver.png
diff --git a/interface/web/themes/default/icons/x16_sprite.png b/interface/web/themes/default-304/icons/x16_sprite.png
similarity index 100%
rename from interface/web/themes/default/icons/x16_sprite.png
rename to interface/web/themes/default-304/icons/x16_sprite.png
diff --git a/interface/web/themes/default/icons/x32/calculator.png b/interface/web/themes/default-304/icons/x32/calculator.png
similarity index 100%
rename from interface/web/themes/default/icons/x32/calculator.png
rename to interface/web/themes/default-304/icons/x32/calculator.png
diff --git a/interface/web/themes/default/icons/x32/client.png b/interface/web/themes/default-304/icons/x32/client.png
similarity index 100%
rename from interface/web/themes/default/icons/x32/client.png
rename to interface/web/themes/default-304/icons/x32/client.png
diff --git a/interface/web/themes/default/icons/x32/dashboard.png b/interface/web/themes/default-304/icons/x32/dashboard.png
similarity index 100%
rename from interface/web/themes/default/icons/x32/dashboard.png
rename to interface/web/themes/default-304/icons/x32/dashboard.png
diff --git a/interface/web/themes/default/icons/x32/dns.png b/interface/web/themes/default-304/icons/x32/dns.png
similarity index 100%
rename from interface/web/themes/default/icons/x32/dns.png
rename to interface/web/themes/default-304/icons/x32/dns.png
diff --git a/interface/web/themes/default/icons/x32/domain.png b/interface/web/themes/default-304/icons/x32/domain.png
similarity index 100%
rename from interface/web/themes/default/icons/x32/domain.png
rename to interface/web/themes/default-304/icons/x32/domain.png
diff --git a/interface/web/themes/default/icons/x32/drawer.png b/interface/web/themes/default-304/icons/x32/drawer.png
similarity index 100%
rename from interface/web/themes/default/icons/x32/drawer.png
rename to interface/web/themes/default-304/icons/x32/drawer.png
diff --git a/interface/web/themes/default/icons/x32/email.png b/interface/web/themes/default-304/icons/x32/email.png
similarity index 100%
rename from interface/web/themes/default/icons/x32/email.png
rename to interface/web/themes/default-304/icons/x32/email.png
diff --git a/interface/web/themes/default/icons/x32/help.png b/interface/web/themes/default-304/icons/x32/help.png
similarity index 100%
rename from interface/web/themes/default/icons/x32/help.png
rename to interface/web/themes/default-304/icons/x32/help.png
diff --git a/interface/web/themes/default/icons/x32/login.png b/interface/web/themes/default-304/icons/x32/login.png
similarity index 100%
rename from interface/web/themes/default/icons/x32/login.png
rename to interface/web/themes/default-304/icons/x32/login.png
diff --git a/interface/web/themes/default/icons/x32/monitor.png b/interface/web/themes/default-304/icons/x32/monitor.png
similarity index 100%
rename from interface/web/themes/default/icons/x32/monitor.png
rename to interface/web/themes/default-304/icons/x32/monitor.png
diff --git a/interface/web/themes/default/icons/x32/network.png b/interface/web/themes/default-304/icons/x32/network.png
similarity index 100%
rename from interface/web/themes/default/icons/x32/network.png
rename to interface/web/themes/default-304/icons/x32/network.png
diff --git a/interface/web/themes/default/icons/x32/server.png b/interface/web/themes/default-304/icons/x32/server.png
similarity index 100%
rename from interface/web/themes/default/icons/x32/server.png
rename to interface/web/themes/default-304/icons/x32/server.png
diff --git a/interface/web/themes/default/icons/x32/sites.png b/interface/web/themes/default-304/icons/x32/sites.png
similarity index 100%
rename from interface/web/themes/default/icons/x32/sites.png
rename to interface/web/themes/default-304/icons/x32/sites.png
diff --git a/interface/web/themes/default/icons/x32/state_critical.png b/interface/web/themes/default-304/icons/x32/state_critical.png
similarity index 100%
rename from interface/web/themes/default/icons/x32/state_critical.png
rename to interface/web/themes/default-304/icons/x32/state_critical.png
diff --git a/interface/web/themes/default/icons/x32/state_error.png b/interface/web/themes/default-304/icons/x32/state_error.png
similarity index 100%
rename from interface/web/themes/default/icons/x32/state_error.png
rename to interface/web/themes/default-304/icons/x32/state_error.png
diff --git a/interface/web/themes/default/icons/x32/state_info.png b/interface/web/themes/default-304/icons/x32/state_info.png
similarity index 100%
rename from interface/web/themes/default/icons/x32/state_info.png
rename to interface/web/themes/default-304/icons/x32/state_info.png
diff --git a/interface/web/themes/default/icons/x32/state_ok.png b/interface/web/themes/default-304/icons/x32/state_ok.png
similarity index 100%
rename from interface/web/themes/default/icons/x32/state_ok.png
rename to interface/web/themes/default-304/icons/x32/state_ok.png
diff --git a/interface/web/themes/default/icons/x32/state_unknown.png b/interface/web/themes/default-304/icons/x32/state_unknown.png
similarity index 100%
rename from interface/web/themes/default/icons/x32/state_unknown.png
rename to interface/web/themes/default-304/icons/x32/state_unknown.png
diff --git a/interface/web/themes/default/icons/x32/state_warning.png b/interface/web/themes/default-304/icons/x32/state_warning.png
similarity index 100%
rename from interface/web/themes/default/icons/x32/state_warning.png
rename to interface/web/themes/default-304/icons/x32/state_warning.png
diff --git a/interface/web/themes/default/icons/x32/system.png b/interface/web/themes/default-304/icons/x32/system.png
similarity index 100%
rename from interface/web/themes/default/icons/x32/system.png
rename to interface/web/themes/default-304/icons/x32/system.png
diff --git a/interface/web/themes/default/icons/x32/tools.png b/interface/web/themes/default-304/icons/x32/tools.png
similarity index 100%
rename from interface/web/themes/default/icons/x32/tools.png
rename to interface/web/themes/default-304/icons/x32/tools.png
diff --git a/interface/web/themes/default-v2/icons/x32_sprite.png b/interface/web/themes/default-304/icons/x32_sprite.png
similarity index 100%
rename from interface/web/themes/default-v2/icons/x32_sprite.png
rename to interface/web/themes/default-304/icons/x32_sprite.png
diff --git a/interface/web/themes/default/icons/x64/client.png b/interface/web/themes/default-304/icons/x64/client.png
similarity index 100%
rename from interface/web/themes/default/icons/x64/client.png
rename to interface/web/themes/default-304/icons/x64/client.png
diff --git a/interface/web/themes/default/icons/x64/dashboard.png b/interface/web/themes/default-304/icons/x64/dashboard.png
similarity index 100%
rename from interface/web/themes/default/icons/x64/dashboard.png
rename to interface/web/themes/default-304/icons/x64/dashboard.png
diff --git a/interface/web/themes/default/icons/x64/dns.png b/interface/web/themes/default-304/icons/x64/dns.png
similarity index 100%
rename from interface/web/themes/default/icons/x64/dns.png
rename to interface/web/themes/default-304/icons/x64/dns.png
diff --git a/interface/web/themes/default/icons/x64/domain.png b/interface/web/themes/default-304/icons/x64/domain.png
similarity index 100%
rename from interface/web/themes/default/icons/x64/domain.png
rename to interface/web/themes/default-304/icons/x64/domain.png
diff --git a/interface/web/themes/default/icons/x64/drawer.png b/interface/web/themes/default-304/icons/x64/drawer.png
similarity index 100%
rename from interface/web/themes/default/icons/x64/drawer.png
rename to interface/web/themes/default-304/icons/x64/drawer.png
diff --git a/interface/web/themes/default/icons/x64/email.png b/interface/web/themes/default-304/icons/x64/email.png
similarity index 100%
rename from interface/web/themes/default/icons/x64/email.png
rename to interface/web/themes/default-304/icons/x64/email.png
diff --git a/interface/web/themes/default/icons/x64/help.png b/interface/web/themes/default-304/icons/x64/help.png
similarity index 100%
rename from interface/web/themes/default/icons/x64/help.png
rename to interface/web/themes/default-304/icons/x64/help.png
diff --git a/interface/web/themes/default/icons/x64/login.png b/interface/web/themes/default-304/icons/x64/login.png
similarity index 100%
rename from interface/web/themes/default/icons/x64/login.png
rename to interface/web/themes/default-304/icons/x64/login.png
diff --git a/interface/web/themes/default/icons/x64/monitor.png b/interface/web/themes/default-304/icons/x64/monitor.png
similarity index 100%
rename from interface/web/themes/default/icons/x64/monitor.png
rename to interface/web/themes/default-304/icons/x64/monitor.png
diff --git a/interface/web/themes/default/icons/x64/network.png b/interface/web/themes/default-304/icons/x64/network.png
similarity index 100%
rename from interface/web/themes/default/icons/x64/network.png
rename to interface/web/themes/default-304/icons/x64/network.png
diff --git a/interface/web/themes/default/icons/x64/server.png b/interface/web/themes/default-304/icons/x64/server.png
similarity index 100%
rename from interface/web/themes/default/icons/x64/server.png
rename to interface/web/themes/default-304/icons/x64/server.png
diff --git a/interface/web/themes/default/icons/x64/sites.png b/interface/web/themes/default-304/icons/x64/sites.png
similarity index 100%
rename from interface/web/themes/default/icons/x64/sites.png
rename to interface/web/themes/default-304/icons/x64/sites.png
diff --git a/interface/web/themes/default/icons/x64/system.png b/interface/web/themes/default-304/icons/x64/system.png
similarity index 100%
rename from interface/web/themes/default/icons/x64/system.png
rename to interface/web/themes/default-304/icons/x64/system.png
diff --git a/interface/web/themes/default/icons/x64/tools.png b/interface/web/themes/default-304/icons/x64/tools.png
similarity index 100%
rename from interface/web/themes/default/icons/x64/tools.png
rename to interface/web/themes/default-304/icons/x64/tools.png
diff --git a/interface/web/themes/default/images/Thumbs.db b/interface/web/themes/default-304/images/Thumbs.db
similarity index 100%
rename from interface/web/themes/default/images/Thumbs.db
rename to interface/web/themes/default-304/images/Thumbs.db
diff --git a/interface/web/themes/default-v2/images/ajax-loader.gif b/interface/web/themes/default-304/images/ajax-loader.gif
similarity index 100%
rename from interface/web/themes/default-v2/images/ajax-loader.gif
rename to interface/web/themes/default-304/images/ajax-loader.gif
diff --git a/interface/web/themes/default-v2/images/buttonHolder_bg.gif b/interface/web/themes/default-304/images/buttonHolder_bg.gif
similarity index 100%
rename from interface/web/themes/default-v2/images/buttonHolder_bg.gif
rename to interface/web/themes/default-304/images/buttonHolder_bg.gif
diff --git a/interface/web/themes/default-v2/images/chevron.png b/interface/web/themes/default-304/images/chevron.png
similarity index 100%
rename from interface/web/themes/default-v2/images/chevron.png
rename to interface/web/themes/default-304/images/chevron.png
diff --git a/interface/web/themes/default-v2/images/favicon.ico b/interface/web/themes/default-304/images/favicon.ico
similarity index 100%
rename from interface/web/themes/default-v2/images/favicon.ico
rename to interface/web/themes/default-304/images/favicon.ico
diff --git a/interface/web/themes/default-v2/images/header_bg.png b/interface/web/themes/default-304/images/header_bg.png
similarity index 100%
rename from interface/web/themes/default-v2/images/header_bg.png
rename to interface/web/themes/default-304/images/header_bg.png
diff --git a/interface/web/themes/default-v2/images/header_logo.png b/interface/web/themes/default-304/images/header_logo.png
similarity index 100%
rename from interface/web/themes/default-v2/images/header_logo.png
rename to interface/web/themes/default-304/images/header_logo.png
diff --git a/interface/web/themes/default-v2/images/lists_tfoot_bg.png b/interface/web/themes/default-304/images/lists_tfoot_bg.png
similarity index 100%
rename from interface/web/themes/default-v2/images/lists_tfoot_bg.png
rename to interface/web/themes/default-304/images/lists_tfoot_bg.png
diff --git a/interface/web/themes/default-v2/images/lists_thead_bg.png b/interface/web/themes/default-304/images/lists_thead_bg.png
similarity index 100%
rename from interface/web/themes/default-v2/images/lists_thead_bg.png
rename to interface/web/themes/default-304/images/lists_thead_bg.png
diff --git a/interface/web/themes/default-v2/images/meter_bg.gif b/interface/web/themes/default-304/images/meter_bg.gif
similarity index 100%
rename from interface/web/themes/default-v2/images/meter_bg.gif
rename to interface/web/themes/default-304/images/meter_bg.gif
diff --git a/interface/web/themes/default-v2/images/screen_bg.png b/interface/web/themes/default-304/images/screen_bg.png
similarity index 100%
rename from interface/web/themes/default-v2/images/screen_bg.png
rename to interface/web/themes/default-304/images/screen_bg.png
diff --git a/interface/web/themes/default/licences.txt b/interface/web/themes/default-304/licences.txt
similarity index 100%
rename from interface/web/themes/default/licences.txt
rename to interface/web/themes/default-304/licences.txt
diff --git a/interface/web/themes/default-v2/templates/admin/firewall_edit.htm b/interface/web/themes/default-304/templates/admin/firewall_edit.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/admin/firewall_edit.htm
rename to interface/web/themes/default-304/templates/admin/firewall_edit.htm
diff --git a/interface/web/themes/default-v2/templates/admin/firewall_list.htm b/interface/web/themes/default-304/templates/admin/firewall_list.htm
similarity index 77%
rename from interface/web/themes/default-v2/templates/admin/firewall_list.htm
rename to interface/web/themes/default-304/templates/admin/firewall_list.htm
index 53e2e4bc39dbec679eab20f3265379a3309f42cc..d209a45882908bf19cd44bc16e37c2bea5e396a5 100644
--- a/interface/web/themes/default-v2/templates/admin/firewall_list.htm
+++ b/interface/web/themes/default-304/templates/admin/firewall_list.htm
@@ -6,7 +6,7 @@
     <div class="pnl_toolsarea">
         <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
             <div class="buttons">
-                <button class="button iconstxt icoAdd" type="button" onClick="loadContent('admin/firewall_edit.php');">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('admin/firewall_edit.php');">
                     <span>{tmpl_var name="add_new_record_txt"}</span>
                 </button>
             </div>
@@ -17,21 +17,19 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr class="caption">
+                    <tr>
                         <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
                         <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
                         <th class="tbl_col_tcp_port" scope="col"><tmpl_var name="tcp_port_txt"></th>
                         <th class="tbl_col_udp_port" scope="col"><tmpl_var name="udp_port_txt"></th>
                         <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
                     </tr>
-                    <tr class="filter">
+                    <tr>
                         <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
                         <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
                         <td class="tbl_col_tcp_port"><input type="text" name="search_tcp_port" value="{tmpl_var name='search_tcp_port'}" /></td>
                         <td class="tbl_col_udp_port"><input type="text" name="search_udp_port" value="{tmpl_var name='search_udp_port'}" /></td>
-                        <td class="tbl_col_buttons">
-                            <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','admin/firewall_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
-                        </td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','admin/firewall_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
                     </tr>
                 </thead>
                 <tbody>
@@ -42,7 +40,9 @@
                             <td class="tbl_col_tcp_port"><a href="#" onClick="loadContent('admin/firewall_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="tcp_port"}</a></td>
                             <td class="tbl_col_udp_port"><a href="#" onClick="loadContent('admin/firewall_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="udp_port"}</a></td>
                             <td class="tbl_col_buttons">
-                                <a class="button icons16 icoDelete" href="javascript: del_record('admin/firewall_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 class="buttons icons16">    
+                                    <a class="icons16 icoDelete" href="javascript: del_record('admin/firewall_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>
                         </tr>
                     </tmpl_loop>
diff --git a/interface/web/themes/default-v2/templates/admin/groups_edit.htm b/interface/web/themes/default-304/templates/admin/groups_edit.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/admin/groups_edit.htm
rename to interface/web/themes/default-304/templates/admin/groups_edit.htm
diff --git a/interface/web/themes/default-v2/templates/admin/groups_list.htm b/interface/web/themes/default-304/templates/admin/groups_list.htm
similarity index 72%
rename from interface/web/themes/default-v2/templates/admin/groups_list.htm
rename to interface/web/themes/default-304/templates/admin/groups_list.htm
index 6cdbcc394ea863ad2c55904301e1d4f579acd3cd..3fc1918ec70af360daad66048bb2de1a8557165a 100644
--- a/interface/web/themes/default-v2/templates/admin/groups_list.htm
+++ b/interface/web/themes/default-304/templates/admin/groups_list.htm
@@ -6,7 +6,7 @@
     <div class="pnl_toolsarea">
         <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
             <div class="buttons">
-                <button class="button iconstxt icoAdd" type="button" onClick="loadContent('admin/groups_edit.php');">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('admin/groups_edit.php');">
                     <span>{tmpl_var name="add_new_record_txt"}</span>
                 </button>
                 <p><tmpl_var name="warning_txt"></p>
@@ -18,17 +18,15 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr class="caption">
+                    <tr>
                         <th class="tbl_col_name" scope="col"><tmpl_var name="name_txt"></th>
                         <th class="tbl_col_description" scope="col"><tmpl_var name="description_txt"></th>
                         <th class="tbl_col_buttons" scope="col">&nbsp;</th>
                     </tr>
-                    <tr class="filter">
+                    <tr>
                         <td class="tbl_col_name"><input type="text" name="search_name" value="{tmpl_var name='search_name'}" /></td>
                         <td class="tbl_col_description"><input type="text" name="search_description" value="{tmpl_var name='search_description'}" /></td>
-                        <td class="tbl_col_buttons">
-                            <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','admin/groups_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
-                        </td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','admin/groups_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
                     </tr>
                 </thead>
                 <tbody>
@@ -37,7 +35,9 @@
                             <td class="tbl_col_name"><a href="#" onClick="loadContent('admin/groups_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="name"}</a></td>
                             <td class="tbl_col_description"><a href="#" onClick="loadContent('admin/groups_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="description"}</a></td>
                             <td class="tbl_col_buttons">
-                                <a class="button icons16 icoDelete" href="javascript: del_record('admin/groups_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 class="buttons icons16">    
+                                    <a class="icons16 icoDelete" href="javascript: del_record('admin/groups_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>
                         </tr>
                     </tmpl_loop>
diff --git a/interface/web/themes/default-v2/templates/admin/iptables_edit.htm b/interface/web/themes/default-304/templates/admin/iptables_edit.htm
similarity index 98%
rename from interface/web/themes/default-v2/templates/admin/iptables_edit.htm
rename to interface/web/themes/default-304/templates/admin/iptables_edit.htm
index 87033ab2c1ed2dda09589a353b0bf891ee4cdb36..33574c9ef5fd66a22fba12d75c3a91877a17b2dd 100644
--- a/interface/web/themes/default-v2/templates/admin/iptables_edit.htm
+++ b/interface/web/themes/default-304/templates/admin/iptables_edit.htm
@@ -1,67 +1,67 @@
-<h2><tmpl_var name="list_head_txt"></h2>
-<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_iptables">
-    
-    <div class="pnl_formsarea">
-        <fieldset class="inlineLabels">
-            <div class="ctrlHolder">
-                <label for="server_id">{tmpl_var name='server_id_txt'}</label>
-                <select name="server_id" id="server_id" class="selectInput">
-                    {tmpl_var name='server_id'}
-                </select>
-            </div>
-            <div class="ctrlHolder">
-                <label for="table">{tmpl_var name='table_txt'}</label>
-                <select name="table" id="table" class="selectInput formLengthLimit">
-                    {tmpl_var name='table'}
-                </select>
-            </div>
-            <div class="ctrlHolder">
-                <label for="protocol">{tmpl_var name='protocol_txt'}</label>
-                <select name="protocol" id="protocol" class="selectInput formLengthLimit">
-                    {tmpl_var name='protocol'}
-                </select>
-            </div>
-            <div class="ctrlHolder">
-                <label for="singleport">{tmpl_var name='singleport_txt'}</label>
-                <input name="singleport" id="singleport" value="{tmpl_var name='singleport'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
-            </div>
-            <div class="ctrlHolder">
-                <label for="multiport">{tmpl_var name='multiport_txt'}</label>
-                <input name="multiport" id="multiport" value="{tmpl_var name='multiport'}" size="20" maxlength="40" type="text" class="textInput" />
-            </div>
-            <div class="ctrlHolder">
-                <label for="destination_ip">{tmpl_var name='destination_ip_txt'}</label>
-                <input name="destination_ip" id="destination_ip" value="{tmpl_var name='destination_ip'}" size="16" maxlength="20" type="text" class="textInput formLengthIPv4" />
-            </div>
-            <div class="ctrlHolder">
-                <label for="source_ip">{tmpl_var name='source_ip_txt'}</label>
-                <input name="source_ip" id="source_ip" value="{tmpl_var name='source_ip'}" size="16" maxlength="20" type="text" class="textInput formLengthIPv4" />
-            </div>
-            <div class="ctrlHolder">
-                <label for="state">{tmpl_var name='state_txt'}</label>
-                <input name="state" id="state" value="{tmpl_var name='state'}" size="16" maxlength="20" type="text" class="textInput" />
-            </div>
-            <div class="ctrlHolder">
-                <label for="target">{tmpl_var name='target_txt'}</label>
-                <select name="target" id="target" class="selectInput formLengthLimit">
-                    {tmpl_var name='target'}
-                </select>
-            </div>
-            <div class="ctrlHolder">
-                <p class="label">{tmpl_var name='active_txt'}</p>
-                <div class="multiField">
-                    {tmpl_var name='active'}
-                </div>
-            </div>
-        </fieldset>
-        <input type="hidden" name="id" value="{tmpl_var name='id'}">
-        <div class="buttonHolder buttons">
-            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/iptables_edit.php');">
-                <span>{tmpl_var name='btn_save_txt'}</span></button>
-            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/iptables_list.php');">
-                <span>{tmpl_var name='btn_cancel_txt'}</span></button>
-        </div>
-    </div> 
-    
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+<div class="panel panel_iptables">
+    
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="server_id">{tmpl_var name='server_id_txt'}</label>
+                <select name="server_id" id="server_id" class="selectInput">
+                    {tmpl_var name='server_id'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="table">{tmpl_var name='table_txt'}</label>
+                <select name="table" id="table" class="selectInput formLengthLimit">
+                    {tmpl_var name='table'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="protocol">{tmpl_var name='protocol_txt'}</label>
+                <select name="protocol" id="protocol" class="selectInput formLengthLimit">
+                    {tmpl_var name='protocol'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="singleport">{tmpl_var name='singleport_txt'}</label>
+                <input name="singleport" id="singleport" value="{tmpl_var name='singleport'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="multiport">{tmpl_var name='multiport_txt'}</label>
+                <input name="multiport" id="multiport" value="{tmpl_var name='multiport'}" size="20" maxlength="40" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="destination_ip">{tmpl_var name='destination_ip_txt'}</label>
+                <input name="destination_ip" id="destination_ip" value="{tmpl_var name='destination_ip'}" size="16" maxlength="20" type="text" class="textInput formLengthIPv4" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="source_ip">{tmpl_var name='source_ip_txt'}</label>
+                <input name="source_ip" id="source_ip" value="{tmpl_var name='source_ip'}" size="16" maxlength="20" type="text" class="textInput formLengthIPv4" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="state">{tmpl_var name='state_txt'}</label>
+                <input name="state" id="state" value="{tmpl_var name='state'}" size="16" maxlength="20" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="target">{tmpl_var name='target_txt'}</label>
+                <select name="target" id="target" class="selectInput formLengthLimit">
+                    {tmpl_var name='target'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='active_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='active'}
+                </div>
+            </div>
+        </fieldset>
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/iptables_edit.php');">
+                <span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/iptables_list.php');">
+                <span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div> 
+    
 </div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/admin/iptables_list.htm b/interface/web/themes/default-304/templates/admin/iptables_list.htm
similarity index 82%
rename from interface/web/themes/default-v2/templates/admin/iptables_list.htm
rename to interface/web/themes/default-304/templates/admin/iptables_list.htm
index f1159f3292558eb8ffa59d00ad8f6f56bfcf3299..6c65094daa7cc39d5831bcd2c5baf1043bc317c7 100644
--- a/interface/web/themes/default-v2/templates/admin/iptables_list.htm
+++ b/interface/web/themes/default-304/templates/admin/iptables_list.htm
@@ -1,69 +1,73 @@
-<h2><tmpl_var name="list_head_txt"></h2>
-
-<div class="panel panel_list_iptables">
-
-    <div class="pnl_toolsarea">
-        <fieldset><legend>Tools</legend>
-            <div class="buttons">
-                <button class="button iconstxt icoAdd" type="button" onClick="loadContent('admin/iptables_edit.php');">
-                    <span>{tmpl_var name="add_new_rule_txt"}</span>
-                </button>
-            </div>
-        </fieldset>
-    </div>
-
-    <div class="pnl_listarea">
-        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
-            <table class="list">
-                <thead>
-                    <tr class="caption">
-                        <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
-                        <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
-                        <th class="tbl_col_table" scope="col"><tmpl_var name="table_txt"></th>
-                        <th class="tbl_col_protocol" scope="col"><tmpl_var name="protocol_txt"></th>
-                        <th class="tbl_col_port" scope="col"><tmpl_var name="singleport_txt"></th>
-                        <th class="tbl_col_port" scope="col"><tmpl_var name="multiport_txt"></th>
-                        <th class="tbl_col_state" scope="col"><tmpl_var name="state_txt"></th>
-                        <th class="tbl_col_target" scope="col"><tmpl_var name="target_txt"></th>
-                        <th class="tbl_col_buttons" scope="col">&nbsp;</th>
-                    </tr>
-                    <tr class="filter">
-                        <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
-                        <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
-                        <td class="tbl_col_table"></td>
-                        <td class="tbl_col_protocol"><select name="search_protocol">{tmpl_var name='search_protocol'}</select></td>
-                        <td class="tbl_col_singleport"></td>
-                        <td class="tbl_col_multiport"></td>
-                        <td class="tbl_col_state"></td>
-                        <td class="tbl_col_target"><select name="search_target">{tmpl_var name='search_target'}</select></td>
-                        <td class="tbl_col_buttons">
-                            <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','admin/iptables_list.php');"><span>{tmpl_var name="filter_txt"}filter_txt</span></button>
-                        </td>
-                    </tr>
-                </thead>
-                <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('admin/iptables_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
-                            <td class="tbl_col_server_id"><a href="#" onClick="loadContent('admin/iptables_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
-                            <td class="tbl_col_table"><a href="#" onClick="loadContent('admin/iptables_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="table"}</a></td>
-                            <td class="tbl_col_protocol"><a href="#" onClick="loadContent('admin/iptables_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="protocol"}</a></td>
-                            <td class="tbl_col_singleport"><a href="#" onClick="loadContent('admin/iptables_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="singleport"}</a></td>
-                            <td class="tbl_col_multiport"><a href="#" onClick="loadContent('admin/iptables_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="multiport"}</a></td>
-                            <td class="tbl_col_state"><a href="#" onClick="loadContent('admin/iptables_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="state"}</a></td>
-                            <td class="tbl_col_target"><a href="#" onClick="loadContent('admin/iptables_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="target"}</a></td>
-                            <td class="tbl_col_buttons">
-                                <a class="button icons16 icoDelete" href="javascript: del_record('admin/iptables_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>
-                            </td>
-                        </tr>
-                    </tmpl_loop>
-                </tbody>
-                <tfoot>
-                    <tr>
-                        <td class="tbl_footer tbl_paging" colspan="9"><tmpl_var name="paging"></td>
-                    </tr>
-                </tfoot>
-            </table>
-        </fieldset>
-    </div>
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_list_iptables">
+
+    <div class="pnl_toolsarea">
+        <fieldset><legend>Tools</legend>
+            <div class="buttons">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('admin/iptables_edit.php');">
+                    <span>{tmpl_var name="add_new_rule_txt"}</span>
+                </button>
+            </div>
+        </fieldset>
+    </div>
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+                        <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
+                        <th class="tbl_col_table" scope="col"><tmpl_var name="table_txt"></th>
+                        <th class="tbl_col_protocol" scope="col"><tmpl_var name="protocol_txt"></th>
+                        <th class="tbl_col_port" scope="col"><tmpl_var name="singleport_txt"></th>
+                        <th class="tbl_col_port" scope="col"><tmpl_var name="multiport_txt"></th>
+                        <th class="tbl_col_state" scope="col"><tmpl_var name="state_txt"></th>
+                        <th class="tbl_col_target" scope="col"><tmpl_var name="target_txt"></th>
+                        <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
+                        <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+                        <td class="tbl_col_table"></td>
+                        <td class="tbl_col_protocol"><select name="search_protocol">{tmpl_var name='search_protocol'}</select></td>
+                        <td class="tbl_col_singleport"></td>
+                        <td class="tbl_col_multiport"></td>
+                        <td class="tbl_col_state"></td>
+                        <td class="tbl_col_target"><select name="search_target">{tmpl_var name='search_target'}</select></td>
+                        <td class="tbl_col_buttons">
+                            <div class="buttons">
+                                <button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','admin/iptables_list.php');"><span>{tmpl_var name="filter_txt"}filter_txt</span></button>
+                            </div>
+                        </td>
+                    </tr>
+                </thead>
+                <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('admin/iptables_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+                            <td class="tbl_col_server_id"><a href="#" onClick="loadContent('admin/iptables_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
+                            <td class="tbl_col_table"><a href="#" onClick="loadContent('admin/iptables_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="table"}</a></td>
+                            <td class="tbl_col_protocol"><a href="#" onClick="loadContent('admin/iptables_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="protocol"}</a></td>
+                            <td class="tbl_col_singleport"><a href="#" onClick="loadContent('admin/iptables_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="singleport"}</a></td>
+                            <td class="tbl_col_multiport"><a href="#" onClick="loadContent('admin/iptables_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="multiport"}</a></td>
+                            <td class="tbl_col_state"><a href="#" onClick="loadContent('admin/iptables_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="state"}</a></td>
+                            <td class="tbl_col_target"><a href="#" onClick="loadContent('admin/iptables_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="target"}</a></td>
+                            <td class="tbl_col_buttons">
+                                <div class="buttons icons16">    
+                                    <a class="icons16 icoDelete" href="javascript: del_record('admin/iptables_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>
+                        </tr>
+                    </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="9"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
 </div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/admin/language_add.htm b/interface/web/themes/default-304/templates/admin/language_add.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/admin/language_add.htm
rename to interface/web/themes/default-304/templates/admin/language_add.htm
diff --git a/interface/web/themes/default-v2/templates/admin/language_complete.htm b/interface/web/themes/default-304/templates/admin/language_complete.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/admin/language_complete.htm
rename to interface/web/themes/default-304/templates/admin/language_complete.htm
diff --git a/interface/web/themes/default-v2/templates/admin/language_edit.htm b/interface/web/themes/default-304/templates/admin/language_edit.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/admin/language_edit.htm
rename to interface/web/themes/default-304/templates/admin/language_edit.htm
diff --git a/interface/web/themes/default-v2/templates/admin/language_export.htm b/interface/web/themes/default-304/templates/admin/language_export.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/admin/language_export.htm
rename to interface/web/themes/default-304/templates/admin/language_export.htm
diff --git a/interface/web/themes/default-v2/templates/admin/language_import.htm b/interface/web/themes/default-304/templates/admin/language_import.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/admin/language_import.htm
rename to interface/web/themes/default-304/templates/admin/language_import.htm
diff --git a/interface/web/themes/default-v2/templates/admin/language_list.htm b/interface/web/themes/default-304/templates/admin/language_list.htm
similarity index 98%
rename from interface/web/themes/default-v2/templates/admin/language_list.htm
rename to interface/web/themes/default-304/templates/admin/language_list.htm
index c0718decdf75b947b9828c88c1b25cc0a4c95f82..d2689535d3ef67540d85bfce002e5b217ebd211a 100644
--- a/interface/web/themes/default-v2/templates/admin/language_list.htm
+++ b/interface/web/themes/default-304/templates/admin/language_list.htm
@@ -20,7 +20,7 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr class="caption">
+                    <tr>
                         <th class="tbl_col_module" scope="col"><tmpl_var name="module_txt"></th>
                         <th class="tbl_col_lang_file" scope="col"><tmpl_var name="lang_file_txt"></th>
                         <th class="tbl_col_limit" scope="col"><tmpl_var name="lang_file_date_txt"></th>
diff --git a/interface/web/themes/default-v2/templates/admin/remote_action_ispcupdate.htm b/interface/web/themes/default-304/templates/admin/remote_action_ispcupdate.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/admin/remote_action_ispcupdate.htm
rename to interface/web/themes/default-304/templates/admin/remote_action_ispcupdate.htm
diff --git a/interface/web/themes/default-v2/templates/admin/remote_action_osupdate.htm b/interface/web/themes/default-304/templates/admin/remote_action_osupdate.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/admin/remote_action_osupdate.htm
rename to interface/web/themes/default-304/templates/admin/remote_action_osupdate.htm
diff --git a/interface/web/themes/default-v2/templates/admin/remote_user_edit.htm b/interface/web/themes/default-304/templates/admin/remote_user_edit.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/admin/remote_user_edit.htm
rename to interface/web/themes/default-304/templates/admin/remote_user_edit.htm
diff --git a/interface/web/themes/default-v2/templates/admin/remote_user_list.htm b/interface/web/themes/default-304/templates/admin/remote_user_list.htm
similarity index 58%
rename from interface/web/themes/default-v2/templates/admin/remote_user_list.htm
rename to interface/web/themes/default-304/templates/admin/remote_user_list.htm
index 131c1aa3d2386a748a3199e5633ecadaf5ea9907..a4549c0655d6c58f7e2e6a53932be3352fa43850 100644
--- a/interface/web/themes/default-v2/templates/admin/remote_user_list.htm
+++ b/interface/web/themes/default-304/templates/admin/remote_user_list.htm
@@ -5,7 +5,7 @@
     <div class="pnl_toolsarea">
         <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
             <div class="buttons">
-                <button class="button iconstxt icoAdd" type="button" onClick="loadContent('admin/remote_user_edit.php');">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('admin/remote_user_edit.php');">
                     <span>{tmpl_var name="add_new_record_txt"}</span>
                 </button>
             </div>
@@ -16,26 +16,26 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr class="caption">
-                        <th class="tbl_col_remote_user_pid" scope="col"><tmpl_var name="parent_remote_userid_txt"></th>
+                    <tr>
+                        <th class="tbl_col_remote_userid" scope="col"><tmpl_var name="parent_remote_userid_txt"></th>
                         <th class="tbl_col_remote_username" scope="col"><tmpl_var name="username_txt"></th>
                         <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
                     </tr>
-                    <tr class="filter">
-                        <td class="tbl_col_remote_user_pid">&nbsp;</td>           
+                    <tr>
+                        <td class="tbl_col_remote_userid">&nbsp;</td>           
                         <td class="tbl_col_remote_username"><input type="text" name="search_username" value="{tmpl_var name='search_username'}" /></td>
-                        <td class="tbl_col_buttons">
-                            <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','admin/remote_user_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
-                        </td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','admin/remote_user_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
                     </tr>
                 </thead>
                 <tbody>
                     <tmpl_loop name="records">
                         <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
-                            <td class="tbl_col_remote_user_pid"><a href="#" onClick="loadContent('admin/remote_user_edit.php?id={tmpl_var name='remote_userid'}');">{tmpl_var name="remote_userid"}</a></td>
+                            <td class="tbl_col_remote_userid"><a href="#" onClick="loadContent('admin/remote_user_edit.php?id={tmpl_var name='remote_userid'}');">{tmpl_var name="remote_userid"}</a></td>
                             <td class="tbl_col_remote_username"><a href="#" onClick="loadContent('admin/remote_user_edit.php?id={tmpl_var name='remote_userid'}');">{tmpl_var name="remote_username"}</a></td>
                             <td class="tbl_col_buttons">
-                                <a class="button icons16 icoDelete" href="javascript: del_record('admin/remote_user_del.php?id={tmpl_var name='remote_userid'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                                <div class="buttons icons16">    
+                                    <a class="icons16 icoDelete" href="javascript: del_record('admin/remote_user_del.php?id={tmpl_var name='remote_userid'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                                </div>
                             </td>
                         </tr>
                     </tmpl_loop>
diff --git a/interface/web/themes/default-v2/templates/admin/server_config_cron_edit.htm b/interface/web/themes/default-304/templates/admin/server_config_cron_edit.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/admin/server_config_cron_edit.htm
rename to interface/web/themes/default-304/templates/admin/server_config_cron_edit.htm
diff --git a/interface/web/themes/default-v2/templates/admin/server_config_dns_edit.htm b/interface/web/themes/default-304/templates/admin/server_config_dns_edit.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/admin/server_config_dns_edit.htm
rename to interface/web/themes/default-304/templates/admin/server_config_dns_edit.htm
diff --git a/interface/web/themes/default-v2/templates/admin/server_config_fastcgi_edit.htm b/interface/web/themes/default-304/templates/admin/server_config_fastcgi_edit.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/admin/server_config_fastcgi_edit.htm
rename to interface/web/themes/default-304/templates/admin/server_config_fastcgi_edit.htm
diff --git a/interface/web/themes/default-v2/templates/admin/server_config_getmail_edit.htm b/interface/web/themes/default-304/templates/admin/server_config_getmail_edit.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/admin/server_config_getmail_edit.htm
rename to interface/web/themes/default-304/templates/admin/server_config_getmail_edit.htm
diff --git a/interface/web/themes/default-v2/templates/admin/server_config_jailkit_edit.htm b/interface/web/themes/default-304/templates/admin/server_config_jailkit_edit.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/admin/server_config_jailkit_edit.htm
rename to interface/web/themes/default-304/templates/admin/server_config_jailkit_edit.htm
diff --git a/interface/web/themes/default-v2/templates/admin/server_config_list.htm b/interface/web/themes/default-304/templates/admin/server_config_list.htm
similarity index 67%
rename from interface/web/themes/default-v2/templates/admin/server_config_list.htm
rename to interface/web/themes/default-304/templates/admin/server_config_list.htm
index b2f0aa352d0778c9fbf2acc9a10f829d569cccd4..1f5356b94b78e596f81e6b20e11824a453351ba5 100644
--- a/interface/web/themes/default-v2/templates/admin/server_config_list.htm
+++ b/interface/web/themes/default-304/templates/admin/server_config_list.htm
@@ -7,15 +7,13 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr class="caption">
+                    <tr>
                         <th class="tbl_col_server_name" scope="col"><tmpl_var name="server_name_txt"></th>
                         <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
                     </tr>
-                    <tr class="filter">
+                    <tr>
                         <td class="tbl_col_server_name"><input type="text" name="search_server_name" value="{tmpl_var name='search_server_name'}" /></td>
-                        <td class="tbl_col_buttons">
-                            <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','admin/server_config_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
-                        </td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','admin/server_config_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
                     </tr>
                 </thead>
                 <tbody>
@@ -23,7 +21,9 @@
                         <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
                             <td class="tbl_col_server_name"><a href="#" onClick="loadContent('admin/server_config_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_name"}</a></td>
                             <td class="tbl_col_buttons">
-                                <a class="button icons16 icoDelete" href="javascript: del_record('admin/server_config_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 class="buttons icons16">    
+                                    <a class="icons16 icoDelete" href="javascript: del_record('admin/server_config_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>
                         </tr>
                     </tmpl_loop>
diff --git a/interface/web/themes/default-v2/templates/admin/server_config_mail_edit.htm b/interface/web/themes/default-304/templates/admin/server_config_mail_edit.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/admin/server_config_mail_edit.htm
rename to interface/web/themes/default-304/templates/admin/server_config_mail_edit.htm
diff --git a/interface/web/themes/default-v2/templates/admin/server_config_rescue_edit.htm b/interface/web/themes/default-304/templates/admin/server_config_rescue_edit.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/admin/server_config_rescue_edit.htm
rename to interface/web/themes/default-304/templates/admin/server_config_rescue_edit.htm
diff --git a/interface/web/themes/default-v2/templates/admin/server_config_server_edit.htm b/interface/web/themes/default-304/templates/admin/server_config_server_edit.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/admin/server_config_server_edit.htm
rename to interface/web/themes/default-304/templates/admin/server_config_server_edit.htm
diff --git a/interface/web/themes/default-v2/templates/admin/server_config_ufw_edit.htm b/interface/web/themes/default-304/templates/admin/server_config_ufw_edit.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/admin/server_config_ufw_edit.htm
rename to interface/web/themes/default-304/templates/admin/server_config_ufw_edit.htm
diff --git a/interface/web/themes/default-v2/templates/admin/server_config_vlogger_edit.htm b/interface/web/themes/default-304/templates/admin/server_config_vlogger_edit.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/admin/server_config_vlogger_edit.htm
rename to interface/web/themes/default-304/templates/admin/server_config_vlogger_edit.htm
diff --git a/interface/web/themes/default-v2/templates/admin/server_config_web_edit.htm b/interface/web/themes/default-304/templates/admin/server_config_web_edit.htm
similarity index 96%
rename from interface/web/themes/default-v2/templates/admin/server_config_web_edit.htm
rename to interface/web/themes/default-304/templates/admin/server_config_web_edit.htm
index c0c9b3b963778968925170ad7f31669d2ef40795..a41efef09834b687caf84365fdec4155c5427092 100644
--- a/interface/web/themes/default-v2/templates/admin/server_config_web_edit.htm
+++ b/interface/web/themes/default-304/templates/admin/server_config_web_edit.htm
@@ -94,6 +94,18 @@
                 <div class="multiField">
                     {tmpl_var name='enable_ip_wildcard'}
                 </div>
+            </div>
+			<div class="ctrlHolder">
+                <p class="label">{tmpl_var name='overtraffic_notify_admin_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='overtraffic_notify_admin'}
+                </div>
+            </div>
+			<div class="ctrlHolder">
+                <p class="label">{tmpl_var name='overtraffic_notify_client_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='overtraffic_notify_client'}
+                </div>
             </div>
             <div class="subsectiontoggle"><span></span>{tmpl_var name='ssl_settings_txt'}<em></em></div>
             <div style="display:none;">
diff --git a/interface/web/themes/default-v2/templates/admin/server_edit_config.htm b/interface/web/themes/default-304/templates/admin/server_edit_config.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/admin/server_edit_config.htm
rename to interface/web/themes/default-304/templates/admin/server_edit_config.htm
diff --git a/interface/web/themes/default-v2/templates/admin/server_edit_services.htm b/interface/web/themes/default-304/templates/admin/server_edit_services.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/admin/server_edit_services.htm
rename to interface/web/themes/default-304/templates/admin/server_edit_services.htm
diff --git a/interface/web/themes/default-v2/templates/admin/server_ip_edit.htm b/interface/web/themes/default-304/templates/admin/server_ip_edit.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/admin/server_ip_edit.htm
rename to interface/web/themes/default-304/templates/admin/server_ip_edit.htm
diff --git a/interface/web/themes/default-v2/templates/admin/server_ip_list.htm b/interface/web/themes/default-304/templates/admin/server_ip_list.htm
similarity index 73%
rename from interface/web/themes/default-v2/templates/admin/server_ip_list.htm
rename to interface/web/themes/default-304/templates/admin/server_ip_list.htm
index c82e9a334fc86770b3acdc830cc7e9108019f4e6..4234e00a971fb3447cb2118ec91e36b074a69c22 100644
--- a/interface/web/themes/default-v2/templates/admin/server_ip_list.htm
+++ b/interface/web/themes/default-304/templates/admin/server_ip_list.htm
@@ -5,7 +5,7 @@
     <div class="pnl_toolsarea">
         <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
             <div class="buttons">
-                <button class="button iconstxt icoAdd" type="button" onClick="loadContent('admin/server_ip_edit.php');">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('admin/server_ip_edit.php');">
                     <span>{tmpl_var name="add_new_record_txt"}</span>
                 </button>
             </div>
@@ -16,38 +16,38 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr class="caption">
+                    <tr>
                         <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
-                        <th class="tbl_col_client_pid" scope="col"><tmpl_var name="client_id_txt"></th>
+                        <th class="tbl_col_client_id" scope="col"><tmpl_var name="client_id_txt"></th>
                         <th class="tbl_col_ip_type" scope="col"><tmpl_var name="ip_type_txt"></th>
                         <th class="tbl_col_ip_address" scope="col"><tmpl_var name="ip_address_txt"></th>
                         <th class="tbl_col_virtualhost" scope="col"><tmpl_var name="virtualhost_txt"></th>
                         <th class="tbl_col_virtualhost_port" scope="col"><tmpl_var name="virtualhost_port_txt"></th>
                         <th class="tbl_col_buttons" scope="col">{tmpl_var name='search_limit'}</th>
                     </tr>
-                    <tr class="filter">
+                    <tr>
                         <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
-                        <td class="tbl_col_client_pid"><select name="search_client_id">{tmpl_var name='search_client_id'}</select></td>
+                        <td class="tbl_col_client_id"><select name="search_client_id">{tmpl_var name='search_client_id'}</select></td>
                         <td class="tbl_col_ip_type"><select name="search_ip_type">{tmpl_var name='search_ip_type'}</select></td>
                         <td class="tbl_col_ip_address"><input type="text" name="search_ip_address" value="{tmpl_var name='search_ip_address'}" /></td>
                         <td class="tbl_col_virtualhost"><select name="search_virtualhost">{tmpl_var name='search_virtualhost'}</select></td>
                         <td class="tbl_col_virtualhost_port"><input type="text" name="search_virtualhost_port" value="{tmpl_var name='search_virtualhost_port'}" /></td>
-                        <td class="tbl_col_buttons">
-                            <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','admin/server_ip_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
-                        </td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','admin/server_ip_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
                     </tr>
                 </thead>
                 <tbody>
                     <tmpl_loop name="records">
                         <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
                             <td class="tbl_col_server_id"><a href="#" onClick="loadContent('admin/server_ip_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
-                            <td class="tbl_col_client_pid"><a href="#" onClick="loadContent('admin/server_ip_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="client_id"}</a></td>
+                            <td class="tbl_col_client_id"><a href="#" onClick="loadContent('admin/server_ip_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="client_id"}</a></td>
                             <td class="tbl_col_ip_type"><a href="#" onClick="loadContent('admin/server_ip_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="ip_type"}</a></td>
                             <td class="tbl_col_ip_address"><a href="#" onClick="loadContent('admin/server_ip_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="ip_address"}</a></td>
                             <td class="tbl_col_virtualhost"><a href="#" onClick="loadContent('admin/server_ip_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="virtualhost"}</a></td>
                             <td class="tbl_col_virtualhost_port"><a href="#" onClick="loadContent('admin/server_ip_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="virtualhost_port"}</a></td>
                             <td class="tbl_col_buttons">
-                                <a class="button icons16 icoDelete" href="javascript: del_record('admin/server_ip_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 class="buttons icons16">    
+                                    <a class="icons16 icoDelete" href="javascript: del_record('admin/server_ip_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>
                         </tr>
                     </tmpl_loop>
diff --git a/interface/web/themes/default-v2/templates/admin/server_list.htm b/interface/web/themes/default-304/templates/admin/server_list.htm
similarity index 82%
rename from interface/web/themes/default-v2/templates/admin/server_list.htm
rename to interface/web/themes/default-304/templates/admin/server_list.htm
index fd2da095cba386c222e2bb7c205a406e06902614..078d262eb0ffca39216e5ffca6af16bd2ecc76e1 100644
--- a/interface/web/themes/default-v2/templates/admin/server_list.htm
+++ b/interface/web/themes/default-304/templates/admin/server_list.htm
@@ -7,7 +7,7 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr class="caption">
+                    <tr>
                         <th class="tbl_col_server_name" scope="col"><tmpl_var name="server_name_txt"></th>
                         <th class="tbl_col_mail_server" scope="col"><tmpl_var name="mail_server_txt"></th>
                         <th class="tbl_col_web_server" scope="col"><tmpl_var name="web_server_txt"></th>
@@ -17,7 +17,7 @@
                         <th class="tbl_col_vserver_server" scope="col"><tmpl_var name="vserver_server_txt"></th>
                         <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
                     </tr>
-                    <tr class="filter">
+                    <tr>
                         <td class="tbl_col_server_name"><input type="text" name="search_server_name" value="{tmpl_var name='search_server_name'}" /></td>
                         <td class="tbl_col_mail_server"><select name="search_active">{tmpl_var name='search_mail_server'}</select></td>
                         <td class="tbl_col_web_server"><select name="search_active">{tmpl_var name='search_web_server'}</select></td>
@@ -25,9 +25,7 @@
                         <td class="tbl_col_file_server"><select name="search_active">{tmpl_var name='search_file_server'}</select></td>
                         <td class="tbl_col_db_server"><select name="search_active">{tmpl_var name='search_db_server'}</select></td>
                         <td class="tbl_col_vserver_server"><select name="search_active">{tmpl_var name='search_vserver_server'}</select></td>
-                        <td class="tbl_col_buttons">
-                            <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','admin/server_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
-                        </td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','admin/server_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
                     </tr>
                 </thead>
                 <tbody>
@@ -41,7 +39,9 @@
                             <td class="tbl_col_db_server">{tmpl_var name="db_server"}</td>
                             <td class="tbl_col_vserver_server">{tmpl_var name="vserver_server"}</td>
                             <td class="tbl_col_buttons">
-                                <a class="button icons16 icoDelete" href="javascript: del_record('admin/server_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 class="buttons icons16">    
+                                    <a class="icons16 icoDelete" href="javascript: del_record('admin/server_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>
                         </tr>
                     </tmpl_loop>
diff --git a/interface/web/themes/default-v2/templates/admin/server_php_fastcgi_edit.htm b/interface/web/themes/default-304/templates/admin/server_php_fastcgi_edit.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/admin/server_php_fastcgi_edit.htm
rename to interface/web/themes/default-304/templates/admin/server_php_fastcgi_edit.htm
diff --git a/interface/web/themes/default-v2/templates/admin/server_php_fpm_edit.htm b/interface/web/themes/default-304/templates/admin/server_php_fpm_edit.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/admin/server_php_fpm_edit.htm
rename to interface/web/themes/default-304/templates/admin/server_php_fpm_edit.htm
diff --git a/interface/web/themes/default-v2/templates/admin/server_php_list.htm b/interface/web/themes/default-304/templates/admin/server_php_list.htm
similarity index 62%
rename from interface/web/themes/default-v2/templates/admin/server_php_list.htm
rename to interface/web/themes/default-304/templates/admin/server_php_list.htm
index f41ff2635551bdbed578d91c8c79423defda22ac..44e6a1fdeea6409cc7f7b5afb02ecbf841efc15a 100644
--- a/interface/web/themes/default-v2/templates/admin/server_php_list.htm
+++ b/interface/web/themes/default-304/templates/admin/server_php_list.htm
@@ -5,7 +5,7 @@
     <div class="pnl_toolsarea">
         <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
             <div class="buttons">
-                <button class="button iconstxt icoAdd" type="button" onClick="loadContent('admin/server_php_edit.php');">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('admin/server_php_edit.php');">
                     <span>{tmpl_var name="add_new_record_txt"}</span>
                 </button>
             </div>
@@ -16,29 +16,29 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr class="caption">
+                    <tr>
                         <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
-                        <th class="tbl_col_client_pid" scope="col"><tmpl_var name="client_id_txt"></th>
+                        <th class="tbl_col_client_id" scope="col"><tmpl_var name="client_id_txt"></th>
                         <th class="tbl_col_ip_address" scope="col"><tmpl_var name="name_txt"></th>
                         <th class="tbl_col_buttons" scope="col">{tmpl_var name='search_limit'}</th>
                     </tr>
-                    <tr class="filter">
+                    <tr>
                         <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
-                        <td class="tbl_col_client_pid"><select name="search_client_id">{tmpl_var name='search_client_id'}</select></td>
+                        <td class="tbl_col_client_id"><select name="search_client_id">{tmpl_var name='search_client_id'}</select></td>
                         <td class="tbl_col_ip_address"><input type="text" name="search_name" value="{tmpl_var name='search_name'}" /></td>
-                        <td class="tbl_col_buttons">
-                            <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','admin/server_php_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
-                        </td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','admin/server_php_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
                     </tr>
                 </thead>
                 <tbody>
                     <tmpl_loop name="records">
                         <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
                             <td class="tbl_col_server_id"><a href="#" onClick="loadContent('admin/server_php_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
-                            <td class="tbl_col_client_pid"><a href="#" onClick="loadContent('admin/server_php_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="client_id"}</a></td>
+                            <td class="tbl_col_client_id"><a href="#" onClick="loadContent('admin/server_php_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="client_id"}</a></td>
                             <td class="tbl_col_name"><a href="#" onClick="loadContent('admin/server_php_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="name"}</a></td>
                             <td class="tbl_col_buttons">
-                                <a class="button icons16 icoDelete" href="javascript: del_record('admin/server_php_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 class="buttons icons16">    
+                                    <a class="icons16 icoDelete" href="javascript: del_record('admin/server_php_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>
                         </tr>
                     </tmpl_loop>
diff --git a/interface/web/themes/default-v2/templates/admin/server_php_name_edit.htm b/interface/web/themes/default-304/templates/admin/server_php_name_edit.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/admin/server_php_name_edit.htm
rename to interface/web/themes/default-304/templates/admin/server_php_name_edit.htm
diff --git a/interface/web/themes/default-v2/templates/admin/software_package_install.htm b/interface/web/themes/default-304/templates/admin/software_package_install.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/admin/software_package_install.htm
rename to interface/web/themes/default-304/templates/admin/software_package_install.htm
diff --git a/interface/web/themes/default-v2/templates/admin/software_package_list.htm b/interface/web/themes/default-304/templates/admin/software_package_list.htm
similarity index 91%
rename from interface/web/themes/default-v2/templates/admin/software_package_list.htm
rename to interface/web/themes/default-304/templates/admin/software_package_list.htm
index d31d8ff34d277f0156a93c0c752d25646df42e81..0cb6f47c16f6a7b1b45246453c4c00932a6c1688 100644
--- a/interface/web/themes/default-v2/templates/admin/software_package_list.htm
+++ b/interface/web/themes/default-304/templates/admin/software_package_list.htm
@@ -6,7 +6,7 @@
     <div class="pnl_toolsarea">
         <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
             <div class="buttons">
-                <button class="button iconstxt icoAdd" type="button" onClick="loadContent('admin/software_package_list.php?action=repoupdate');">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('admin/software_package_list.php?action=repoupdate');">
                     <span>{tmpl_var name="repoupdate_txt"}</span>
                 </button>
             </div>
@@ -17,7 +17,7 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr class="caption">
+                    <tr>
                         <th class="tbl_col_installed" scope="col"><tmpl_var name="installed_txt"></th>
                         <th class="tbl_col_package_title" scope="col"><tmpl_var name="package_title_txt"></th>
                         <th class="tbl_col_package_description" scope="col"><tmpl_var name="package_description_txt"></th>
diff --git a/interface/web/themes/default-v2/templates/admin/software_repo_edit.htm b/interface/web/themes/default-304/templates/admin/software_repo_edit.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/admin/software_repo_edit.htm
rename to interface/web/themes/default-304/templates/admin/software_repo_edit.htm
diff --git a/interface/web/themes/default-v2/templates/admin/software_repo_list.htm b/interface/web/themes/default-304/templates/admin/software_repo_list.htm
similarity index 75%
rename from interface/web/themes/default-v2/templates/admin/software_repo_list.htm
rename to interface/web/themes/default-304/templates/admin/software_repo_list.htm
index 66aa396633e6290992d7fe99d8ae8d1304187301..16a1749315931a5241c85975334690d86b295428 100644
--- a/interface/web/themes/default-v2/templates/admin/software_repo_list.htm
+++ b/interface/web/themes/default-304/templates/admin/software_repo_list.htm
@@ -6,7 +6,7 @@
     <div class="pnl_toolsarea">
         <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
             <div class="buttons">
-                <button class="button iconstxt icoAdd" type="button" onClick="loadContent('admin/software_repo_edit.php');">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('admin/software_repo_edit.php');">
                     <span>{tmpl_var name="add_new_record_txt"}</span>
                 </button>
             </div>
@@ -17,19 +17,17 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr class="caption">
+                    <tr>
                         <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
                         <th class="tbl_col_repo_name" scope="col"><tmpl_var name="repo_name_txt"></th>
                         <th class="tbl_col_repo_url" scope="col"><tmpl_var name="repo_url_txt"></th>
                         <th class="tbl_col_buttons" scope="col">&nbsp;</th>
                     </tr>
-                    <tr class="filter">
+                    <tr>
                         <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
                         <td class="tbl_col_repo_name"><input type="text" name="search_repo_name" value="{tmpl_var name='search_repo_name'}" /></td>
                         <td class="tbl_col_repo_url"><input type="text" name="search_repo_url" value="{tmpl_var name='search_repo_url'}" /></td>
-                        <td class="tbl_col_buttons">
-                            <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','admin/software_repo_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
-                        </td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','admin/software_repo_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
                     </tr>
                 </thead>
                 <tbody>
@@ -39,7 +37,9 @@
                             <td class="tbl_col_repo_name"><a href="#" onClick="loadContent('admin/software_repo_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="repo_name"}</a></td>
                             <td class="tbl_col_repo_url"><a href="#" onClick="loadContent('admin/software_repo_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="repo_url"}</a></td>
                             <td class="tbl_col_buttons">
-                                <a class="button icons16 icoDelete" href="javascript: del_record('admin/software_repo_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 class="buttons icons16">    
+                                    <a class="icons16 icoDelete" href="javascript: del_record('admin/software_repo_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>
                         </tr>
                     </tmpl_loop>
diff --git a/interface/web/themes/default-v2/templates/admin/software_update_list.htm b/interface/web/themes/default-304/templates/admin/software_update_list.htm
similarity index 97%
rename from interface/web/themes/default-v2/templates/admin/software_update_list.htm
rename to interface/web/themes/default-304/templates/admin/software_update_list.htm
index 7f8a5f833736564e800bf0359676843df1d36e28..8a3760e71a94eebdecf979ee37d8e32408b11d6b 100644
--- a/interface/web/themes/default-v2/templates/admin/software_update_list.htm
+++ b/interface/web/themes/default-304/templates/admin/software_update_list.htm
@@ -22,7 +22,7 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr class="caption">
+                    <tr>
                         <th class="tbl_col_installed" scope="col"><tmpl_var name="installed_txt"></th>
                         <th class="tbl_col_update_title" scope="col"><tmpl_var name="update_title_txt"></th>
                         <th class="tbl_col_version" scope="col"><tmpl_var name="version_txt"></th>
diff --git a/interface/web/themes/default-v2/templates/admin/system_config_domains_edit.htm b/interface/web/themes/default-304/templates/admin/system_config_domains_edit.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/admin/system_config_domains_edit.htm
rename to interface/web/themes/default-304/templates/admin/system_config_domains_edit.htm
diff --git a/interface/web/themes/default-v2/templates/admin/system_config_mail_edit.htm b/interface/web/themes/default-304/templates/admin/system_config_mail_edit.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/admin/system_config_mail_edit.htm
rename to interface/web/themes/default-304/templates/admin/system_config_mail_edit.htm
diff --git a/interface/web/themes/default-v2/templates/admin/system_config_misc_edit.htm b/interface/web/themes/default-304/templates/admin/system_config_misc_edit.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/admin/system_config_misc_edit.htm
rename to interface/web/themes/default-304/templates/admin/system_config_misc_edit.htm
diff --git a/interface/web/themes/default-v2/templates/admin/system_config_sites_edit.htm b/interface/web/themes/default-304/templates/admin/system_config_sites_edit.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/admin/system_config_sites_edit.htm
rename to interface/web/themes/default-304/templates/admin/system_config_sites_edit.htm
diff --git a/interface/web/themes/default-v2/templates/admin/tpl_default-v2_basic.htm b/interface/web/themes/default-304/templates/admin/tpl_default-v2_basic.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/admin/tpl_default-v2_basic.htm
rename to interface/web/themes/default-304/templates/admin/tpl_default-v2_basic.htm
diff --git a/interface/web/themes/default-v2/templates/admin/tpl_default_basic.htm b/interface/web/themes/default-304/templates/admin/tpl_default_basic.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/admin/tpl_default_basic.htm
rename to interface/web/themes/default-304/templates/admin/tpl_default_basic.htm
diff --git a/interface/web/themes/default-v2/templates/admin/users_groups_edit.htm b/interface/web/themes/default-304/templates/admin/users_groups_edit.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/admin/users_groups_edit.htm
rename to interface/web/themes/default-304/templates/admin/users_groups_edit.htm
diff --git a/interface/web/themes/default-v2/templates/admin/users_list.htm b/interface/web/themes/default-304/templates/admin/users_list.htm
similarity index 55%
rename from interface/web/themes/default-v2/templates/admin/users_list.htm
rename to interface/web/themes/default-304/templates/admin/users_list.htm
index 1b824866b7eb7444f80e57ff7fb0eeba08200a4d..d66228162677537a3f3dca5ce8b0909d51462384 100644
--- a/interface/web/themes/default-v2/templates/admin/users_list.htm
+++ b/interface/web/themes/default-304/templates/admin/users_list.htm
@@ -6,7 +6,7 @@
     <div class="pnl_toolsarea">
         <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
             <div class="buttons">
-                <button class="button iconstxt icoAdd" type="button" onClick="loadContent('admin/users_edit.php');">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('admin/users_edit.php');">
                     <span>{tmpl_var name="add_new_record_txt"}</span>
                 </button>
                 <p><tmpl_var name="warning_txt"></p>
@@ -18,35 +18,35 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr class="caption">
-                        <th class="tbl_col_client_pid" scope="col"><tmpl_var name="client_id_txt"></th>
+                    <tr>
+                        <th class="tbl_col_client_id" scope="col"><tmpl_var name="client_id_txt"></th>
                         <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
                         <th class="tbl_col_username" scope="col"><tmpl_var name="username_txt"></th>
                         <th class="tbl_col_groups" scope="col"><tmpl_var name="groups_txt"></th>
                         <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
                     </tr>
-                    <tr class="filter">
-                        <td class="tbl_col_client_pid"><input type="text" name="search_client_id" value="{tmpl_var name='search_client_id'}" /></td>
+                    <tr>
+                        <td class="tbl_col_client_id"><input type="text" name="search_client_id" value="{tmpl_var name='search_client_id'}" /></td>
                         <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
                         <td class="tbl_col_username"><input type="text" name="search_username" value="{tmpl_var name='search_username'}" /></td>
                         <td class="tbl_col_groups"><select name="search_groups">{tmpl_var name='search_groups'}</select></td>
-                        <td class="tbl_col_buttons">
-                            <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','admin/users_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
-                        </td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','admin/users_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
                     </tr>
                 </thead>
                 <tbody>
                     <tmpl_loop name="records">
                         <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
-                            <td class="tbl_col_client_pid"><a href="#" onClick="loadContent('admin/users_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="client_id"}</a></td>
+                            <td class="tbl_col_client_id"><a href="#" onClick="loadContent('admin/users_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="client_id"}</a></td>
                             <td class="tbl_col_active"><a href="#" onClick="loadContent('admin/users_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
-                            <td class="tbl_col_username"><div class="icons16 group-{tmpl_var name="typ"}" title="{tmpl_var name="typ"}"><span>{tmpl_var name="typ"}</span></div> <div class="group-icon"><a href="#" onClick="loadContent('admin/users_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="username"}</a></div></td>
+                            <td class="tbl_col_username"><a href="#" onClick="loadContent('admin/users_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="username"}</a></td>
                             <td class="tbl_col_groups">{tmpl_var name="groups"}</td>
                             <td class="tbl_col_buttons">
-                                <tmpl_if name="username" op="!=" value="admin">
-                                    <a class="button icons16 icoLoginAs" href="javascript: loadContent('admin/login_as.php?id={tmpl_var name='id'}');"><span>{tmpl_var name='login_as_txt'}</span></a>
-                                    <a class="button icons16 icoDelete" href="javascript: del_record('admin/users_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>
-                                </tmpl_if>
+                                <div class="buttons icons16">    
+                                    <tmpl_if name="username" op="!=" value="admin">
+                                        <a class="icons16 icoLoginAs" href="javascript: loadContent('admin/login_as.php?id={tmpl_var name='id'}');"><span>{tmpl_var name='login_as_txt'}</span></a>
+                                        <a class="icons16 icoDelete" href="javascript: del_record('admin/users_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>
+                                    </tmpl_if>
+                                </div>
                             </td>
                         </tr>
                     </tmpl_loop>
diff --git a/interface/web/themes/default-v2/templates/admin/users_user_edit.htm b/interface/web/themes/default-304/templates/admin/users_user_edit.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/admin/users_user_edit.htm
rename to interface/web/themes/default-304/templates/admin/users_user_edit.htm
diff --git a/interface/web/themes/default-v2/templates/client/client_circle_edit.htm b/interface/web/themes/default-304/templates/client/client_circle_edit.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/client/client_circle_edit.htm
rename to interface/web/themes/default-304/templates/client/client_circle_edit.htm
diff --git a/interface/web/themes/default-v2/templates/client/client_circle_list.htm b/interface/web/themes/default-304/templates/client/client_circle_list.htm
similarity index 64%
rename from interface/web/themes/default-v2/templates/client/client_circle_list.htm
rename to interface/web/themes/default-304/templates/client/client_circle_list.htm
index 08a8148ef5c36a171209dcecbc8d731e9a9520c8..4c5a889b64df653a7a20ef6d45e5ee8edc6b348a 100644
--- a/interface/web/themes/default-v2/templates/client/client_circle_list.htm
+++ b/interface/web/themes/default-304/templates/client/client_circle_list.htm
@@ -6,7 +6,7 @@
     <div class="pnl_toolsarea">
         <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
             <div class="buttons">
-                <button class="button iconstxt icoAdd" type="button" onClick="loadContent('client/client_circle_edit.php');">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('client/client_circle_edit.php');">
                     <span>{tmpl_var name="add_new_record_txt"}</span>
                 </button>
             </div>
@@ -17,32 +17,32 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr class="caption">
-                        <th class="tbl_col_circle_pid" scope="col"><tmpl_var name="circle_id_txt"></th>
+                    <tr>
+                        <th class="tbl_col_circle_id" scope="col"><tmpl_var name="circle_id_txt"></th>
                         <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
                         <th class="tbl_col_circle_name" scope="col"><tmpl_var name="circle_name_txt"></th>
                         <th class="tbl_col_description" scope="col"><tmpl_var name="description_txt"></th>
                         <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
                     </tr>
-                    <tr class="filter">
-                        <td class="tbl_col_circle_pid"><input type="text" name="search_circle_id" value="{tmpl_var name='search_circle_id'}" /></td>
+                    <tr>
+                        <td class="tbl_col_circle_id"><input type="text" name="search_circle_id" value="{tmpl_var name='search_circle_id'}" style="width:30px;" /></td>
                         <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
-                        <td class="tbl_col_circle_name"><input type="text" name="search_circle_name" value="{tmpl_var name='search_circle_name'}" /></td>
-                        <td class="tbl_col_description"><input type="text" name="search_description" value="{tmpl_var name='search_description'}" /></td>
-                        <td class="tbl_col_buttons">
-                            <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','client/client_circle_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
-                        </td>
+                        <td class="tbl_col_circle_name"><input type="text" name="search_circle_name" value="{tmpl_var name='search_circle_name'}" style="width:120px;" /></td>
+                        <td class="tbl_col_description"><input type="text" name="search_description" value="{tmpl_var name='search_description'}" style="width:120px;" /></td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','client/client_circle_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
                     </tr>
                 </thead>
                 <tbody>
                     <tmpl_loop name="records">
                         <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
-                            <td class="tbl_col_circle_pid"><a href="#" onClick="loadContent('client/client_circle_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="circle_id"}</a></td>
+                            <td class="tbl_col_circle_id"><a href="#" onClick="loadContent('client/client_circle_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="circle_id"}</a></td>
                             <td class="tbl_col_active"><a href="#" onClick="loadContent('client/client_circle_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
                             <td class="tbl_col_circle_name"><a href="#" onClick="loadContent('client/client_circle_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="circle_name"}</a></td>
                             <td class="tbl_col_description"><a href="#" onClick="loadContent('client/client_circle_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="description"}</a></td>
                             <td class="tbl_col_buttons">
-                                <a class="button icons16 icoDelete" href="javascript: del_record('client/client_circle_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 class="buttons icons16" style="width:60px;">
+                                    <a class="icons16 icoDelete" href="javascript: del_record('client/client_circle_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>
                         </tr>
                     </tmpl_loop>
diff --git a/interface/web/themes/default-v2/templates/client/client_del.htm b/interface/web/themes/default-304/templates/client/client_del.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/client/client_del.htm
rename to interface/web/themes/default-304/templates/client/client_del.htm
diff --git a/interface/web/themes/default-v2/templates/client/client_edit_address.htm b/interface/web/themes/default-304/templates/client/client_edit_address.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/client/client_edit_address.htm
rename to interface/web/themes/default-304/templates/client/client_edit_address.htm
diff --git a/interface/web/themes/default-v2/templates/client/client_edit_limits.htm b/interface/web/themes/default-304/templates/client/client_edit_limits.htm
similarity index 99%
rename from interface/web/themes/default-v2/templates/client/client_edit_limits.htm
rename to interface/web/themes/default-304/templates/client/client_edit_limits.htm
index 9e12671b11db14ec046022100bfcbf912e7618bb..8ce7f80fa6dec3e7a4ceb8388267085097593fcc 100644
--- a/interface/web/themes/default-v2/templates/client/client_edit_limits.htm
+++ b/interface/web/themes/default-304/templates/client/client_edit_limits.htm
@@ -6,7 +6,7 @@
     <tmpl_if name="is_admin">
         <div class="pnl_toolsarea">
             <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
-                <div class="buttons topbuttons">
+                <div class="buttons">
                     <button class="positive iconstxt icoAdd" type="button" value="{tmpl_var name='add_additional_template_txt'}" onClick="addAdditionalTemplate();"><span>{tmpl_var name='add_additional_template_txt'}</span></button>
                     <button class="negative iconstxt icoDelete" type="button" value="{tmpl_var name='delete_additional_template_txt'}" onClick="delAdditionalTemplate();"><span>{tmpl_var name='delete_additional_template_txt'}</span></button>
                 </div>
diff --git a/interface/web/themes/default-v2/templates/client/client_message.htm b/interface/web/themes/default-304/templates/client/client_message.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/client/client_message.htm
rename to interface/web/themes/default-304/templates/client/client_message.htm
diff --git a/interface/web/themes/default-v2/templates/client/client_template_edit_limits.htm b/interface/web/themes/default-304/templates/client/client_template_edit_limits.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/client/client_template_edit_limits.htm
rename to interface/web/themes/default-304/templates/client/client_template_edit_limits.htm
diff --git a/interface/web/themes/default-v2/templates/client/client_template_edit_template.htm b/interface/web/themes/default-304/templates/client/client_template_edit_template.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/client/client_template_edit_template.htm
rename to interface/web/themes/default-304/templates/client/client_template_edit_template.htm
diff --git a/interface/web/themes/default-v2/templates/client/client_template_list.htm b/interface/web/themes/default-304/templates/client/client_template_list.htm
similarity index 74%
rename from interface/web/themes/default-v2/templates/client/client_template_list.htm
rename to interface/web/themes/default-304/templates/client/client_template_list.htm
index 81d93fd9b22c11591815833e7c8cbd4efebede9e..5249fce5d5bb0bb5b728baff4ed5640596ecde5c 100644
--- a/interface/web/themes/default-v2/templates/client/client_template_list.htm
+++ b/interface/web/themes/default-304/templates/client/client_template_list.htm
@@ -6,7 +6,7 @@
   <div class="pnl_toolsarea">
     <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
       <div class="buttons">
-        <button class="button iconstxt icoAdd" type="button" onClick="loadContent('client/client_template_edit.php');">
+        <button class="iconstxt icoAdd" type="button" onClick="loadContent('client/client_template_edit.php');">
           <span>{tmpl_var name="add_new_record_txt"}</span>
         </button>
       </div>
@@ -17,19 +17,17 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr class="caption">
+                    <tr>
                         <th class="tbl_col_template_id" scope="col"><tmpl_var name="template_id_txt"></th>
                         <th class="tbl_col_template_type" scope="col"><tmpl_var name="template_type_txt"></th>
                         <th class="tbl_col_template_name" scope="col"><tmpl_var name="template_name_txt"></th>
                         <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
                     </tr>
-                    <tr class="filter">
-                        <td class="tbl_col_template_id"><input type="text" name="search_template_id" value="{tmpl_var name='search_template_id'}" /></td>
+                    <tr>
+                        <td class="tbl_col_template_id"><input type="text" name="search_template_id" value="{tmpl_var name='search_template_id'}" style="width:30px;" /></td>
                         <td class="tbl_col_template_type"><select name="search_template_type">{tmpl_var name='search_template_type'}</select></td>
                         <td class="tbl_col_template_name"><input type="text" name="search_template_name" value="{tmpl_var name='search_template_name'}" /></td>
-                        <td class="tbl_col_buttons">
-                            <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','client/client_template_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
-                        </td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','client/client_template_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
                     </tr>
                 </thead>
                 <tbody>
@@ -39,7 +37,9 @@
                             <td class="tbl_col_template_type"><a href="#" onClick="loadContent('client/client_template_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="template_type"}</a></td>
                             <td class="tbl_col_template_name"><a href="#" onClick="loadContent('client/client_template_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="template_name"}</a></td>
                             <td class="tbl_col_buttons">
-                                <a class="button icons16 icoDelete" href="javascript: del_record('client/client_template_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 class="buttons icons16">
+                                    <a class="icons16 icoDelete" href="javascript: del_record('client/client_template_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>
                         </tr>
                     </tmpl_loop>
diff --git a/interface/web/themes/default-v2/templates/client/clients_list.htm b/interface/web/themes/default-304/templates/client/clients_list.htm
similarity index 59%
rename from interface/web/themes/default-v2/templates/client/clients_list.htm
rename to interface/web/themes/default-304/templates/client/clients_list.htm
index cc948ce2f4c91271df2d0916df3a1c7b927fa395..2e906d00be9cfa6a71d761703a78b7f5e3cc2a97 100644
--- a/interface/web/themes/default-v2/templates/client/clients_list.htm
+++ b/interface/web/themes/default-304/templates/client/clients_list.htm
@@ -6,7 +6,7 @@
     <div class="pnl_toolsarea">
         <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
             <div class="buttons">
-                <button class="button iconstxt icoAdd" type="button" onClick="loadContent('client/client_edit.php');">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('client/client_edit.php');">
                     <span>{tmpl_var name="add_new_record_txt"}</span>
                 </button>
             </div>
@@ -17,8 +17,8 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr class="caption">
-                        <th class="tbl_col_client_pid" scope="col"><tmpl_var name="client_id_txt"></th>
+                    <tr>
+                        <th class="tbl_col_client_id" scope="col"><tmpl_var name="client_id_txt"></th>
                         <th class="tbl_col_company_name" scope="col"><tmpl_var name="company_name_txt"></th>
                         <th class="tbl_col_contact_name" scope="col"><tmpl_var name="contact_name_txt"></th>
                         <th class="tbl_col_username" scope="col"><tmpl_var name="username_txt"></th>
@@ -26,32 +26,32 @@
                         <th class="tbl_col_country" scope="col"><tmpl_var name="country_txt"></th>
                         <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
                     </tr>
-                    <tr class="filter">
-                        <td class="tbl_col_client_pid"><input type="text" name="search_client_id" value="{tmpl_var name='search_client_id'}" /></td>
-                        <td class="tbl_col_company_name"><input type="text" name="search_company_name" value="{tmpl_var name='search_company_name'}" /></td>
-                        <td class="tbl_col_contact_name"><input type="text" name="search_contact_name" value="{tmpl_var name='search_contact_name'}" /></td>
-                        <td class="tbl_col_username"><input type="text" name="search_username" value="{tmpl_var name='search_username'}" /></td>
-                        <td class="tbl_col_city"><input type="text" name="search_city" value="{tmpl_var name='search_city'}" /></td>
-                        <td class="tbl_col_country"><select name="search_country">{tmpl_var name='search_country'}</select></td>
-                        <td class="tbl_col_buttons">
-                            <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','client/client_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
-                        </td>
+                    <tr>
+                        <td class="tbl_col_client_id"><input type="text" name="search_client_id" value="{tmpl_var name='search_client_id'}" style="width:30px;" /></td>
+                        <td class="tbl_col_company_name"><input type="text" name="search_company_name" value="{tmpl_var name='search_company_name'}" style="width:120px;" /></td>
+                        <td class="tbl_col_contact_name"><input type="text" name="search_contact_name" value="{tmpl_var name='search_contact_name'}" style="width:120px;" /></td>
+                        <td class="tbl_col_username"><input type="text" name="search_username" value="{tmpl_var name='search_username'}" style="width:120px;" /></td>
+                        <td class="tbl_col_city"><input type="text" name="search_city" value="{tmpl_var name='search_city'}" style="width:120px;" /></td>
+                        <td class="tbl_col_country"><select name="search_country" class="selectInput flags" style="width:120px;">{tmpl_var name='search_country'}</select></td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','client/client_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
                     </tr>
                 </thead>
                 <tbody>
                     <tmpl_loop name="records">
                         <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
-                            <td class="tbl_col_client_pid"><a href="#" onClick="loadContent('client/client_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="client_id"}</a></td>
+                            <td class="tbl_col_client_id"><a href="#" onClick="loadContent('client/client_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="client_id"}</a></td>
                             <td class="tbl_col_company_name"><a href="#" onClick="loadContent('client/client_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="company_name"}</a></td>
                             <td class="tbl_col_contact_name"><a href="#" onClick="loadContent('client/client_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="contact_name"}</a></td>
                             <td class="tbl_col_username"><a href="#" onClick="loadContent('client/client_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="username"}</a></td>
                             <td class="tbl_col_city"><a href="#" onClick="loadContent('client/client_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="city"}</a></td>
-                            <td class="tbl_col_country"><div class="country-{tmpl_var name="country"}"><span>{tmpl_var name="country"}</span></div></td>
+                            <td class="tbl_col_country"><a href="#" onClick="loadContent('client/client_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="country"}</a></td>
                             <td class="tbl_col_buttons">
-                                <tmpl_if name="is_admin">
-                                    <a class="button icons16 icoLoginAs" href="javascript: loadContent('admin/login_as.php?cid={tmpl_var name='id'}');"><span>{tmpl_var name='login_as_txt'}</span></a>
-                                </tmpl_if>
-                                <a class="button icons16 icoDelete" href="javascript: del_record('client/client_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 class="buttons icons16" style="width:60px;">
+                                    <tmpl_if name="is_admin">
+                                        <a class="icons16 icoLoginAs" href="javascript: loadContent('admin/login_as.php?cid={tmpl_var name='id'}');"><span>{tmpl_var name='login_as_txt'}</span></a>
+                                    </tmpl_if>
+                                    <a class="icons16 icoDelete" href="javascript: del_record('client/client_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>
                         </tr>
                     </tmpl_loop>
diff --git a/interface/web/themes/default-v2/templates/client/domain_edit.htm b/interface/web/themes/default-304/templates/client/domain_edit.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/client/domain_edit.htm
rename to interface/web/themes/default-304/templates/client/domain_edit.htm
diff --git a/interface/web/themes/default-v2/templates/client/domain_list.htm b/interface/web/themes/default-304/templates/client/domain_list.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/client/domain_list.htm
rename to interface/web/themes/default-304/templates/client/domain_list.htm
diff --git a/interface/web/themes/default-v2/templates/client/reseller_edit_address.htm b/interface/web/themes/default-304/templates/client/reseller_edit_address.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/client/reseller_edit_address.htm
rename to interface/web/themes/default-304/templates/client/reseller_edit_address.htm
diff --git a/interface/web/themes/default-v2/templates/client/reseller_edit_limits.htm b/interface/web/themes/default-304/templates/client/reseller_edit_limits.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/client/reseller_edit_limits.htm
rename to interface/web/themes/default-304/templates/client/reseller_edit_limits.htm
diff --git a/interface/web/themes/default-v2/templates/client/resellers_list.htm b/interface/web/themes/default-304/templates/client/resellers_list.htm
similarity index 57%
rename from interface/web/themes/default-v2/templates/client/resellers_list.htm
rename to interface/web/themes/default-304/templates/client/resellers_list.htm
index f5e1726d12aa6e852c9a4bec92c023c8433c7a3b..42a9a0cc9a3cc0d2430d7194a394167391f6cf50 100644
--- a/interface/web/themes/default-v2/templates/client/resellers_list.htm
+++ b/interface/web/themes/default-304/templates/client/resellers_list.htm
@@ -6,7 +6,7 @@
     <div class="pnl_toolsarea">
         <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
             <div class="buttons">
-                <button class="button iconstxt icoAdd" type="button" onClick="loadContent('client/reseller_edit.php');">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('client/reseller_edit.php');">
                     <span>{tmpl_var name="add_new_record_txt"}</span>
                 </button>
             </div>
@@ -17,36 +17,36 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr class="caption">
-                        <th class="tbl_col_client_pid" scope="col"><tmpl_var name="client_id_txt"></th>
+                    <tr>
+                        <th class="tbl_col_client_id" scope="col"><tmpl_var name="client_id_txt"></th>
                         <th class="tbl_col_company_name" scope="col"><tmpl_var name="company_name_txt"></th>
                         <th class="tbl_col_contact_name" scope="col"><tmpl_var name="contact_name_txt"></th>
                         <th class="tbl_col_city" scope="col"><tmpl_var name="city_txt"></th>
                         <th class="tbl_col_country" scope="col"><tmpl_var name="country_txt"></th>
                         <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
                     </tr>
-                    <tr class="filter">
-                        <td class="tbl_col_client_pid"><input type="text" name="search_client_id" value="{tmpl_var name='search_client_id'}" /></td>
-                        <td class="tbl_col_company_name"><input type="text" name="search_company_name" value="{tmpl_var name='search_company_name'}" /></td>
-                        <td class="tbl_col_contact_name"><input type="text" name="search_contact_name" value="{tmpl_var name='search_contact_name'}" /></td>
-                        <td class="tbl_col_city"><input type="text" name="search_city" value="{tmpl_var name='search_city'}" /></td>
-                        <td class="tbl_col_country"><select name="search_country">{tmpl_var name='search_country'}</select></td>
-                        <td class="tbl_col_buttons">
-                            <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','client/reseller_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
-                        </td>
+                    <tr>
+                        <td class="tbl_col_client_id"><input type="text" name="search_client_id" value="{tmpl_var name='search_client_id'}" style="width:30px;" /></td>
+                        <td class="tbl_col_company_name"><input type="text" name="search_company_name" value="{tmpl_var name='search_company_name'}" style="width:120px;" /></td>
+                        <td class="tbl_col_contact_name"><input type="text" name="search_contact_name" value="{tmpl_var name='search_contact_name'}" style="width:120px;" /></td>
+                        <td class="tbl_col_city"><input type="text" name="search_city" value="{tmpl_var name='search_city'}" style="width:120px;" /></td>
+                        <td class="tbl_col_country"><select name="search_country" class="selectInput flags" style="width:120px;">{tmpl_var name='search_country'}</select></td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','client/reseller_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
                     </tr>
                 </thead>
                 <tbody>
                     <tmpl_loop name="records">
                         <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
-                            <td class="tbl_col_client_pid"><a href="#" onClick="loadContent('client/reseller_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="client_id"}</a></td>
+                            <td class="tbl_col_client_id"><a href="#" onClick="loadContent('client/reseller_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="client_id"}</a></td>
                             <td class="tbl_col_company_name"><a href="#" onClick="loadContent('client/reseller_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="company_name"}</a></td>
                             <td class="tbl_col_contact_name"><a href="#" onClick="loadContent('client/reseller_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="contact_name"}</a></td>
                             <td class="tbl_col_city"><a href="#" onClick="loadContent('client/reseller_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="city"}</a></td>
-                            <td class="tbl_col_country"><div class="country-{tmpl_var name="country"}"><span>{tmpl_var name="country"}</span></div></td>
+                            <td class="tbl_col_country"><a href="#" onClick="loadContent('client/reseller_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="country"}</a></td>
                             <td class="tbl_col_buttons">
-                                <a class="button icons16 icoLoginAs" href="javascript: loadContent('admin/login_as.php?cid={tmpl_var name='id'}');"><span>{tmpl_var name='login_as_txt'}</span></a>
-                                <a class="button icons16 icoDelete" href="javascript: del_record('client/reseller_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 class="buttons icons16" style="width:60px;">
+                                <a class="icons16 icoLoginAs" href="javascript: loadContent('admin/login_as.php?cid={tmpl_var name='id'}');"><span>{tmpl_var name='login_as_txt'}</span></a>
+                                <a class="icons16 icoDelete" href="javascript: del_record('client/reseller_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>
                         </tr>
                     </tmpl_loop>
diff --git a/interface/web/themes/default-v2/templates/dashboard/custom_menu.htm b/interface/web/themes/default-304/templates/dashboard/custom_menu.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/dashboard/custom_menu.htm
rename to interface/web/themes/default-304/templates/dashboard/custom_menu.htm
diff --git a/interface/web/themes/default-v2/templates/dashboard/dashboard.htm b/interface/web/themes/default-304/templates/dashboard/dashboard.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/dashboard/dashboard.htm
rename to interface/web/themes/default-304/templates/dashboard/dashboard.htm
diff --git a/interface/web/themes/default-v2/templates/dashlets/limits.htm b/interface/web/themes/default-304/templates/dashboard/dashlets/limits.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/dashlets/limits.htm
rename to interface/web/themes/default-304/templates/dashboard/dashlets/limits.htm
diff --git a/interface/web/themes/default-v2/templates/dashlets/modules.htm b/interface/web/themes/default-304/templates/dashboard/dashlets/modules.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/dashlets/modules.htm
rename to interface/web/themes/default-304/templates/dashboard/dashlets/modules.htm
diff --git a/interface/web/themes/default-v2/templates/designer/form_edit.htm b/interface/web/themes/default-304/templates/designer/form_edit.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/designer/form_edit.htm
rename to interface/web/themes/default-304/templates/designer/form_edit.htm
diff --git a/interface/web/themes/default-v2/templates/designer/form_list.htm b/interface/web/themes/default-304/templates/designer/form_list.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/designer/form_list.htm
rename to interface/web/themes/default-304/templates/designer/form_list.htm
diff --git a/interface/web/themes/default-v2/templates/designer/form_show.htm b/interface/web/themes/default-304/templates/designer/form_show.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/designer/form_show.htm
rename to interface/web/themes/default-304/templates/designer/form_show.htm
diff --git a/interface/web/themes/default-v2/templates/designer/module_edit.htm b/interface/web/themes/default-304/templates/designer/module_edit.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/designer/module_edit.htm
rename to interface/web/themes/default-304/templates/designer/module_edit.htm
diff --git a/interface/web/themes/default-v2/templates/designer/module_list.htm b/interface/web/themes/default-304/templates/designer/module_list.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/designer/module_list.htm
rename to interface/web/themes/default-304/templates/designer/module_list.htm
diff --git a/interface/web/themes/default-v2/templates/designer/module_nav_edit.htm b/interface/web/themes/default-304/templates/designer/module_nav_edit.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/designer/module_nav_edit.htm
rename to interface/web/themes/default-304/templates/designer/module_nav_edit.htm
diff --git a/interface/web/themes/default-v2/templates/designer/module_nav_item_edit.htm b/interface/web/themes/default-304/templates/designer/module_nav_item_edit.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/designer/module_nav_item_edit.htm
rename to interface/web/themes/default-304/templates/designer/module_nav_item_edit.htm
diff --git a/interface/web/themes/default-v2/templates/designer/module_show.htm b/interface/web/themes/default-304/templates/designer/module_show.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/designer/module_show.htm
rename to interface/web/themes/default-304/templates/designer/module_show.htm
diff --git a/interface/web/themes/default-v2/templates/designer/paging.tpl.htm b/interface/web/themes/default-304/templates/designer/paging.tpl.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/designer/paging.tpl.htm
rename to interface/web/themes/default-304/templates/designer/paging.tpl.htm
diff --git a/interface/web/themes/default-v2/templates/dns/dns_a_edit.htm b/interface/web/themes/default-304/templates/dns/dns_a_edit.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/dns/dns_a_edit.htm
rename to interface/web/themes/default-304/templates/dns/dns_a_edit.htm
diff --git a/interface/web/themes/default-v2/templates/dns/dns_a_list.htm b/interface/web/themes/default-304/templates/dns/dns_a_list.htm
similarity index 54%
rename from interface/web/themes/default-v2/templates/dns/dns_a_list.htm
rename to interface/web/themes/default-304/templates/dns/dns_a_list.htm
index 658962146e493fb726fb09a17b3244407b333c25..913f628a69a919f09dd928b0c332fb65bf7673c2 100644
--- a/interface/web/themes/default-v2/templates/dns/dns_a_list.htm
+++ b/interface/web/themes/default-304/templates/dns/dns_a_list.htm
@@ -1,17 +1,39 @@
 <div class="pnl_toolsarea">
     <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
-        <div class="buttons topbuttons">
-            <button class="button iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_a_edit.php?zone={tmpl_var name='parent_id'}');"><span>A</span></button>
-            <button class="button iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_aaaa_edit.php?zone={tmpl_var name='parent_id'}');"><span>AAAA</span></button>
-            <button class="button iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_alias_edit.php?zone={tmpl_var name='parent_id'}');"><span>ALIAS</span></button>
-            <button class="button iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_cname_edit.php?zone={tmpl_var name='parent_id'}');"><span>CNAME</span></button>
-            <button class="button iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_hinfo_edit.php?zone={tmpl_var name='parent_id'}');"><span>HINFO</span></button>
-            <button class="button iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_mx_edit.php?zone={tmpl_var name='parent_id'}');"><span>MX</span></button>
-            <button class="button iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_ns_edit.php?zone={tmpl_var name='parent_id'}');"><span>NS</span></button>
-            <button class="button iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_ptr_edit.php?zone={tmpl_var name='parent_id'}');"><span>PTR</span></button>
-            <button class="button iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_rp_edit.php?zone={tmpl_var name='parent_id'}');"><span>RP</span></button>
-            <button class="button iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_srv_edit.php?zone={tmpl_var name='parent_id'}');"><span>SRV</span></button>
-            <button class="button iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_txt_edit.php?zone={tmpl_var name='parent_id'}');"><span>TXT</span></button>
+        <div class="buttons">
+            <button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_a_edit.php?zone={tmpl_var name='parent_id'}');">
+                <span>A</span>
+            </button>
+            <button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_aaaa_edit.php?zone={tmpl_var name='parent_id'}');">
+                <span>AAAA</span>
+            </button>
+            <button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_alias_edit.php?zone={tmpl_var name='parent_id'}');">
+                <span>ALIAS</span>
+            </button>
+            <button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_cname_edit.php?zone={tmpl_var name='parent_id'}');">
+                <span>CNAME</span>
+            </button>
+            <button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_hinfo_edit.php?zone={tmpl_var name='parent_id'}');">
+                <span>HINFO</span>
+            </button>
+            <button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_mx_edit.php?zone={tmpl_var name='parent_id'}');">
+                <span>MX</span>
+            </button>
+            <button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_ns_edit.php?zone={tmpl_var name='parent_id'}');">
+                <span>NS</span>
+            </button>
+            <button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_ptr_edit.php?zone={tmpl_var name='parent_id'}');">
+                <span>PTR</span>
+            </button>
+            <button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_rp_edit.php?zone={tmpl_var name='parent_id'}');">
+                <span>RP</span>
+            </button>
+            <button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_srv_edit.php?zone={tmpl_var name='parent_id'}');">
+                <span>SRV</span>
+            </button>
+            <button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_txt_edit.php?zone={tmpl_var name='parent_id'}');">
+                <span>TXT</span>
+            </button>
         </div>
     </fieldset>
 </div>
@@ -20,7 +42,7 @@
     <fieldset><legend><tmpl_var name="list_head_txt"></legend>
         <table class="list">
             <thead>
-                <tr class="caption">
+                <tr>
                     <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
                     <th class="tbl_col_type" scope="col"><tmpl_var name="type_txt"></th>
                     <th class="tbl_col_name" scope="col"><tmpl_var name="name_txt"></th>
@@ -29,16 +51,14 @@
                     <th class="tbl_col_ttl" scope="col"><tmpl_var name="ttl_txt"></th>
                     <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
                 </tr>
-                <tr class="filter">
+                <tr>
                     <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
                     <td class="tbl_col_type"><select name="search_type">{tmpl_var name='search_type'}</select></td>
                     <td class="tbl_col_name"><input type="text" name="search_name" value="{tmpl_var name='search_name'}" /></td>
                     <td class="tbl_col_data"><input type="text" name="search_data" value="{tmpl_var name='search_data'}" /></td>
                     <td class="tbl_col_aux"><input type="text" name="search_aux" value="{tmpl_var name='search_aux'}" /></td>
                     <td class="tbl_col_ttl"><input type="text" name="search_ttl" value="{tmpl_var name='search_ttl'}" /></td>
-                    <td class="tbl_col_buttons">
-                        <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="changeTab('dns_records','dns/dns_soa_edit.php');"><span>{tmpl_var name="filter_txt"}</span></button>
-                    </td>
+                    <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="changeTab('dns_records','dns/dns_soa_edit.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
                 </tr>
             </thead>
             <tbody>
@@ -51,7 +71,9 @@
                         <td class="tbl_col_aux"><a href="#" onClick="loadContent('dns/dns_{tmpl_var name='type_lowercase'}_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="aux"}</a></td>
                         <td class="tbl_col_ttl"><a href="#" onClick="loadContent('dns/dns_{tmpl_var name='type_lowercase'}_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="ttl"}</a></td>
                         <td class="tbl_col_buttons">
-                            <a class="button icons16 icoDelete" href="javascript: del_record('dns/dns_rr_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 class="buttons icons16">    
+                                <a class="icons16 icoDelete" href="javascript: del_record('dns/dns_rr_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>
                     </tr>
                 </tmpl_loop>
diff --git a/interface/web/themes/default-v2/templates/dns/dns_aaaa_edit.htm b/interface/web/themes/default-304/templates/dns/dns_aaaa_edit.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/dns/dns_aaaa_edit.htm
rename to interface/web/themes/default-304/templates/dns/dns_aaaa_edit.htm
diff --git a/interface/web/themes/default-v2/templates/dns/dns_alias_edit.htm b/interface/web/themes/default-304/templates/dns/dns_alias_edit.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/dns/dns_alias_edit.htm
rename to interface/web/themes/default-304/templates/dns/dns_alias_edit.htm
diff --git a/interface/web/themes/default-v2/templates/dns/dns_cname_edit.htm b/interface/web/themes/default-304/templates/dns/dns_cname_edit.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/dns/dns_cname_edit.htm
rename to interface/web/themes/default-304/templates/dns/dns_cname_edit.htm
diff --git a/interface/web/themes/default-v2/templates/dns/dns_hinfo_edit.htm b/interface/web/themes/default-304/templates/dns/dns_hinfo_edit.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/dns/dns_hinfo_edit.htm
rename to interface/web/themes/default-304/templates/dns/dns_hinfo_edit.htm
diff --git a/interface/web/themes/default-v2/templates/dns/dns_import.htm b/interface/web/themes/default-304/templates/dns/dns_import.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/dns/dns_import.htm
rename to interface/web/themes/default-304/templates/dns/dns_import.htm
diff --git a/interface/web/themes/default-v2/templates/dns/dns_mx_edit.htm b/interface/web/themes/default-304/templates/dns/dns_mx_edit.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/dns/dns_mx_edit.htm
rename to interface/web/themes/default-304/templates/dns/dns_mx_edit.htm
diff --git a/interface/web/themes/default-v2/templates/dns/dns_ns_edit.htm b/interface/web/themes/default-304/templates/dns/dns_ns_edit.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/dns/dns_ns_edit.htm
rename to interface/web/themes/default-304/templates/dns/dns_ns_edit.htm
diff --git a/interface/web/themes/default-v2/templates/dns/dns_ptr_edit.htm b/interface/web/themes/default-304/templates/dns/dns_ptr_edit.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/dns/dns_ptr_edit.htm
rename to interface/web/themes/default-304/templates/dns/dns_ptr_edit.htm
diff --git a/interface/web/themes/default-v2/templates/dns/dns_records_edit.htm b/interface/web/themes/default-304/templates/dns/dns_records_edit.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/dns/dns_records_edit.htm
rename to interface/web/themes/default-304/templates/dns/dns_records_edit.htm
diff --git a/interface/web/themes/default-v2/templates/dns/dns_rp_edit.htm b/interface/web/themes/default-304/templates/dns/dns_rp_edit.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/dns/dns_rp_edit.htm
rename to interface/web/themes/default-304/templates/dns/dns_rp_edit.htm
diff --git a/interface/web/themes/default-v2/templates/dns/dns_slave_edit.htm b/interface/web/themes/default-304/templates/dns/dns_slave_edit.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/dns/dns_slave_edit.htm
rename to interface/web/themes/default-304/templates/dns/dns_slave_edit.htm
diff --git a/interface/web/themes/default-v2/templates/dns/dns_slave_list.htm b/interface/web/themes/default-304/templates/dns/dns_slave_list.htm
similarity index 78%
rename from interface/web/themes/default-v2/templates/dns/dns_slave_list.htm
rename to interface/web/themes/default-304/templates/dns/dns_slave_list.htm
index 730b13ae3bef056f00d43d98dfc0346776c63424..d4458e0d9f2221aa9eaaed339546df8bb985a8d5 100644
--- a/interface/web/themes/default-v2/templates/dns/dns_slave_list.htm
+++ b/interface/web/themes/default-304/templates/dns/dns_slave_list.htm
@@ -6,7 +6,7 @@
     <div class="pnl_toolsarea">
         <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
             <div class="buttons">
-                <button class="button iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_slave_edit.php');">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_slave_edit.php');">
                     <span>{tmpl_var name="add_new_record_txt"}</span>
                 </button>
             </div>
@@ -17,21 +17,19 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                <tr class="caption">
+                <tr>
                     <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
                     <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
                     <th class="tbl_col_origin" scope="col"><tmpl_var name="origin_txt"></th>
                     <th class="tbl_col_ns" scope="col"><tmpl_var name="ns_txt"></th>
                     <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
                 </tr>
-                <tr class="filter">
+                <tr>
                     <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
                     <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
                     <td class="tbl_col_origin"><input type="text" name="search_origin" value="{tmpl_var name='search_origin'}" /></td>
                     <td class="tbl_col_ns"><input type="text" name="search_ns" value="{tmpl_var name='search_ns'}" /></td>
-                    <td class="tbl_col_buttons">
-                        <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','dns/dns_slave_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
-                    </td>
+                    <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','dns/dns_slave_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
                 </tr>
                 </thead>
                 <tbody>
@@ -42,7 +40,9 @@
                         <td class="tbl_col_origin"><a href="#" onClick="loadContent('dns/dns_slave_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="origin"}</a></td>
                         <td class="tbl_col_ns"><a href="#" onClick="loadContent('dns/dns_slave_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="ns"}</a></td>
                         <td class="tbl_col_buttons">
-                            <a class="button icons16 icoDelete" href="javascript: del_record('dns/dns_slave_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 class="buttons icons16">    
+                            <a class="icons16 icoDelete" href="javascript: del_record('dns/dns_slave_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>
                     </tr>
                 </tmpl_loop>
diff --git a/interface/web/themes/default-v2/templates/dns/dns_soa_edit.htm b/interface/web/themes/default-304/templates/dns/dns_soa_edit.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/dns/dns_soa_edit.htm
rename to interface/web/themes/default-304/templates/dns/dns_soa_edit.htm
diff --git a/interface/web/themes/default-v2/templates/dns/dns_soa_list.htm b/interface/web/themes/default-304/templates/dns/dns_soa_list.htm
similarity index 70%
rename from interface/web/themes/default-v2/templates/dns/dns_soa_list.htm
rename to interface/web/themes/default-304/templates/dns/dns_soa_list.htm
index 980b002fdd3b39936e8b123b39fbb0511c577a3a..fa09c78e0e7bf902796f2810557ba746c91a3f6d 100644
--- a/interface/web/themes/default-v2/templates/dns/dns_soa_list.htm
+++ b/interface/web/themes/default-304/templates/dns/dns_soa_list.htm
@@ -6,9 +6,9 @@
     <div class="pnl_toolsarea">
         <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
             <div class="buttons">
-                <button class="button iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_wizard.php');"><span>{tmpl_var name="add_new_record_wizard_txt"}</span></button>
-                <button class="button iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_soa_edit.php');"><span>{tmpl_var name="add_new_record_txt"}</span></button>
-                <button class="button iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_import.php');"><span>Import Zone File</span></button>
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_wizard.php');"><span>{tmpl_var name="add_new_record_wizard_txt"}</span></button>
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_soa_edit.php');"><span>{tmpl_var name="add_new_record_txt"}</span></button>
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_import.php');"><span>Import Zone File</span></button>
             </div>
         </fieldset>
     </div>
@@ -17,7 +17,7 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
             <thead>
-                <tr class="caption">
+                <tr>
                     <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
                     <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
                     <th class="tbl_col_origin" scope="col"><tmpl_var name="origin_txt"></th>
@@ -25,15 +25,13 @@
                     <th class="tbl_col_mbox" scope="col"><tmpl_var name="mbox_txt"></th>
                     <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
                 </tr>
-                <tr class="filter">
+                <tr>
                     <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
                     <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
                     <td class="tbl_col_origin"><input type="text" name="search_origin" value="{tmpl_var name='search_origin'}" /></td>
                     <td class="tbl_col_ns"><input type="text" name="search_ns" value="{tmpl_var name='search_ns'}" /></td>
                     <td class="tbl_col_mbox"><input type="text" name="search_mbox" value="{tmpl_var name='search_mbox'}" /></td>
-                    <td class="tbl_col_buttons">
-                        <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','dns/dns_soa_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
-                    </td>
+                    <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','dns/dns_soa_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
                 </tr>
             </thead>
             <tbody>
@@ -44,8 +42,10 @@
                         <td class="tbl_col_origin"><a href="#" onClick="loadContent('dns/dns_soa_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="origin"}</a></td>
                         <td class="tbl_col_ns"><a href="#" onClick="loadContent('dns/dns_soa_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="ns"}</a></td>
                         <td class="tbl_col_mbox"><a href="#" onClick="loadContent('dns/dns_soa_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="mbox"}</a></td>
-                        <td class="tbl_col_buttons">   
-                            <a class="button icons16 icoDelete" href="javascript: del_record('dns/dns_soa_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>
+                        <td class="tbl_col_buttons">
+                            <div class="buttons icons16">    
+                                <a class="icons16 icoDelete" href="javascript: del_record('dns/dns_soa_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>
                     </tr>
                 </tmpl_loop>
diff --git a/interface/web/themes/default-v2/templates/dns/dns_srv_edit.htm b/interface/web/themes/default-304/templates/dns/dns_srv_edit.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/dns/dns_srv_edit.htm
rename to interface/web/themes/default-304/templates/dns/dns_srv_edit.htm
diff --git a/interface/web/themes/default-v2/templates/dns/dns_template_edit.htm b/interface/web/themes/default-304/templates/dns/dns_template_edit.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/dns/dns_template_edit.htm
rename to interface/web/themes/default-304/templates/dns/dns_template_edit.htm
diff --git a/interface/web/themes/default-v2/templates/dns/dns_template_list.htm b/interface/web/themes/default-304/templates/dns/dns_template_list.htm
similarity index 71%
rename from interface/web/themes/default-v2/templates/dns/dns_template_list.htm
rename to interface/web/themes/default-304/templates/dns/dns_template_list.htm
index 87b28387e29ba4d29c4ba95523763de4bf2e5665..7039d34b106220ea8a38639972743660cc568111 100644
--- a/interface/web/themes/default-v2/templates/dns/dns_template_list.htm
+++ b/interface/web/themes/default-304/templates/dns/dns_template_list.htm
@@ -6,7 +6,7 @@
     <div class="pnl_toolsarea">
         <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
             <div class="buttons">
-                <button class="button iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_template_edit.php');">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_template_edit.php');">
                     <span>{tmpl_var name="add_new_record_txt"}</span>
                 </button>
             </div>
@@ -17,17 +17,15 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr class="caption">
+                    <tr>
                         <th class="tbl_col_visible" scope="col"><tmpl_var name="visible_txt"></th>
                         <th class="tbl_col_name" scope="col"><tmpl_var name="name_txt"></th>
                         <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
                     </tr>
-                    <tr class="filter">
+                    <tr>
                         <td class="tbl_col_visible"><select name="search_visible">{tmpl_var name='search_visible'}</select></td>
                         <td class="tbl_col_name"><input type="text" name="search_name" value="{tmpl_var name='search_name'}" /></td>
-                        <td class="tbl_col_buttons">
-                            <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','dns/dns_template_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
-                        </td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','dns/dns_template_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
                     </tr>
                 </thead>
                 <tbody>
@@ -36,7 +34,9 @@
                         <td class="tbl_col_visible"><a href="#" onClick="loadContent('dns/dns_template_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="visible"}</a></td>
                         <td class="tbl_col_name"><a href="#" onClick="loadContent('dns/dns_template_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="name"}</a></td>
                         <td class="tbl_col_buttons">
-                            <a class="button icons16 icoDelete" href="javascript: del_record('dns/dns_template_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 class="buttons icons16">    
+                                <a class="icons16 icoDelete" href="javascript: del_record('dns/dns_template_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>
                     </tr>
                 </tmpl_loop>
diff --git a/interface/web/themes/default-v2/templates/dns/dns_txt_edit.htm b/interface/web/themes/default-304/templates/dns/dns_txt_edit.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/dns/dns_txt_edit.htm
rename to interface/web/themes/default-304/templates/dns/dns_txt_edit.htm
diff --git a/interface/web/themes/default-v2/templates/dns/dns_wizard.htm b/interface/web/themes/default-304/templates/dns/dns_wizard.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/dns/dns_wizard.htm
rename to interface/web/themes/default-304/templates/dns/dns_wizard.htm
diff --git a/interface/web/themes/default-v2/templates/error.tpl.htm b/interface/web/themes/default-304/templates/error.tpl.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/error.tpl.htm
rename to interface/web/themes/default-304/templates/error.tpl.htm
diff --git a/interface/web/themes/default-v2/templates/form.tpl.htm b/interface/web/themes/default-304/templates/form.tpl.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/form.tpl.htm
rename to interface/web/themes/default-304/templates/form.tpl.htm
diff --git a/interface/web/themes/default-v2/templates/help/faq_edit.htm b/interface/web/themes/default-304/templates/help/faq_edit.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/help/faq_edit.htm
rename to interface/web/themes/default-304/templates/help/faq_edit.htm
diff --git a/interface/web/themes/default-v2/templates/help/faq_manage_questions_list.htm b/interface/web/themes/default-304/templates/help/faq_manage_questions_list.htm
similarity index 74%
rename from interface/web/themes/default-v2/templates/help/faq_manage_questions_list.htm
rename to interface/web/themes/default-304/templates/help/faq_manage_questions_list.htm
index ad5d1f8faa5b8539e247227c2accef557383ab9a..c045dfbb1be5c039f1db3c9483d62011ac766c15 100644
--- a/interface/web/themes/default-v2/templates/help/faq_manage_questions_list.htm
+++ b/interface/web/themes/default-304/templates/help/faq_manage_questions_list.htm
@@ -4,7 +4,7 @@
     <div class="pnl_toolsarea">
         <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
             <div class="buttons">
-                <button class="button iconstxt icoAdd" type="button" onclick="loadContent('help/faq_edit.php');">
+                <button class="iconstxt icoAdd" type="button" onclick="loadContent('help/faq_edit.php');">
                     <span>{tmpl_var name="faq_new_question_txt"}</span>
                 </button>
             </div>
@@ -15,7 +15,7 @@
         <fieldset><legend><tmpl_var name="faq_sections_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr class="caption">
+                    <tr>
                         <th class="tbl_col_active" scope="col">{tmpl_var name="faq_question_txt"}</th>
                         <th class="tbl_col_active" scope="col">{tmpl_var name="faq_section_name_txt"}</th>
                         <th class="tbl_col_server_id" scope="col">{tmpl_var name="faq_delete_txt"}</th>
@@ -26,8 +26,10 @@
                     <tr>
                         <td>{tmpl_var name='hf_question'}</td>
                         <td>{tmpl_var name='hf_section'}</td>
-                        <td class="tbl_col_buttons">
-                            <a class="button icons16 icoDelete" href="javascript: del_record('help/faq_delete.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name="faq_delete_txt"}</span></a>
+                        <td>
+                            <div class="buttons icons16">
+                                <a class="icons16 icoDelete" href="javascript: del_record('help/faq_delete.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');">
+                                    <span>{tmpl_var name="faq_delete_txt"}</span></a> </div>
                         </td>
                         <td>
                             <a href="#" onClick="loadContent('help/faq_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="faq_edit_txt"}</a>
diff --git a/interface/web/themes/default-v2/templates/help/faq_sections_edit.htm b/interface/web/themes/default-304/templates/help/faq_sections_edit.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/help/faq_sections_edit.htm
rename to interface/web/themes/default-304/templates/help/faq_sections_edit.htm
diff --git a/interface/web/themes/default-v2/templates/help/help_faq_list.htm b/interface/web/themes/default-304/templates/help/help_faq_list.htm
similarity index 53%
rename from interface/web/themes/default-v2/templates/help/help_faq_list.htm
rename to interface/web/themes/default-304/templates/help/help_faq_list.htm
index 436f515597190d7d66a5d35f83ae373ee977d618..6af928f7676e2479e7d9c6865c4ff7c95a69da1d 100644
--- a/interface/web/themes/default-v2/templates/help/help_faq_list.htm
+++ b/interface/web/themes/default-304/templates/help/help_faq_list.htm
@@ -5,7 +5,9 @@
         {tmpl_var name='hf_answer'}
     </p>
     <tmpl_if name='is_admin'>
-        <a class="button icons16 icoDelete" href="javascript: del_record('help/faq_delete.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>Delete</span></a>
+        <div class="buttons icons16">
+            <a class="icons16 icoDelete" href="javascript: del_record('help/faq_delete.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>Delete</span></a>
+        </div>
         <a href="#" onClick="loadContent('help/faq_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="edit_txt"}</a>
         <br/>
         <br/>
diff --git a/interface/web/themes/default-v2/templates/help/help_faq_sections_list.htm b/interface/web/themes/default-304/templates/help/help_faq_sections_list.htm
similarity index 71%
rename from interface/web/themes/default-v2/templates/help/help_faq_sections_list.htm
rename to interface/web/themes/default-304/templates/help/help_faq_sections_list.htm
index 8f1db6ea4991ade6bd2ffed8ba68604142d3d5a7..ddb1a560e10705ed672000cc1cfb37e55cd4afcd 100644
--- a/interface/web/themes/default-v2/templates/help/help_faq_sections_list.htm
+++ b/interface/web/themes/default-304/templates/help/help_faq_sections_list.htm
@@ -6,7 +6,7 @@
     <div class="pnl_toolsarea">
         <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
             <div class="buttons">
-                <button class="button iconstxt icoAdd" type="button" onclick="loadContent('help/faq_sections_edit.php');">
+                <button class="iconstxt icoAdd" type="button" onclick="loadContent('help/faq_sections_edit.php');">
                     <span>{tmpl_var name="faq_new_section_txt"}</span>
                 </button>
             </div>
@@ -17,7 +17,7 @@
         <fieldset><legend><tmpl_var name="faq_sections_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr class="caption">
+                    <tr>
                         <th class="tbl_col_active" scope="col">{tmpl_var name="faq_section_name_txt"}</th>
                         <th class="tbl_col_server_id" scope="col">{tmpl_var name="faq_delete_txt"}</th>
                         <th class="tbl_col_domain" scope="col">{tmpl_var name="faq_edit_txt"}</th>
@@ -27,9 +27,11 @@
                     <tr>
                         <td><b>{tmpl_var name='hfs_name'}</b></td>
                         <td>
-                            <a class="button icons16 icoDelete" href="javascript: del_record('help/faq_sections_delete.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name="faq_delete_txt"}</span></a>
-                        </td>
-                        <td>
+                            <div class="buttons icons16">
+                                <a class="icons16 icoDelete" href="javascript: del_record('help/faq_sections_delete.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');">
+                                    <span>{tmpl_var name="faq_delete_txt"}</span></a> </div>
+                        </td><td>
+
                             <a href="#" onClick="loadContent('help/faq_sections_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="faq_edit_txt"}</a>
                         </td>
                     </tr>
diff --git a/interface/web/themes/default-v2/templates/help/support_message_edit.htm b/interface/web/themes/default-304/templates/help/support_message_edit.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/help/support_message_edit.htm
rename to interface/web/themes/default-304/templates/help/support_message_edit.htm
diff --git a/interface/web/themes/default-v2/templates/help/support_message_list.htm b/interface/web/themes/default-304/templates/help/support_message_list.htm
similarity index 71%
rename from interface/web/themes/default-v2/templates/help/support_message_list.htm
rename to interface/web/themes/default-304/templates/help/support_message_list.htm
index 6a7d6d640e7a898c53cd7e99707aa0b0b5bc3889..e828fe9e5750d4a53f38525fe69c26c08657f504 100644
--- a/interface/web/themes/default-v2/templates/help/support_message_list.htm
+++ b/interface/web/themes/default-304/templates/help/support_message_list.htm
@@ -6,7 +6,7 @@
     <div class="pnl_toolsarea">
         <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
             <div class="buttons">
-                <button class="button iconstxt icoAdd" type="button" onClick="loadContent('help/support_message_edit.php');">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('help/support_message_edit.php');">
                     <span>{tmpl_var name="add_new_record_txt"}</span>
                 </button>
             </div>
@@ -17,17 +17,15 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr class="caption">
+                    <tr>
                         <th class="tbl_col_sender_id" scope="col"><tmpl_var name="sender_id_txt"></th>
                         <th class="tbl_col_subject" scope="col"><tmpl_var name="subject_txt"></th>
                         <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
                     </tr>
-                    <tr class="filter">
+                    <tr>
                         <td class="tbl_col_sender_id"><select name="search_sender_id">{tmpl_var name='search_sender_id'}</select></td>
                         <td class="tbl_col_subject"><input type="text" name="search_subject" value="{tmpl_var name='search_subject'}" /></td>
-                        <td class="tbl_col_buttons">
-                            <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','help/support_message_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
-                        </td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','help/support_message_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
                     </tr>
                 </thead>
                 <tbody>
@@ -36,7 +34,9 @@
                             <td class="tbl_col_sender_id"><a href="#" onClick="loadContent('help/support_message_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="sender_id"}</a></td>
                             <td class="tbl_col_subject"><a href="#" onClick="loadContent('help/support_message_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="subject"}</a></td>
                             <td class="tbl_col_buttons">
-                                <a class="button icons16 icoDelete" href="javascript: del_record('help/support_message_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 class="buttons icons16">    
+                                    <a class="icons16 icoDelete" href="javascript: del_record('help/support_message_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>
                         </tr>
                     </tmpl_loop>
diff --git a/interface/web/themes/default-v2/templates/help/support_message_view.htm b/interface/web/themes/default-304/templates/help/support_message_view.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/help/support_message_view.htm
rename to interface/web/themes/default-304/templates/help/support_message_view.htm
diff --git a/interface/web/themes/default-v2/templates/listpage.tpl.htm b/interface/web/themes/default-304/templates/listpage.tpl.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/listpage.tpl.htm
rename to interface/web/themes/default-304/templates/listpage.tpl.htm
diff --git a/interface/web/themes/default-v2/templates/login/index.htm b/interface/web/themes/default-304/templates/login/index.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/login/index.htm
rename to interface/web/themes/default-304/templates/login/index.htm
diff --git a/interface/web/themes/default-v2/templates/login/password_reset.htm b/interface/web/themes/default-304/templates/login/password_reset.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/login/password_reset.htm
rename to interface/web/themes/default-304/templates/login/password_reset.htm
diff --git a/interface/web/themes/default-v2/templates/mail/mail_alias_edit.htm b/interface/web/themes/default-304/templates/mail/mail_alias_edit.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/mail/mail_alias_edit.htm
rename to interface/web/themes/default-304/templates/mail/mail_alias_edit.htm
diff --git a/interface/web/themes/default-v2/templates/mail/mail_alias_list.htm b/interface/web/themes/default-304/templates/mail/mail_alias_list.htm
similarity index 77%
rename from interface/web/themes/default-v2/templates/mail/mail_alias_list.htm
rename to interface/web/themes/default-304/templates/mail/mail_alias_list.htm
index b6935a75a55362dc56f929d37c225489612e6119..92755ddb9fff7536a5238f89cacfb71d79b6e065 100644
--- a/interface/web/themes/default-v2/templates/mail/mail_alias_list.htm
+++ b/interface/web/themes/default-304/templates/mail/mail_alias_list.htm
@@ -6,7 +6,7 @@
     <div class="pnl_toolsarea">
         <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
             <div class="buttons">
-                <button class="button iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_alias_edit.php');">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_alias_edit.php');">
                     <span>{tmpl_var name="add_new_record_txt"}</span>
                 </button>
             </div>
@@ -17,19 +17,17 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr class="caption">
+                    <tr>
                         <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
                         <th class="tbl_col_source" scope="col"><tmpl_var name="source_txt"></th>
                         <th class="tbl_col_destination" scope="col"><tmpl_var name="destination_txt"></th>
                         <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
                     </tr>
-                    <tr class="filter">
+                    <tr>
                         <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
                         <td class="tbl_col_source"><input type="text" name="search_source" value="{tmpl_var name='search_source'}" /></td>
                         <td class="tbl_col_destination"><input type="text" name="search_destination" value="{tmpl_var name='search_destination'}" /></td>
-                        <td class="tbl_col_buttons">
-                            <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_alias_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
-                        </td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_alias_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
                     </tr>
                 </thead>
                 <tbody>
@@ -39,7 +37,9 @@
                             <td class="tbl_col_source"><a href="#" onClick="loadContent('mail/mail_alias_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="source"}</a></td>
                             <td class="tbl_col_destination"><a href="#" onClick="loadContent('mail/mail_alias_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="destination"}</a></td>
                             <td class="tbl_col_buttons">
-                                <a class="button icons16 icoDelete" href="javascript: del_record('mail/mail_alias_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 class="buttons icons16">    
+                                <a class="icons16 icoDelete" href="javascript: del_record('mail/mail_alias_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>
                         </tr>
                     </tmpl_loop>
diff --git a/interface/web/themes/default-v2/templates/mail/mail_aliasdomain_edit.htm b/interface/web/themes/default-304/templates/mail/mail_aliasdomain_edit.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/mail/mail_aliasdomain_edit.htm
rename to interface/web/themes/default-304/templates/mail/mail_aliasdomain_edit.htm
diff --git a/interface/web/themes/default-v2/templates/mail/mail_aliasdomain_list.htm b/interface/web/themes/default-304/templates/mail/mail_aliasdomain_list.htm
similarity index 75%
rename from interface/web/themes/default-v2/templates/mail/mail_aliasdomain_list.htm
rename to interface/web/themes/default-304/templates/mail/mail_aliasdomain_list.htm
index 5303a78b43dcc9a9527232365c28039774f7579a..d75c236e6479c9f0e849dfe1b690644be845e4fa 100644
--- a/interface/web/themes/default-v2/templates/mail/mail_aliasdomain_list.htm
+++ b/interface/web/themes/default-304/templates/mail/mail_aliasdomain_list.htm
@@ -6,7 +6,7 @@
     <div class="pnl_toolsarea">
         <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
             <div class="buttons">
-                <button class="button iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_aliasdomain_edit.php');">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_aliasdomain_edit.php');">
                     <span>{tmpl_var name="add_new_record_txt"}</span>
                 </button>
             </div>
@@ -17,19 +17,17 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr class="caption">
+                    <tr>
                         <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
                         <th class="tbl_col_source" scope="col"><tmpl_var name="source_txt"></th>
                         <th class="tbl_col_destination" scope="col"><tmpl_var name="destination_txt"></th>
                         <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
                     </tr>
-                    <tr class="filter">
+                    <tr>
                         <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
                         <td class="tbl_col_source"><input type="text" name="search_source" value="{tmpl_var name='search_source'}" /></td>
                         <td class="tbl_col_destination"><input type="text" name="search_destination" value="{tmpl_var name='search_destination'}" /></td>
-                        <td class="tbl_col_buttons">
-                            <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_aliasdomain_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
-                        </td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_aliasdomain_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
                     </tr>
                 </thead>
                 <tbody>
@@ -39,7 +37,9 @@
                             <td class="tbl_col_source"><a href="#" onClick="loadContent('mail/mail_aliasdomain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="source"}</a></td>
                             <td class="tbl_col_destination"><a href="#" onClick="loadContent('mail/mail_aliasdomain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="destination"}</a></td>
                             <td class="tbl_col_buttons">
-                                <a class="button icons16 icoDelete" href="javascript: del_record('mail/mail_aliasdomain_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 class="buttons icons16">    
+                                    <a class="icons16 icoDelete" href="javascript: del_record('mail/mail_aliasdomain_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>
                         </tr>
                     </tmpl_loop>
diff --git a/interface/web/themes/default-v2/templates/mail/mail_blacklist_edit.htm b/interface/web/themes/default-304/templates/mail/mail_blacklist_edit.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/mail/mail_blacklist_edit.htm
rename to interface/web/themes/default-304/templates/mail/mail_blacklist_edit.htm
diff --git a/interface/web/themes/default-v2/templates/mail/mail_blacklist_list.htm b/interface/web/themes/default-304/templates/mail/mail_blacklist_list.htm
similarity index 77%
rename from interface/web/themes/default-v2/templates/mail/mail_blacklist_list.htm
rename to interface/web/themes/default-304/templates/mail/mail_blacklist_list.htm
index cb410099a57aaf1cd17f76da57ac4e9278af5dcc..6dd81c62c59318fc69c6843cab4bdc8501b2dd7c 100644
--- a/interface/web/themes/default-v2/templates/mail/mail_blacklist_list.htm
+++ b/interface/web/themes/default-304/templates/mail/mail_blacklist_list.htm
@@ -6,7 +6,7 @@
     <div class="pnl_toolsarea">
         <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
             <div class="buttons">
-                <button class="button iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_blacklist_edit.php');">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_blacklist_edit.php');">
                     <span>{tmpl_var name="add_new_record_txt"}</span>
                 </button>
             </div>
@@ -17,21 +17,19 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr class="caption">
+                    <tr>
                         <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
                         <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
                         <th class="tbl_col_source" scope="col"><tmpl_var name="source_txt"></th>
                         <th class="tbl_col_type" scope="col"><tmpl_var name="type_txt"></th>
                         <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
                     </tr>
-                    <tr class="filter">
+                    <tr>
                         <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
                         <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
                         <td class="tbl_col_source"><input type="text" name="search_source" value="{tmpl_var name='search_source'}" /></td>
                         <td class="tbl_col_type"><select name="search_type">{tmpl_var name='search_type'}</select></td>
-                        <td class="tbl_col_buttons">
-                            <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_blacklist_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
-                        </td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_blacklist_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
                     </tr>
                 </thead>
                 <tbody>
@@ -42,7 +40,9 @@
                             <td class="tbl_col_source"><a href="#" onClick="loadContent('mail/mail_blacklist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="source"}</a></td>
                             <td class="tbl_col_type"><a href="#" onClick="loadContent('mail/mail_blacklist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="type"}</a></td>
                             <td class="tbl_col_buttons">
-                                <a class="button icons16 icoDelete" href="javascript: del_record('mail/mail_blacklist_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 class="buttons icons16">    
+                                    <a class="icons16 icoDelete" href="javascript: del_record('mail/mail_blacklist_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>
                         </tr>
                     </tmpl_loop>
diff --git a/interface/web/themes/default-v2/templates/mail/mail_content_filter_edit.htm b/interface/web/themes/default-304/templates/mail/mail_content_filter_edit.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/mail/mail_content_filter_edit.htm
rename to interface/web/themes/default-304/templates/mail/mail_content_filter_edit.htm
diff --git a/interface/web/themes/default-v2/templates/mail/mail_content_filter_list.htm b/interface/web/themes/default-304/templates/mail/mail_content_filter_list.htm
similarity index 77%
rename from interface/web/themes/default-v2/templates/mail/mail_content_filter_list.htm
rename to interface/web/themes/default-304/templates/mail/mail_content_filter_list.htm
index c55d9990abe12a5ca97c1baa824de81f6021d3f1..fda80a6cc141ff969ce94dff2f380a31411b5906 100644
--- a/interface/web/themes/default-v2/templates/mail/mail_content_filter_list.htm
+++ b/interface/web/themes/default-304/templates/mail/mail_content_filter_list.htm
@@ -6,7 +6,7 @@
     <div class="pnl_toolsarea">
         <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
             <div class="buttons">
-                <button class="button iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_content_filter_edit.php');">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_content_filter_edit.php');">
                     <span>{tmpl_var name="add_new_record_txt"}</span>
                 </button>
             </div>
@@ -17,21 +17,19 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr class="caption">
+                    <tr>
                         <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
                         <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
                         <th class="tbl_col_pattern" scope="col"><tmpl_var name="pattern_txt"></th>
                         <th class="tbl_col_action" scope="col"><tmpl_var name="action_txt"></th>
                         <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
                     </tr>
-                    <tr class="filter">
+                    <tr>
                         <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
                         <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
                         <td class="tbl_col_pattern"><input type="text" name="search_pattern" value="{tmpl_var name='search_pattern'}" /></td>
                         <td class="tbl_col_action"><select name="search_action">{tmpl_var name='search_action'}</select></td>
-                        <td class="tbl_col_buttons">
-                            <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_content_filter_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
-                        </td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_content_filter_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
                     </tr>
                 </thead>
                 <tbody>
@@ -42,7 +40,9 @@
                             <td class="tbl_col_pattern"><a href="#" onClick="loadContent('mail/mail_content_filter_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="pattern"}</a></td>
                             <td class="tbl_col_action"><a href="#" onClick="loadContent('mail/mail_content_filter_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="action"}</a></td>
                             <td class="tbl_col_buttons">
-                                <a class="button icons16 icoDelete" href="javascript: del_record('mail/mail_content_filter_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 class="buttons icons16">    
+                                    <a class="icons16 icoDelete" href="javascript: del_record('mail/mail_content_filter_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>
                         </tr>
                     </tmpl_loop>
diff --git a/interface/web/themes/default-v2/templates/mail/mail_domain_admin_list.htm b/interface/web/themes/default-304/templates/mail/mail_domain_admin_list.htm
similarity index 77%
rename from interface/web/themes/default-v2/templates/mail/mail_domain_admin_list.htm
rename to interface/web/themes/default-304/templates/mail/mail_domain_admin_list.htm
index 7fae59575e4dfdb405502596239267d6d9ee6ba3..4b26fb14c7cbb5a6b70bad3ba096213237f6782e 100644
--- a/interface/web/themes/default-v2/templates/mail/mail_domain_admin_list.htm
+++ b/interface/web/themes/default-304/templates/mail/mail_domain_admin_list.htm
@@ -5,7 +5,7 @@
     <div class="pnl_toolsarea">
         <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
             <div class="buttons">
-                <button class="button iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_domain_edit.php');">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_domain_edit.php');">
                     <span>{tmpl_var name="add_new_record_txt"}</span>
                 </button>
             </div>
@@ -16,21 +16,19 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr class="caption">
+                    <tr>
                         <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
                         <th class="tbl_col_sys_groupid" scope="col"><tmpl_var name="sys_groupid_txt"></th>
                         <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
                         <th class="tbl_col_domain" scope="col"><tmpl_var name="domain_txt"></th>
                         <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
                     </tr>
-                    <tr class="filter">
+                    <tr>
                         <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
                         <td class="tbl_col_sys_groupid"><select name="search_sys_groupid">{tmpl_var name='search_sys_groupid'}</select></td>
                         <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
                         <td class="tbl_col_domain"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td>
-                        <td class="tbl_col_buttons">
-                            <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_domain_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
-                        </td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_domain_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
                     </tr>
                 </thead>
                 <tbody>
@@ -41,7 +39,9 @@
                             <td class="tbl_col_server_id"><a href="#" onClick="loadContent('mail/mail_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
                             <td class="tbl_col_domain"><a href="#" onClick="loadContent('mail/mail_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="domain"}</a></td>
                             <td class="tbl_col_buttons">
-                                <a class="button icons16 icoDelete" href="javascript: del_record('mail/mail_domain_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 class="buttons icons16">    
+                                    <a class="icons16 icoDelete" href="javascript: del_record('mail/mail_domain_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>
                         </tr>
                     </tmpl_loop>
diff --git a/interface/web/themes/default-v2/templates/mail/mail_domain_catchall_edit.htm b/interface/web/themes/default-304/templates/mail/mail_domain_catchall_edit.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/mail/mail_domain_catchall_edit.htm
rename to interface/web/themes/default-304/templates/mail/mail_domain_catchall_edit.htm
diff --git a/interface/web/themes/default-v2/templates/mail/mail_domain_catchall_list.htm b/interface/web/themes/default-304/templates/mail/mail_domain_catchall_list.htm
similarity index 74%
rename from interface/web/themes/default-v2/templates/mail/mail_domain_catchall_list.htm
rename to interface/web/themes/default-304/templates/mail/mail_domain_catchall_list.htm
index 1800917bc30385399cbb4f87bcb5562b5aa1eeff..d608425ddb16c27c8e7ab5ad280d21721cda7ccd 100644
--- a/interface/web/themes/default-v2/templates/mail/mail_domain_catchall_list.htm
+++ b/interface/web/themes/default-304/templates/mail/mail_domain_catchall_list.htm
@@ -6,7 +6,7 @@
     <div class="pnl_toolsarea">
         <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
             <div class="buttons">
-                <button class="button iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_domain_catchall_edit.php');">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_domain_catchall_edit.php');">
                     <span>{tmpl_var name="add_new_record_txt"}</span>
                 </button>
             </div>
@@ -17,19 +17,17 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr class="caption">
+                    <tr>
                         <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
                         <th class="tbl_col_source" scope="col"><tmpl_var name="source_txt"></th>
                         <th class="tbl_col_destination" scope="col"><tmpl_var name="destination_txt"></th>
                         <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
                     </tr>
-                    <tr class="filter">
+                    <tr>
                         <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
                         <td class="tbl_col_source"><input type="text" name="search_source" value="{tmpl_var name='search_source'}" /></td>
                         <td class="tbl_col_destination"><input type="text" name="search_destination" value="{tmpl_var name='search_destination'}" /></td>
-                        <td class="tbl_col_buttons">
-                            <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_domain_catchall_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
-                        </td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_domain_catchall_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
                     </tr>
                 </thead>
                 <tbody>
@@ -39,7 +37,9 @@
                             <td class="tbl_col_source"><a href="#" onClick="loadContent('mail/mail_domain_catchall_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="source"}</a></td>
                             <td class="tbl_col_destination"><a href="#" onClick="loadContent('mail/mail_domain_catchall_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="destination"}</a></td>
                             <td class="tbl_col_buttons">
-                                <a class="button icons16 icoDelete" href="javascript: del_record('mail/mail_domain_catchall_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 class="buttons icons16">    
+                                    <a class="icons16 icoDelete" href="javascript: del_record('mail/mail_domain_catchall_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>
                         </tr>
                     </tmpl_loop>
diff --git a/interface/web/themes/default-v2/templates/mail/mail_domain_edit.htm b/interface/web/themes/default-304/templates/mail/mail_domain_edit.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/mail/mail_domain_edit.htm
rename to interface/web/themes/default-304/templates/mail/mail_domain_edit.htm
diff --git a/interface/web/themes/default-v2/templates/mail/mail_domain_list.htm b/interface/web/themes/default-304/templates/mail/mail_domain_list.htm
similarity index 75%
rename from interface/web/themes/default-v2/templates/mail/mail_domain_list.htm
rename to interface/web/themes/default-304/templates/mail/mail_domain_list.htm
index 0b888bd85179656ea7dd67b182a3de92bc1cf21c..958f7430043af1860451dd5a0ae80d83b1a86e54 100644
--- a/interface/web/themes/default-v2/templates/mail/mail_domain_list.htm
+++ b/interface/web/themes/default-304/templates/mail/mail_domain_list.htm
@@ -6,7 +6,7 @@
     <div class="pnl_toolsarea">
         <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
             <div class="buttons">
-                <button class="button iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_domain_edit.php');">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_domain_edit.php');">
                     <span>{tmpl_var name="add_new_record_txt"}</span>
                 </button>
             </div>
@@ -17,19 +17,17 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr class="caption">
+                    <tr>
                         <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
                         <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
                         <th class="tbl_col_domain" scope="col"><tmpl_var name="domain_txt"></th>
                         <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
                     </tr>
-                    <tr class="filter">
+                    <tr>
                         <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
                         <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
                         <td class="tbl_col_domain"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td>
-                        <td class="tbl_col_buttons">
-                            <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_domain_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
-                        </td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_domain_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
                     </tr>
                 </thead>
                 <tbody>
@@ -39,7 +37,9 @@
                             <td class="tbl_col_server_id"><a href="#" onClick="loadContent('mail/mail_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
                             <td class="tbl_col_domain"><a href="#" onClick="loadContent('mail/mail_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="domain"}</a></td>
                             <td class="tbl_col_buttons">
-                                <a class="button icons16 icoDelete" href="javascript: del_record('mail/mail_domain_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 class="buttons icons16">    
+                                    <a class="icons16 icoDelete" href="javascript: del_record('mail/mail_domain_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>
                         </tr>
                     </tmpl_loop>
diff --git a/interface/web/themes/default-v2/templates/mail/mail_forward_edit.htm b/interface/web/themes/default-304/templates/mail/mail_forward_edit.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/mail/mail_forward_edit.htm
rename to interface/web/themes/default-304/templates/mail/mail_forward_edit.htm
diff --git a/interface/web/themes/default-v2/templates/mail/mail_forward_list.htm b/interface/web/themes/default-304/templates/mail/mail_forward_list.htm
similarity index 75%
rename from interface/web/themes/default-v2/templates/mail/mail_forward_list.htm
rename to interface/web/themes/default-304/templates/mail/mail_forward_list.htm
index 83d1be39790637cec76162270e534c8353024fbf..24a0538802aff71f7c5c09125c20f8c347a616d8 100644
--- a/interface/web/themes/default-v2/templates/mail/mail_forward_list.htm
+++ b/interface/web/themes/default-304/templates/mail/mail_forward_list.htm
@@ -6,7 +6,7 @@
     <div class="pnl_toolsarea">
         <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
             <div class="buttons">
-                <button class="button iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_forward_edit.php');">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_forward_edit.php');">
                     <span>{tmpl_var name="add_new_record_txt"}</span>
                 </button>
             </div>
@@ -17,19 +17,17 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                <tr class="caption">
+                <tr>
                         <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
                         <th class="tbl_col_source" scope="col"><tmpl_var name="source_txt"></th>
                         <th class="tbl_col_destination" scope="col"><tmpl_var name="destination_txt"></th>
                         <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
                     </tr>
-                    <tr class="filter">
+                    <tr>
                         <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
                         <td class="tbl_col_source"><input type="text" name="search_source" value="{tmpl_var name='search_source'}" /></td>
                         <td class="tbl_col_destination"><input type="text" name="search_destination" value="{tmpl_var name='search_destination'}" /></td>
-                        <td class="tbl_col_buttons">
-                            <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_forward_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
-                        </td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_forward_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
                     </tr>
                 </thead>
                 <tbody>
@@ -39,7 +37,9 @@
                             <td class="tbl_col_source"><a href="#" onClick="loadContent('mail/mail_forward_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="source"}</a></td>
                             <td class="tbl_col_destination"><a href="#" onClick="loadContent('mail/mail_forward_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="destination"}</a></td>
                             <td class="tbl_col_buttons">
-                                <a class="button icons16 icoDelete" href="javascript: del_record('mail/mail_forward_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 class="buttons icons16">    
+                                    <a class="icons16 icoDelete" href="javascript: del_record('mail/mail_forward_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>
                         </tr>
                     </tmpl_loop>
diff --git a/interface/web/themes/default-v2/templates/mail/mail_get_edit.htm b/interface/web/themes/default-304/templates/mail/mail_get_edit.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/mail/mail_get_edit.htm
rename to interface/web/themes/default-304/templates/mail/mail_get_edit.htm
diff --git a/interface/web/themes/default-v2/templates/mail/mail_get_list.htm b/interface/web/themes/default-304/templates/mail/mail_get_list.htm
similarity index 80%
rename from interface/web/themes/default-v2/templates/mail/mail_get_list.htm
rename to interface/web/themes/default-304/templates/mail/mail_get_list.htm
index 34b731849eb346ed08dca57eba8bd9ad107fe34a..2997bf77c52c9e6a941e659293a828b265663a3b 100644
--- a/interface/web/themes/default-v2/templates/mail/mail_get_list.htm
+++ b/interface/web/themes/default-304/templates/mail/mail_get_list.htm
@@ -6,7 +6,7 @@
     <div class="pnl_toolsarea">
         <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
             <div class="buttons">
-                <button class="button iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_get_edit.php');">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_get_edit.php');">
                     <span>{tmpl_var name="add_new_record_txt"}</span>
                 </button>
             </div>
@@ -17,7 +17,7 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr class="caption">
+                    <tr>
                         <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
                         <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
                         <th class="tbl_col_source_server" scope="col"><tmpl_var name="source_server_txt"></th>
@@ -25,15 +25,13 @@
                         <th class="tbl_col_destination" scope="col"><tmpl_var name="destination_txt"></th>
                         <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
                     </tr>
-                    <tr class="filter">
+                    <tr>
                         <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
                         <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
                         <td class="tbl_col_source_server"><input type="text" name="search_source_server" value="{tmpl_var name='search_source_server'}" /></td>
                         <td class="tbl_col_source_username"><input type="text" name="search_source_username" value="{tmpl_var name='search_source_username'}" /></td>
                         <td class="tbl_col_destination"><input type="text" name="search_destination" value="{tmpl_var name='search_destination'}" /></td>
-                        <td class="tbl_col_buttons">
-                            <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_get_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
-                        </td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_get_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
                     </tr>
                 </thead>
                 <tbody>
@@ -45,7 +43,9 @@
                             <td class="tbl_col_source_username"><a href="#" onClick="loadContent('mail/mail_get_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="source_username"}</a></td>
                             <td class="tbl_col_destination"><a href="#" onClick="loadContent('mail/mail_get_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="destination"}</a></td>
                             <td class="tbl_col_buttons">
-                                <a class="button icons16 icoDelete" href="javascript: del_record('mail/mail_get_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 class="buttons icons16">    
+                                    <a class="icons16 icoDelete" href="javascript: del_record('mail/mail_get_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>
                         </tr>
                     </tmpl_loop>
diff --git a/interface/web/themes/default-v2/templates/mail/mail_mailinglist_edit.htm b/interface/web/themes/default-304/templates/mail/mail_mailinglist_edit.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/mail/mail_mailinglist_edit.htm
rename to interface/web/themes/default-304/templates/mail/mail_mailinglist_edit.htm
diff --git a/interface/web/themes/default-v2/templates/mail/mail_mailinglist_list.htm b/interface/web/themes/default-304/templates/mail/mail_mailinglist_list.htm
similarity index 65%
rename from interface/web/themes/default-v2/templates/mail/mail_mailinglist_list.htm
rename to interface/web/themes/default-304/templates/mail/mail_mailinglist_list.htm
index 0b9e6b9b68ffca8ad9b3d630f8e6f06d42145fe7..cbb572f746c372d41314e39ae535625c69b70aae 100644
--- a/interface/web/themes/default-v2/templates/mail/mail_mailinglist_list.htm
+++ b/interface/web/themes/default-304/templates/mail/mail_mailinglist_list.htm
@@ -5,7 +5,7 @@
     <div class="pnl_toolsarea">
         <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
             <div class="buttons">
-                <button class="button iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_mailinglist_edit.php');">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_mailinglist_edit.php');">
                     <span>{tmpl_var name="add_new_record_txt"}</span>
                 </button>
             </div>
@@ -16,17 +16,15 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr class="caption">
+                    <tr>
                         <th class="tbl_col_listname" scope="col"><tmpl_var name="listname_txt"></th>
                         <th class="tbl_col_domain" scope="col"><tmpl_var name="domain_txt"></th>
                         <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
                     </tr>
-                    <tr class="filter">
+                    <tr>
                         <td class="tbl_col_listname"><input type="text" name="search_listname" value="{tmpl_var name='search_listname'}" /></td>
                         <td class="tbl_col_domain"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td>
-                        <td class="tbl_col_buttons">
-                            <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_mailinglist_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
-                        </td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_mailinglist_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
                     </tr>
                 </thead>
                 <tbody>
@@ -35,10 +33,10 @@
                             <td class="tbl_col_listname"><a href="#" onClick="loadContent('mail/mail_mailinglist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="listname"}</a></td>
                             <td class="tbl_col_domain"><a href="#" onClick="loadContent('mail/mail_mailinglist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="domain"}</a></td>
                             <td class="tbl_col_buttons">
-                                <tmpl_if name="mailmailinglist_link">
-                                    <a class="button icons16 icoWebmailer" href="mail/mailinglist.php?id={tmpl_var name='id'}" target="mailmailinglist"><span>{tmpl_var name='delete_txt'}</span></a>
-                                </tmpl_if>
-                                <a class="button icons16 icoDelete" href="javascript: del_record('mail/mail_mailinglist_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 class="buttons icons16">
+                                                    <tmpl_if name="mailmailinglist_link"><a class="icons16 icoWebmailer" href="mail/mailinglist.php?id={tmpl_var name='id'}" target="mailmailinglist"><span>{tmpl_var name='delete_txt'}</span></a></tmpl_if>
+                                    <a class="icons16 icoDelete" href="javascript: del_record('mail/mail_mailinglist_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>
                         </tr>
                     </tmpl_loop>
diff --git a/interface/web/themes/default-v2/templates/mail/mail_relay_recipient_edit.htm b/interface/web/themes/default-304/templates/mail/mail_relay_recipient_edit.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/mail/mail_relay_recipient_edit.htm
rename to interface/web/themes/default-304/templates/mail/mail_relay_recipient_edit.htm
diff --git a/interface/web/themes/default-v2/templates/mail/mail_relay_recipient_list.htm b/interface/web/themes/default-304/templates/mail/mail_relay_recipient_list.htm
similarity index 74%
rename from interface/web/themes/default-v2/templates/mail/mail_relay_recipient_list.htm
rename to interface/web/themes/default-304/templates/mail/mail_relay_recipient_list.htm
index c86e68f2b7810df982ea32f5cbc9cab14e0904da..7aeb45f7dc4f39c8a22cc3ef116e322dc0a40948 100644
--- a/interface/web/themes/default-v2/templates/mail/mail_relay_recipient_list.htm
+++ b/interface/web/themes/default-304/templates/mail/mail_relay_recipient_list.htm
@@ -5,7 +5,7 @@
     <div class="pnl_toolsarea">
         <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
         <div class="buttons">
-            <button class="button iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_relay_recipient_edit.php');">
+            <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_relay_recipient_edit.php');">
             <span>{tmpl_var name="add_new_record_txt"}</span>
             </button>
         </div>
@@ -16,19 +16,17 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr class="caption">
+                    <tr>
                         <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
                         <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
                         <th class="tbl_col_source" scope="col"><tmpl_var name="source_txt"></th>
                         <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
                     </tr>
-                    <tr class="filter">
+                    <tr>
                         <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
                         <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
                         <td class="tbl_col_source"><input type="text" name="search_source" value="{tmpl_var name='search_source'}" /></td>
-                        <td class="tbl_col_buttons">
-                            <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_relay_recipient_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
-                        </td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_relay_recipient_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
                     </tr>
                 </thead>
                 <tbody>
@@ -38,7 +36,9 @@
                             <td class="tbl_col_server_id"><a href="#" onClick="loadContent('mail/mail_relay_recipient_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
                             <td class="tbl_col_source"><a href="#" onClick="loadContent('mail/mail_relay_recipient_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="source"}</a></td>
                             <td class="tbl_col_buttons">
-                                <a class="button icons16 icoDelete" href="javascript: del_record('mail/mail_relay_recipient_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 class="buttons icons16">    
+                                    <a class="icons16 icoDelete" href="javascript: del_record('mail/mail_relay_recipient_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>
                         </tr>
                     </tmpl_loop>
diff --git a/interface/web/themes/default-v2/templates/mail/mail_transport_edit.htm b/interface/web/themes/default-304/templates/mail/mail_transport_edit.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/mail/mail_transport_edit.htm
rename to interface/web/themes/default-304/templates/mail/mail_transport_edit.htm
diff --git a/interface/web/themes/default-v2/templates/mail/mail_transport_list.htm b/interface/web/themes/default-304/templates/mail/mail_transport_list.htm
similarity index 80%
rename from interface/web/themes/default-v2/templates/mail/mail_transport_list.htm
rename to interface/web/themes/default-304/templates/mail/mail_transport_list.htm
index 70bd71745fa56556ec021430a05aaafd4bbdc029..3f56fb5d2358d4ce93af209876bd318dc753e6a7 100644
--- a/interface/web/themes/default-v2/templates/mail/mail_transport_list.htm
+++ b/interface/web/themes/default-304/templates/mail/mail_transport_list.htm
@@ -6,7 +6,7 @@
     <div class="pnl_toolsarea">
         <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
             <div class="buttons">
-                <button class="button iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_transport_edit.php');">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_transport_edit.php');">
                     <span>{tmpl_var name="add_new_record_txt"}</span>
                 </button>
             </div>
@@ -17,7 +17,7 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr class="caption">
+                    <tr>
                         <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
                         <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
                         <th class="tbl_col_domain" scope="col"><tmpl_var name="domain_txt"></th>
@@ -25,15 +25,13 @@
                         <th class="tbl_col_sort_order" scope="col"><tmpl_var name="sort_order_txt"></th>
                         <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
                     </tr>
-                    <tr class="filter">
+                    <tr>
                         <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
                         <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
                         <td class="tbl_col_domain"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td>
                         <td class="tbl_col_transport"><input type="text" name="search_transport" value="{tmpl_var name='search_transport'}" /></td>
                         <td class="tbl_col_sort_order"><input type="text" name="search_sort_order" value="{tmpl_var name='search_sort_order'}" /></td>
-                        <td class="tbl_col_buttons">
-                            <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_transport_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
-                        </td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_transport_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
                     </tr>
                 </thead>
                 <tbody>
@@ -45,7 +43,9 @@
                             <td class="tbl_col_transport"><a href="#" onClick="loadContent('mail/mail_transport_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="transport"}</a></td>
                             <td class="tbl_col_sort_order"><a href="#" onClick="loadContent('mail/mail_transport_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="sort_order"}</a></td>
                             <td class="tbl_col_buttons">
-                                <a class="button icons16 icoDelete" href="javascript: del_record('mail/mail_transport_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 class="buttons icons16">    
+                                    <a class="icons16 icoDelete" href="javascript: del_record('mail/mail_transport_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>
                         </tr>
                     </tmpl_loop>
diff --git a/interface/web/themes/default-v2/templates/mail/mail_user_autoresponder_edit.htm b/interface/web/themes/default-304/templates/mail/mail_user_autoresponder_edit.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/mail/mail_user_autoresponder_edit.htm
rename to interface/web/themes/default-304/templates/mail/mail_user_autoresponder_edit.htm
diff --git a/interface/web/themes/default-v2/templates/mail/mail_user_custom_rules_edit.htm b/interface/web/themes/default-304/templates/mail/mail_user_custom_rules_edit.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/mail/mail_user_custom_rules_edit.htm
rename to interface/web/themes/default-304/templates/mail/mail_user_custom_rules_edit.htm
diff --git a/interface/web/themes/default-v2/templates/mail/mail_user_filter_edit.htm b/interface/web/themes/default-304/templates/mail/mail_user_filter_edit.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/mail/mail_user_filter_edit.htm
rename to interface/web/themes/default-304/templates/mail/mail_user_filter_edit.htm
diff --git a/interface/web/themes/default-v2/templates/mail/mail_user_filter_list.htm b/interface/web/themes/default-304/templates/mail/mail_user_filter_list.htm
similarity index 63%
rename from interface/web/themes/default-v2/templates/mail/mail_user_filter_list.htm
rename to interface/web/themes/default-304/templates/mail/mail_user_filter_list.htm
index 018e82562c58a0afdb1a2c75866ebc1b0e072a2b..f270944bbe4e779c74b385d78633073f0d9f6d22 100644
--- a/interface/web/themes/default-v2/templates/mail/mail_user_filter_list.htm
+++ b/interface/web/themes/default-304/templates/mail/mail_user_filter_list.htm
@@ -2,7 +2,7 @@
 <div class="pnl_toolsarea">
     <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
         <div class="buttons">
-            <button class="button iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_user_filter_edit.php?mailuser_id={tmpl_var name='parent_id'}');">
+            <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_user_filter_edit.php?mailuser_id={tmpl_var name='parent_id'}');">
                 <span>{tmpl_var name="add_new_record_txt"}</span>
             </button>
         </div>
@@ -13,15 +13,13 @@
     <fieldset><legend><tmpl_var name="list_head_txt"></legend>
         <table class="list">
             <thead>
-                <tr class="caption">
+                <tr>
                     <th class="tbl_col_rulename" scope="col"><tmpl_var name="rulename_txt"></th>
                     <th class="tbl_col_buttons" scope="col">{tmpl_var name='search_limit'}</th>
                 </tr>
-                <tr class="filter">
+                <tr>
                     <td class="tbl_col_rulename"><input type="text" name="search_rulename" value="{tmpl_var name='search_rulename'}" /></td>
-                    <td class="tbl_col_buttons">
-                        <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="changeTab('filter_records','mail/mail_user_edit.php');"><span>{tmpl_var name="filter_txt"}</span></button>
-                    </td>
+                    <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="changeTab('filter_records','mail/mail_user_edit.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
                 </tr>
             </thead>
             <tbody>
@@ -29,7 +27,9 @@
                     <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
                         <td class="tbl_col_rulename"><a href="#" onClick="loadContent('mail/mail_user_filter_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="rulename"}</a></td>
                         <td class="tbl_col_buttons">
-                            <a class="button icons16 icoDelete" href="javascript: del_record('mail/mail_user_filter_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 class="buttons icons16">    
+                                <a class="icons16 icoDelete" href="javascript: del_record('mail/mail_user_filter_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>
                     </tr>
                 </tmpl_loop>
diff --git a/interface/web/themes/default-v2/templates/mail/mail_user_list.htm b/interface/web/themes/default-304/templates/mail/mail_user_list.htm
similarity index 74%
rename from interface/web/themes/default-v2/templates/mail/mail_user_list.htm
rename to interface/web/themes/default-304/templates/mail/mail_user_list.htm
index 66ff0b0fb01a7eeeee927edcb951173561243b51..8e1dda458b49dcd6d9f446c806ddde31bca06e55 100644
--- a/interface/web/themes/default-v2/templates/mail/mail_user_list.htm
+++ b/interface/web/themes/default-304/templates/mail/mail_user_list.htm
@@ -6,7 +6,7 @@
     <div class="pnl_toolsarea">
         <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
             <div class="buttons">
-                <button class="button iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_user_edit.php');">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_user_edit.php');">
                     <span>{tmpl_var name="add_new_record_txt"}</span>
                 </button>
             </div>
@@ -17,21 +17,19 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr class="caption">
+                    <tr>
                         <th class="tbl_col_email" scope="col"><tmpl_var name="email_txt"></th>
                 <tmpl_if name="enable_custom_login"><th class="tbl_col_login" scope="col"><tmpl_var name="login_txt"></th></tmpl_if>
                 <th class="tbl_col_name" scope="col"><tmpl_var name="name_txt"></th>
                         <th class="tbl_col_autoresponder" scope="col"><tmpl_var name="autoresponder_txt"></th>
                         <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
                     </tr>
-                    <tr class="filter">
+                    <tr>
                         <td class="tbl_col_email"><input type="text" name="search_email" value="{tmpl_var name='search_email'}" /></td>
                                     <td class="tbl_col_name"><input type="text" name="search_name" value="{tmpl_var name='search_name'}" /></td>
             <tmpl_if name="enable_custom_login"><td class="tbl_col_login"><input type="text" name="search_login" value="{tmpl_var name='search_login'}" /></td></tmpl_if>
                         <td class="tbl_col_autoresponder"><select name="search_autoresponder">{tmpl_var name='search_autoresponder'}</select></td>
-                        <td class="tbl_col_buttons">
-                            <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_user_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
-                        </td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_user_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
                     </tr>
                 </thead>
                 <tbody>
@@ -46,10 +44,12 @@
                         <td class="tbl_col_name"><a href="#" onClick="loadContent('mail/mail_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="name"}</a></td>
                         <td class="tbl_col_autoresponder"><a href="#" onClick="loadContent('mail/mail_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="autoresponder"}</a></td>
                         <td class="tbl_col_buttons">
-                            <tmpl_if name="mailboxlist_webmail_link">
-                                <a class="button icons16 icoWebmailer" href="mail/webmailer.php?id={tmpl_var name='id'}" target="webmail"><span>{tmpl_var name='delete_txt'}</span></a>
-                            </tmpl_if>
-                            <a class="button icons16 icoDelete" href="javascript: del_record('mail/mail_user_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 class="buttons icons16">    
+                                <tmpl_if name="mailboxlist_webmail_link">
+                                    <a class="icons16 icoWebmailer" href="mail/webmailer.php?id={tmpl_var name='id'}" target="webmail"><span>{tmpl_var name='delete_txt'}</span></a>
+                                </tmpl_if>
+                                <a class="icons16 icoDelete" href="javascript: del_record('mail/mail_user_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>
                     </tr>
                 </tmpl_loop>
diff --git a/interface/web/themes/default-v2/templates/mail/mail_user_mailbox_edit.htm b/interface/web/themes/default-304/templates/mail/mail_user_mailbox_edit.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/mail/mail_user_mailbox_edit.htm
rename to interface/web/themes/default-304/templates/mail/mail_user_mailbox_edit.htm
diff --git a/interface/web/themes/default-v2/templates/mail/mail_user_mailfilter_edit.htm b/interface/web/themes/default-304/templates/mail/mail_user_mailfilter_edit.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/mail/mail_user_mailfilter_edit.htm
rename to interface/web/themes/default-304/templates/mail/mail_user_mailfilter_edit.htm
diff --git a/interface/web/themes/default-v2/templates/mail/mail_user_stats_list.htm b/interface/web/themes/default-304/templates/mail/mail_user_stats_list.htm
similarity index 82%
rename from interface/web/themes/default-v2/templates/mail/mail_user_stats_list.htm
rename to interface/web/themes/default-304/templates/mail/mail_user_stats_list.htm
index fac9fa9d1dd4610715f05b29059b38bca669d521..2000f34b46e4e287228300ac159d930a9ffe9ff5 100644
--- a/interface/web/themes/default-v2/templates/mail/mail_user_stats_list.htm
+++ b/interface/web/themes/default-304/templates/mail/mail_user_stats_list.htm
@@ -7,7 +7,7 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr class="caption">
+                    <tr>
                         <th class="tbl_col_email" scope="col"><tmpl_var name="email_txt"></th>
                         <th class="tbl_col_mail_traffic_this_month" scope="col"><tmpl_var name="this_month_txt"></th>
                         <th class="tbl_col_mail_traffic_last_month" scope="col"><tmpl_var name="last_month_txt"></th>
@@ -15,15 +15,13 @@
                         <th class="tbl_col_mail_traffic_last_year" scope="col"><tmpl_var name="last_year_txt"></th>
                         <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
                     </tr>
-                    <tr class="filter">
+                    <tr>
                         <td class="tbl_col_email"><input type="text" name="search_email" value="{tmpl_var name='search_email'}" /></td>
                         <td class="tbl_col_this_month"></td>
                         <td class="tbl_col_last_month"></td>
                         <td class="tbl_col_this_year"></td>
                         <td class="tbl_col_last_year"></td>
-                        <td class="tbl_col_buttons">
-                            <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_user_stats.php');"><span>{tmpl_var name="filter_txt"}</span></button>
-                        </td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_user_stats.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
                     </tr>
                 </thead>
                 <tbody>
@@ -34,7 +32,11 @@
                             <td class="tbl_col_last_month"><a href="#" onClick="loadContent('mail/mail_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="last_month"} MB</a></td>
                             <td class="tbl_col_this_year"><a href="#" onClick="loadContent('mail/mail_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="this_year"} MB</a></td>
                             <td class="tbl_col_last_year"><a href="#" onClick="loadContent('mail/mail_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="last_year"} MB</a></td>
-                            <td class="tbl_col_buttons"></td>
+                            <td class="tbl_col_buttons">
+                                <div class="buttons icons16">
+                                    &nbsp;
+                                </div>
+                            </td>
                         </tr>
                     </tmpl_loop>
                 </tbody>
diff --git a/interface/web/themes/default-v2/templates/mail/mail_whitelist_edit.htm b/interface/web/themes/default-304/templates/mail/mail_whitelist_edit.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/mail/mail_whitelist_edit.htm
rename to interface/web/themes/default-304/templates/mail/mail_whitelist_edit.htm
diff --git a/interface/web/themes/default-v2/templates/mail/mail_whitelist_list.htm b/interface/web/themes/default-304/templates/mail/mail_whitelist_list.htm
similarity index 77%
rename from interface/web/themes/default-v2/templates/mail/mail_whitelist_list.htm
rename to interface/web/themes/default-304/templates/mail/mail_whitelist_list.htm
index 043875a0f5ba586fe71ba39c526630038500db02..219345fe08c84b4e5b7577851a9691d781a82300 100644
--- a/interface/web/themes/default-v2/templates/mail/mail_whitelist_list.htm
+++ b/interface/web/themes/default-304/templates/mail/mail_whitelist_list.htm
@@ -6,7 +6,7 @@
     <div class="pnl_toolsarea">
         <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
             <div class="buttons">
-                <button class="button iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_whitelist_edit.php');">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_whitelist_edit.php');">
                     <span>{tmpl_var name="add_new_record_txt"}</span>
                 </button>
             </div>
@@ -17,21 +17,19 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr class="caption">
+                    <tr>
                         <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
                         <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
                         <th class="tbl_col_source" scope="col"><tmpl_var name="source_txt"></th>
                         <th class="tbl_col_type" scope="col"><tmpl_var name="type_txt"></th>
                         <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
                     </tr>
-                    <tr class="filter">
+                    <tr>
                         <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
                         <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
                         <td class="tbl_col_source"><input type="text" name="search_source" value="{tmpl_var name='search_source'}" /></td>
                         <td class="tbl_col_type"><select name="search_type">{tmpl_var name='search_type'}</select></td>
-                        <td class="tbl_col_buttons">
-                            <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_whitelist_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
-                        </td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_whitelist_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
                     </tr>
                 </thead>
                 <tbody>
@@ -42,7 +40,9 @@
                             <td class="tbl_col_source"><a href="#" onClick="loadContent('mail/mail_whitelist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="source"}</a></td>
                             <td class="tbl_col_type"><a href="#" onClick="loadContent('mail/mail_whitelist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="type"}</a></td>
                             <td class="tbl_col_buttons">
-                                <a class="button icons16 icoDelete" href="javascript: del_record('mail/mail_whitelist_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 class="buttons icons16">    
+                                    <a class="icons16 icoDelete" href="javascript: del_record('mail/mail_whitelist_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>
                         </tr>
                     </tmpl_loop>
diff --git a/interface/web/themes/default-v2/templates/mail/spamfilter_blacklist_edit.htm b/interface/web/themes/default-304/templates/mail/spamfilter_blacklist_edit.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/mail/spamfilter_blacklist_edit.htm
rename to interface/web/themes/default-304/templates/mail/spamfilter_blacklist_edit.htm
diff --git a/interface/web/themes/default-v2/templates/mail/spamfilter_blacklist_list.htm b/interface/web/themes/default-304/templates/mail/spamfilter_blacklist_list.htm
similarity index 79%
rename from interface/web/themes/default-v2/templates/mail/spamfilter_blacklist_list.htm
rename to interface/web/themes/default-304/templates/mail/spamfilter_blacklist_list.htm
index 181c68649866608197696db2630c629aa3798b44..8a05d36a00adb4db0d2719db011ff2bc3af38083 100644
--- a/interface/web/themes/default-v2/templates/mail/spamfilter_blacklist_list.htm
+++ b/interface/web/themes/default-304/templates/mail/spamfilter_blacklist_list.htm
@@ -6,7 +6,7 @@
     <div class="pnl_toolsarea">
         <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
             <div class="buttons">
-                <button class="button iconstxt icoAdd" type="button" onClick="loadContent('mail/spamfilter_blacklist_edit.php');">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/spamfilter_blacklist_edit.php');">
                     <span>{tmpl_var name="add_new_record_txt"}</span>
                 </button>
             </div>
@@ -17,7 +17,7 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr class="caption">
+                    <tr>
                         <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
                         <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
                         <th class="tbl_col_priority" scope="col"><tmpl_var name="priority_txt"></th>
@@ -25,15 +25,13 @@
                         <th class="tbl_col_email" scope="col"><tmpl_var name="email_txt"></th>
                         <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
                     </tr>
-                    <tr class="filter">
+                    <tr>
                         <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
                         <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
                         <td class="tbl_col_priority"><select name="search_priority">{tmpl_var name='search_priority'}</select></td>
                         <td class="tbl_col_rid"><select name="search_rid">{tmpl_var name='search_rid'}</select></td>
                         <td class="tbl_col_email"><input type="text" name="search_email" value="{tmpl_var name='search_email'}" /></td>
-                        <td class="tbl_col_buttons">
-                            <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/spamfilter_blacklist_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
-                        </td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/spamfilter_blacklist_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
                     </tr>
                 </thead>
                 <tbody>
@@ -45,7 +43,9 @@
                             <td class="tbl_col_rid"><a href="#" onClick="loadContent('mail/spamfilter_blacklist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="rid"}</a></td>
                             <td class="tbl_col_email"><a href="#" onClick="loadContent('mail/spamfilter_blacklist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="email"}</a></td>
                             <td class="tbl_col_buttons">
-                                <a class="button icons16 icoDelete" href="javascript: del_record('mail/spamfilter_blacklist_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 class="buttons icons16">    
+                                    <a class="icons16 icoDelete" href="javascript: del_record('mail/spamfilter_blacklist_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>
                         </tr>
                     </tmpl_loop>
diff --git a/interface/web/themes/default-v2/templates/mail/spamfilter_config_getmail_edit.htm b/interface/web/themes/default-304/templates/mail/spamfilter_config_getmail_edit.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/mail/spamfilter_config_getmail_edit.htm
rename to interface/web/themes/default-304/templates/mail/spamfilter_config_getmail_edit.htm
diff --git a/interface/web/themes/default-v2/templates/mail/spamfilter_config_list.htm b/interface/web/themes/default-304/templates/mail/spamfilter_config_list.htm
similarity index 67%
rename from interface/web/themes/default-v2/templates/mail/spamfilter_config_list.htm
rename to interface/web/themes/default-304/templates/mail/spamfilter_config_list.htm
index 5f6a28f572e138fc972b92d4a240d471c8382631..b84a77f9aa9f76828200e58ae1954c39bd5a344f 100644
--- a/interface/web/themes/default-v2/templates/mail/spamfilter_config_list.htm
+++ b/interface/web/themes/default-304/templates/mail/spamfilter_config_list.htm
@@ -6,7 +6,7 @@
     <div class="pnl_toolsarea">
         <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
             <div class="buttons">
-                <button class="button iconstxt icoAdd" type="button" onClick="loadContent('mail/spamfilter_config_edit.php');">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/spamfilter_config_edit.php');">
                     <span>{tmpl_var name="add_new_record_txt"}</span>
                 </button>
             </div>
@@ -17,15 +17,13 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr class="caption">
+                    <tr>
                         <th class="tbl_col_server_name" scope="col"><tmpl_var name="server_name_txt"></th>
                         <th class="tbl_col_buttons" scope="col">&nbsp;</th>
                     </tr>
-                    <tr class="filter">
+                    <tr>
                         <td class="tbl_col_server_name"><input type="text" name="search_server_name" value="{tmpl_var name='search_server_name'}" /></td>
-                        <td class="tbl_col_buttons">
-                            <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/spamfilter_config_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
-                        </td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/spamfilter_config_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
                     </tr>
                 </thead>
                 <tbody>
@@ -33,7 +31,9 @@
                         <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
                             <td class="tbl_col_server_name"><a href="#" onClick="loadContent('mail/spamfilter_config_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_name"}</a></td>
                             <td class="tbl_col_buttons">
-                                <a class="button icons16 icoDelete" href="javascript: del_record('mail/spamfilter_config_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 class="buttons icons16">    
+                                    <a class="icons16 icoDelete" href="javascript: del_record('mail/spamfilter_config_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>
                         </tr>
                     </tmpl_loop>
diff --git a/interface/web/themes/default-v2/templates/mail/spamfilter_config_mail_edit.htm b/interface/web/themes/default-304/templates/mail/spamfilter_config_mail_edit.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/mail/spamfilter_config_mail_edit.htm
rename to interface/web/themes/default-304/templates/mail/spamfilter_config_mail_edit.htm
diff --git a/interface/web/themes/default-v2/templates/mail/spamfilter_config_server_edit.htm b/interface/web/themes/default-304/templates/mail/spamfilter_config_server_edit.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/mail/spamfilter_config_server_edit.htm
rename to interface/web/themes/default-304/templates/mail/spamfilter_config_server_edit.htm
diff --git a/interface/web/themes/default-v2/templates/mail/spamfilter_other_edit.htm b/interface/web/themes/default-304/templates/mail/spamfilter_other_edit.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/mail/spamfilter_other_edit.htm
rename to interface/web/themes/default-304/templates/mail/spamfilter_other_edit.htm
diff --git a/interface/web/themes/default-v2/templates/mail/spamfilter_policy_edit.htm b/interface/web/themes/default-304/templates/mail/spamfilter_policy_edit.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/mail/spamfilter_policy_edit.htm
rename to interface/web/themes/default-304/templates/mail/spamfilter_policy_edit.htm
diff --git a/interface/web/themes/default-v2/templates/mail/spamfilter_policy_list.htm b/interface/web/themes/default-304/templates/mail/spamfilter_policy_list.htm
similarity index 80%
rename from interface/web/themes/default-v2/templates/mail/spamfilter_policy_list.htm
rename to interface/web/themes/default-304/templates/mail/spamfilter_policy_list.htm
index 653c4bcaed874563fc3a6ea802b85b7b0da83e3c..48d323f775458fc4ee4b8e761f1e00af8a04d76c 100644
--- a/interface/web/themes/default-v2/templates/mail/spamfilter_policy_list.htm
+++ b/interface/web/themes/default-304/templates/mail/spamfilter_policy_list.htm
@@ -6,7 +6,7 @@
     <div class="pnl_toolsarea">
         <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
             <div class="buttons">
-                <button class="button iconstxt icoAdd" type="button" onClick="loadContent('mail/spamfilter_policy_edit.php');">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/spamfilter_policy_edit.php');">
                     <span>{tmpl_var name="add_new_record_txt"}</span>
                 </button>
             </div>
@@ -17,7 +17,7 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr class="caption">
+                    <tr>
                         <th class="tbl_col_policy_name" scope="col"><tmpl_var name="policy_name_txt"></th>
                         <th class="tbl_col_virus_lover" scope="col"><tmpl_var name="virus_lover_txt"></th>
                         <th class="tbl_col_spam_lover" scope="col"><tmpl_var name="spam_lover_txt"></th>
@@ -25,15 +25,13 @@
                         <th class="tbl_col_bad_header_lover" scope="col"><tmpl_var name="bad_header_lover_txt"></th>
                         <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
                     </tr>
-                    <tr class="filter">
+                    <tr>
                         <td class="tbl_col_policy_name"><input type="text" name="search_policy_name" value="{tmpl_var name='search_policy_name'}" /></td>
                         <td class="tbl_col_virus_lover"><select name="search_virus_lover">{tmpl_var name='search_virus_lover'}</select></td>
                         <td class="tbl_col_spam_lover"><select name="search_spam_lover">{tmpl_var name='search_spam_lover'}</select></td>
                         <td class="tbl_col_banned_files_lover"><select name="search_banned_files_lover">{tmpl_var name='search_banned_files_lover'}</select></td>
                         <td class="tbl_col_bad_header_lover"><select name="search_bad_header_lover">{tmpl_var name='search_bad_header_lover'}</select></td>
-                        <td class="tbl_col_buttons">
-                            <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/spamfilter_policy_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
-                        </td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/spamfilter_policy_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
                     </tr>
                 </thead>
                 <tbody>
@@ -45,7 +43,9 @@
                         <td class="tbl_col_banned_files_lover"><a href="#" onClick="loadContent('mail/spamfilter_policy_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="banned_files_lover"}</a></td>
                         <td class="tbl_col_bad_header_lover"><a href="#" onClick="loadContent('mail/spamfilter_policy_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="bad_header_lover"}</a></td>
                         <td class="tbl_col_buttons">
-                            <a class="button icons16 icoDelete" href="javascript: del_record('mail/spamfilter_policy_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 class="buttons icons16">    
+                                <a class="icons16 icoDelete" href="javascript: del_record('mail/spamfilter_policy_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>
                     </tr>
                 </tmpl_loop>
diff --git a/interface/web/themes/default-v2/templates/mail/spamfilter_quarantine_edit.htm b/interface/web/themes/default-304/templates/mail/spamfilter_quarantine_edit.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/mail/spamfilter_quarantine_edit.htm
rename to interface/web/themes/default-304/templates/mail/spamfilter_quarantine_edit.htm
diff --git a/interface/web/themes/default-v2/templates/mail/spamfilter_taglevel_edit.htm b/interface/web/themes/default-304/templates/mail/spamfilter_taglevel_edit.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/mail/spamfilter_taglevel_edit.htm
rename to interface/web/themes/default-304/templates/mail/spamfilter_taglevel_edit.htm
diff --git a/interface/web/themes/default-v2/templates/mail/spamfilter_users_edit.htm b/interface/web/themes/default-304/templates/mail/spamfilter_users_edit.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/mail/spamfilter_users_edit.htm
rename to interface/web/themes/default-304/templates/mail/spamfilter_users_edit.htm
diff --git a/interface/web/themes/default-v2/templates/mail/spamfilter_users_list.htm b/interface/web/themes/default-304/templates/mail/spamfilter_users_list.htm
similarity index 79%
rename from interface/web/themes/default-v2/templates/mail/spamfilter_users_list.htm
rename to interface/web/themes/default-304/templates/mail/spamfilter_users_list.htm
index 39c4ef8686346be57c07ba3efca5473d777c2985..280e7664f87d5b775e0bb0e69c78c53328b17fb6 100644
--- a/interface/web/themes/default-v2/templates/mail/spamfilter_users_list.htm
+++ b/interface/web/themes/default-304/templates/mail/spamfilter_users_list.htm
@@ -6,7 +6,7 @@
     <div class="pnl_toolsarea">
         <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
             <div class="buttons">
-                <button class="button iconstxt icoAdd" type="button" onClick="loadContent('mail/spamfilter_users_edit.php');">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/spamfilter_users_edit.php');">
                     <span>{tmpl_var name="add_new_record_txt"}</span>
                 </button>
             </div>
@@ -17,7 +17,7 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr class="caption">
+                    <tr>
                         <th class="tbl_col_local" scope="col"><tmpl_var name="local_txt"></th>
                         <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
                         <th class="tbl_col_priority" scope="col"><tmpl_var name="priority_txt"></th>
@@ -25,15 +25,13 @@
                         <th class="tbl_col_fullname" scope="col"><tmpl_var name="fullname_txt"></th>
                         <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
                     </tr>
-                    <tr class="filter">
+                    <tr>
                         <td class="tbl_col_local"><select name="search_local">{tmpl_var name='search_local'}</select></td>
                         <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
                         <td class="tbl_col_priority"><select name="search_priority">{tmpl_var name='search_priority'}</select></td>
                         <td class="tbl_col_policy_id"><select name="search_policy_id">{tmpl_var name='search_policy_id'}</select></td>
                         <td class="tbl_col_fullname"><input type="text" name="search_fullname" value="{tmpl_var name='search_fullname'}" /></td>
-                        <td class="tbl_col_buttons">
-                            <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/spamfilter_users_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
-                        </td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/spamfilter_users_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
                     </tr>
                 </thead>
                 <tbody>
@@ -45,7 +43,9 @@
                         <td class="tbl_col_policy_id"><a href="#" onClick="loadContent('mail/spamfilter_users_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="policy_id"}</a></td>
                         <td class="tbl_col_fullname"><a href="#" onClick="loadContent('mail/spamfilter_users_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="fullname"}</a></td>
                         <td class="tbl_col_buttons">
-                            <a class="button icons16 icoDelete" href="javascript: del_record('mail/spamfilter_users_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 class="buttons icons16">    
+                                <a class="icons16 icoDelete" href="javascript: del_record('mail/spamfilter_users_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>
                     </tr>
                     </tmpl_loop>
diff --git a/interface/web/themes/default-v2/templates/mail/spamfilter_whitelist_edit.htm b/interface/web/themes/default-304/templates/mail/spamfilter_whitelist_edit.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/mail/spamfilter_whitelist_edit.htm
rename to interface/web/themes/default-304/templates/mail/spamfilter_whitelist_edit.htm
diff --git a/interface/web/themes/default-v2/templates/mail/spamfilter_whitelist_list.htm b/interface/web/themes/default-304/templates/mail/spamfilter_whitelist_list.htm
similarity index 79%
rename from interface/web/themes/default-v2/templates/mail/spamfilter_whitelist_list.htm
rename to interface/web/themes/default-304/templates/mail/spamfilter_whitelist_list.htm
index 9cb4ba6bbbb83cab53fe962dea51d4bae7433723..6c7ff3d834a530f69249443c13bc44153409783e 100644
--- a/interface/web/themes/default-v2/templates/mail/spamfilter_whitelist_list.htm
+++ b/interface/web/themes/default-304/templates/mail/spamfilter_whitelist_list.htm
@@ -6,7 +6,7 @@
     <div class="pnl_toolsarea">
         <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
             <div class="buttons">
-                <button class="button iconstxt icoAdd" type="button" onClick="loadContent('mail/spamfilter_whitelist_edit.php');">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/spamfilter_whitelist_edit.php');">
                     <span>{tmpl_var name="add_new_record_txt"}</span>
                 </button>
             </div>
@@ -17,7 +17,7 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr class="caption">
+                    <tr>
                         <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
                         <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
                         <th class="tbl_col_priority" scope="col"><tmpl_var name="priority_txt"></th>
@@ -25,15 +25,13 @@
                         <th class="tbl_col_email" scope="col"><tmpl_var name="email_txt"></th>
                         <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
                     </tr>
-                    <tr class="filter">
+                    <tr>
                         <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
                         <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
                         <td class="tbl_col_priority"><select name="search_priority">{tmpl_var name='search_priority'}</select></td>
                         <td class="tbl_col_rid"><select name="search_rid">{tmpl_var name='search_rid'}</select></td>
                         <td class="tbl_col_email"><input type="text" name="search_email" value="{tmpl_var name='search_email'}" /></td>
-                        <td class="tbl_col_buttons">
-                            <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/spamfilter_whitelist_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
-                        </td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/spamfilter_whitelist_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
                     </tr>
                 </thead>
                 <tbody>
@@ -45,7 +43,9 @@
                             <td class="tbl_col_rid"><a href="#" onClick="loadContent('mail/spamfilter_whitelist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="rid"}</a></td>
                             <td class="tbl_col_email"><a href="#" onClick="loadContent('mail/spamfilter_whitelist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="email"}</a></td>
                             <td class="tbl_col_buttons">
-                                <a class="button icons16 icoDelete" href="javascript: del_record('mail/spamfilter_whitelist_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 class="buttons icons16">    
+                                    <a class="icons16 icoDelete" href="javascript: del_record('mail/spamfilter_whitelist_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>
                         </tr>
                     </tmpl_loop>
diff --git a/interface/web/themes/default-304/templates/mail/user_quota_stats_list.htm b/interface/web/themes/default-304/templates/mail/user_quota_stats_list.htm
new file mode 100644
index 0000000000000000000000000000000000000000..b4f3c1e2f67b30198bdc67bad92e1f63f74dbdc5
--- /dev/null
+++ b/interface/web/themes/default-304/templates/mail/user_quota_stats_list.htm
@@ -0,0 +1,52 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_list_user_quota_stats">
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_email" scope="col"><tmpl_var name="email_txt"></th>
+                        <th class="tbl_col_name" scope="col"><tmpl_var name="name_txt"></th>
+                        <th class="" scope="col" style="text-align:right;"><tmpl_var name="used_txt"></th>
+                        <th class="" scope="col" style="text-align:right;"><tmpl_var name="quota_txt"></th>
+                        <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_domain"><input type="text" name="search_email" value="{tmpl_var name='search_email'}" /></td>
+                        <td class="tbl_col_system_user"><input type="text" name="search_system_user" value="{tmpl_var name='search_name'}" /></td>
+                        <td class="tbl_col_system_user">&nbsp;</td>
+                        <td class="tbl_col_system_user">&nbsp;</td>
+                        <td class="tbl_col_buttons">
+                            <div class="buttons">
+                                <button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/user_quota_stats.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+                            </div>
+                        </td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tmpl_loop name="records">
+                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                            <td class="tbl_col_email"><a href="#" onClick="loadContent('mail/mail_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="email"}</a></td>
+                            <td class="tbl_col_name"><a href="#" onClick="loadContent('mail/mail_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="name"}</a></td>
+                            <td class="tbl_col_used" style="text-align:right;"><a href="#" onClick="loadContent('mail/mail_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="used"}</a></td>
+                            <td class="tbl_col_limit" style="text-align:right;"><a href="#" onClick="loadContent('mail/mail_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="quota"}</a></td>
+                            <td class="tbl_col_buttons">
+                                <div class="buttons icons16">    
+                                    &nbsp;
+                                </div>
+                            </td>
+                        </tr>
+                    </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="5"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
diff --git a/interface/web/themes/default-v2/templates/mailuser/index.htm b/interface/web/themes/default-304/templates/mailuser/index.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/mailuser/index.htm
rename to interface/web/themes/default-304/templates/mailuser/index.htm
diff --git a/interface/web/themes/default-v2/templates/mailuser/mail_user_autoresponder_edit.htm b/interface/web/themes/default-304/templates/mailuser/mail_user_autoresponder_edit.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/mailuser/mail_user_autoresponder_edit.htm
rename to interface/web/themes/default-304/templates/mailuser/mail_user_autoresponder_edit.htm
diff --git a/interface/web/themes/default-v2/templates/mailuser/mail_user_cc_edit.htm b/interface/web/themes/default-304/templates/mailuser/mail_user_cc_edit.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/mailuser/mail_user_cc_edit.htm
rename to interface/web/themes/default-304/templates/mailuser/mail_user_cc_edit.htm
diff --git a/interface/web/themes/default-v2/templates/mailuser/mail_user_filter_edit.htm b/interface/web/themes/default-304/templates/mailuser/mail_user_filter_edit.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/mailuser/mail_user_filter_edit.htm
rename to interface/web/themes/default-304/templates/mailuser/mail_user_filter_edit.htm
diff --git a/interface/web/themes/default-v2/templates/mailuser/mail_user_filter_list.htm b/interface/web/themes/default-304/templates/mailuser/mail_user_filter_list.htm
similarity index 66%
rename from interface/web/themes/default-v2/templates/mailuser/mail_user_filter_list.htm
rename to interface/web/themes/default-304/templates/mailuser/mail_user_filter_list.htm
index a303d03484106644bc601268d1aabcf457762627..b8501e8ddee0d579964fcfbe93acb752db795a0e 100644
--- a/interface/web/themes/default-v2/templates/mailuser/mail_user_filter_list.htm
+++ b/interface/web/themes/default-304/templates/mailuser/mail_user_filter_list.htm
@@ -5,7 +5,7 @@
   <div class="pnl_toolsarea">
     <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
       <div class="buttons">
-        <button class="button iconstxt icoAdd" type="button" onClick="loadContent('mailuser/mail_user_filter_edit.php');">
+        <button class="iconstxt icoAdd" type="button" onClick="loadContent('mailuser/mail_user_filter_edit.php');">
           <span>{tmpl_var name="add_new_record_txt"}</span>
         </button>
       </div>
@@ -16,15 +16,13 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                <tr class="caption">
+                <tr>
                     <th class="tbl_col_rulename" scope="col"><tmpl_var name="rulename_txt"></th>
                     <th class="tbl_col_buttons" scope="col">&nbsp;</th>
                 </tr>
-                <tr class="filter">
+                <tr>
                     <td class="tbl_col_rulename"><input type="text" name="search_rulename" value="{tmpl_var name='search_rulename'}" /></td>
-                    <td class="tbl_col_buttons">
-                        <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_user_edit.php');"><span>{tmpl_var name="filter_txt"}</span></button>
-                    </td>
+                    <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_user_edit.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
                 </tr>
                 </thead>
                 <tbody>
@@ -32,7 +30,9 @@
                 <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
                     <td class="tbl_col_rulename"><a href="#" onClick="loadContent('mailuser/mail_user_filter_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="rulename"}</a></td>
                     <td class="tbl_col_buttons">
-                        <a class="button icons16 icoDelete" href="javascript: del_record('mailuser/mail_user_filter_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 class="buttons icons16">    
+                        <a class="icons16 icoDelete" href="javascript: del_record('mailuser/mail_user_filter_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>
                 </tr>
                 </tmpl_loop>
diff --git a/interface/web/themes/default-v2/templates/mailuser/mail_user_password_edit.htm b/interface/web/themes/default-304/templates/mailuser/mail_user_password_edit.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/mailuser/mail_user_password_edit.htm
rename to interface/web/themes/default-304/templates/mailuser/mail_user_password_edit.htm
diff --git a/interface/web/themes/default-v2/templates/mailuser/mail_user_spamfilter_edit.htm b/interface/web/themes/default-304/templates/mailuser/mail_user_spamfilter_edit.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/mailuser/mail_user_spamfilter_edit.htm
rename to interface/web/themes/default-304/templates/mailuser/mail_user_spamfilter_edit.htm
diff --git a/interface/web/themes/default-304/templates/main.tpl.htm b/interface/web/themes/default-304/templates/main.tpl.htm
new file mode 100644
index 0000000000000000000000000000000000000000..9707eecf21f4feeadde539958b509d9f8734ec38
--- /dev/null
+++ b/interface/web/themes/default-304/templates/main.tpl.htm
@@ -0,0 +1,177 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+    <head>
+        <title><tmpl_var name="app_title"> <tmpl_var name="app_version"></title>
+        <meta http-equiv="Content-Type" content="text/html; charset=<tmpl_var name="html_content_encoding">"/>
+        <meta http-equiv="X-UA-Compatible" content="IE=8"/>
+        <link href="themes/default/css/central.css" rel="stylesheet" type="text/css"/>
+        <!--[if lte IE 7]>
+                <link href="themes/default/css/patches/central.css" rel="stylesheet" type="text/css" />
+        <![endif]-->
+        <!--[if lte ie 6]>
+          <style type="text/css" media="screen">
+            /*
+            Move these to your IE specific stylesheet if possible
+            */
+            .uniForm,
+            .uniForm fieldset,
+            .uniForm .ctrlHolder,
+            .uniForm .formHint,
+            .uniForm .buttonHolder, 
+            .uniForm .ctrlHolder .multiField,
+            .uniForm .inlineLabel{ zoom:1; }
+                
+            .uniForm .inlineLabels label, .uniForm .inlineLabels .label,
+            .uniForm .blockLabels label, .uniForm .blockLabels .label,
+            .uniForm .inlineLabel span{ padding-bottom: .2em; }
+                
+            .uniForm .inlineLabel input,
+            .uniForm .inlineLabels .inlineLabel input,
+            .uniForm .blockLabels .inlineLabel input{ margin-top: -.3em; }
+          </style>
+        <![endif]-->
+        <!--[if gt ie 6]>
+          <style type="text/css" media="screen">
+            /*
+            Move these to your IE specific stylesheet if possible
+            */
+            .uniForm,
+            .uniForm fieldset,
+            .uniForm .ctrlHolder,
+            .uniForm .formHint,
+            .uniForm .buttonHolder, 
+            .uniForm .ctrlHolder .multiField,
+            .uniForm .inlineLabel{ zoom:1; }
+                
+            .uniForm .inlineLabels label, .uniForm .inlineLabels .label,
+            .uniForm .blockLabels label, .uniForm .blockLabels .label,
+            .uniForm .inlineLabel span{ padding-bottom: .2em; }
+                
+            .uniForm .inlineLabel input,
+            .uniForm .inlineLabels .inlineLabel input,
+            .uniForm .blockLabels .inlineLabel input{ margin-top: -.3em; }
+          </style>
+        <![endif]-->
+        <link href="themes/default/css/screen/redmond/jquery-ui-1.8.16.custom.css" rel="stylesheet" type="text/css"/>
+        <link href="themes/default/css/screen/jquery-ui-custom.css" rel="stylesheet" type="text/css"/>
+        <link rel="shortcut icon" href="/themes/default/images/favicon.ico" />
+        <script type="text/javascript" src="js/jquery-1.6.3.min.js"></script>
+        <script type="text/javascript" src="js/jquery-ui-1.8.16.custom.min.js"></script>
+        <script type="text/javascript" src="js/scrigo.js.php"></script>
+        <script type="text/javascript" src="js/uni-form/uni-form.jquery.js"></script>
+        <script type="text/javascript" src="js/jquery.ispconfigsearch.js"></script>
+        <script type="text/javascript" src="js/jquery.tipsy.js"></script>
+        <script language="JavaScript" type="text/javascript">
+            var is_chrome = navigator.userAgent.toLowerCase().indexOf('chrome') > -1;
+            if(!is_chrome && getInternetExplorerVersion() > 8.0) {
+                var style = document.createElement('style');
+                style.innerHTML = '#page_margins { min-width: 980px; max-width: 80%; background: #fff; display: table;}';
+                document.getElementsByTagName("head")[0].appendChild(style);
+            }
+            
+            jQuery(document).ready(function() {
+                loadInitContent();
+                
+                $("#pageForm").submit(function(e){
+                    //Prevent form submit: e.preventDefault() in lists
+                    if ($(".panel #Filter").length > 0) {
+                        e.preventDefault();
+                    }
+                });
+                
+                jQuery('.subsectiontoggle').live("click", function(){
+                    jQuery(this).children().toggleClass('showing').end().next().slideToggle();
+                });
+                
+                jQuery('#globalsearch').ispconfigSearch({
+                    dataSrc: '/dashboard/ajax_get_json.php?type=globalsearch',
+                    resultsLimit: '$ <tmpl_var name="globalsearch_resultslimit_of_txt"> % <tmpl_var name="globalsearch_resultslimit_results_txt">',
+                    noResultsText: '<tmpl_var name="globalsearch_noresults_text_txt">',
+                    noResultsLimit: '<tmpl_var name="globalsearch_noresults_limit_txt">',
+                    searchFieldWatermark: '<tmpl_var name="globalsearch_searchfield_watermark_txt">'
+                });
+                
+                jQuery('.ttip').tipsy({live: true, gravity: 'ne', html: true});
+            });
+            
+            
+            jQuery(document).bind("change", function(event) {
+                if (jQuery(".panel #Filter").length > 0 && event.target.localName == 'select') {
+                    event.preventDefault();
+                    jQuery(".panel #Filter").trigger('click');
+                }
+            });
+            
+            jQuery(document).bind("keypress", function(event) {
+                //Use jQuery submit with keypress Enter in panel filterbar
+                if (event.which == '13' && jQuery(".panel #Filter").length > 0) {
+                    event.preventDefault();
+                    jQuery(".panel #Filter").trigger('click');
+                }
+                //Use jQuery submit with keypress Enter in forms
+                if (event.which == '13' && jQuery(".pnl_formsarea button.positive").length > 0 && event.target.localName != 'textarea') {
+                    event.preventDefault();
+                    jQuery(".pnl_formsarea button.positive:first").trigger('click');
+                }
+            });
+        </script>
+    </head>
+    <body>
+        <div id="page_margins">
+            <div id="page">
+                <div id="header">
+                    <div id="topsubnav">
+                        <!-- start: skip link navigation -->
+                        <a class="skip" href="#navigation" title="skip link">Skip to the navigation</a><span class="hideme">.</span>
+                        <a class="skip" href="#content" title="skip link">Skip to the content</a><span class="hideme">.</span>
+                        <!-- end: skip link navigation -->
+                        <tmpl_if name="cpuser">
+                            <span><a href="#logout" onclick="loadContent('login/logout.php');"><tmpl_var format="strtoupper" name="logout_txt"> <tmpl_var format="strtoupper" name="cpuser"></a><!-- | <a href="#" onclick="capp('help')">Help</a> | <a href="#">Imprint</a>--></span>
+                            <tmpl_if name='usertype' op='==' value='normaluser'><input type="text" id="globalsearch" size="25" value="" /></tmpl_if>
+                        </tmpl_if>
+                    </div>
+                    <h1 id="ir-HeaderLogo" class="swap" style="background-image:url('{tmpl_var name='app_logo'}');"><span>ISPConfig 3</span></h1>
+                    <span>hosting control panel</span>
+                </div>
+                <!-- begin: main navigation #nav -->
+                <div id="nav">
+                    <a id="navigation" name="navigation"></a>
+                    <!-- skiplink anchor: navigation -->
+                    <div id="nav_main">
+                        <div id="topNav">&nbsp;</div>
+                    </div>
+                </div>
+                <!-- end: main navigation -->
+                <!-- begin: main content area #main -->
+                <div id="main">
+                    <!-- begin: #col1 - first float column -->
+                    <div id="col1">
+                        <div id="col1_content" class="clearfix">
+                            <div id="sideNav">&nbsp;</div>
+                        </div>
+                    </div>
+                    <!-- end: #col1 -->
+                    <!-- begin: #col3 static column -->
+                    <div id="col3">
+                        <div id="col3_content" class="clearfix">
+                            <a id="content" name="content"></a>
+                            <!-- skiplink anchor: Content -->
+                            <form method="post" action="" id="pageForm" name="pageForm" enctype="multipart/form-data" class="uniForm">
+                                <div id="pageContent"><!-- AJAX CONTENT --></div>
+                            </form>
+                        </div>
+                        <div id="ie_clearing">&nbsp;</div>
+                        <!-- End: IE Column Clearing -->
+                    </div>
+                    <!-- end: #col3 -->
+                </div>
+                <!-- end: #main -->
+                <!-- begin: #footer -->
+                <div id="footer">
+                    Powered by <a href="<tmpl_var name="app_link">" target="_blank"><tmpl_var name="app_title"></a>
+                </div><!-- end: #footer -->
+            </div>
+        </div>
+    </body>
+</html>
diff --git a/interface/web/themes/default-v2/templates/module.tpl.htm b/interface/web/themes/default-304/templates/module.tpl.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/module.tpl.htm
rename to interface/web/themes/default-304/templates/module.tpl.htm
diff --git a/interface/web/themes/default-v2/templates/module_tree.tpl.htm b/interface/web/themes/default-304/templates/module_tree.tpl.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/module_tree.tpl.htm
rename to interface/web/themes/default-304/templates/module_tree.tpl.htm
diff --git a/interface/web/themes/default-v2/templates/monitor/datalog_list.htm b/interface/web/themes/default-304/templates/monitor/datalog_list.htm
similarity index 73%
rename from interface/web/themes/default-v2/templates/monitor/datalog_list.htm
rename to interface/web/themes/default-304/templates/monitor/datalog_list.htm
index e237e5aa1ac63eccd1cf6f33639950e2d44ba902..158a5a84a1d7bc7f5415e495a09bf3d938dc364f 100644
--- a/interface/web/themes/default-v2/templates/monitor/datalog_list.htm
+++ b/interface/web/themes/default-304/templates/monitor/datalog_list.htm
@@ -7,21 +7,19 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr class="caption">
+                    <tr>
                         <th class="tbl_col_tstamp" scope="col"><tmpl_var name="tstamp_txt"></th>
                         <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
                         <th class="tbl_col_action" scope="col"><tmpl_var name="action_txt"></th>
                         <th class="tbl_col_dbtable" scope="col"><tmpl_var name="dbtable_txt"></th>
                         <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
                     </tr>
-                    <tr class="filter">
+                    <tr>
                         <td class="tbl_col_tstamp">&nbsp;</td>
                         <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
                         <td class="tbl_col_action"><select name="search_action">{tmpl_var name='search_action'}</select></td>
                         <td class="tbl_col_dbtable"><input type="text" name="search_dbtable" value="{tmpl_var name='search_dbtable'}" /></td>
-                        <td class="tbl_col_buttons">
-                            <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','monitor/datalog_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
-                        </td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','monitor/datalog_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
                     </tr>
                 </thead>
                 <tbody>
@@ -31,8 +29,10 @@
                             <td class="tbl_col_server_id">{tmpl_var name="server_id"}</td>
                             <td class="tbl_col_action">{tmpl_var name="action"}</td>
                             <td class="tbl_col_dbtable">{tmpl_var name="dbtable"}</td>
-                            <td class="tbl_col_buttons">    
-                                <!--<a class="button icons16 icoDelete" href="javascript: del_record('monitor/datalog_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> -->
+                            <td class="tbl_col_buttons">
+                                <div class="buttons icons16">    
+                                    <!--<a class="icons16 icoDelete" href="javascript: del_record('monitor/datalog_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>
                         </tr>
                     </tmpl_loop>
diff --git a/interface/web/themes/default-v2/templates/monitor/show_data.htm b/interface/web/themes/default-304/templates/monitor/show_data.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/monitor/show_data.htm
rename to interface/web/themes/default-304/templates/monitor/show_data.htm
diff --git a/interface/web/themes/default-v2/templates/monitor/show_log.htm b/interface/web/themes/default-304/templates/monitor/show_log.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/monitor/show_log.htm
rename to interface/web/themes/default-304/templates/monitor/show_log.htm
diff --git a/interface/web/themes/default-v2/templates/monitor/show_sys_state.htm b/interface/web/themes/default-304/templates/monitor/show_sys_state.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/monitor/show_sys_state.htm
rename to interface/web/themes/default-304/templates/monitor/show_sys_state.htm
diff --git a/interface/web/themes/default-v2/templates/monitor/syslog_list.htm b/interface/web/themes/default-304/templates/monitor/syslog_list.htm
similarity index 69%
rename from interface/web/themes/default-v2/templates/monitor/syslog_list.htm
rename to interface/web/themes/default-304/templates/monitor/syslog_list.htm
index 9b796f246f7b430c1b279e045a8f0b0597a023d1..e3d18cb318164caa6558f9f57b13d37b412658b5 100644
--- a/interface/web/themes/default-v2/templates/monitor/syslog_list.htm
+++ b/interface/web/themes/default-304/templates/monitor/syslog_list.htm
@@ -7,21 +7,19 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr class="caption">
+                    <tr>
                         <th class="tbl_col_tstamp" scope="col"><tmpl_var name="tstamp_txt"></th>
                         <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
                         <th class="tbl_col_loglevel" scope="col"><tmpl_var name="loglevel_txt"></th>
                         <th class="tbl_col_message" scope="col"><tmpl_var name="message_txt"></th>
                         <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
                     </tr>
-                    <tr class="filter">
+                    <tr>
                         <td class="tbl_col_tstamp">&nbsp;</td>
                         <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
                         <td class="tbl_col_loglevel"><select name="search_loglevel">{tmpl_var name='search_loglevel'}</select></td>
                         <td class="tbl_col_message"><input type="text" name="search_message" value="{tmpl_var name='search_message'}" /></td>
-                        <td class="tbl_col_buttons">
-                            <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','monitor/log_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
-                        </td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','monitor/log_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
                     </tr>
                 </thead>
                 <tbody>
@@ -33,10 +31,14 @@
                             <td class="tbl_col_message">{tmpl_var name="message"}</td>
                             <td class="tbl_col_buttons">
                                 <tmpl_if name="loglevel" op="==" value="Error">
-                                    <a class="button icons16 icoDelete" href="javascript: del_record('monitor/log_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 class="buttons icons16">
+                                        <a class="icons16 icoDelete" href="javascript: del_record('monitor/log_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>
                                 </tmpl_if>
                                 <tmpl_if name="loglevel" op="==" value="Warning">
-                                    <a class="button icons16 icoDelete" href="javascript: del_record('monitor/log_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 class="buttons icons16">
+                                        <a class="icons16 icoDelete" href="javascript: del_record('monitor/log_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>
                                 </tmpl_if>
                             </td>
                         </tr>
diff --git a/interface/web/themes/default-v2/templates/sidenav.tpl.htm b/interface/web/themes/default-304/templates/sidenav.tpl.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/sidenav.tpl.htm
rename to interface/web/themes/default-304/templates/sidenav.tpl.htm
diff --git a/interface/web/themes/default-v2/templates/sites/aps_install_package.htm b/interface/web/themes/default-304/templates/sites/aps_install_package.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/sites/aps_install_package.htm
rename to interface/web/themes/default-304/templates/sites/aps_install_package.htm
diff --git a/interface/web/themes/default-v2/templates/sites/aps_instances_list.htm b/interface/web/themes/default-304/templates/sites/aps_instances_list.htm
similarity index 71%
rename from interface/web/themes/default-v2/templates/sites/aps_instances_list.htm
rename to interface/web/themes/default-304/templates/sites/aps_instances_list.htm
index 3007d40c7f99bff19cdf78e29322589c793c1620..640c0bb96c8ab99e50f9efb0d225107e63cfebc9 100644
--- a/interface/web/themes/default-v2/templates/sites/aps_instances_list.htm
+++ b/interface/web/themes/default-304/templates/sites/aps_instances_list.htm
@@ -6,7 +6,7 @@
         <fieldset><legend>{tmpl_var name="list_head_txt"}</legend>
             <table class="list">
                 <thead>
-                    <tr class="caption">
+                    <tr>
                         <th class="tbl_col_name" scope="col">{tmpl_var name='name_txt'}</th>
                         <th class="tbl_col_version" scope="col">{tmpl_var name='version_txt'}</th>
                         <tmpl_if name='is_noclient'>
@@ -16,7 +16,7 @@
                         <th class="tbl_col_instancestatus" scope="col">{tmpl_var name='status_txt'}</th>
                         <th class="tbl_col_buttons" scope="col" >&nbsp;</th>
                     </tr>
-                    <tr class="filter">
+                    <tr>
                         <td class="tbl_col_name"><input type="text" name="search_name" value="{tmpl_var name='search_name'}" /></td>
                         <td class="tbl_col_version"><input type="text" name="search_version" value="{tmpl_var name='search_version'}" /></td>
                         <tmpl_if name='is_noclient'>
@@ -25,7 +25,9 @@
                         <td class="tbl_col_installlocation">&nbsp;</td>
                         <td class="tbl_col_instancestatus"><select name="search_instance_status" onChange="submitForm('pageForm','sites/aps_installedpackages_list.php');">{tmpl_var name='search_instance_status'}</select></td>
                         <td class="tbl_col_buttons">
-                            <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name='filter_txt'}" onClick="submitForm('pageForm','sites/aps_installedpackages_list.php');"><span>{tmpl_var name='filter_txt'}</span></button>
+                        <button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name='filter_txt'}" onClick="submitForm('pageForm','sites/aps_installedpackages_list.php');">
+                            <span>{tmpl_var name='filter_txt'}</span>
+                        </button>
                         </td>
                     </tr>
                 </thead>
@@ -40,12 +42,10 @@
                             <td class="tbl_col_installlocation"><a href="http://{tmpl_var name='install_location'}" target="_blank">{tmpl_var name='install_location_short'}</a></td>
                             <td class="tbl_col_instancestatus"><span id="status_content{tmpl_var name='__ROWNUM__'}">{tmpl_var name='instance_status'}</span></td>
                             <td class="tbl_col_buttons">
-                                <tmpl_if name='delete_possible'>
-                                    <a class="button icons16 icoDelete" href="javascript:if(window.confirm('{tmpl_var name='pkg_delete_confirmation'}')){ loadContentInto('status_content{tmpl_var name='__ROWNUM__'}', 'sites/aps_do_operation.php?action=delete_instance&id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}'); }"><span>{tmpl_var name='delete_txt'}</span></a>
-                                </tmpl_if>
-                                <tmpl_if name='reinstall_possible'>
-                                    <a class="button icons16 icoEdit" href="javascript:if(window.confirm('{tmpl_var name='pkg_reinstall_confirmation'}')){ loadContentInto('status_content{tmpl_var name='__ROWNUM__'}', 'sites/aps_do_operation.php?action=reinstall_instance&id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}'); }"><span>{tmpl_var name='reinstall_txt'}</span></a>
-                                </tmpl_if>
+                                <div class="buttons icons16" style="width:60px;">
+                                    <tmpl_if name='delete_possible'><a class="icons16 icoDelete" href="javascript:if(window.confirm('{tmpl_var name='pkg_delete_confirmation'}')){ loadContentInto('status_content{tmpl_var name='__ROWNUM__'}', 'sites/aps_do_operation.php?action=delete_instance&id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}'); }"><span>{tmpl_var name='delete_txt'}</span></a></tmpl_if>
+                                    <tmpl_if name='reinstall_possible'><a class="icons16 icoEdit" href="javascript:if(window.confirm('{tmpl_var name='pkg_reinstall_confirmation'}')){ loadContentInto('status_content{tmpl_var name='__ROWNUM__'}', 'sites/aps_do_operation.php?action=reinstall_instance&id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}'); }"><span>{tmpl_var name='reinstall_txt'}</span></a></tmpl_if>
+                                </div>
                             </td>        
                         </tr>
                     </tmpl_loop>
diff --git a/interface/web/themes/default-v2/templates/sites/aps_packagedetails_show.htm b/interface/web/themes/default-304/templates/sites/aps_packagedetails_show.htm
similarity index 95%
rename from interface/web/themes/default-v2/templates/sites/aps_packagedetails_show.htm
rename to interface/web/themes/default-304/templates/sites/aps_packagedetails_show.htm
index 403522a9ef568dd1cecb074cea09676d151a28eb..351d3ac0460a708d0fdcc02d175149bd8ef3a4b5 100644
--- a/interface/web/themes/default-v2/templates/sites/aps_packagedetails_show.htm
+++ b/interface/web/themes/default-304/templates/sites/aps_packagedetails_show.htm
@@ -8,9 +8,11 @@
 <p>&nbsp;</p>
 
 <div class="pnl_toolsarea">
-        <button class="button iconstxt icoAdd" type="button" onClick="loadContent('sites/aps_install_package.php?id={tmpl_var name='pkg_id'}');">
+    <div class="buttons">
+        <button class="iconstxt icoAdd" type="button" onClick="loadContent('sites/aps_install_package.php?id={tmpl_var name='pkg_id'}');">
             <span>{tmpl_var name='install_package_txt'}</span>
         </button>
+    </div>
     <p>&nbsp;</p><p>&nbsp;</p>
 </div>
 
diff --git a/interface/web/themes/default-v2/templates/sites/aps_packages_list.htm b/interface/web/themes/default-304/templates/sites/aps_packages_list.htm
similarity index 89%
rename from interface/web/themes/default-v2/templates/sites/aps_packages_list.htm
rename to interface/web/themes/default-304/templates/sites/aps_packages_list.htm
index 454822d7d1cab9c68c4879dd30fd50c854a08802..e7db3e84a4e7b5313658dac83414c8a443f005f1 100644
--- a/interface/web/themes/default-v2/templates/sites/aps_packages_list.htm
+++ b/interface/web/themes/default-304/templates/sites/aps_packages_list.htm
@@ -6,7 +6,7 @@
         <fieldset><legend>{tmpl_var name="list_head_txt"} ({tmpl_var name='package_count'})</legend>
             <table class="list">
                 <thead>
-                    <tr class="caption">
+                    <tr>
                         <th class="tbl_col_name" scope="col">{tmpl_var name='name_txt'}</th>
                         <th class="tbl_col_version" scope="col">{tmpl_var name='version_txt'}</th>
                         <th class="tbl_col_category" scope="col">{tmpl_var name='category_txt'}</th>
@@ -15,14 +15,14 @@
                             </tmpl_if>
                         <th class="tbl_col_buttons" scope="col" width="60px;">&nbsp;</th>
                     </tr>
-                    <tr class="filter">
+                    <tr>
                         <td class="tbl_col_name"><input type="text" name="search_name" value="{tmpl_var name='search_name'}" /></td>
                         <td class="tbl_col_version"><input type="text" name="search_version" value="{tmpl_var name='search_version'}" /></td>
                         <td class="tbl_col_customerid"><select name="search_category" onChange="submitForm('pageForm','sites/aps_availablepackages_list.php');">{tmpl_var name='search_category'}</select></td>
                             <tmpl_if name='is_admin'>
                                 <td class="tbl_col_status"><select name="search_package_status" onChange="submitForm('pageForm','sites/aps_availablepackages_list.php');">{tmpl_var name='search_package_status'}</select></td>
                             </tmpl_if>
-                        <td class="tbl_col_buttons"><button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name='filter_txt'}" onClick="submitForm('pageForm','sites/aps_availablepackages_list.php');"><span>{tmpl_var name='filter_txt'}</span></button></td>
+                        <td class="tbl_col_buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name='filter_txt'}" onClick="submitForm('pageForm','sites/aps_availablepackages_list.php');"><span>{tmpl_var name='filter_txt'}</span></button></td>
                     </tr>
                 </thead>
                 <tbody>
diff --git a/interface/web/themes/default-v2/templates/sites/cron_edit.htm b/interface/web/themes/default-304/templates/sites/cron_edit.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/sites/cron_edit.htm
rename to interface/web/themes/default-304/templates/sites/cron_edit.htm
diff --git a/interface/web/themes/default-v2/templates/sites/cron_list.htm b/interface/web/themes/default-304/templates/sites/cron_list.htm
similarity index 86%
rename from interface/web/themes/default-v2/templates/sites/cron_list.htm
rename to interface/web/themes/default-304/templates/sites/cron_list.htm
index 868469c5cf812adcb584844d23d99c2daa04d486..f822b89ebeb14497d458d2972474e80060125df2 100644
--- a/interface/web/themes/default-v2/templates/sites/cron_list.htm
+++ b/interface/web/themes/default-304/templates/sites/cron_list.htm
@@ -6,7 +6,7 @@
     <div class="pnl_toolsarea">
         <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
             <div class="buttons">
-                <button class="button iconstxt icoAdd" type="button" onClick="loadContent('sites/cron_edit.php');">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('sites/cron_edit.php');">
                     <span>{tmpl_var name="add_new_cron_txt"}</span>
                 </button>
             </div>
@@ -17,7 +17,7 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr class="caption">
+                    <tr>
                         <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
                         <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
                         <th class="tbl_col_parent_domain_id" scope="col"><tmpl_var name="parent_domain_id_txt"></th>
@@ -29,7 +29,7 @@
                         <th class="tbl_col_command" scope="col"><tmpl_var name="command_txt"></th>
                         <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
                     </tr>
-                    <tr class="filter">
+                    <tr>
                         <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
                         <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
                         <td class="tbl_col_parent_domain_id"><select name="search_parent_domain_id">{tmpl_var name='search_parent_domain_id'}</select></td>
@@ -39,9 +39,7 @@
                         <td class="tbl_col_run_month"><input type="text" name="search_run_month" size="1" value="{tmpl_var name='search_run_month'}" /></td>
                         <td class="tbl_col_run_wday"><input type="text" name="search_run_wday" size="1" value="{tmpl_var name='search_run_wday'}" /></td>
                         <td class="tbl_col_command"><input type="text" name="search_command" value="{tmpl_var name='search_command'}" /></td>
-                        <td class="tbl_col_buttons">
-                            <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','sites/cron_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
-                        </td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','sites/cron_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
                     </tr>
                 </thead>
                 <tbody>
@@ -58,7 +56,7 @@
                             <td class="tbl_col_commnd"><a href="#" onClick="loadContent('sites/cron_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="command"}</a></td>
                             <td class="tbl_col_buttons">
                                 <div class="buttons icons16">    
-                                    <a class="button icons16 icoDelete" href="javascript: del_record('sites/cron_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>
+                                    <a class="icons16 icoDelete" href="javascript: del_record('sites/cron_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>
                         </tr>
diff --git a/interface/web/themes/default-v2/templates/sites/database_admin_list.htm b/interface/web/themes/default-304/templates/sites/database_admin_list.htm
similarity index 73%
rename from interface/web/themes/default-v2/templates/sites/database_admin_list.htm
rename to interface/web/themes/default-304/templates/sites/database_admin_list.htm
index b62b3491cde1c4406965e5239e1bfbb5545b27a2..fda3ba70c8a1a047cb6c68e5168f3f104ded4cd4 100644
--- a/interface/web/themes/default-v2/templates/sites/database_admin_list.htm
+++ b/interface/web/themes/default-304/templates/sites/database_admin_list.htm
@@ -5,7 +5,7 @@
     <div class="pnl_toolsarea">
         <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
             <div class="buttons">
-                <button class="button iconstxt icoAdd" type="button" onClick="loadContent('sites/database_edit.php');">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('sites/database_edit.php');">
                     <span>{tmpl_var name="add_new_record_txt"}</span>
                 </button>
             </div>
@@ -16,7 +16,7 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr class="caption">
+                    <tr>
                         <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
                         <th class="tbl_col_remote_access" scope="col"><tmpl_var name="remote_access_txt"></th>
                         <th class="tbl_col_sys_groupid" scope="col"><tmpl_var name="sys_groupid_txt"></th>
@@ -25,16 +25,14 @@
                         <th class="tbl_col_database_name" scope="col"><tmpl_var name="database_name_txt"></th>
                         <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
                     </tr>
-                    <tr class="filter">
+                    <tr>
                         <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
                         <td class="tbl_col_remote_access"><select name="search_remote_access">{tmpl_var name='search_remote_access'}</select></td>
                         <td class="tbl_col_sys_groupid"><select name="search_sys_groupid">{tmpl_var name='search_sys_groupid'}</select></td>
                         <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
                         <td class="tbl_col_database_user"><select name="search_database_user_id">{tmpl_var name='search_database_user_id'}</select></td>
                         <td class="tbl_col_database_name"><input type="text" name="search_database_name" value="{tmpl_var name='search_database_name'}" /></td>
-                        <td class="tbl_col_buttons">
-                            <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','sites/database_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
-                        </td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','sites/database_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
                     </tr>
                 </thead>
                 <tbody>
@@ -44,14 +42,16 @@
                             <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_sys_groupid"><a href="#" onClick="loadContent('sites/database_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="sys_groupid"}</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_database_user"><a href="#" onClick="loadContent('sites/database_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="database_user"}</a></td>
+                            <td class="tbl_col_database_user"><a href="#" onClick="loadContent('sites/database_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="database_user_id"}</a></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">
-                                <tmpl_if name="dblist_phpmyadmin_link">
-                                    <a class="button icons16 icoDbAdmin" href="sites/database_phpmyadmin.php?id={tmpl_var name='id'}" target="phpmyadmin"><span>{tmpl_var name='admin_txt'}</span></a>
-                                </tmpl_if>
-                                <a class="button icons16 icoEdit" href="javascript: loadContent('sites/database_edit.php?id={tmpl_var name='id'}');"><span>{tmpl_var name='edit_txt'}</span></a>
-                                <a class="button 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 class="buttons icons16">
+                                    <tmpl_if name="dblist_phpmyadmin_link">
+                                        <a class="icons16 icoDbAdmin" href="sites/database_phpmyadmin.php?id={tmpl_var name='id'}" target="phpmyadmin"><span>{tmpl_var name='admin_txt'}</span></a>
+                                    </tmpl_if>
+                                    <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>
                         </tr>
                     </tmpl_loop>
diff --git a/interface/web/themes/default-v2/templates/sites/database_edit.htm b/interface/web/themes/default-304/templates/sites/database_edit.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/sites/database_edit.htm
rename to interface/web/themes/default-304/templates/sites/database_edit.htm
diff --git a/interface/web/themes/default-v2/templates/sites/database_list.htm b/interface/web/themes/default-304/templates/sites/database_list.htm
similarity index 70%
rename from interface/web/themes/default-v2/templates/sites/database_list.htm
rename to interface/web/themes/default-304/templates/sites/database_list.htm
index ea2162f1525163f465fd7ca58d193e05e3b55553..7b49e87044fc2f2618026bddd7c776aca947c844 100644
--- a/interface/web/themes/default-v2/templates/sites/database_list.htm
+++ b/interface/web/themes/default-304/templates/sites/database_list.htm
@@ -6,7 +6,7 @@
     <div class="pnl_toolsarea">
         <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
             <div class="buttons">
-                <button class="button iconstxt icoAdd" type="button" onClick="loadContent('sites/database_edit.php');">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('sites/database_edit.php');">
                     <span>{tmpl_var name="add_new_record_txt"}</span>
                 </button>
             </div>
@@ -17,7 +17,7 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr class="caption">
+                    <tr>
                         <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
                         <th class="tbl_col_remote_access" scope="col"><tmpl_var name="remote_access_txt"></th>
                         <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
@@ -25,15 +25,13 @@
                         <th class="tbl_col_database_name" scope="col"><tmpl_var name="database_name_txt"></th>
                         <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
                     </tr>
-                    <tr class="filter">
+                    <tr>
                         <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
                         <td class="tbl_col_remote_access"><select name="search_remote_access">{tmpl_var name='search_remote_access'}</select></td>
                         <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
                         <td class="tbl_col_database_user"><select name="search_database_user_id">{tmpl_var name='search_database_user_id'}</select></td>
                         <td class="tbl_col_database_name"><input type="text" name="search_database_name" value="{tmpl_var name='search_database_name'}"/></td>
-                        <td class="tbl_col_buttons">
-                            <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','sites/database_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
-                        </td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','sites/database_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
                     </tr>
                 </thead>
                 <tbody>
@@ -42,14 +40,16 @@
                             <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_database_user"><a href="#" onClick="loadContent('sites/database_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="database_user"}</a></td>
+                            <td class="tbl_col_database_user"><a href="#" onClick="loadContent('sites/database_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="database_user_id"}</a></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">
-                                <tmpl_if name="dblist_phpmyadmin_link">
-                                    <a class="button icons16 icoDbAdmin" href="sites/database_phpmyadmin.php?id={tmpl_var name='id'}" target="phpmyadmin"><span>{tmpl_var name='admin_txt'}</span></a>
-                                </tmpl_if>
-                                <a class="button icons16 icoEdit" href="javascript: loadContent('sites/database_edit.php?id={tmpl_var name='id'}');"><span>{tmpl_var name='edit_txt'}</span></a>
-                                <a class="button 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 class="buttons icons16">    
+                                    <tmpl_if name="dblist_phpmyadmin_link">
+                                        <a class="icons16 icoDbAdmin" href="sites/database_phpmyadmin.php?id={tmpl_var name='id'}" target="phpmyadmin"><span>{tmpl_var name='admin_txt'}</span></a>
+                                    </tmpl_if>
+                                    <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>
                         </tr>
                     </tmpl_loop>
diff --git a/interface/web/themes/default-v2/templates/sites/database_user_admin_list.htm b/interface/web/themes/default-304/templates/sites/database_user_admin_list.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/sites/database_user_admin_list.htm
rename to interface/web/themes/default-304/templates/sites/database_user_admin_list.htm
diff --git a/interface/web/themes/default-v2/templates/sites/database_user_edit.htm b/interface/web/themes/default-304/templates/sites/database_user_edit.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/sites/database_user_edit.htm
rename to interface/web/themes/default-304/templates/sites/database_user_edit.htm
diff --git a/interface/web/themes/default-v2/templates/sites/database_user_list.htm b/interface/web/themes/default-304/templates/sites/database_user_list.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/sites/database_user_list.htm
rename to interface/web/themes/default-304/templates/sites/database_user_list.htm
diff --git a/interface/web/themes/default-v2/templates/sites/ftp_user_advanced.htm b/interface/web/themes/default-304/templates/sites/ftp_user_advanced.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/sites/ftp_user_advanced.htm
rename to interface/web/themes/default-304/templates/sites/ftp_user_advanced.htm
diff --git a/interface/web/themes/default-v2/templates/sites/ftp_user_advanced_client.htm b/interface/web/themes/default-304/templates/sites/ftp_user_advanced_client.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/sites/ftp_user_advanced_client.htm
rename to interface/web/themes/default-304/templates/sites/ftp_user_advanced_client.htm
diff --git a/interface/web/themes/default-v2/templates/sites/ftp_user_edit.htm b/interface/web/themes/default-304/templates/sites/ftp_user_edit.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/sites/ftp_user_edit.htm
rename to interface/web/themes/default-304/templates/sites/ftp_user_edit.htm
diff --git a/interface/web/themes/default-v2/templates/sites/ftp_user_list.htm b/interface/web/themes/default-304/templates/sites/ftp_user_list.htm
similarity index 73%
rename from interface/web/themes/default-v2/templates/sites/ftp_user_list.htm
rename to interface/web/themes/default-304/templates/sites/ftp_user_list.htm
index 8c07458ff2bdd3666f1bd583fc84603a741889ad..d455e0d4cdd0d266d52cf56e802c3e8447ab72c6 100644
--- a/interface/web/themes/default-v2/templates/sites/ftp_user_list.htm
+++ b/interface/web/themes/default-304/templates/sites/ftp_user_list.htm
@@ -6,7 +6,7 @@
     <div class="pnl_toolsarea">
         <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
             <div class="buttons">
-                <button class="button iconstxt icoAdd" type="button" onClick="loadContent('sites/ftp_user_edit.php');">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('sites/ftp_user_edit.php');">
                     <span>{tmpl_var name="add_new_record_txt"}</span>
                 </button>
             </div>
@@ -17,21 +17,19 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr class="caption">
+                    <tr>
                         <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
                         <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
                         <th class="tbl_col_parent_domain_id" scope="col"><tmpl_var name="parent_domain_id_txt"></th>
                         <th class="tbl_col_username" scope="col"><tmpl_var name="username_txt"></th>
                         <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
                     </tr>
-                    <tr class="filter">
+                    <tr>
                         <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
                         <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
                         <td class="tbl_col_parent_domain_id"><select name="search_parent_domain_id">{tmpl_var name='search_parent_domain_id'}</select></td>
                         <td class="tbl_col_username"><input type="text" name="search_username" value="{tmpl_var name='search_username'}" /></td>
-                        <td class="tbl_col_buttons">
-                            <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','sites/ftp_user_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
-                        </td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','sites/ftp_user_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
                     </tr>
                 </thead>
                 <tbody>
@@ -42,10 +40,12 @@
                             <td class="tbl_col_parent_domain_id"><a href="#" onClick="loadContent('sites/ftp_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="parent_domain_id"}</a></td>
                             <td class="tbl_col_username"><a href="#" onClick="loadContent('sites/ftp_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="username"}</a></td>
                             <td class="tbl_col_buttons">
-                            <tmpl_if name="webftp_link">
-                                <a class="button icons16 icoDbAdmin" href="{tmpl_var name='webftp_url'}" target="_blank"><span>{tmpl_var name='admin_txt'}</span></a>
-                            </tmpl_if>
-                            <a class="button icons16 icoDelete" href="javascript: del_record('sites/ftp_user_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 class="buttons icons16">    
+                                    <tmpl_if name="webftp_link">
+                                        <a class="icons16 icoDbAdmin" href="{tmpl_var name='webftp_url'}" target="_blank"><span>{tmpl_var name='admin_txt'}</span></a>
+                                    </tmpl_if>
+                                    <a class="icons16 icoDelete" href="javascript: del_record('sites/ftp_user_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>
                         </tr>
                     </tmpl_loop>
diff --git a/interface/web/themes/default-v2/templates/sites/shell_user_advanced.htm b/interface/web/themes/default-304/templates/sites/shell_user_advanced.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/sites/shell_user_advanced.htm
rename to interface/web/themes/default-304/templates/sites/shell_user_advanced.htm
diff --git a/interface/web/themes/default-v2/templates/sites/shell_user_edit.htm b/interface/web/themes/default-304/templates/sites/shell_user_edit.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/sites/shell_user_edit.htm
rename to interface/web/themes/default-304/templates/sites/shell_user_edit.htm
diff --git a/interface/web/themes/default-v2/templates/sites/shell_user_list.htm b/interface/web/themes/default-304/templates/sites/shell_user_list.htm
similarity index 78%
rename from interface/web/themes/default-v2/templates/sites/shell_user_list.htm
rename to interface/web/themes/default-304/templates/sites/shell_user_list.htm
index d98c959754033a0c8dbb61c31e4e0a94ffe58d76..9087c6669afccbc04fc53419ab1e5ea9f1b26025 100644
--- a/interface/web/themes/default-v2/templates/sites/shell_user_list.htm
+++ b/interface/web/themes/default-304/templates/sites/shell_user_list.htm
@@ -6,7 +6,7 @@
     <div class="pnl_toolsarea">
         <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
             <div class="buttons">
-                <button class="button iconstxt icoAdd" type="button" onClick="loadContent('sites/shell_user_edit.php');">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('sites/shell_user_edit.php');">
                     <span>{tmpl_var name="add_new_record_txt"}</span>
                 </button>
             </div>
@@ -17,21 +17,19 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr class="caption">
+                    <tr>
                         <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
                         <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
                         <th class="tbl_col_parent_domain_id" scope="col"><tmpl_var name="parent_domain_id_txt"></th>
                         <th class="tbl_col_username" scope="col"><tmpl_var name="username_txt"></th>
                         <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
                     </tr>
-                    <tr class="filter">
+                    <tr>
                         <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
                         <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
                         <td class="tbl_col_parent_domain_id"><select name="search_parent_domain_id">{tmpl_var name='search_parent_domain_id'}</select></td>
                         <td class="tbl_col_username"><input type="text" name="search_username" value="{tmpl_var name='search_username'}" /></td>
-                        <td class="tbl_col_buttons">
-                            <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','sites/shell_user_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
-                        </td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','sites/shell_user_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
                     </tr>
                 </thead>
                 <tbody>
@@ -42,7 +40,9 @@
                             <td class="tbl_col_parent_domain_id"><a href="#" onClick="loadContent('sites/shell_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="parent_domain_id"}</a></td>
                             <td class="tbl_col_username"><a href="#" onClick="loadContent('sites/shell_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="username"}</a></td>
                             <td class="tbl_col_buttons">
-                                <a class="button icons16 icoDelete" href="javascript: del_record('sites/shell_user_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 class="buttons icons16">    
+                                    <a class="icons16 icoDelete" href="javascript: del_record('sites/shell_user_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>
                         </tr>
                     </tmpl_loop>
diff --git a/interface/web/themes/default-304/templates/sites/user_quota_stats_list.htm b/interface/web/themes/default-304/templates/sites/user_quota_stats_list.htm
new file mode 100644
index 0000000000000000000000000000000000000000..adb1e356143b61522a97cd11b7c96ef515ecb419
--- /dev/null
+++ b/interface/web/themes/default-304/templates/sites/user_quota_stats_list.htm
@@ -0,0 +1,54 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_list_user_quota_stats">
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                <tr>
+                    <th class="tbl_col_domain" scope="col"><tmpl_var name="domain_txt"></th>
+                    <th class="tbl_col_system_user" scope="col"><tmpl_var name="system_user_txt"></th>
+                    <th class="" scope="col" style="text-align:right;"><tmpl_var name="used_txt"></th>
+                    <th class="" scope="col" style="text-align:right;"><tmpl_var name="soft_txt"></th>
+                    <th class="" scope="col" style="text-align:right;"><tmpl_var name="hard_txt"></th>
+                    <th class="" scope="col" style="text-align:right;"><tmpl_var name="files_txt"></th>
+                    <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+                </tr>
+                <tr>
+                    <td class="tbl_col_domain"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td>
+                    <td class="tbl_col_system_user"><input type="text" name="search_system_user" value="{tmpl_var name='search_system_user'}" /></td>
+                    <td class="tbl_col_system_user">&nbsp;</td>
+                    <td class="tbl_col_system_user">&nbsp;</td>
+                    <td class="tbl_col_system_user">&nbsp;</td>
+                    <td class="tbl_col_system_user">&nbsp;</td>
+                    <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','sites/user_quota_stats.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                </tr>
+                </thead>
+                <tbody>
+                    <tmpl_loop name="records">
+                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                            <td class="tbl_col_domain"><a href="#" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="domain"}</a></td>
+                            <td class="tbl_col_system_user"><a href="#" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="system_user"}</a></td>
+                            <td class="tbl_col_used" style="text-align:right;"><a href="#" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="used"}</a></td>
+                            <td class="tbl_col_soft" style="text-align:right;"><a href="#" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="soft"}</a></td>
+                            <td class="tbl_col_hard" style="text-align:right;"><a href="#" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="hard"}</a></td>
+                            <td class="tbl_col_files" style="text-align:right;"><a href="#" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="files"}</a></td>
+                            <td class="tbl_col_buttons">
+                                <div class="buttons icons16">    
+                                    &nbsp;
+                                </div>
+                            </td>
+                        </tr>
+                    </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="7"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/sites/web_aliasdomain_edit.htm b/interface/web/themes/default-304/templates/sites/web_aliasdomain_edit.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/sites/web_aliasdomain_edit.htm
rename to interface/web/themes/default-304/templates/sites/web_aliasdomain_edit.htm
diff --git a/interface/web/themes/default-v2/templates/sites/web_aliasdomain_list.htm b/interface/web/themes/default-304/templates/sites/web_aliasdomain_list.htm
similarity index 77%
rename from interface/web/themes/default-v2/templates/sites/web_aliasdomain_list.htm
rename to interface/web/themes/default-304/templates/sites/web_aliasdomain_list.htm
index 126a972d95a7a8afb5ccee33c8e512195df5dbac..faab74e1919b48a1798761f81bb6419b62ba3b63 100644
--- a/interface/web/themes/default-v2/templates/sites/web_aliasdomain_list.htm
+++ b/interface/web/themes/default-304/templates/sites/web_aliasdomain_list.htm
@@ -6,7 +6,7 @@
     <div class="pnl_listsarea">
         <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
             <div class="buttons">
-                <button class="button iconstxt icoAdd" type="button" onClick="loadContent('sites/web_aliasdomain_edit.php');">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('sites/web_aliasdomain_edit.php');">
                     <span>{tmpl_var name="add_new_record_txt"}</span>
                 </button>
             </div>
@@ -17,21 +17,19 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr class="caption">
+                    <tr>
                         <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
                         <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
                         <th class="tbl_col_parent_domain_id" scope="col"><tmpl_var name="parent_domain_id_txt"></th>
                         <th class="tbl_col_domain" scope="col"><tmpl_var name="domain_txt"></th>
                         <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
                     </tr>
-                    <tr class="filter">
+                    <tr>
                         <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
                         <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
                         <td class="tbl_col_parent_domain_id"><select name="search_parent_domain_id">{tmpl_var name='search_parent_domain_id'}</select></td>
                         <td class="tbl_col_domain"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td>
-                        <td class="tbl_col_buttons">
-                            <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','sites/web_aliasdomain_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
-                        </td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','sites/web_aliasdomain_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
                     </tr>
                 </thead>
                 <tbody>
@@ -42,7 +40,9 @@
                             <td class="tbl_col_parent_domain_id"><a href="#" onClick="loadContent('sites/web_aliasdomain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="parent_domain_id"}</a></td>
                             <td class="tbl_col_domain"><a href="#" onClick="loadContent('sites/web_aliasdomain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="domain"}</a></td>
                             <td class="tbl_col_buttons">
-                                <a class="button icons16 icoDelete" href="javascript: del_record('sites/web_aliasdomain_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 class="buttons icons16">    
+                                    <a class="icons16 icoDelete" href="javascript: del_record('sites/web_aliasdomain_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>
                         </tr>
                     </tmpl_loop>
diff --git a/interface/web/themes/default-v2/templates/sites/web_backup_list.htm b/interface/web/themes/default-304/templates/sites/web_backup_list.htm
similarity index 64%
rename from interface/web/themes/default-v2/templates/sites/web_backup_list.htm
rename to interface/web/themes/default-304/templates/sites/web_backup_list.htm
index 0347072e5952f1e37dff65094660165ff1e01524..85639770961b52ab02e7a4f3f2fc8c696f4e6b34 100644
--- a/interface/web/themes/default-v2/templates/sites/web_backup_list.htm
+++ b/interface/web/themes/default-304/templates/sites/web_backup_list.htm
@@ -12,7 +12,7 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr class="caption">
+                    <tr>
                         <th class="tbl_col_date" scope="col"><tmpl_var name="date_txt"></th>
                         <th class="tbl_col_date" scope="col"><tmpl_var name="backup_type_txt"></th>
                         <th class="tbl_col_filename" scope="col"><tmpl_var name="filename_txt"></th>
@@ -25,10 +25,10 @@
                             <td class="tbl_col_date">{tmpl_var name="date"}</td>
                             <td class="tbl_col_date">{tmpl_var name="backup_type"}</td>
                             <td class="tbl_col_filename">{tmpl_var name="filename"}</td>
-                            <td class="tbl_col_buttons">
-                                <div class="buttons">
-                                    <button class="button iconstxt icoRestore" type="button" onClick="confirm_action('sites/web_domain_edit.php?id={tmpl_var name='parent_id'}&next_tab=backup&backup_action=restore&backup_id={tmpl_var name='backup_id'}','{tmpl_var name='restore_confirm_txt'}');"><span>{tmpl_var name="restore_backup_txt"}</span></button>
-                                    <button class="button iconstxt icoDownload" type="button" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='parent_id'}&next_tab=backup&backup_action=download&backup_id={tmpl_var name='backup_id'}');"><span>{tmpl_var name="download_backup_txt"}</span></button>
+                            <td class="tbl_col_buttons" style="width:300px;">
+                                <div class="buttons" >
+                                    <button class="iconstxt icoRestore" type="button" onClick="confirm_action('sites/web_domain_edit.php?id={tmpl_var name='parent_id'}&next_tab=backup&backup_action=restore&backup_id={tmpl_var name='backup_id'}','{tmpl_var name='restore_confirm_txt'}');"><span>{tmpl_var name="restore_backup_txt"}</span></button>
+                                    <button class="iconstxt icoDownload" type="button" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='parent_id'}&next_tab=backup&backup_action=download&backup_id={tmpl_var name='backup_id'}');"><span>{tmpl_var name="download_backup_txt"}</span></button>
                                 </div>
                             </td>
                         </tr>
diff --git a/interface/web/themes/default-v2/templates/sites/web_domain_admin_list.htm b/interface/web/themes/default-304/templates/sites/web_domain_admin_list.htm
similarity index 80%
rename from interface/web/themes/default-v2/templates/sites/web_domain_admin_list.htm
rename to interface/web/themes/default-304/templates/sites/web_domain_admin_list.htm
index 627868b2d2507f001ac4b9062526ce068ada3606..f363e44c70cfd8bcbb31a08ee1d1a1efec5b478e 100644
--- a/interface/web/themes/default-v2/templates/sites/web_domain_admin_list.htm
+++ b/interface/web/themes/default-304/templates/sites/web_domain_admin_list.htm
@@ -5,7 +5,7 @@
     <div class="pnl_toolsarea">
         <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
             <div class="buttons">
-                <button class="button iconstxt icoAdd" type="button" onClick="loadContent('sites/web_domain_edit.php');">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('sites/web_domain_edit.php');">
                     <span>{tmpl_var name="add_new_record_txt"}</span>
                 </button>
             </div>
@@ -16,7 +16,7 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr class="caption">
+                    <tr>
                         <th class="tbl_col_domain_id" scope="col"><tmpl_var name="domain_id_txt"></th>
                         <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
                         <th class="tbl_col_sys_groupid" scope="col"><tmpl_var name="sys_groupid_txt"></th>
@@ -24,15 +24,13 @@
                         <th class="tbl_col_domain" scope="col"><tmpl_var name="domain_txt"></th>
                         <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
                     </tr>
-                    <tr class="filter">
+                    <tr>
                         <td class="tbl_col_domain_id"><input type="text" name="search_domain_id" size="4" value="{tmpl_var name='search_domain_id'}" /></td>
                         <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
                         <td class="tbl_col_sys_groupid"><select name="search_sys_groupid">{tmpl_var name='search_sys_groupid'}</select></td>
                         <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
                         <td class="tbl_col_domain"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td>
-                        <td class="tbl_col_buttons">
-                            <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','sites/web_domain_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
-                        </td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','sites/web_domain_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
                     </tr>
                 </thead>
                 <tbody>
@@ -44,7 +42,9 @@
                         <td class="tbl_col_server_id"><a href="#" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
                         <td class="tbl_col_domain"><a href="#" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="domain"}</a></td>
                         <td class="tbl_col_buttons">
-                            <a class="button icons16 icoDelete" href="javascript: del_record('sites/web_domain_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 class="buttons icons16">    
+                                <a class="icons16 icoDelete" href="javascript: del_record('sites/web_domain_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>
                     </tr>
                 </tmpl_loop>
diff --git a/interface/web/themes/default-v2/templates/sites/web_domain_advanced.htm b/interface/web/themes/default-304/templates/sites/web_domain_advanced.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/sites/web_domain_advanced.htm
rename to interface/web/themes/default-304/templates/sites/web_domain_advanced.htm
diff --git a/interface/web/themes/default-v2/templates/sites/web_domain_backup.htm b/interface/web/themes/default-304/templates/sites/web_domain_backup.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/sites/web_domain_backup.htm
rename to interface/web/themes/default-304/templates/sites/web_domain_backup.htm
diff --git a/interface/web/themes/default-v2/templates/sites/web_domain_edit.htm b/interface/web/themes/default-304/templates/sites/web_domain_edit.htm
similarity index 99%
rename from interface/web/themes/default-v2/templates/sites/web_domain_edit.htm
rename to interface/web/themes/default-304/templates/sites/web_domain_edit.htm
index edf1836d29a0ab48a764a21844efce438b4cbfee..c2d9d21ea574fb7661785503365469cfd415c053 100644
--- a/interface/web/themes/default-v2/templates/sites/web_domain_edit.htm
+++ b/interface/web/themes/default-304/templates/sites/web_domain_edit.htm
@@ -246,4 +246,4 @@
         });
     </tmpl_if>
 			
-</script>
+</script>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/sites/web_domain_list.htm b/interface/web/themes/default-304/templates/sites/web_domain_list.htm
similarity index 77%
rename from interface/web/themes/default-v2/templates/sites/web_domain_list.htm
rename to interface/web/themes/default-304/templates/sites/web_domain_list.htm
index fe782f88e952658c2013f9a52b02a20d28f99fdc..4ce5d5ddd43c7891e7bc3df8fce6e612ced757a7 100644
--- a/interface/web/themes/default-v2/templates/sites/web_domain_list.htm
+++ b/interface/web/themes/default-304/templates/sites/web_domain_list.htm
@@ -6,7 +6,7 @@
     <div class="pnl_toolsarea">
         <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
             <div class="buttons">
-                <button class="button iconstxt icoAdd" type="button" onClick="loadContent('sites/web_domain_edit.php');">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('sites/web_domain_edit.php');">
                     <span>{tmpl_var name="add_new_record_txt"}</span>
                 </button>
             </div>
@@ -17,21 +17,19 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                <tr class="caption">
+                <tr>
                     <th class="tbl_col_domain_id" scope="col"><tmpl_var name="domain_id_txt"></th>
                     <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
                     <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
                     <th class="tbl_col_domain" scope="col"><tmpl_var name="domain_txt"></th>
                     <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
                 </tr>
-                <tr class="filter">
+                <tr>
                     <td class="tbl_col_domain_id"><input type="text" size="5" name="search_domain_id" value="{tmpl_var name='search_domain_id'}" /></td>
                     <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
                     <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
                     <td class="tbl_col_domain"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td>
-                    <td class="tbl_col_buttons">
-                        <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','sites/web_domain_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
-                    </td>
+                    <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','sites/web_domain_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
                 </tr>
                 </thead>
                 <tbody>
@@ -42,7 +40,9 @@
                         <td class="tbl_col_server_id"><a href="#" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
                         <td class="tbl_col_domain"><a href="#" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="domain"}</a></td>
                         <td class="tbl_col_buttons">
-                            <a class="button icons16 icoDelete" href="javascript: del_record('sites/web_domain_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 class="buttons icons16">    
+                                <a class="icons16 icoDelete" href="javascript: del_record('sites/web_domain_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>
                     </tr>
                 </tmpl_loop>
diff --git a/interface/web/themes/default-v2/templates/sites/web_domain_redirect.htm b/interface/web/themes/default-304/templates/sites/web_domain_redirect.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/sites/web_domain_redirect.htm
rename to interface/web/themes/default-304/templates/sites/web_domain_redirect.htm
diff --git a/interface/web/themes/default-v2/templates/sites/web_domain_ssl.htm b/interface/web/themes/default-304/templates/sites/web_domain_ssl.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/sites/web_domain_ssl.htm
rename to interface/web/themes/default-304/templates/sites/web_domain_ssl.htm
diff --git a/interface/web/themes/default-v2/templates/sites/web_domain_stats.htm b/interface/web/themes/default-304/templates/sites/web_domain_stats.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/sites/web_domain_stats.htm
rename to interface/web/themes/default-304/templates/sites/web_domain_stats.htm
diff --git a/interface/web/themes/default-v2/templates/sites/web_folder_edit.htm b/interface/web/themes/default-304/templates/sites/web_folder_edit.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/sites/web_folder_edit.htm
rename to interface/web/themes/default-304/templates/sites/web_folder_edit.htm
diff --git a/interface/web/themes/default-v2/templates/sites/web_folder_list.htm b/interface/web/themes/default-304/templates/sites/web_folder_list.htm
similarity index 78%
rename from interface/web/themes/default-v2/templates/sites/web_folder_list.htm
rename to interface/web/themes/default-304/templates/sites/web_folder_list.htm
index 6b7761c98f9d6a93ec527da2f0dcb271a26a4442..3dcb9ee0cbb2c415165ef1cbb2eb789eed3aa305 100644
--- a/interface/web/themes/default-v2/templates/sites/web_folder_list.htm
+++ b/interface/web/themes/default-304/templates/sites/web_folder_list.htm
@@ -5,7 +5,7 @@
     <div class="pnl_toolsarea">
         <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
             <div class="buttons">
-                <button class="button iconstxt icoAdd" type="button" onClick="loadContent('sites/web_folder_edit.php');">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('sites/web_folder_edit.php');">
                     <span>{tmpl_var name="add_new_record_txt"}</span>
                 </button>
             </div>
@@ -16,21 +16,19 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr class="caption">
+                    <tr>
                         <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
                         <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
                         <th class="tbl_col_parent_domain_id" scope="col"><tmpl_var name="parent_domain_id_txt"></th>
                         <th class="tbl_col_path" scope="col"><tmpl_var name="path_txt"></th>
                         <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
                     </tr>
-                    <tr class="filter">
+                    <tr>
                         <td class="tbl_col_active"><select name="search_active" onChange="submitForm('pageForm','sites/web_folder_list.php');">{tmpl_var name='search_active'}</select></td>
                         <td class="tbl_col_server_id"><select name="search_server_id" onChange="submitForm('pageForm','sites/web_folder_list.php');">{tmpl_var name='search_server_id'}</select></td>
                         <td class="tbl_col_parent_domain_id"><select name="search_parent_domain_id" onChange="submitForm('pageForm','sites/web_folder_list.php');">{tmpl_var name='search_parent_domain_id'}</select></td>
                         <td class="tbl_col_path"><input type="text" name="search_path" value="{tmpl_var name='search_path'}" /></td>
-                        <td class="tbl_col_buttons">
-                            <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','sites/web_folder_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
-                        </td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','sites/web_folder_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
                     </tr>
                 </thead>
                 <tbody>
@@ -41,7 +39,9 @@
                         <td class="tbl_col_parent_domain_id"><a href="#" onClick="loadContent('sites/web_folder_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="parent_domain_id"}</a></td>
                         <td class="tbl_col_path"><a href="#" onClick="loadContent('sites/web_folder_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="path"}</a></td>
                         <td class="tbl_col_buttons">
-                            <a class="button icons16 icoDelete" href="javascript: del_record('sites/web_folder_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 class="buttons icons16">    
+                                <a class="icons16 icoDelete" href="javascript: del_record('sites/web_folder_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>
                     </tr>
                 </tmpl_loop>
diff --git a/interface/web/themes/default-v2/templates/sites/web_folder_user_edit.htm b/interface/web/themes/default-304/templates/sites/web_folder_user_edit.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/sites/web_folder_user_edit.htm
rename to interface/web/themes/default-304/templates/sites/web_folder_user_edit.htm
diff --git a/interface/web/themes/default-v2/templates/sites/web_folder_user_list.htm b/interface/web/themes/default-304/templates/sites/web_folder_user_list.htm
similarity index 75%
rename from interface/web/themes/default-v2/templates/sites/web_folder_user_list.htm
rename to interface/web/themes/default-304/templates/sites/web_folder_user_list.htm
index ae00cccb28dc23903f54f8f55924d9f69498334a..2df924f1c9993b148606ecb69a8d0615752eb3c0 100644
--- a/interface/web/themes/default-v2/templates/sites/web_folder_user_list.htm
+++ b/interface/web/themes/default-304/templates/sites/web_folder_user_list.htm
@@ -5,7 +5,7 @@
     <div class="pnl_toolsarea">
         <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
             <div class="buttons">
-                <button class="button iconstxt icoAdd" type="button" onClick="loadContent('sites/web_folder_user_edit.php');">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('sites/web_folder_user_edit.php');">
                     <span>{tmpl_var name="add_new_record_txt"}</span>
                 </button>
             </div>
@@ -16,19 +16,17 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr class="caption">
+                    <tr>
                         <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
                         <th class="tbl_col_web_folder_id" scope="col"><tmpl_var name="web_folder_id_txt"></th>
                         <th class="tbl_col_username" scope="col"><tmpl_var name="username_txt"></th>
                         <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
                     </tr>
-                    <tr class="filter">
+                    <tr>
                         <td class="tbl_col_active"><select name="search_active" onChange="submitForm('pageForm','sites/web_folder_user_list.php');">{tmpl_var name='search_active'}</select></td>
                         <td class="tbl_col_web_folder_id"><select name="search_web_folder_id" onChange="submitForm('pageForm','sites/web_folder_user_list.php');">{tmpl_var name='search_web_folder_id'}</select></td>
                         <td class="tbl_col_username"><input type="text" name="search_username" value="{tmpl_var name='search_username'}" /></td>
-                        <td class="tbl_col_buttons">
-                            <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','sites/web_folder_user_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
-                        </td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','sites/web_folder_user_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
                     </tr>
                 </thead>
                 <tbody>
@@ -38,7 +36,9 @@
                         <td class="tbl_col_web_folder_id"><a href="#" onClick="loadContent('sites/web_folder_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="web_folder_id"}</a></td>
                         <td class="tbl_col_username"><a href="#" onClick="loadContent('sites/web_folder_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="username"}</a></td>
                         <td class="tbl_col_buttons">
-                            <a class="button icons16 icoDelete" href="javascript: del_record('sites/web_folder_user_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 class="buttons icons16">    
+                                <a class="icons16 icoDelete" href="javascript: del_record('sites/web_folder_user_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>
                     </tr>
                 </tmpl_loop>
diff --git a/interface/web/themes/default-v2/templates/sites/web_sites_stats_list.htm b/interface/web/themes/default-304/templates/sites/web_sites_stats_list.htm
similarity index 90%
rename from interface/web/themes/default-v2/templates/sites/web_sites_stats_list.htm
rename to interface/web/themes/default-304/templates/sites/web_sites_stats_list.htm
index 475c9d1b9ca058be15d04d579120dbe823061fcc..d51e0e2b812ca2d0f672a004fb90946d2f5a5234 100644
--- a/interface/web/themes/default-v2/templates/sites/web_sites_stats_list.htm
+++ b/interface/web/themes/default-304/templates/sites/web_sites_stats_list.htm
@@ -7,7 +7,7 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr class="caption">
+                    <tr>
                         <th class="tbl_col_domain" scope="col"><tmpl_var name="domain_txt"></th>
                         <th class="tbl_col_web_traffic_this_month" scope="col"><tmpl_var name="this_month_txt"></th>
                         <th class="tbl_col_web_traffic_last_month" scope="col"><tmpl_var name="last_month_txt"></th>
@@ -15,15 +15,13 @@
                         <th class="tbl_col_web_traffic_last_year" scope="col"><tmpl_var name="last_year_txt"></th>
                         <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
                     </tr>
-                    <tr class="filter">
+                    <tr>
                         <td class="tbl_col_domain"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td>
                         <td class="tbl_col_this_month"></td>
                         <td class="tbl_col_last_month"></td>
                         <td class="tbl_col_this_year"></td>
                         <td class="tbl_col_last_year"></td>
-                        <td class="tbl_col_buttons">
-                            <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','sites/web_sites_stats.php');"><span>{tmpl_var name="filter_txt"}</span></button>
-                        </td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','sites/web_sites_stats.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
                     </tr>
                 </thead>
                 <tbody>
@@ -34,7 +32,10 @@
                         <td class="tbl_col_last_month"><a href="#" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="last_month"} MB</a></td>
                         <td class="tbl_col_this_year"><a href="#" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="this_year"} MB</a></td>
                         <td class="tbl_col_last_year"><a href="#" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="last_year"} MB</a></td>
-                        <td class="tbl_col_buttons"></td>
+                        <td class="tbl_col_buttons">
+                            <div class="buttons icons16">    
+                            </div>
+                        </td>
                     </tr>
                 </tmpl_loop>
 				<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
diff --git a/interface/web/themes/default-v2/templates/sites/web_subdomain_edit.htm b/interface/web/themes/default-304/templates/sites/web_subdomain_edit.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/sites/web_subdomain_edit.htm
rename to interface/web/themes/default-304/templates/sites/web_subdomain_edit.htm
diff --git a/interface/web/themes/default-v2/templates/sites/web_subdomain_list.htm b/interface/web/themes/default-304/templates/sites/web_subdomain_list.htm
similarity index 77%
rename from interface/web/themes/default-v2/templates/sites/web_subdomain_list.htm
rename to interface/web/themes/default-304/templates/sites/web_subdomain_list.htm
index 7d097ec48704631d6d82a0243e7d0ed14ecf0b2c..237cd8568970f9066346379b389250c9aa10ffc8 100644
--- a/interface/web/themes/default-v2/templates/sites/web_subdomain_list.htm
+++ b/interface/web/themes/default-304/templates/sites/web_subdomain_list.htm
@@ -6,7 +6,7 @@
     <div class="pnl_toolsarea">
         <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
             <div class="buttons">
-                <button class="button iconstxt icoAdd" type="button" onClick="loadContent('sites/web_subdomain_edit.php');">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('sites/web_subdomain_edit.php');">
                     <span>{tmpl_var name="add_new_record_txt"}</span>
                 </button>
             </div>
@@ -17,21 +17,19 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr class="caption">
+                    <tr>
                         <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
                         <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
                         <th class="tbl_col_parent_domain_id" scope="col"><tmpl_var name="parent_domain_id_txt"></th>
                         <th class="tbl_col_domain" scope="col"><tmpl_var name="domain_txt"></th>
                         <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
                     </tr>
-                    <tr class="filter">
+                    <tr>
                         <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
                         <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
                         <td class="tbl_col_parent_domain_id"><select name="search_parent_domain_id">{tmpl_var name='search_parent_domain_id'}</select></td>
                         <td class="tbl_col_domain"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td>
-                        <td class="tbl_col_buttons">
-                            <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','sites/web_subdomain_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
-                        </td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','sites/web_subdomain_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
                     </tr>
                 </thead>
                 <tbody>
@@ -42,7 +40,9 @@
                             <td class="tbl_col_parent_domain_id"><a href="#" onClick="loadContent('sites/web_subdomain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="parent_domain_id"}</a></td>
                             <td class="tbl_col_domain"><a href="#" onClick="loadContent('sites/web_subdomain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="domain"}</a></td>
                             <td class="tbl_col_buttons">
-                                <a class="button icons16 icoDelete" href="javascript: del_record('sites/web_subdomain_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 class="buttons icons16">    
+                                    <a class="icons16 icoDelete" href="javascript: del_record('sites/web_subdomain_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>
                         </tr>
                     </tmpl_loop>
diff --git a/interface/web/themes/default-v2/templates/sites/web_vhost_subdomain_advanced.htm b/interface/web/themes/default-304/templates/sites/web_vhost_subdomain_advanced.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/sites/web_vhost_subdomain_advanced.htm
rename to interface/web/themes/default-304/templates/sites/web_vhost_subdomain_advanced.htm
diff --git a/interface/web/themes/default-v2/templates/sites/web_vhost_subdomain_backup.htm b/interface/web/themes/default-304/templates/sites/web_vhost_subdomain_backup.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/sites/web_vhost_subdomain_backup.htm
rename to interface/web/themes/default-304/templates/sites/web_vhost_subdomain_backup.htm
diff --git a/interface/web/themes/default-v2/templates/sites/web_vhost_subdomain_edit.htm b/interface/web/themes/default-304/templates/sites/web_vhost_subdomain_edit.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/sites/web_vhost_subdomain_edit.htm
rename to interface/web/themes/default-304/templates/sites/web_vhost_subdomain_edit.htm
diff --git a/interface/web/themes/default-v2/templates/sites/web_vhost_subdomain_list.htm b/interface/web/themes/default-304/templates/sites/web_vhost_subdomain_list.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/sites/web_vhost_subdomain_list.htm
rename to interface/web/themes/default-304/templates/sites/web_vhost_subdomain_list.htm
diff --git a/interface/web/themes/default-v2/templates/sites/web_vhost_subdomain_redirect.htm b/interface/web/themes/default-304/templates/sites/web_vhost_subdomain_redirect.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/sites/web_vhost_subdomain_redirect.htm
rename to interface/web/themes/default-304/templates/sites/web_vhost_subdomain_redirect.htm
diff --git a/interface/web/themes/default-v2/templates/sites/web_vhost_subdomain_ssl.htm b/interface/web/themes/default-304/templates/sites/web_vhost_subdomain_ssl.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/sites/web_vhost_subdomain_ssl.htm
rename to interface/web/themes/default-304/templates/sites/web_vhost_subdomain_ssl.htm
diff --git a/interface/web/themes/default-v2/templates/sites/web_vhost_subdomain_stats.htm b/interface/web/themes/default-304/templates/sites/web_vhost_subdomain_stats.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/sites/web_vhost_subdomain_stats.htm
rename to interface/web/themes/default-304/templates/sites/web_vhost_subdomain_stats.htm
diff --git a/interface/web/themes/default-v2/templates/sites/webdav_user_edit.htm b/interface/web/themes/default-304/templates/sites/webdav_user_edit.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/sites/webdav_user_edit.htm
rename to interface/web/themes/default-304/templates/sites/webdav_user_edit.htm
diff --git a/interface/web/themes/default-v2/templates/sites/webdav_user_list.htm b/interface/web/themes/default-304/templates/sites/webdav_user_list.htm
similarity index 78%
rename from interface/web/themes/default-v2/templates/sites/webdav_user_list.htm
rename to interface/web/themes/default-304/templates/sites/webdav_user_list.htm
index e5b055a2ba1e3bc398a7f5ada37115779880fbba..ee2b45df80049d536cb6d0ac7bb5cc9ae284e892 100644
--- a/interface/web/themes/default-v2/templates/sites/webdav_user_list.htm
+++ b/interface/web/themes/default-304/templates/sites/webdav_user_list.htm
@@ -6,7 +6,7 @@
     <div class="pnl_toolsarea">
         <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
             <div class="buttons">
-                <button class="button iconstxt icoAdd" type="button" onClick="loadContent('sites/webdav_user_edit.php');">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('sites/webdav_user_edit.php');">
                     <span>{tmpl_var name="add_new_record_txt"}</span>
                 </button>
             </div>
@@ -17,21 +17,19 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr class="caption">
+                    <tr>
                         <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
                         <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
                         <th class="tbl_col_parent_domain_id" scope="col"><tmpl_var name="parent_domain_id_txt"></th>
                         <th class="tbl_col_username" scope="col"><tmpl_var name="username_txt"></th>
                         <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
                     </tr>
-                    <tr class="filter">
+                    <tr>
                         <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
                         <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
                         <td class="tbl_col_parent_domain_id"><select name="search_parent_domain_id">{tmpl_var name='search_parent_domain_id'}</select></td>
                         <td class="tbl_col_username"><input type="text" name="search_username" value="{tmpl_var name='search_username'}" /></td>
-                        <td class="tbl_col_buttons">
-                            <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','sites/webdav_user_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
-                        </td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','sites/webdav_user_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
                     </tr>
                 </thead>
                 <tbody>
@@ -42,7 +40,9 @@
                             <td class="tbl_col_parent_domain_id"><a href="#" onClick="loadContent('sites/webdav_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="parent_domain_id"}</a></td>
                             <td class="tbl_col_username"><a href="#" onClick="loadContent('sites/webdav_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="username"}</a></td>
                             <td class="tbl_col_buttons">
-                                <a class="button icons16 icoDelete" href="javascript: del_record('sites/webdav_user_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 class="buttons icons16">    
+                                    <a class="icons16 icoDelete" href="javascript: del_record('sites/webdav_user_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>
                         </tr>
                     </tmpl_loop>
diff --git a/interface/web/themes/default-v2/templates/tabbed_form.tpl.htm b/interface/web/themes/default-304/templates/tabbed_form.tpl.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/tabbed_form.tpl.htm
rename to interface/web/themes/default-304/templates/tabbed_form.tpl.htm
diff --git a/interface/web/themes/default-v2/templates/tools/dns_import_tupa.htm b/interface/web/themes/default-304/templates/tools/dns_import_tupa.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/tools/dns_import_tupa.htm
rename to interface/web/themes/default-304/templates/tools/dns_import_tupa.htm
diff --git a/interface/web/themes/default-v2/templates/tools/import_ispconfig.htm b/interface/web/themes/default-304/templates/tools/import_ispconfig.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/tools/import_ispconfig.htm
rename to interface/web/themes/default-304/templates/tools/import_ispconfig.htm
diff --git a/interface/web/themes/default-v2/templates/tools/import_plesk.htm b/interface/web/themes/default-304/templates/tools/import_plesk.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/tools/import_plesk.htm
rename to interface/web/themes/default-304/templates/tools/import_plesk.htm
diff --git a/interface/web/themes/default-v2/templates/tools/index.htm b/interface/web/themes/default-304/templates/tools/index.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/tools/index.htm
rename to interface/web/themes/default-304/templates/tools/index.htm
diff --git a/interface/web/themes/default-v2/templates/tools/interface_settings.htm b/interface/web/themes/default-304/templates/tools/interface_settings.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/tools/interface_settings.htm
rename to interface/web/themes/default-304/templates/tools/interface_settings.htm
diff --git a/interface/web/themes/default-v2/templates/tools/resync.htm b/interface/web/themes/default-304/templates/tools/resync.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/tools/resync.htm
rename to interface/web/themes/default-304/templates/tools/resync.htm
diff --git a/interface/web/themes/default-v2/templates/tools/tpl_default-v2.htm b/interface/web/themes/default-304/templates/tools/tpl_default-v2.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/tools/tpl_default-v2.htm
rename to interface/web/themes/default-304/templates/tools/tpl_default-v2.htm
diff --git a/interface/web/themes/default-v2/templates/tools/tpl_default.htm b/interface/web/themes/default-304/templates/tools/tpl_default.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/tools/tpl_default.htm
rename to interface/web/themes/default-304/templates/tools/tpl_default.htm
diff --git a/interface/web/themes/default-v2/templates/tools/user_settings.htm b/interface/web/themes/default-304/templates/tools/user_settings.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/tools/user_settings.htm
rename to interface/web/themes/default-304/templates/tools/user_settings.htm
diff --git a/interface/web/themes/default-v2/templates/topnav.tpl.htm b/interface/web/themes/default-304/templates/topnav.tpl.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/topnav.tpl.htm
rename to interface/web/themes/default-304/templates/topnav.tpl.htm
diff --git a/interface/web/themes/default-v2/templates/vm/openvz_action.htm b/interface/web/themes/default-304/templates/vm/openvz_action.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/vm/openvz_action.htm
rename to interface/web/themes/default-304/templates/vm/openvz_action.htm
diff --git a/interface/web/themes/default-v2/templates/vm/openvz_ip_edit.htm b/interface/web/themes/default-304/templates/vm/openvz_ip_edit.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/vm/openvz_ip_edit.htm
rename to interface/web/themes/default-304/templates/vm/openvz_ip_edit.htm
diff --git a/interface/web/themes/default-v2/templates/vm/openvz_ip_list.htm b/interface/web/themes/default-304/templates/vm/openvz_ip_list.htm
similarity index 77%
rename from interface/web/themes/default-v2/templates/vm/openvz_ip_list.htm
rename to interface/web/themes/default-304/templates/vm/openvz_ip_list.htm
index 12d50da03967af434a8f1284182ea8692bb40698..886d4b9e84da912df8c4612f8494e5c5149d2cc5 100644
--- a/interface/web/themes/default-v2/templates/vm/openvz_ip_list.htm
+++ b/interface/web/themes/default-304/templates/vm/openvz_ip_list.htm
@@ -5,7 +5,7 @@
     <div class="pnl_toolsarea">
         <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
             <div class="buttons">
-                <button class="button iconstxt icoAdd" type="button" onClick="loadContent('vm/openvz_ip_edit.php');">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('vm/openvz_ip_edit.php');">
                     <span>{tmpl_var name="add_new_record_txt"}</span>
                 </button>
             </div>
@@ -16,21 +16,19 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr class="caption">
+                    <tr>
                         <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
                         <th class="tbl_col_vm_id" scope="col"><tmpl_var name="vm_id_txt"></th>
                         <th class="tbl_col_ip_address" scope="col"><tmpl_var name="ip_address_txt"></th>
                         <th class="tbl_col_reserved" scope="col"><tmpl_var name="reserved_txt"></th>
                         <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
                     </tr>
-                    <tr class="filter">
+                    <tr>
                         <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
                         <td class="tbl_col_vm_id"><select name="search_vm_id">{tmpl_var name='search_vm_id'}</select></td>
                         <td class="tbl_col_ip_address"><input type="text" name="search_ip_address" value="{tmpl_var name='search_ip_address'}" /></td>
                         <td class="tbl_col_reserved"><select name="search_reserved">{tmpl_var name='search_reserved'}</select></td>
-                        <td class="tbl_col_buttons">
-                            <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','vm/openvz_ip_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
-                        </td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','vm/openvz_ip_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
                     </tr>
                 </thead>
                 <tbody>
@@ -41,7 +39,9 @@
                             <td class="tbl_col_ip_address"><a href="#" onClick="loadContent('vm/openvz_ip_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="ip_address"}</a></td>
                             <td class="tbl_col_reserved"><a href="#" onClick="loadContent('vm/openvz_ip_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="reserved"}</a></td>
                             <td class="tbl_col_buttons">
-                                <a class="button icons16 icoDelete" href="javascript: del_record('vm/openvz_ip_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 class="buttons icons16">    
+                                    <a class="icons16 icoDelete" href="javascript: del_record('vm/openvz_ip_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>
                         </tr>
                     </tmpl_loop>
diff --git a/interface/web/themes/default-v2/templates/vm/openvz_ostemplate_edit.htm b/interface/web/themes/default-304/templates/vm/openvz_ostemplate_edit.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/vm/openvz_ostemplate_edit.htm
rename to interface/web/themes/default-304/templates/vm/openvz_ostemplate_edit.htm
diff --git a/interface/web/themes/default-v2/templates/vm/openvz_ostemplate_list.htm b/interface/web/themes/default-304/templates/vm/openvz_ostemplate_list.htm
similarity index 79%
rename from interface/web/themes/default-v2/templates/vm/openvz_ostemplate_list.htm
rename to interface/web/themes/default-304/templates/vm/openvz_ostemplate_list.htm
index f30f68affbd631ed6382841b8e43fb3a89edd32c..c15277422abca6ab254b3b0bb574abc322413665 100644
--- a/interface/web/themes/default-v2/templates/vm/openvz_ostemplate_list.htm
+++ b/interface/web/themes/default-304/templates/vm/openvz_ostemplate_list.htm
@@ -5,7 +5,7 @@
     <div class="pnl_toolsarea">
         <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
             <div class="buttons">
-                <button class="button iconstxt icoAdd" type="button" onClick="loadContent('vm/openvz_ostemplate_edit.php');">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('vm/openvz_ostemplate_edit.php');">
                     <span>{tmpl_var name="add_new_record_txt"}</span>
                 </button>
             </div>
@@ -16,7 +16,7 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr class="caption">
+                    <tr>
                         <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
                         <th class="tbl_col_ostemplate_id" scope="col"><tmpl_var name="ostemplate_id_txt"></th>
                         <th class="tbl_col_template_name" scope="col"><tmpl_var name="template_name_txt"></th>
@@ -24,15 +24,13 @@
                         <th class="tbl_col_allservers" scope="col"><tmpl_var name="allservers_txt"></th>
                         <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
                     </tr>
-                    <tr class="filter">
+                    <tr>
                         <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
-                        <td class="tbl_col_ostemplate_id"><input type="text" name="search_ostemplate_id" value="{tmpl_var name='search_ostemplate_id'}" /></td>
+                        <td class="tbl_col_ostemplate_id"><input type="text" name="search_ostemplate_id" value="{tmpl_var name='search_ostemplate_id'}" style="width:30px;" /></td>
                         <td class="tbl_col_template_name"><input type="text" name="search_template_name" value="{tmpl_var name='search_template_name'}" /></td>
                         <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
                         <td class="tbl_col_allservers"><select name="search_allservers">{tmpl_var name='search_allservers'}</select></td>
-                        <td class="tbl_col_buttons">
-                            <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','vm/openvz_ostemplate_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
-                        </td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','vm/openvz_ostemplate_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
                     </tr>
                 </thead>
                 <tbody>
@@ -44,7 +42,9 @@
                             <td class="tbl_col_server_id"><a href="#" onClick="loadContent('vm/openvz_ostemplate_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
                             <td class="tbl_col_allservers"><a href="#" onClick="loadContent('vm/openvz_ostemplate_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="allservers"}</a></td>
                             <td class="tbl_col_buttons">
-                                <a class="button icons16 icoDelete" href="javascript: del_record('vm/openvz_ostemplate_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 class="buttons icons16">    
+                                    <a class="icons16 icoDelete" href="javascript: del_record('vm/openvz_ostemplate_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>
                         </tr>
                     </tmpl_loop>
diff --git a/interface/web/themes/default-v2/templates/vm/openvz_template_advanced_edit.htm b/interface/web/themes/default-304/templates/vm/openvz_template_advanced_edit.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/vm/openvz_template_advanced_edit.htm
rename to interface/web/themes/default-304/templates/vm/openvz_template_advanced_edit.htm
diff --git a/interface/web/themes/default-v2/templates/vm/openvz_template_edit.htm b/interface/web/themes/default-304/templates/vm/openvz_template_edit.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/vm/openvz_template_edit.htm
rename to interface/web/themes/default-304/templates/vm/openvz_template_edit.htm
diff --git a/interface/web/themes/default-v2/templates/vm/openvz_template_list.htm b/interface/web/themes/default-304/templates/vm/openvz_template_list.htm
similarity index 71%
rename from interface/web/themes/default-v2/templates/vm/openvz_template_list.htm
rename to interface/web/themes/default-304/templates/vm/openvz_template_list.htm
index d83eb31de2f00ae7303d7c3496376634f10531db..78f102bf792de4cb9decc7688f429b3f6e3a2d3f 100644
--- a/interface/web/themes/default-v2/templates/vm/openvz_template_list.htm
+++ b/interface/web/themes/default-304/templates/vm/openvz_template_list.htm
@@ -5,7 +5,7 @@
     <div class="pnl_toolsarea">
         <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
             <div class="buttons">
-                <button class="button iconstxt icoAdd" type="button" onClick="loadContent('vm/openvz_template_edit.php');">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('vm/openvz_template_edit.php');">
                     <span>{tmpl_var name="add_new_record_txt"}</span>
                 </button>
             </div>
@@ -16,17 +16,15 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr class="caption">
+                    <tr>
                         <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
                         <th class="tbl_col_template_name" scope="col"><tmpl_var name="template_name_txt"></th>
                         <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
                     </tr>
-                    <tr class="filter">
+                    <tr>
                         <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
                         <td class="tbl_col_template_name"><input type="text" name="search_template_name" value="{tmpl_var name='search_template_name'}" /></td>
-                        <td class="tbl_col_buttons">
-                            <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','vm/openvz_template_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
-                        </td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','vm/openvz_template_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
                     </tr>
                 </thead>
                 <tbody>
@@ -35,7 +33,9 @@
                             <td class="tbl_col_active"><a href="#" onClick="loadContent('vm/openvz_template_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
                             <td class="tbl_col_template_name"><a href="#" onClick="loadContent('vm/openvz_template_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="template_name"}</a></td>
                             <td class="tbl_col_buttons">
-                                <a class="button icons16 icoDelete" href="javascript: del_record('vm/openvz_template_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 class="buttons icons16">    
+                                    <a class="icons16 icoDelete" href="javascript: del_record('vm/openvz_template_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>
                         </tr>
                     </tmpl_loop>
diff --git a/interface/web/themes/default-v2/templates/vm/openvz_vm_advanced_edit.htm b/interface/web/themes/default-304/templates/vm/openvz_vm_advanced_edit.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/vm/openvz_vm_advanced_edit.htm
rename to interface/web/themes/default-304/templates/vm/openvz_vm_advanced_edit.htm
diff --git a/interface/web/themes/default-v2/templates/vm/openvz_vm_edit.htm b/interface/web/themes/default-304/templates/vm/openvz_vm_edit.htm
similarity index 100%
rename from interface/web/themes/default-v2/templates/vm/openvz_vm_edit.htm
rename to interface/web/themes/default-304/templates/vm/openvz_vm_edit.htm
diff --git a/interface/web/themes/default-v2/templates/vm/openvz_vm_list.htm b/interface/web/themes/default-304/templates/vm/openvz_vm_list.htm
similarity index 77%
rename from interface/web/themes/default-v2/templates/vm/openvz_vm_list.htm
rename to interface/web/themes/default-304/templates/vm/openvz_vm_list.htm
index 66d65a1d749c89469bd5a22f0198bf370c946fc9..ad0245617e45403a7c995871541ca14129094ff0 100644
--- a/interface/web/themes/default-v2/templates/vm/openvz_vm_list.htm
+++ b/interface/web/themes/default-304/templates/vm/openvz_vm_list.htm
@@ -5,7 +5,7 @@
     <div class="pnl_toolsarea">
         <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
             <div class="buttons">
-                <button class="button iconstxt icoAdd" type="button" onClick="loadContent('vm/openvz_vm_edit.php');">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('vm/openvz_vm_edit.php');">
                     <span>{tmpl_var name="add_new_record_txt"}</span>
                 </button>
             </div>
@@ -16,7 +16,7 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr class="caption">
+                    <tr>
                         <th class="tbl_col_veid" scope="col"><tmpl_var name="veid_txt"></th>
                         <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
                         <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
@@ -26,17 +26,15 @@
                         <th class="tbl_col_ip_address" scope="col"><tmpl_var name="ip_address_txt"></th>
                         <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
                     </tr>
-                    <tr class="filter">
-                        <td class="tbl_col_veid"><input type="text" name="search_veid" value="{tmpl_var name='search_veid'}" /></td>
+                    <tr>
+                        <td class="tbl_col_veid"><input type="text" name="search_veid" style="width:40px;" value="{tmpl_var name='search_veid'}" /></td>
                         <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
                         <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
                         <td class="tbl_col_ostemplate_id"><select name="search_ostemplate_id">{tmpl_var name='search_ostemplate_id'}</select></td>
                         <td class="tbl_col_template_id"><select name="search_template_id">{tmpl_var name='search_template_id'}</select></td>
                         <td class="tbl_col_hostname"><input type="text" name="search_hostname" value="{tmpl_var name='search_hostname'}" /></td>
-                        <td class="tbl_col_ip_address"><input type="text" name="search_ip_address" value="{tmpl_var name='search_ip_address'}" /></td>
-                        <td class="tbl_col_buttons">
-                            <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','vm/openvz_vm_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
-                        </td>
+                        <td class="tbl_col_ip_address"><input type="text" name="search_ip_address" style="width:80px;" value="{tmpl_var name='search_ip_address'}" /></td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','vm/openvz_vm_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
                     </tr>
                 </thead>
                 <tbody>
@@ -50,8 +48,10 @@
                             <td class="tbl_col_hostname"><a href="#" onClick="loadContent('vm/openvz_vm_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="hostname"}</a></td>
                             <td class="tbl_col_ip_address"><a href="#" onClick="loadContent('vm/openvz_vm_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="ip_address"}</a></td>
                             <td class="tbl_col_buttons">
-                                <a class="button icons16 icoAction" href="javascript: loadContent('vm/openvz_action.php?id={tmpl_var name='id'}');"><span>Action</span></a>
-                                <a class="button icons16 icoDelete" href="javascript: del_record('vm/openvz_vm_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 class="buttons icons16">    
+                                    <a class="icons16 icoAction" href="javascript: loadContent('vm/openvz_action.php?id={tmpl_var name='id'}');"><span>Action</span></a>
+                                    <a class="icons16 icoDelete" href="javascript: del_record('vm/openvz_vm_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>
                         </tr>
                     </tmpl_loop>
diff --git a/interface/web/themes/default/yaml/!important.txt b/interface/web/themes/default-304/yaml/!important.txt
similarity index 100%
rename from interface/web/themes/default/yaml/!important.txt
rename to interface/web/themes/default-304/yaml/!important.txt
diff --git a/interface/web/themes/default/yaml/core/base.css b/interface/web/themes/default-304/yaml/core/base.css
similarity index 100%
rename from interface/web/themes/default/yaml/core/base.css
rename to interface/web/themes/default-304/yaml/core/base.css
diff --git a/interface/web/themes/default/yaml/core/iehacks.css b/interface/web/themes/default-304/yaml/core/iehacks.css
similarity index 100%
rename from interface/web/themes/default/yaml/core/iehacks.css
rename to interface/web/themes/default-304/yaml/core/iehacks.css
diff --git a/interface/web/themes/default/yaml/core/print_base.css b/interface/web/themes/default-304/yaml/core/print_base.css
similarity index 100%
rename from interface/web/themes/default/yaml/core/print_base.css
rename to interface/web/themes/default-304/yaml/core/print_base.css
diff --git a/interface/web/themes/default/yaml/core/slim_base.css b/interface/web/themes/default-304/yaml/core/slim_base.css
similarity index 100%
rename from interface/web/themes/default/yaml/core/slim_base.css
rename to interface/web/themes/default-304/yaml/core/slim_base.css
diff --git a/interface/web/themes/default/yaml/core/slim_iehacks.css b/interface/web/themes/default-304/yaml/core/slim_iehacks.css
similarity index 100%
rename from interface/web/themes/default/yaml/core/slim_iehacks.css
rename to interface/web/themes/default-304/yaml/core/slim_iehacks.css
diff --git a/interface/web/themes/default/yaml/core/slim_print_base.css b/interface/web/themes/default-304/yaml/core/slim_print_base.css
similarity index 100%
rename from interface/web/themes/default/yaml/core/slim_print_base.css
rename to interface/web/themes/default-304/yaml/core/slim_print_base.css
diff --git a/interface/web/themes/default/yaml/debug/debug.css b/interface/web/themes/default-304/yaml/debug/debug.css
similarity index 100%
rename from interface/web/themes/default/yaml/debug/debug.css
rename to interface/web/themes/default-304/yaml/debug/debug.css
diff --git a/interface/web/themes/default/yaml/debug/images/grid_pattern.png b/interface/web/themes/default-304/yaml/debug/images/grid_pattern.png
similarity index 100%
rename from interface/web/themes/default/yaml/debug/images/grid_pattern.png
rename to interface/web/themes/default-304/yaml/debug/images/grid_pattern.png
diff --git a/interface/web/themes/default/yaml/debug/images/warning_iehacks.gif b/interface/web/themes/default-304/yaml/debug/images/warning_iehacks.gif
similarity index 100%
rename from interface/web/themes/default/yaml/debug/images/warning_iehacks.gif
rename to interface/web/themes/default-304/yaml/debug/images/warning_iehacks.gif
diff --git a/interface/web/themes/default/yaml/debug/images/yaml_debug.gif b/interface/web/themes/default-304/yaml/debug/images/yaml_debug.gif
similarity index 100%
rename from interface/web/themes/default/yaml/debug/images/yaml_debug.gif
rename to interface/web/themes/default-304/yaml/debug/images/yaml_debug.gif
diff --git a/interface/web/themes/default/yaml/navigation/nav_vlist.css b/interface/web/themes/default-304/yaml/navigation/nav_vlist.css
similarity index 100%
rename from interface/web/themes/default/yaml/navigation/nav_vlist.css
rename to interface/web/themes/default-304/yaml/navigation/nav_vlist.css
diff --git a/interface/web/themes/default/yaml/patches/patch_layout_draft.css b/interface/web/themes/default-304/yaml/patches/patch_layout_draft.css
similarity index 100%
rename from interface/web/themes/default/yaml/patches/patch_layout_draft.css
rename to interface/web/themes/default-304/yaml/patches/patch_layout_draft.css
diff --git a/interface/web/themes/default/yaml/patches/patch_nav_vlist.css b/interface/web/themes/default-304/yaml/patches/patch_nav_vlist.css
similarity index 100%
rename from interface/web/themes/default/yaml/patches/patch_nav_vlist.css
rename to interface/web/themes/default-304/yaml/patches/patch_nav_vlist.css
diff --git a/interface/web/themes/default/yaml/print/print_003_draft.css b/interface/web/themes/default-304/yaml/print/print_003_draft.css
similarity index 100%
rename from interface/web/themes/default/yaml/print/print_003_draft.css
rename to interface/web/themes/default-304/yaml/print/print_003_draft.css
diff --git a/interface/web/themes/default/yaml/print/print_020_draft.css b/interface/web/themes/default-304/yaml/print/print_020_draft.css
similarity index 100%
rename from interface/web/themes/default/yaml/print/print_020_draft.css
rename to interface/web/themes/default-304/yaml/print/print_020_draft.css
diff --git a/interface/web/themes/default/yaml/print/print_023_draft.css b/interface/web/themes/default-304/yaml/print/print_023_draft.css
similarity index 100%
rename from interface/web/themes/default/yaml/print/print_023_draft.css
rename to interface/web/themes/default-304/yaml/print/print_023_draft.css
diff --git a/interface/web/themes/default/yaml/print/print_100_draft.css b/interface/web/themes/default-304/yaml/print/print_100_draft.css
similarity index 100%
rename from interface/web/themes/default/yaml/print/print_100_draft.css
rename to interface/web/themes/default-304/yaml/print/print_100_draft.css
diff --git a/interface/web/themes/default/yaml/print/print_103_draft.css b/interface/web/themes/default-304/yaml/print/print_103_draft.css
similarity index 100%
rename from interface/web/themes/default/yaml/print/print_103_draft.css
rename to interface/web/themes/default-304/yaml/print/print_103_draft.css
diff --git a/interface/web/themes/default/yaml/print/print_120_draft.css b/interface/web/themes/default-304/yaml/print/print_120_draft.css
similarity index 100%
rename from interface/web/themes/default/yaml/print/print_120_draft.css
rename to interface/web/themes/default-304/yaml/print/print_120_draft.css
diff --git a/interface/web/themes/default/yaml/print/print_123_draft.css b/interface/web/themes/default-304/yaml/print/print_123_draft.css
similarity index 100%
rename from interface/web/themes/default/yaml/print/print_123_draft.css
rename to interface/web/themes/default-304/yaml/print/print_123_draft.css
diff --git a/interface/web/themes/default/yaml/screen/basemod_draft.css b/interface/web/themes/default-304/yaml/screen/basemod_draft.css
similarity index 100%
rename from interface/web/themes/default/yaml/screen/basemod_draft.css
rename to interface/web/themes/default-304/yaml/screen/basemod_draft.css
diff --git a/interface/web/themes/default/yaml/screen/content_default.css b/interface/web/themes/default-304/yaml/screen/content_default.css
similarity index 100%
rename from interface/web/themes/default/yaml/screen/content_default.css
rename to interface/web/themes/default-304/yaml/screen/content_default.css
diff --git a/interface/web/themes/default-v2/templates/mail/user_quota_stats_list.htm b/interface/web/themes/default-v2/templates/mail/user_quota_stats_list.htm
deleted file mode 100644
index 1f8a9ecc8507f528a3e2c899e94e03ecc87b8044..0000000000000000000000000000000000000000
--- a/interface/web/themes/default-v2/templates/mail/user_quota_stats_list.htm
+++ /dev/null
@@ -1,46 +0,0 @@
-<h2><tmpl_var name="list_head_txt"></h2>
-
-<div class="panel panel_list_user_quota_stats">
-
-    <div class="pnl_listarea">
-        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
-            <table class="list">
-                <thead>
-                    <tr class="caption">
-                        <th class="tbl_col_email" scope="col"><tmpl_var name="email_txt"></th>
-                        <th class="tbl_col_name" scope="col"><tmpl_var name="name_txt"></th>
-                        <th class="tbl_col_used" scope="col"><tmpl_var name="used_txt"></th>
-                        <th class="tbl_col_quota" scope="col"><tmpl_var name="quota_txt"></th>
-                        <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
-                    </tr>
-                    <tr class="filter">
-                        <td class="tbl_col_email"><input type="text" name="search_email" value="{tmpl_var name='search_email'}" /></td>
-                        <td class="tbl_col_name"><input type="text" name="search_system_user" value="{tmpl_var name='search_name'}" /></td>
-                        <td class="tbl_col_used">&nbsp;</td>
-                        <td class="tbl_col_quota">&nbsp;</td>
-                        <td class="tbl_col_buttons">
-                            <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/user_quota_stats.php');"><span>{tmpl_var name="filter_txt"}</span></button>
-                        </td>
-                    </tr>
-                </thead>
-                <tbody>
-                    <tmpl_loop name="records">
-                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
-                            <td class="tbl_col_email"><a href="#" onClick="loadContent('mail/mail_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="email"}</a></td>
-                            <td class="tbl_col_name"><a href="#" onClick="loadContent('mail/mail_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="name"}</a></td>
-                            <td class="tbl_col_used"><a href="#" onClick="loadContent('mail/mail_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="used"}</a></td>
-                            <td class="tbl_col_quota"><a href="#" onClick="loadContent('mail/mail_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="quota"}</a></td>
-                            <td class="tbl_col_buttons"></td>
-                        </tr>
-                    </tmpl_loop>
-                </tbody>
-                <tfoot>
-                    <tr>
-                        <td class="tbl_footer tbl_paging" colspan="5"><tmpl_var name="paging"></td>
-                    </tr>
-                </tfoot>
-            </table>
-        </fieldset>
-    </div>
-
-</div>
diff --git a/interface/web/themes/default-v2/templates/main.tpl.htm b/interface/web/themes/default-v2/templates/main.tpl.htm
deleted file mode 100644
index 4e222dd9af27fbddc3670c90f9f1921a97caa089..0000000000000000000000000000000000000000
--- a/interface/web/themes/default-v2/templates/main.tpl.htm
+++ /dev/null
@@ -1,113 +0,0 @@
-<!DOCTYPE html>
-<html dir="ltr" lang="<tmpl_var name="language">-<tmpl_var name="country">">      
-    <head>
-        <!--Possible? Vars in lang= ?-->
-        <meta charset="<tmpl_var name="html_content_encoding">" />
-        <title><tmpl_var name="app_title"> <tmpl_var name="app_version"></title>
-        <meta http-equiv="X-UA-Compatible" content="IE=8"/>
-        <link href="themes/default-v2/css/styles.css" rel="stylesheet" media="screen" type="text/css"/>
-        <link href="themes/default-v2/css/print.css" rel="stylesheet" media="print" type="text/css"/>
-        <!--[if IE 9]><link href="themes/default-v2/css/iehacks.css" rel="stylesheet" type="text/css" /><![endif]-->
-        <!--[if lte IE 8]><link href="themes/default-v2/css/iehacks.css" rel="stylesheet" type="text/css" /><![endif]-->
-        <!--[if lte IE 7]><link href="themes/default-v2/css/iehacks.css" rel="stylesheet" type="text/css" /><![endif]-->
-        <link href="themes/default-v2/css/jquery-ui-1.8.16.custom.css" rel="stylesheet" type="text/css"/>
-        <link rel="shortcut icon" href="/themes/default-v2/images/favicon.ico" />
-        <script type="text/javascript" src="js/jquery-1.6.3.min.js"></script>
-        <script type="text/javascript" src="js/jquery-ui-1.8.16.custom.min.js"></script>
-        <script type="text/javascript" src="js/scrigo.js.php"></script>
-        <script type="text/javascript" src="js/uni-form/uni-form.jquery.js"></script>
-        <script type="text/javascript" src="js/jquery.ispconfigsearch.js"></script>
-        <script type="text/javascript" src="js/jquery.tipsy.js"></script>
-        <script type="text/javascript" src="themes/default-v2/js/html5shiv.js"></script>
-        <script language="JavaScript" type="text/javascript">
-            jQuery(document).ready(function() {
-                loadInitContent();
-                
-                $("#pageForm").submit(function(e){
-                    //Prevent form submit: e.preventDefault() in lists
-                    if ($(".panel #Filter").length > 0) {
-                        e.preventDefault();
-                    }
-                });
-                
-                jQuery('.subsectiontoggle').live("click", function(){
-                    jQuery(this).children().toggleClass('showing').end().next().slideToggle();
-                });
-                
-                jQuery('#globalsearch').ispconfigSearch({
-                    dataSrc: '/dashboard/ajax_get_json.php?type=globalsearch',
-                    resultsLimit: '$ <tmpl_var name="globalsearch_resultslimit_of_txt"> % <tmpl_var name="globalsearch_resultslimit_results_txt">',
-                    noResultsText: '<tmpl_var name="globalsearch_noresults_text_txt">',
-                    noResultsLimit: '<tmpl_var name="globalsearch_noresults_limit_txt">',
-                    searchFieldWatermark: '<tmpl_var name="globalsearch_searchfield_watermark_txt">'
-                });
-                
-                jQuery('.ttip').tipsy({live: true, gravity: 'ne', html: true});
-            });
-            
-            
-            jQuery(document).bind("change", function(event) {
-                if (jQuery(".panel #Filter").length > 0 && event.target.localName == 'select') {
-                    event.preventDefault();
-                    jQuery(".panel #Filter").trigger('click');
-                }
-            });
-            
-            jQuery(document).bind("keypress", function(event) {
-                //Use jQuery submit with keypress Enter in panel filterbar
-                if (event.which == '13' && jQuery(".panel #Filter").length > 0) {
-                    event.preventDefault();
-                    jQuery(".panel #Filter").trigger('click');
-                }
-                //Use jQuery submit with keypress Enter in forms
-                if (event.which == '13' && jQuery(".pnl_formsarea button.positive").length > 0 && event.target.localName != 'textarea') {
-                    event.preventDefault();
-                    jQuery(".pnl_formsarea button.positive:first").trigger('click');
-                }
-            });
-        </script>
-    </head>
-    <body>
-        <div id="page">
-            <!-- begin: header -->
-            <header>
-                <nav id="topsubnav">
-                    <!-- start: skip link navigation -->
-                    <a class="skip" href="#navigation" title="skip link">Skip to the navigation</a><span class="hideme">.</span>
-                    <a class="skip" href="#content" title="skip link">Skip to the content</a><span class="hideme">.</span>
-                    <!-- end: skip link navigation -->
-                    <tmpl_if name="cpuser">
-                        <a href="#logout" onclick="loadContent('login/logout.php');"><tmpl_var format="strtoupper" name="logout_txt"> <tmpl_var format="strtoupper" name="cpuser"></a><!-- | <a href="#" onclick="capp('help')">Help</a> | <a href="#">Imprint</a>-->
-                        <tmpl_if name='usertype' op='==' value='normaluser'><input type="text" id="globalsearch" size="25" value="" /></tmpl_if>
-                    </tmpl_if>
-                </nav>
-                <h1 id="ir-HeaderLogo" class="swap" style="background-image:url('{tmpl_var name='app_logo'}');"><span>ISPConfig 3</span></h1>
-                <span>hosting control panel</span>
-            </header>
-            <!-- end: header -->
-            <a id="navigation" name="navigation"></a><!-- skiplink anchor: navigation -->
-            <!-- begin: main navigation #nav -->
-            <nav id="topNav">&nbsp;</nav>
-            <!-- end: main navigation -->
-
-            <!-- begin: main content area #main -->
-            <section id="main" name="content">
-                <nav id="sideNav" class="clearfix">&nbsp;</nav>
-                <!-- begin: #content -->
-                <section id="content">
-                    <form method="post" action="" id="pageForm" name="pageForm" enctype="multipart/form-data" class="uniForm">
-                        <div id="pageContent"><!-- AJAX CONTENT --></div>
-                    </form>
-                    <div id="ie_clearing">&nbsp;</div>
-                    <!-- End: IE Column Clearing -->
-                </section>
-                <!-- end: #content -->
-            </section>
-            <!-- end: #main -->
-            <!-- begin: footer -->
-            <footer>
-                Powered by <a href="<tmpl_var name="app_link">" target="_blank"><tmpl_var name="app_title"></a>
-            </footer><!-- end: footer -->
-        </div>
-    </body>
-</html>
diff --git a/interface/web/themes/default-v2/templates/sites/user_quota_stats_list.htm b/interface/web/themes/default-v2/templates/sites/user_quota_stats_list.htm
deleted file mode 100644
index 43b6a00b7868b3c2edcc8d0a34bcc2c872b27872..0000000000000000000000000000000000000000
--- a/interface/web/themes/default-v2/templates/sites/user_quota_stats_list.htm
+++ /dev/null
@@ -1,52 +0,0 @@
-<h2><tmpl_var name="list_head_txt"></h2>
-
-<div class="panel panel_list_user_quota_stats">
-
-    <div class="pnl_listarea">
-        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
-            <table class="list">
-                <thead>
-                <tr class="caption">
-                    <th class="tbl_col_domain" scope="col"><tmpl_var name="domain_txt"></th>
-                    <th class="tbl_col_system_user" scope="col"><tmpl_var name="system_user_txt"></th>
-                    <th class="tbl_col_used" scope="col"><tmpl_var name="used_txt"></th>
-                    <th class="tbl_col_soft" scope="col"><tmpl_var name="soft_txt"></th>
-                    <th class="tbl_col_hard" scope="col"><tmpl_var name="hard_txt"></th>
-                    <th class="tbl_col_files" scope="col"><tmpl_var name="files_txt"></th>
-                    <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
-                </tr>
-                <tr class="filter">
-                    <td class="tbl_col_domain"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td>
-                    <td class="tbl_col_system_user"><input type="text" name="search_system_user" value="{tmpl_var name='search_system_user'}" /></td>
-                    <td class="tbl_col_used">&nbsp;</td>
-                    <td class="tbl_col_soft">&nbsp;</td>
-                    <td class="tbl_col_hard">&nbsp;</td>
-                    <td class="tbl_col_files">&nbsp;</td>
-                    <td class="tbl_col_buttons">
-                        <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','sites/user_quota_stats.php');"><span>{tmpl_var name="filter_txt"}</span></button>
-                    </td>
-                </tr>
-                </thead>
-                <tbody>
-                    <tmpl_loop name="records">
-                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
-                            <td class="tbl_col_domain"><a href="#" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="domain"}</a></td>
-                            <td class="tbl_col_system_user"><a href="#" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="system_user"}</a></td>
-                            <td class="tbl_col_used"><a href="#" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="used"}</a></td>
-                            <td class="tbl_col_soft"><a href="#" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="soft"}</a></td>
-                            <td class="tbl_col_hard"><a href="#" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="hard"}</a></td>
-                            <td class="tbl_col_files"><a href="#" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="files"}</a></td>
-                            <td class="tbl_col_buttons"></td>
-                        </tr>
-                    </tmpl_loop>
-                </tbody>
-                <tfoot>
-                    <tr>
-                        <td class="tbl_footer tbl_paging" colspan="7"><tmpl_var name="paging"></td>
-                    </tr>
-                </tfoot>
-            </table>
-        </fieldset>
-    </div>
-
-</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/vm/openvz.conf.tpl b/interface/web/themes/default-v2/templates/vm/openvz.conf.tpl
deleted file mode 100644
index 5bdd385a46d1a0455c261aa16625e871f03bfd46..0000000000000000000000000000000000000000
--- a/interface/web/themes/default-v2/templates/vm/openvz.conf.tpl
+++ /dev/null
@@ -1,50 +0,0 @@
-
-# Template version
-VERSION="2"
-
-# Parameters
-ONBOOT="{tmpl_var name='onboot'}"
-KMEMSIZE="{tmpl_var name='kmemsize'}"
-LOCKEDPAGES="{tmpl_var name='lockedpages'}"
-PRIVVMPAGES="{tmpl_var name='privvmpages'}"
-SHMPAGES="{tmpl_var name='shmpages'}"
-NUMPROC="{tmpl_var name='numproc'}"
-PHYSPAGES="{tmpl_var name='physpages'}"
-VMGUARPAGES="{tmpl_var name='vmguarpages'}"
-OOMGUARPAGES="{tmpl_var name='oomguarpages'}"
-NUMTCPSOCK="{tmpl_var name='numtcpsock'}"
-NUMFLOCK="{tmpl_var name='numflock'}"
-NUMPTY="{tmpl_var name='numpty'}"
-NUMSIGINFO="{tmpl_var name='numsiginfo'}"
-TCPSNDBUF="{tmpl_var name='tcpsndbuf'}"
-TCPRCVBUF="{tmpl_var name='tcprcvbuf'}"
-OTHERSOCKBUF="{tmpl_var name='othersockbuf'}"
-DGRAMRCVBUF="{tmpl_var name='dgramrcvbuf'}"
-NUMOTHERSOCK="{tmpl_var name='numothersock'}"
-DCACHESIZE="{tmpl_var name='dcachesize'}"
-NUMFILE="{tmpl_var name='numfile'}"
-AVNUMPROC="{tmpl_var name='avnumproc'}"
-NUMIPTENT="{tmpl_var name='numiptent'}"
-
-DISKSPACE="{tmpl_var name='diskspace'}"
-DISKINODES="{tmpl_var name='diskinodes'}"
-QUOTAUGIDLIMIT="10000"
-IOPRIO="{tmpl_var name='io_priority'}"
-QUOTATIME="0"
-
-CPUS="{tmpl_var name='cpu_num'}"
-CPUUNITS="{tmpl_var name='cpu_units'}"
-CPULIMIT="{tmpl_var name='cpu_limit'}"
-
-VE_ROOT="/vz/root/$VEID"
-VE_PRIVATE="/vz/private/$VEID"
-OSTEMPLATE="{tmpl_var name='ostemplate'}"
-ORIGIN_SAMPLE="vps.basic"
-HOSTNAME="{tmpl_var name='hostname'}"
-IP_ADDRESS="{tmpl_var name='ip_address'}"
-NAMESERVER="{tmpl_var name='nameserver'}"
-# alternative meminfo: "pages:256000"
-MEMINFO="privvmpages:1"
-# SWAPPAGES="{tmpl_var name='swappages'}"
-
-CAPABILITY="{tmpl_var name='capability'}"
diff --git a/interface/web/themes/default-v2/CHANGELOG b/interface/web/themes/default/CHANGELOG
similarity index 100%
rename from interface/web/themes/default-v2/CHANGELOG
rename to interface/web/themes/default/CHANGELOG
diff --git a/interface/web/themes/default-v2/LICENSE b/interface/web/themes/default/LICENSE
similarity index 100%
rename from interface/web/themes/default-v2/LICENSE
rename to interface/web/themes/default/LICENSE
diff --git a/interface/web/themes/default-v2/TODO b/interface/web/themes/default/TODO
similarity index 100%
rename from interface/web/themes/default-v2/TODO
rename to interface/web/themes/default/TODO
diff --git a/interface/web/themes/default-v2/css/iehacks.css b/interface/web/themes/default/css/css/iehacks.css
similarity index 100%
rename from interface/web/themes/default-v2/css/iehacks.css
rename to interface/web/themes/default/css/css/iehacks.css
diff --git a/interface/web/themes/default/css/screen/redmond/images/ui-bg_flat_0_aaaaaa_40x100.png b/interface/web/themes/default/css/css/images/ui-bg_flat_0_aaaaaa_40x100.png
similarity index 100%
rename from interface/web/themes/default/css/screen/redmond/images/ui-bg_flat_0_aaaaaa_40x100.png
rename to interface/web/themes/default/css/css/images/ui-bg_flat_0_aaaaaa_40x100.png
diff --git a/interface/web/themes/default/css/screen/redmond/images/ui-bg_flat_55_fbec88_40x100.png b/interface/web/themes/default/css/css/images/ui-bg_flat_55_fbec88_40x100.png
similarity index 100%
rename from interface/web/themes/default/css/screen/redmond/images/ui-bg_flat_55_fbec88_40x100.png
rename to interface/web/themes/default/css/css/images/ui-bg_flat_55_fbec88_40x100.png
diff --git a/interface/web/themes/default/css/screen/redmond/images/ui-bg_glass_75_d0e5f5_1x400.png b/interface/web/themes/default/css/css/images/ui-bg_glass_75_d0e5f5_1x400.png
similarity index 100%
rename from interface/web/themes/default/css/screen/redmond/images/ui-bg_glass_75_d0e5f5_1x400.png
rename to interface/web/themes/default/css/css/images/ui-bg_glass_75_d0e5f5_1x400.png
diff --git a/interface/web/themes/default/css/screen/redmond/images/ui-bg_glass_85_dfeffc_1x400.png b/interface/web/themes/default/css/css/images/ui-bg_glass_85_dfeffc_1x400.png
similarity index 100%
rename from interface/web/themes/default/css/screen/redmond/images/ui-bg_glass_85_dfeffc_1x400.png
rename to interface/web/themes/default/css/css/images/ui-bg_glass_85_dfeffc_1x400.png
diff --git a/interface/web/themes/default/css/screen/redmond/images/ui-bg_glass_95_fef1ec_1x400.png b/interface/web/themes/default/css/css/images/ui-bg_glass_95_fef1ec_1x400.png
similarity index 100%
rename from interface/web/themes/default/css/screen/redmond/images/ui-bg_glass_95_fef1ec_1x400.png
rename to interface/web/themes/default/css/css/images/ui-bg_glass_95_fef1ec_1x400.png
diff --git a/interface/web/themes/default/css/screen/redmond/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png b/interface/web/themes/default/css/css/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png
similarity index 100%
rename from interface/web/themes/default/css/screen/redmond/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png
rename to interface/web/themes/default/css/css/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png
diff --git a/interface/web/themes/default/css/screen/redmond/images/ui-bg_inset-hard_100_f5f8f9_1x100.png b/interface/web/themes/default/css/css/images/ui-bg_inset-hard_100_f5f8f9_1x100.png
similarity index 100%
rename from interface/web/themes/default/css/screen/redmond/images/ui-bg_inset-hard_100_f5f8f9_1x100.png
rename to interface/web/themes/default/css/css/images/ui-bg_inset-hard_100_f5f8f9_1x100.png
diff --git a/interface/web/themes/default/css/screen/redmond/images/ui-bg_inset-hard_100_fcfdfd_1x100.png b/interface/web/themes/default/css/css/images/ui-bg_inset-hard_100_fcfdfd_1x100.png
similarity index 100%
rename from interface/web/themes/default/css/screen/redmond/images/ui-bg_inset-hard_100_fcfdfd_1x100.png
rename to interface/web/themes/default/css/css/images/ui-bg_inset-hard_100_fcfdfd_1x100.png
diff --git a/interface/web/themes/default/css/screen/redmond/images/ui-icons_217bc0_256x240.png b/interface/web/themes/default/css/css/images/ui-icons_217bc0_256x240.png
similarity index 100%
rename from interface/web/themes/default/css/screen/redmond/images/ui-icons_217bc0_256x240.png
rename to interface/web/themes/default/css/css/images/ui-icons_217bc0_256x240.png
diff --git a/interface/web/themes/default/css/screen/redmond/images/ui-icons_2e83ff_256x240.png b/interface/web/themes/default/css/css/images/ui-icons_2e83ff_256x240.png
similarity index 100%
rename from interface/web/themes/default/css/screen/redmond/images/ui-icons_2e83ff_256x240.png
rename to interface/web/themes/default/css/css/images/ui-icons_2e83ff_256x240.png
diff --git a/interface/web/themes/default/css/screen/redmond/images/ui-icons_469bdd_256x240.png b/interface/web/themes/default/css/css/images/ui-icons_469bdd_256x240.png
similarity index 100%
rename from interface/web/themes/default/css/screen/redmond/images/ui-icons_469bdd_256x240.png
rename to interface/web/themes/default/css/css/images/ui-icons_469bdd_256x240.png
diff --git a/interface/web/themes/default/css/screen/redmond/images/ui-icons_6da8d5_256x240.png b/interface/web/themes/default/css/css/images/ui-icons_6da8d5_256x240.png
similarity index 100%
rename from interface/web/themes/default/css/screen/redmond/images/ui-icons_6da8d5_256x240.png
rename to interface/web/themes/default/css/css/images/ui-icons_6da8d5_256x240.png
diff --git a/interface/web/themes/default/css/screen/redmond/images/ui-icons_cd0a0a_256x240.png b/interface/web/themes/default/css/css/images/ui-icons_cd0a0a_256x240.png
similarity index 100%
rename from interface/web/themes/default/css/screen/redmond/images/ui-icons_cd0a0a_256x240.png
rename to interface/web/themes/default/css/css/images/ui-icons_cd0a0a_256x240.png
diff --git a/interface/web/themes/default/css/screen/redmond/images/ui-icons_d8e7f3_256x240.png b/interface/web/themes/default/css/css/images/ui-icons_d8e7f3_256x240.png
similarity index 100%
rename from interface/web/themes/default/css/screen/redmond/images/ui-icons_d8e7f3_256x240.png
rename to interface/web/themes/default/css/css/images/ui-icons_d8e7f3_256x240.png
diff --git a/interface/web/themes/default/css/screen/redmond/images/ui-icons_f9bd01_256x240.png b/interface/web/themes/default/css/css/images/ui-icons_f9bd01_256x240.png
similarity index 100%
rename from interface/web/themes/default/css/screen/redmond/images/ui-icons_f9bd01_256x240.png
rename to interface/web/themes/default/css/css/images/ui-icons_f9bd01_256x240.png
diff --git a/interface/web/themes/default/css/screen/redmond/jquery-ui-1.8.16.custom.css b/interface/web/themes/default/css/css/jquery-ui-1.8.16.custom.css
similarity index 100%
rename from interface/web/themes/default/css/screen/redmond/jquery-ui-1.8.16.custom.css
rename to interface/web/themes/default/css/css/jquery-ui-1.8.16.custom.css
diff --git a/interface/web/themes/default-v2/css/print.css b/interface/web/themes/default/css/css/print.css
similarity index 100%
rename from interface/web/themes/default-v2/css/print.css
rename to interface/web/themes/default/css/css/print.css
diff --git a/interface/web/themes/default-v2/css/styles.css b/interface/web/themes/default/css/css/styles.css
similarity index 100%
rename from interface/web/themes/default-v2/css/styles.css
rename to interface/web/themes/default/css/css/styles.css
diff --git a/interface/web/themes/default-v2/icons/button_sprite.png b/interface/web/themes/default/icons/icons/button_sprite.png
similarity index 100%
rename from interface/web/themes/default-v2/icons/button_sprite.png
rename to interface/web/themes/default/icons/icons/button_sprite.png
diff --git a/interface/web/themes/default-v2/icons/device_sprite.png b/interface/web/themes/default/icons/icons/device_sprite.png
similarity index 100%
rename from interface/web/themes/default-v2/icons/device_sprite.png
rename to interface/web/themes/default/icons/icons/device_sprite.png
diff --git a/interface/web/themes/default/icons/flags_sprite.png b/interface/web/themes/default/icons/icons/flags_sprite.png
similarity index 100%
rename from interface/web/themes/default/icons/flags_sprite.png
rename to interface/web/themes/default/icons/icons/flags_sprite.png
diff --git a/interface/web/themes/default/icons/x16/arrow.png b/interface/web/themes/default/icons/icons/x16/arrow.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/arrow.png
rename to interface/web/themes/default/icons/icons/x16/arrow.png
diff --git a/interface/web/themes/default/icons/x16/arrow_180.png b/interface/web/themes/default/icons/icons/x16/arrow_180.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/arrow_180.png
rename to interface/web/themes/default/icons/icons/x16/arrow_180.png
diff --git a/interface/web/themes/default/icons/x16/arrow_stop.png b/interface/web/themes/default/icons/icons/x16/arrow_stop.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/arrow_stop.png
rename to interface/web/themes/default/icons/icons/x16/arrow_stop.png
diff --git a/interface/web/themes/default/icons/x16/arrow_stop_180.png b/interface/web/themes/default/icons/icons/x16/arrow_stop_180.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/arrow_stop_180.png
rename to interface/web/themes/default/icons/icons/x16/arrow_stop_180.png
diff --git a/interface/web/themes/default/icons/x16/cross_circle.png b/interface/web/themes/default/icons/icons/x16/cross_circle.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/cross_circle.png
rename to interface/web/themes/default/icons/icons/x16/cross_circle.png
diff --git a/interface/web/themes/default/icons/x16/tick_circle.png b/interface/web/themes/default/icons/icons/x16/tick_circle.png
similarity index 100%
rename from interface/web/themes/default/icons/x16/tick_circle.png
rename to interface/web/themes/default/icons/icons/x16/tick_circle.png
diff --git a/interface/web/themes/default-v2/icons/x16_sprite.png b/interface/web/themes/default/icons/icons/x16_sprite.png
similarity index 100%
rename from interface/web/themes/default-v2/icons/x16_sprite.png
rename to interface/web/themes/default/icons/icons/x16_sprite.png
diff --git a/interface/web/themes/default/icons/x32_sprite.png b/interface/web/themes/default/icons/icons/x32_sprite.png
similarity index 100%
rename from interface/web/themes/default/icons/x32_sprite.png
rename to interface/web/themes/default/icons/icons/x32_sprite.png
diff --git a/interface/web/themes/default/images/ajax-loader.gif b/interface/web/themes/default/images/images/ajax-loader.gif
similarity index 100%
rename from interface/web/themes/default/images/ajax-loader.gif
rename to interface/web/themes/default/images/images/ajax-loader.gif
diff --git a/interface/web/themes/default/images/buttonHolder_bg.gif b/interface/web/themes/default/images/images/buttonHolder_bg.gif
similarity index 100%
rename from interface/web/themes/default/images/buttonHolder_bg.gif
rename to interface/web/themes/default/images/images/buttonHolder_bg.gif
diff --git a/interface/web/themes/default/images/chevron.png b/interface/web/themes/default/images/images/chevron.png
similarity index 100%
rename from interface/web/themes/default/images/chevron.png
rename to interface/web/themes/default/images/images/chevron.png
diff --git a/interface/web/themes/default/images/favicon.ico b/interface/web/themes/default/images/images/favicon.ico
similarity index 100%
rename from interface/web/themes/default/images/favicon.ico
rename to interface/web/themes/default/images/images/favicon.ico
diff --git a/interface/web/themes/default/images/header_bg.png b/interface/web/themes/default/images/images/header_bg.png
similarity index 100%
rename from interface/web/themes/default/images/header_bg.png
rename to interface/web/themes/default/images/images/header_bg.png
diff --git a/interface/web/themes/default/images/header_logo.png b/interface/web/themes/default/images/images/header_logo.png
similarity index 100%
rename from interface/web/themes/default/images/header_logo.png
rename to interface/web/themes/default/images/images/header_logo.png
diff --git a/interface/web/themes/default/images/lists_tfoot_bg.png b/interface/web/themes/default/images/images/lists_tfoot_bg.png
similarity index 100%
rename from interface/web/themes/default/images/lists_tfoot_bg.png
rename to interface/web/themes/default/images/images/lists_tfoot_bg.png
diff --git a/interface/web/themes/default/images/lists_thead_bg.png b/interface/web/themes/default/images/images/lists_thead_bg.png
similarity index 100%
rename from interface/web/themes/default/images/lists_thead_bg.png
rename to interface/web/themes/default/images/images/lists_thead_bg.png
diff --git a/interface/web/themes/default/icons/x16/loading.gif b/interface/web/themes/default/images/images/loading.gif
similarity index 100%
rename from interface/web/themes/default/icons/x16/loading.gif
rename to interface/web/themes/default/images/images/loading.gif
diff --git a/interface/web/themes/default/images/meter_bg.gif b/interface/web/themes/default/images/images/meter_bg.gif
similarity index 100%
rename from interface/web/themes/default/images/meter_bg.gif
rename to interface/web/themes/default/images/images/meter_bg.gif
diff --git a/interface/web/themes/default/images/screen_bg.png b/interface/web/themes/default/images/images/screen_bg.png
similarity index 100%
rename from interface/web/themes/default/images/screen_bg.png
rename to interface/web/themes/default/images/images/screen_bg.png
diff --git a/interface/web/themes/default-v2/js/html5shiv.js b/interface/web/themes/default/js/html5shiv.js
similarity index 100%
rename from interface/web/themes/default-v2/js/html5shiv.js
rename to interface/web/themes/default/js/html5shiv.js
diff --git a/interface/web/themes/default/templates/main.tpl.htm b/interface/web/themes/default/templates/main.tpl.htm
index 9707eecf21f4feeadde539958b509d9f8734ec38..4e222dd9af27fbddc3670c90f9f1921a97caa089 100644
--- a/interface/web/themes/default/templates/main.tpl.htm
+++ b/interface/web/themes/default/templates/main.tpl.htm
@@ -1,75 +1,25 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<!DOCTYPE html>
+<html dir="ltr" lang="<tmpl_var name="language">-<tmpl_var name="country">">      
     <head>
+        <!--Possible? Vars in lang= ?-->
+        <meta charset="<tmpl_var name="html_content_encoding">" />
         <title><tmpl_var name="app_title"> <tmpl_var name="app_version"></title>
-        <meta http-equiv="Content-Type" content="text/html; charset=<tmpl_var name="html_content_encoding">"/>
         <meta http-equiv="X-UA-Compatible" content="IE=8"/>
-        <link href="themes/default/css/central.css" rel="stylesheet" type="text/css"/>
-        <!--[if lte IE 7]>
-                <link href="themes/default/css/patches/central.css" rel="stylesheet" type="text/css" />
-        <![endif]-->
-        <!--[if lte ie 6]>
-          <style type="text/css" media="screen">
-            /*
-            Move these to your IE specific stylesheet if possible
-            */
-            .uniForm,
-            .uniForm fieldset,
-            .uniForm .ctrlHolder,
-            .uniForm .formHint,
-            .uniForm .buttonHolder, 
-            .uniForm .ctrlHolder .multiField,
-            .uniForm .inlineLabel{ zoom:1; }
-                
-            .uniForm .inlineLabels label, .uniForm .inlineLabels .label,
-            .uniForm .blockLabels label, .uniForm .blockLabels .label,
-            .uniForm .inlineLabel span{ padding-bottom: .2em; }
-                
-            .uniForm .inlineLabel input,
-            .uniForm .inlineLabels .inlineLabel input,
-            .uniForm .blockLabels .inlineLabel input{ margin-top: -.3em; }
-          </style>
-        <![endif]-->
-        <!--[if gt ie 6]>
-          <style type="text/css" media="screen">
-            /*
-            Move these to your IE specific stylesheet if possible
-            */
-            .uniForm,
-            .uniForm fieldset,
-            .uniForm .ctrlHolder,
-            .uniForm .formHint,
-            .uniForm .buttonHolder, 
-            .uniForm .ctrlHolder .multiField,
-            .uniForm .inlineLabel{ zoom:1; }
-                
-            .uniForm .inlineLabels label, .uniForm .inlineLabels .label,
-            .uniForm .blockLabels label, .uniForm .blockLabels .label,
-            .uniForm .inlineLabel span{ padding-bottom: .2em; }
-                
-            .uniForm .inlineLabel input,
-            .uniForm .inlineLabels .inlineLabel input,
-            .uniForm .blockLabels .inlineLabel input{ margin-top: -.3em; }
-          </style>
-        <![endif]-->
-        <link href="themes/default/css/screen/redmond/jquery-ui-1.8.16.custom.css" rel="stylesheet" type="text/css"/>
-        <link href="themes/default/css/screen/jquery-ui-custom.css" rel="stylesheet" type="text/css"/>
-        <link rel="shortcut icon" href="/themes/default/images/favicon.ico" />
+        <link href="themes/default-v2/css/styles.css" rel="stylesheet" media="screen" type="text/css"/>
+        <link href="themes/default-v2/css/print.css" rel="stylesheet" media="print" type="text/css"/>
+        <!--[if IE 9]><link href="themes/default-v2/css/iehacks.css" rel="stylesheet" type="text/css" /><![endif]-->
+        <!--[if lte IE 8]><link href="themes/default-v2/css/iehacks.css" rel="stylesheet" type="text/css" /><![endif]-->
+        <!--[if lte IE 7]><link href="themes/default-v2/css/iehacks.css" rel="stylesheet" type="text/css" /><![endif]-->
+        <link href="themes/default-v2/css/jquery-ui-1.8.16.custom.css" rel="stylesheet" type="text/css"/>
+        <link rel="shortcut icon" href="/themes/default-v2/images/favicon.ico" />
         <script type="text/javascript" src="js/jquery-1.6.3.min.js"></script>
         <script type="text/javascript" src="js/jquery-ui-1.8.16.custom.min.js"></script>
         <script type="text/javascript" src="js/scrigo.js.php"></script>
         <script type="text/javascript" src="js/uni-form/uni-form.jquery.js"></script>
         <script type="text/javascript" src="js/jquery.ispconfigsearch.js"></script>
         <script type="text/javascript" src="js/jquery.tipsy.js"></script>
+        <script type="text/javascript" src="themes/default-v2/js/html5shiv.js"></script>
         <script language="JavaScript" type="text/javascript">
-            var is_chrome = navigator.userAgent.toLowerCase().indexOf('chrome') > -1;
-            if(!is_chrome && getInternetExplorerVersion() > 8.0) {
-                var style = document.createElement('style');
-                style.innerHTML = '#page_margins { min-width: 980px; max-width: 80%; background: #fff; display: table;}';
-                document.getElementsByTagName("head")[0].appendChild(style);
-            }
-            
             jQuery(document).ready(function() {
                 loadInitContent();
                 
@@ -118,60 +68,46 @@
         </script>
     </head>
     <body>
-        <div id="page_margins">
-            <div id="page">
-                <div id="header">
-                    <div id="topsubnav">
-                        <!-- start: skip link navigation -->
-                        <a class="skip" href="#navigation" title="skip link">Skip to the navigation</a><span class="hideme">.</span>
-                        <a class="skip" href="#content" title="skip link">Skip to the content</a><span class="hideme">.</span>
-                        <!-- end: skip link navigation -->
-                        <tmpl_if name="cpuser">
-                            <span><a href="#logout" onclick="loadContent('login/logout.php');"><tmpl_var format="strtoupper" name="logout_txt"> <tmpl_var format="strtoupper" name="cpuser"></a><!-- | <a href="#" onclick="capp('help')">Help</a> | <a href="#">Imprint</a>--></span>
-                            <tmpl_if name='usertype' op='==' value='normaluser'><input type="text" id="globalsearch" size="25" value="" /></tmpl_if>
-                        </tmpl_if>
-                    </div>
-                    <h1 id="ir-HeaderLogo" class="swap" style="background-image:url('{tmpl_var name='app_logo'}');"><span>ISPConfig 3</span></h1>
-                    <span>hosting control panel</span>
-                </div>
-                <!-- begin: main navigation #nav -->
-                <div id="nav">
-                    <a id="navigation" name="navigation"></a>
-                    <!-- skiplink anchor: navigation -->
-                    <div id="nav_main">
-                        <div id="topNav">&nbsp;</div>
-                    </div>
-                </div>
-                <!-- end: main navigation -->
-                <!-- begin: main content area #main -->
-                <div id="main">
-                    <!-- begin: #col1 - first float column -->
-                    <div id="col1">
-                        <div id="col1_content" class="clearfix">
-                            <div id="sideNav">&nbsp;</div>
-                        </div>
-                    </div>
-                    <!-- end: #col1 -->
-                    <!-- begin: #col3 static column -->
-                    <div id="col3">
-                        <div id="col3_content" class="clearfix">
-                            <a id="content" name="content"></a>
-                            <!-- skiplink anchor: Content -->
-                            <form method="post" action="" id="pageForm" name="pageForm" enctype="multipart/form-data" class="uniForm">
-                                <div id="pageContent"><!-- AJAX CONTENT --></div>
-                            </form>
-                        </div>
-                        <div id="ie_clearing">&nbsp;</div>
-                        <!-- End: IE Column Clearing -->
-                    </div>
-                    <!-- end: #col3 -->
-                </div>
-                <!-- end: #main -->
-                <!-- begin: #footer -->
-                <div id="footer">
-                    Powered by <a href="<tmpl_var name="app_link">" target="_blank"><tmpl_var name="app_title"></a>
-                </div><!-- end: #footer -->
-            </div>
+        <div id="page">
+            <!-- begin: header -->
+            <header>
+                <nav id="topsubnav">
+                    <!-- start: skip link navigation -->
+                    <a class="skip" href="#navigation" title="skip link">Skip to the navigation</a><span class="hideme">.</span>
+                    <a class="skip" href="#content" title="skip link">Skip to the content</a><span class="hideme">.</span>
+                    <!-- end: skip link navigation -->
+                    <tmpl_if name="cpuser">
+                        <a href="#logout" onclick="loadContent('login/logout.php');"><tmpl_var format="strtoupper" name="logout_txt"> <tmpl_var format="strtoupper" name="cpuser"></a><!-- | <a href="#" onclick="capp('help')">Help</a> | <a href="#">Imprint</a>-->
+                        <tmpl_if name='usertype' op='==' value='normaluser'><input type="text" id="globalsearch" size="25" value="" /></tmpl_if>
+                    </tmpl_if>
+                </nav>
+                <h1 id="ir-HeaderLogo" class="swap" style="background-image:url('{tmpl_var name='app_logo'}');"><span>ISPConfig 3</span></h1>
+                <span>hosting control panel</span>
+            </header>
+            <!-- end: header -->
+            <a id="navigation" name="navigation"></a><!-- skiplink anchor: navigation -->
+            <!-- begin: main navigation #nav -->
+            <nav id="topNav">&nbsp;</nav>
+            <!-- end: main navigation -->
+
+            <!-- begin: main content area #main -->
+            <section id="main" name="content">
+                <nav id="sideNav" class="clearfix">&nbsp;</nav>
+                <!-- begin: #content -->
+                <section id="content">
+                    <form method="post" action="" id="pageForm" name="pageForm" enctype="multipart/form-data" class="uniForm">
+                        <div id="pageContent"><!-- AJAX CONTENT --></div>
+                    </form>
+                    <div id="ie_clearing">&nbsp;</div>
+                    <!-- End: IE Column Clearing -->
+                </section>
+                <!-- end: #content -->
+            </section>
+            <!-- end: #main -->
+            <!-- begin: footer -->
+            <footer>
+                Powered by <a href="<tmpl_var name="app_link">" target="_blank"><tmpl_var name="app_title"></a>
+            </footer><!-- end: footer -->
         </div>
     </body>
 </html>
diff --git a/interface/web/vm/templates/openvz_ip_list.htm b/interface/web/vm/templates/openvz_ip_list.htm
index 886d4b9e84da912df8c4612f8494e5c5149d2cc5..12d50da03967af434a8f1284182ea8692bb40698 100644
--- a/interface/web/vm/templates/openvz_ip_list.htm
+++ b/interface/web/vm/templates/openvz_ip_list.htm
@@ -5,7 +5,7 @@
     <div class="pnl_toolsarea">
         <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
             <div class="buttons">
-                <button class="iconstxt icoAdd" type="button" onClick="loadContent('vm/openvz_ip_edit.php');">
+                <button class="button iconstxt icoAdd" type="button" onClick="loadContent('vm/openvz_ip_edit.php');">
                     <span>{tmpl_var name="add_new_record_txt"}</span>
                 </button>
             </div>
@@ -16,19 +16,21 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr>
+                    <tr class="caption">
                         <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
                         <th class="tbl_col_vm_id" scope="col"><tmpl_var name="vm_id_txt"></th>
                         <th class="tbl_col_ip_address" scope="col"><tmpl_var name="ip_address_txt"></th>
                         <th class="tbl_col_reserved" scope="col"><tmpl_var name="reserved_txt"></th>
                         <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
                     </tr>
-                    <tr>
+                    <tr class="filter">
                         <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
                         <td class="tbl_col_vm_id"><select name="search_vm_id">{tmpl_var name='search_vm_id'}</select></td>
                         <td class="tbl_col_ip_address"><input type="text" name="search_ip_address" value="{tmpl_var name='search_ip_address'}" /></td>
                         <td class="tbl_col_reserved"><select name="search_reserved">{tmpl_var name='search_reserved'}</select></td>
-                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','vm/openvz_ip_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                        <td class="tbl_col_buttons">
+                            <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','vm/openvz_ip_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+                        </td>
                     </tr>
                 </thead>
                 <tbody>
@@ -39,9 +41,7 @@
                             <td class="tbl_col_ip_address"><a href="#" onClick="loadContent('vm/openvz_ip_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="ip_address"}</a></td>
                             <td class="tbl_col_reserved"><a href="#" onClick="loadContent('vm/openvz_ip_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="reserved"}</a></td>
                             <td class="tbl_col_buttons">
-                                <div class="buttons icons16">    
-                                    <a class="icons16 icoDelete" href="javascript: del_record('vm/openvz_ip_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>
+                                <a class="button icons16 icoDelete" href="javascript: del_record('vm/openvz_ip_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>
                             </td>
                         </tr>
                     </tmpl_loop>
diff --git a/interface/web/vm/templates/openvz_ostemplate_list.htm b/interface/web/vm/templates/openvz_ostemplate_list.htm
index c15277422abca6ab254b3b0bb574abc322413665..f30f68affbd631ed6382841b8e43fb3a89edd32c 100644
--- a/interface/web/vm/templates/openvz_ostemplate_list.htm
+++ b/interface/web/vm/templates/openvz_ostemplate_list.htm
@@ -5,7 +5,7 @@
     <div class="pnl_toolsarea">
         <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
             <div class="buttons">
-                <button class="iconstxt icoAdd" type="button" onClick="loadContent('vm/openvz_ostemplate_edit.php');">
+                <button class="button iconstxt icoAdd" type="button" onClick="loadContent('vm/openvz_ostemplate_edit.php');">
                     <span>{tmpl_var name="add_new_record_txt"}</span>
                 </button>
             </div>
@@ -16,7 +16,7 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr>
+                    <tr class="caption">
                         <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
                         <th class="tbl_col_ostemplate_id" scope="col"><tmpl_var name="ostemplate_id_txt"></th>
                         <th class="tbl_col_template_name" scope="col"><tmpl_var name="template_name_txt"></th>
@@ -24,13 +24,15 @@
                         <th class="tbl_col_allservers" scope="col"><tmpl_var name="allservers_txt"></th>
                         <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
                     </tr>
-                    <tr>
+                    <tr class="filter">
                         <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
-                        <td class="tbl_col_ostemplate_id"><input type="text" name="search_ostemplate_id" value="{tmpl_var name='search_ostemplate_id'}" style="width:30px;" /></td>
+                        <td class="tbl_col_ostemplate_id"><input type="text" name="search_ostemplate_id" value="{tmpl_var name='search_ostemplate_id'}" /></td>
                         <td class="tbl_col_template_name"><input type="text" name="search_template_name" value="{tmpl_var name='search_template_name'}" /></td>
                         <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
                         <td class="tbl_col_allservers"><select name="search_allservers">{tmpl_var name='search_allservers'}</select></td>
-                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','vm/openvz_ostemplate_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                        <td class="tbl_col_buttons">
+                            <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','vm/openvz_ostemplate_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+                        </td>
                     </tr>
                 </thead>
                 <tbody>
@@ -42,9 +44,7 @@
                             <td class="tbl_col_server_id"><a href="#" onClick="loadContent('vm/openvz_ostemplate_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
                             <td class="tbl_col_allservers"><a href="#" onClick="loadContent('vm/openvz_ostemplate_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="allservers"}</a></td>
                             <td class="tbl_col_buttons">
-                                <div class="buttons icons16">    
-                                    <a class="icons16 icoDelete" href="javascript: del_record('vm/openvz_ostemplate_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>
+                                <a class="button icons16 icoDelete" href="javascript: del_record('vm/openvz_ostemplate_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>
                             </td>
                         </tr>
                     </tmpl_loop>
diff --git a/interface/web/vm/templates/openvz_template_list.htm b/interface/web/vm/templates/openvz_template_list.htm
index 78f102bf792de4cb9decc7688f429b3f6e3a2d3f..d83eb31de2f00ae7303d7c3496376634f10531db 100644
--- a/interface/web/vm/templates/openvz_template_list.htm
+++ b/interface/web/vm/templates/openvz_template_list.htm
@@ -5,7 +5,7 @@
     <div class="pnl_toolsarea">
         <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
             <div class="buttons">
-                <button class="iconstxt icoAdd" type="button" onClick="loadContent('vm/openvz_template_edit.php');">
+                <button class="button iconstxt icoAdd" type="button" onClick="loadContent('vm/openvz_template_edit.php');">
                     <span>{tmpl_var name="add_new_record_txt"}</span>
                 </button>
             </div>
@@ -16,15 +16,17 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr>
+                    <tr class="caption">
                         <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
                         <th class="tbl_col_template_name" scope="col"><tmpl_var name="template_name_txt"></th>
                         <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
                     </tr>
-                    <tr>
+                    <tr class="filter">
                         <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
                         <td class="tbl_col_template_name"><input type="text" name="search_template_name" value="{tmpl_var name='search_template_name'}" /></td>
-                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','vm/openvz_template_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                        <td class="tbl_col_buttons">
+                            <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','vm/openvz_template_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+                        </td>
                     </tr>
                 </thead>
                 <tbody>
@@ -33,9 +35,7 @@
                             <td class="tbl_col_active"><a href="#" onClick="loadContent('vm/openvz_template_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
                             <td class="tbl_col_template_name"><a href="#" onClick="loadContent('vm/openvz_template_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="template_name"}</a></td>
                             <td class="tbl_col_buttons">
-                                <div class="buttons icons16">    
-                                    <a class="icons16 icoDelete" href="javascript: del_record('vm/openvz_template_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>
+                                <a class="button icons16 icoDelete" href="javascript: del_record('vm/openvz_template_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>
                             </td>
                         </tr>
                     </tmpl_loop>
diff --git a/interface/web/vm/templates/openvz_vm_list.htm b/interface/web/vm/templates/openvz_vm_list.htm
index ad0245617e45403a7c995871541ca14129094ff0..66d65a1d749c89469bd5a22f0198bf370c946fc9 100644
--- a/interface/web/vm/templates/openvz_vm_list.htm
+++ b/interface/web/vm/templates/openvz_vm_list.htm
@@ -5,7 +5,7 @@
     <div class="pnl_toolsarea">
         <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
             <div class="buttons">
-                <button class="iconstxt icoAdd" type="button" onClick="loadContent('vm/openvz_vm_edit.php');">
+                <button class="button iconstxt icoAdd" type="button" onClick="loadContent('vm/openvz_vm_edit.php');">
                     <span>{tmpl_var name="add_new_record_txt"}</span>
                 </button>
             </div>
@@ -16,7 +16,7 @@
         <fieldset><legend><tmpl_var name="list_head_txt"></legend>
             <table class="list">
                 <thead>
-                    <tr>
+                    <tr class="caption">
                         <th class="tbl_col_veid" scope="col"><tmpl_var name="veid_txt"></th>
                         <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
                         <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
@@ -26,15 +26,17 @@
                         <th class="tbl_col_ip_address" scope="col"><tmpl_var name="ip_address_txt"></th>
                         <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
                     </tr>
-                    <tr>
-                        <td class="tbl_col_veid"><input type="text" name="search_veid" style="width:40px;" value="{tmpl_var name='search_veid'}" /></td>
+                    <tr class="filter">
+                        <td class="tbl_col_veid"><input type="text" name="search_veid" value="{tmpl_var name='search_veid'}" /></td>
                         <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
                         <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
                         <td class="tbl_col_ostemplate_id"><select name="search_ostemplate_id">{tmpl_var name='search_ostemplate_id'}</select></td>
                         <td class="tbl_col_template_id"><select name="search_template_id">{tmpl_var name='search_template_id'}</select></td>
                         <td class="tbl_col_hostname"><input type="text" name="search_hostname" value="{tmpl_var name='search_hostname'}" /></td>
-                        <td class="tbl_col_ip_address"><input type="text" name="search_ip_address" style="width:80px;" value="{tmpl_var name='search_ip_address'}" /></td>
-                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','vm/openvz_vm_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                        <td class="tbl_col_ip_address"><input type="text" name="search_ip_address" value="{tmpl_var name='search_ip_address'}" /></td>
+                        <td class="tbl_col_buttons">
+                            <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','vm/openvz_vm_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+                        </td>
                     </tr>
                 </thead>
                 <tbody>
@@ -48,10 +50,8 @@
                             <td class="tbl_col_hostname"><a href="#" onClick="loadContent('vm/openvz_vm_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="hostname"}</a></td>
                             <td class="tbl_col_ip_address"><a href="#" onClick="loadContent('vm/openvz_vm_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="ip_address"}</a></td>
                             <td class="tbl_col_buttons">
-                                <div class="buttons icons16">    
-                                    <a class="icons16 icoAction" href="javascript: loadContent('vm/openvz_action.php?id={tmpl_var name='id'}');"><span>Action</span></a>
-                                    <a class="icons16 icoDelete" href="javascript: del_record('vm/openvz_vm_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>
+                                <a class="button icons16 icoAction" href="javascript: loadContent('vm/openvz_action.php?id={tmpl_var name='id'}');"><span>Action</span></a>
+                                <a class="button icons16 icoDelete" href="javascript: del_record('vm/openvz_vm_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>
                             </td>
                         </tr>
                     </tmpl_loop>