diff --git a/admin/themes/clear/theme.css b/admin/themes/clear/theme.css
index eff007248..cd70f30fe 100644
--- a/admin/themes/clear/theme.css
+++ b/admin/themes/clear/theme.css
@@ -69,7 +69,7 @@ h3, .throw, .row1 { background-color: #ddd; }
 
 #content {
 	background: #f1f1f1;
-  border: 1px solid #aaa;
+  border: 1px solid #f9f9f9;
 	min-height: 467px;
   margin-left:217px;
   margin-top: 7px;
@@ -91,7 +91,16 @@ UL.thumbnails span.wrap2 {
 
 
 /* borders */
-fieldset { border: 2px solid #ddd; }
+fieldset {
+  border: none;
+  border-top: 2px solid #ddd;
+}
+
+fieldset.with-border {
+  border: 2px solid #ddd;
+}
+
+
 TEXTAREA { cursor:text; font-size: 13px; }
 .tagSelection label { padding-right:12px; }
 .tagSelection LI.tagSelected {background-color:#dbe8f3;}
diff --git a/admin/themes/default/template/cat_list.tpl b/admin/themes/default/template/cat_list.tpl
index a8f976cf7..87c0b2d70 100644
--- a/admin/themes/default/template/cat_list.tpl
+++ b/admin/themes/default/template/cat_list.tpl
@@ -63,7 +63,7 @@ jQuery(document).ready(function(){
   {if ($PARENT_EDIT)}| <a href="{$PARENT_EDIT}"></span>{'edit'|@translate}</a>{/if}
 </p>
 <form id="formCreateAlbum" action="{$F_ACTION}" method="post" style="display:none;">
-  <fieldset>
+  <fieldset class="with-border">
       <legend>{'create a new album'|@translate}</legend>
       <input type="hidden" name="pwg_token" value="{$PWG_TOKEN}">
       
@@ -80,7 +80,7 @@ jQuery(document).ready(function(){
 </form>
 {if count($categories)}
 <form id="formAutoOrder" action="{$F_ACTION}" method="post" style="display:none;">
-  <fieldset>
+  <fieldset class="with-border">
     <legend>{'Automatic sort order'|@translate}</legend>
     <input type="hidden" name="pwg_token" value="{$PWG_TOKEN}">
     
diff --git a/admin/themes/default/template/group_list.tpl b/admin/themes/default/template/group_list.tpl
index 0d2d727d1..b14ff1725 100644
--- a/admin/themes/default/template/group_list.tpl
+++ b/admin/themes/default/template/group_list.tpl
@@ -70,7 +70,7 @@ $(document).ready(function() {
 </p>
 
 <form method="post" style="display:none" id="addGroupForm" name="add_user" action="{$F_ADD_ACTION}" class="properties">
-  <fieldset>
+  <fieldset class="with-border">
     <legend>{'Add group'|@translate}</legend>
 
     <p>
diff --git a/admin/themes/default/template/history.tpl b/admin/themes/default/template/history.tpl
index fcdc67d8b..96701d8bf 100644
--- a/admin/themes/default/template/history.tpl
+++ b/admin/themes/default/template/history.tpl
@@ -10,7 +10,7 @@ jQuery(function(){ {* <!-- onLoad needed to wait localization loads --> *}
 <h2>{'History'|@translate} {$TABSHEET_TITLE}</h2>
 
 <form class="filter" method="post" name="filter" action="{$F_ACTION}">
-<fieldset>
+<fieldset class="with-border">
   <legend>{'Filter'|@translate}</legend>
   <ul>
     <li><label>{'Date'|@translate}</label></li>
diff --git a/admin/themes/default/template/user_list.tpl b/admin/themes/default/template/user_list.tpl
index c25ae0df6..892b44085 100644
--- a/admin/themes/default/template/user_list.tpl
+++ b/admin/themes/default/template/user_list.tpl
@@ -874,7 +874,7 @@ span.infos, span.errors {background-image:none; padding:2px 5px; margin:0;border
 </p>
 
 <form id="addUserForm" style="display:none" method="post" name="add_user" action="{$F_ADD_ACTION}">
-  <fieldset>
+  <fieldset class="with-border">
     <legend>{'Add a user'|@translate}</legend>
 
     <p>