diff --git a/admin/themes/clear/theme.css b/admin/themes/clear/theme.css
index 39e519b34..3b13dcf63 100644
--- a/admin/themes/clear/theme.css
+++ b/admin/themes/clear/theme.css
@@ -87,7 +87,6 @@ UL.thumbnails span.wrap2 {
 /* borders */
 fieldset {
   border: none;
-  border-top: 2px solid #ddd;
 }
 
 fieldset.with-border {
diff --git a/admin/themes/default/template/album_notification.tpl b/admin/themes/default/template/album_notification.tpl
index 8c56544b2..67f1e90ea 100644
--- a/admin/themes/default/template/album_notification.tpl
+++ b/admin/themes/default/template/album_notification.tpl
@@ -62,7 +62,7 @@ span.errors {
 <form action="{$F_ACTION}" method="post" id="categoryNotify">
 
 <fieldset id="emailCatInfo">
-  <legend>{'Send mail to users'|@translate}</legend>
+  <legend><span class="icon-mail-1 icon-green"></span>{'Send mail to users'|@translate}</legend>
 
   <p>
     <strong>{'Recipients'|@translate}</strong>
diff --git a/admin/themes/default/template/cat_modify.tpl b/admin/themes/default/template/cat_modify.tpl
index 1e8aa6540..f89613c67 100644
--- a/admin/themes/default/template/cat_modify.tpl
+++ b/admin/themes/default/template/cat_modify.tpl
@@ -171,7 +171,7 @@ jQuery(document).ready(function() {
 <div id="catModify">
 
 <fieldset>
-  <legend>{'Informations'|@translate}</legend>
+  <legend><span class="icon-info-circled-1 icon-blue"></span>{'Informations'|@translate}</legend>
 
   <table style="width:100%">
     <tr>
@@ -227,7 +227,7 @@ jQuery(document).ready(function() {
 
 <form action="{$F_ACTION}" method="POST">
 <fieldset>
-  <legend>{'Properties'|@translate}</legend>
+  <legend><span class="icon-tools icon-red"></span>{'Properties'|@translate}</legend>
   <p>
     <strong>{'Name'|@translate}</strong>
     <br>
diff --git a/admin/themes/default/template/cat_perm.tpl b/admin/themes/default/template/cat_perm.tpl
index d985e56a5..d2026e256 100644
--- a/admin/themes/default/template/cat_perm.tpl
+++ b/admin/themes/default/template/cat_perm.tpl
@@ -56,7 +56,7 @@ jQuery("#selectStatus").change(function() {
 <form action="{$F_ACTION}" method="post" id="categoryPermissions">
 
 <fieldset>
-  <legend>{'Access type'|@translate}</legend>
+  <legend><span class="icon-lock icon-yellow"></span>{'Access type'|@translate}</legend>
 
   <p id="selectStatus">
     <label class="font-checkbox">
diff --git a/admin/themes/default/template/configuration_display.tpl b/admin/themes/default/template/configuration_display.tpl
index 0bca05704..629a9f400 100644
--- a/admin/themes/default/template/configuration_display.tpl
+++ b/admin/themes/default/template/configuration_display.tpl
@@ -24,7 +24,7 @@
 <div id="configContent">
 
   <fieldset id="indexDisplayConf">
-    <legend>{'Main Page'|translate}</legend>
+    <legend><span class="icon-television icon-green"></span>{'Main Page'|translate}</legend>
     <ul>
       <li>
         <label class="font-checkbox">
@@ -124,7 +124,7 @@
   </fieldset>
 
   <fieldset id="pictureDisplayConf">
-    <legend>{'Photo Page'|translate}</legend>
+    <legend><span class="icon-picture icon-blue"></span>{'Photo Page'|translate}</legend>
     <ul>
       <li>
         <label class="font-checkbox">
@@ -217,7 +217,7 @@
   </fieldset>
 
   <fieldset id="pictureInfoConf">
-    <legend>{'Photo Properties'|translate}</legend>
+    <legend><span class="icon-cog icon-red"></span>{'Photo Properties'|translate}</legend>
     <ul>
       <li>
         <label class="font-checkbox">
diff --git a/admin/themes/default/template/configuration_main.tpl b/admin/themes/default/template/configuration_main.tpl
index 3a3fdf7bc..9e02ac2ce 100644
--- a/admin/themes/default/template/configuration_main.tpl
+++ b/admin/themes/default/template/configuration_main.tpl
@@ -69,7 +69,7 @@ jQuery("input[name='mail_theme']").change(function() {
 <div id="configContent">
 
   <fieldset class="mainConf">
-    <legend>{'Basic settings'|translate}</legend>
+    <legend><span class="icon-cog icon-purple"></span>{'Basic settings'|translate}</legend>
     <ul>
       <li>
         <label for="gallery_title">{'Gallery title'|translate}</label>
@@ -105,7 +105,7 @@ jQuery("input[name='mail_theme']").change(function() {
   </fieldset>
 
   <fieldset class="mainConf">
-    <legend>{'Permissions'|translate}</legend>
+    <legend><span class="icon-lock icon-yellow"></span>{'Permissions'|translate}</legend>
     <ul>
       <li>
         <label class="font-checkbox">
@@ -154,7 +154,7 @@ jQuery("input[name='mail_theme']").change(function() {
   </fieldset>
 
   <fieldset class="mainConf">
-    <legend>{'Miscellaneous'|translate}</legend>
+    <legend><span class="icon-wrench icon-blue"></span>{'Miscellaneous'|translate}</legend>
     <ul>
       <li>
         <label>{'Week starts on'|translate}
diff --git a/admin/themes/default/template/configuration_sizes.tpl b/admin/themes/default/template/configuration_sizes.tpl
index 93ff48c17..d4c44e2f6 100644
--- a/admin/themes/default/template/configuration_sizes.tpl
+++ b/admin/themes/default/template/configuration_sizes.tpl
@@ -71,7 +71,7 @@
 <div id="configContent">
 
   <fieldset id="sizesConf">
-    <legend>{'Original Size'|translate}</legend>
+    <legend><span class="icon-picture icon-red"></span>{'Original Size'|translate}</legend>
   {if $is_gd}
     <div>
       {'Resize after upload disabled due to the use of GD as graphic library'|translate}
@@ -116,7 +116,7 @@
   </fieldset>
 
   <fieldset id="multiSizesConf">
-    <legend>{'Multiple Size'|translate}</legend>
+    <legend><span class="icon-th icon-purple"></span>{'Multiple Size'|translate}</legend>
 
     <div class="showDetails">
       <a href="#" id="showDetails"{if isset($ferrors)} style="display:none"{/if}>{'show details'|translate}</a>
diff --git a/admin/themes/default/template/element_set_ranks.tpl b/admin/themes/default/template/element_set_ranks.tpl
index 3321a69fa..67e40a5b1 100644
--- a/admin/themes/default/template/element_set_ranks.tpl
+++ b/admin/themes/default/template/element_set_ranks.tpl
@@ -47,7 +47,7 @@ jQuery('.thumbnail').tipTip({
 {if !empty($thumbnails)}
   <p><input type="submit" value="{'Submit'|@translate}" name="submit"></p>
   <fieldset>
-    <legend>{'Manual order'|@translate}</legend>
+    <legend><span class="icon-sort-alt-down icon-blue"></span>{'Manual order'|@translate}</legend>
     {if !empty($thumbnails)}
     <p>{'Drag to re-order'|@translate}</p>
     <ul class="thumbnails">
@@ -63,7 +63,7 @@ jQuery('.thumbnail').tipTip({
 {/if}
 
   <fieldset>
-    <legend>{'Sort order'|@translate}</legend>
+    <legend><span class="icon-sort-name-up icon-red"></span>{'Sort order'|@translate}</legend>
     <p class="field">
       <label class="font-checkbox">
         <span class="icon-dot-circled"></span>
diff --git a/admin/themes/default/template/history.tpl b/admin/themes/default/template/history.tpl
index 96701d8bf..a9a9fc6ea 100644
--- a/admin/themes/default/template/history.tpl
+++ b/admin/themes/default/template/history.tpl
@@ -11,7 +11,7 @@ jQuery(function(){ {* <!-- onLoad needed to wait localization loads --> *}
 
 <form class="filter" method="post" name="filter" action="{$F_ACTION}">
 <fieldset class="with-border">
-  <legend>{'Filter'|@translate}</legend>
+  <legend><span class="icon-filter icon-green"></span>{'Filter'|@translate}</legend>
   <ul>
     <li><label>{'Date'|@translate}</label></li>
     <li>
diff --git a/admin/themes/default/template/notification_by_mail.tpl b/admin/themes/default/template/notification_by_mail.tpl
index 8d962428e..e07cef5d0 100644
--- a/admin/themes/default/template/notification_by_mail.tpl
+++ b/admin/themes/default/template/notification_by_mail.tpl
@@ -131,7 +131,7 @@ jQuery(document).ready(function(){
 
 {if isset($auth_key_duration)}
     <fieldset>
-      <legend>{'Informations'|@translate}</legend>
+      <legend><span class="icon-info-circled-1 icon-blue"></span>{'Informations'|@translate}</legend>
       <p>
       {'Each email sent will contain its own automatic authentication key on links, valid for %s.'|translate:$auth_key_duration}
       <br>{'For security reason, authentication keys do not work for administrators.'|translate}
diff --git a/admin/themes/default/template/permalinks.tpl b/admin/themes/default/template/permalinks.tpl
index 648048949..a7e9f6a31 100644
--- a/admin/themes/default/template/permalinks.tpl
+++ b/admin/themes/default/template/permalinks.tpl
@@ -63,7 +63,7 @@ form fieldset p.actionButtons {margin-bottom:0}
 </form>
 
 <fieldset>
-  <legend>{'Permalinks'|@translate}</legend>
+  <legend><span class="icon-lock icon-blue"></span>{'Permalinks'|@translate}</legend>
 <table class="table2" style="margin:0">
 	<tr class="throw">
 		<td>Id {$SORT_ID}</td>
@@ -81,7 +81,7 @@ form fieldset p.actionButtons {margin-bottom:0}
 </fieldset>
 
 <fieldset>
-  <legend>{'Permalink history'|@translate} <a name="old_permalinks"></a></legend>
+  <legend><span class="icon-lock icon-red"></span>{'Permalink history'|@translate} <a name="old_permalinks"></a></legend>
 <table class="table2" style="margin:0">
 	<tr class="throw">
 		<td>Id {$SORT_OLD_CAT_ID}</td>
diff --git a/admin/themes/default/template/photos_add_direct.tpl b/admin/themes/default/template/photos_add_direct.tpl
index d14ff5d86..b595028d7 100644
--- a/admin/themes/default/template/photos_add_direct.tpl
+++ b/admin/themes/default/template/photos_add_direct.tpl
@@ -290,7 +290,7 @@ jQuery(document).ready(function(){
 
   <form id="uploadForm" enctype="multipart/form-data" method="post" action="{$form_action}"{if $NB_ALBUMS == 0} style="display:none;"{/if}>
     <fieldset class="selectAlbum">
-      <legend>{'Drop into album'|@translate}</legend>
+      <legend><span class="icon-folder-open icon-red"></span>{'Drop into album'|@translate}</legend>
       <div class="selectedAlbum"{if !isset($ADD_TO_ALBUM)} style="display: none"{/if}><span class="icon-sitemap">{$ADD_TO_ALBUM}</span></div>
       <div class="selectAlbumBlock"{if isset($ADD_TO_ALBUM)} style="display: none"{/if}>
         <a href="#" data-add-album="category" title="{'create a new album'|@translate}" class="icon-plus"></a>
@@ -312,7 +312,7 @@ jQuery(document).ready(function(){
     </fieldset>
 *}
     <fieldset class="selectFiles">
-      <legend>{'Select files'|@translate}</legend>
+      <legend><span class="icon-docs icon-yellow"></span>{'Select files'|@translate}</legend>
       <div class="selectFilesButtonBlock">
         <button id="addFiles" class="buttonGradient">{'Add Photos'|translate}<i class="icon-plus-circled"></i></button>
         <div class="selectFilesinfo">
diff --git a/admin/themes/default/template/rating.tpl b/admin/themes/default/template/rating.tpl
index 7be061e16..f78e06319 100644
--- a/admin/themes/default/template/rating.tpl
+++ b/admin/themes/default/template/rating.tpl
@@ -38,7 +38,7 @@ jQuery("select[name=cat]").change(function(){
 
 <form action="{$F_ACTION}" method="GET" class="filter">
   <fieldset>
-    <legend>{'Filter'|@translate}</legend>
+    <legend><span class="icon-filter icon-green"></span>{'Filter'|@translate}</legend>
 
     <label>
       {'Sort by'|@translate}
diff --git a/admin/themes/default/template/site_update.tpl b/admin/themes/default/template/site_update.tpl
index 2b2ec3f96..8fe8453b3 100644
--- a/admin/themes/default/template/site_update.tpl
+++ b/admin/themes/default/template/site_update.tpl
@@ -60,7 +60,7 @@
 <form action="" method="post" id="update">
 
 	<fieldset id="syncFiles">
-		<legend>{'synchronize files structure with database'|@translate}</legend>
+		<legend><span class="icon-docs icon-blue"></span>{'synchronize files structure with database'|@translate}</legend>
 		<ul>
 			<li><label><input type="radio" name="sync" value="" {if empty($introduction.sync)}checked="checked"{/if}> {'nothing'|@translate}</label></li>
 			<li><label><input type="radio" name="sync" value="dirs" {if 'dirs'==$introduction.sync}checked="checked"{/if}> {'only directories'|@translate}</label></li>
@@ -76,7 +76,7 @@
 	</fieldset>
 
 	<fieldset id="syncMetadata">
-		<legend>{'synchronize files metadata with database photos informations'|@translate}</legend>
+		<legend><span class="icon-hdd icon-red"></span>{'synchronize files metadata with database photos informations'|@translate}</legend>
 		<label><input type="checkbox" name="sync_meta" {if $introduction.sync_meta}checked="checked"{/if}> {'Synchronize metadata'|@translate} ({$METADATA_LIST})</label>
 		<ul style="padding-left:3em">
 	  		<li>
@@ -89,12 +89,12 @@
 	</fieldset>
 
   <fieldset id="syncSimulate">
-    <legend>{'Simulation'|@translate}</legend>
+    <legend><span class="icon-chart-bar icon-green"></span>{'Simulation'|@translate}</legend>
     <ul><li><label><input type="checkbox" name="simulate" value="1" checked="checked"> {'only perform a simulation (no change in database will be made)'|@translate}</label></li></ul>
   </fieldset>
 
   <fieldset id="catSubset">
-    <legend>{'reduce to single existing albums'|@translate}</legend>
+    <legend><span class="icon-filter icon-purple"></span>{'reduce to single existing albums'|@translate}</legend>
     <ul>
     <li>
     <select class="categoryList" name="cat" size="10">
diff --git a/admin/themes/default/theme.css b/admin/themes/default/theme.css
index dbf0e34f5..825790267 100644
--- a/admin/themes/default/theme.css
+++ b/admin/themes/default/theme.css
@@ -1064,9 +1064,7 @@ a.stat-box:hover {
   border:none;
   padding-left:20px;
 }
-#configContent fieldset:not(.no-border) {
-  border-top:1px solid #bbb;
-}
+
 #configContent legend {
   padding-left:0;
   margin-left:-20px;
@@ -1813,7 +1811,16 @@ INPUT[type="radio"], INPUT[type="checkbox"] {
 
 LEGEND {
   font-weight: bold;
-  padding: 0 10px;
+  font-size: 14px;
+  margin: 10px 0;
+  padding: 0;
+}
+
+LEGEND SPAN {
+  padding: 2px;
+  border-radius: 100%;
+  margin-right: 6px;
+  font-size: 18px;
 }
 
 /* Batch Manager, global mode */
@@ -1848,7 +1855,7 @@ LEGEND {
 }
 
 #batchManagerGlobal legend span {
-  padding: 5px;
+  padding: 3px;
   border-radius: 100%;
   margin-right: 6px;
   font-size: 16px;
diff --git a/language/en_UK/admin.lang.php b/language/en_UK/admin.lang.php
index 5a59cfec5..0d70bd851 100644
--- a/language/en_UK/admin.lang.php
+++ b/language/en_UK/admin.lang.php
@@ -517,7 +517,7 @@ $lang['No mail to send.'] = "No mail to be sent.";
 $lang['No members to manage'] = "No members to manage";
 $lang['No order field selected'] = 'No order field selected';
 $lang['No photo can be deleted'] = "No photo can be deleted";
-$lang['No photo in the current set.'] = 'No photo in the current set.';
+$lang['No photo in the current set.'] = 'No photos in the current set.';
 $lang['No photo in this album'] = "No photo in this album";
 $lang['No photo selected, %d photos in current set'] = 'No photos selected, %d photos in current set';
 $lang['No photos selected, no actions possible.'] = 'No photos selected, no actions possible.';
diff --git a/themes/default/template/comments.tpl b/themes/default/template/comments.tpl
index 6a38dcf99..42d786ac5 100644
--- a/themes/default/template/comments.tpl
+++ b/themes/default/template/comments.tpl
@@ -12,7 +12,7 @@
 <form class="filter" action="{$F_ACTION}" method="get">
 
   <fieldset>
-    <legend>{'Filter'|@translate}</legend>
+    <legend><span class="icon-filter icon-green"></span>{'Filter'|@translate}</legend>
 
 		<ul>
 			<li>