diff --git a/extensions/webmail/templates/index.html b/extensions/webmail/templates/index.html
index 3e26387d6..ef364a67d 100644
--- a/extensions/webmail/templates/index.html
+++ b/extensions/webmail/templates/index.html
@@ -249,6 +249,7 @@ ul.visible {
       src = navparams.get("order").charAt(0) == "-" ? "down_arrow.png" : "up_arrow.png";
       th = $$("th[id=" + navparams.get("order").substring(1) + "]");
       th.getElement("img").set("src", "/static/pics/" + src);
+      th.getElement("img").setStyle("display", "block");
       th.addClass("selected");
     }
     var selectedRows = new Array();
diff --git a/static/stylesheets/basic.css b/static/stylesheets/basic.css
deleted file mode 100644
index 58de59d91..000000000
--- a/static/stylesheets/basic.css
+++ /dev/null
@@ -1,355 +0,0 @@
-body {
-    font-family: arial, helvetica, verdana, tahoma, sans-serif;
-    font-size: small;
-    background: #153F65;
-    margin: 0;
-}
-
-#first-container { 
-    width: 950px;
-    margin: 0 auto;
-    padding: 0;
-}
-
-#header {
-    width: 100%;
-    height: 120px;
-    background: #072342;
-    margin-top: 20px;
-    border: 1px solid #333;
-}
-
-#header h1 {
-    color: white;
-}
-
-#header h2 {
-    margin-left: 20px;
-    color: #6AB0C5;
-}
-
-#header h3 {
-    margin: 0 0 5px 0;
-    text-align: center;
-    font-size: small;
-}
-
-#logo {
-    float: left;
-    margin-top: 20px;
-    background: url(logo.png) left no-repeat;
-    height: 90px;
-    line-height: 90px;
-    min-width: 90px;
-    width: expression(document.body.clientWidth < 1280 ? "90px" : "15%");
-}
-
-#title {
-    float: left;
-    margin-left: 10px;
-}
-
-#info {
-    float: right;
-    text-align: center;
-    background: white;
-    width: 150px;
-    margin: 20px 20px;
-    padding: 10px;
-    border: 1px solid #333;
-}
-
-#body {
-    float: left;
-    width: 100%;
-    margin: 15px 0;
-}
-
-#loginbox {
-    margin: 50px auto;
-    width: 300px;
-    padding-bottom: 15px;
-    border: 1px solid #ddd;
-    background: white;
-}
-
-#loginbox h3 {
-    font-size: small;
-    text-align: center;
-}
-
-#leftcol {
-    float: left;    
-}
-
-.leftbox {
-    border: 1px solid #333;
-    background: white;
-}
-
-#menubox {
-    width: 170px;
-}
-
-#userbox {
-    width: 170px;
-}
-
-.leftbox h3 {
-    font-size: small;
-    margin: 2px 0px 2px 0px;
-    text-align: center;
-}
-
-.leftbox ul {
-    list-style: none;
-    padding: 5px 5px;
-    margin: 0;
-}
-
-.leftbox li {
-    clear: both;
-    margin-bottom: 4px;
-}
-
-.leftbox a:link, .leftbox a:visited {
-    background: transparent;
-    color: black;
-    font-weight: bold;
-    text-decoration: none;
-}
-
-.leftbox a:hover { 
-    color: #6AB0C5;
-    text-decoration: none;
-}
-
-.leftbox img {
-    float: left;
-    margin-right: 2px;
-}
-
-#content {
-    float: right;
-    width: 750px;
-    background: white;
-    border: 1px solid #333;
-    padding: 5px;
-    margin: 0 0 0 15px;
-    min-height: 400px;
-}
-
-#content2 { 
-}
-
-#menubar {
-    margin-left: 20px;
-    display: table;
-    width: 730px;
-    position: absolute;
-}
-
-#form-container { 
-    margin-top: 60px;
-}
-
-#table-container { 
-    margin-top: 60px;
-}
-
-.menu2 { 
-    font-size: 95%;
-    white-space: nowrap;
-}
-
-.menu2 ul { 
-    margin: 0;
-    padding: 0;
-    list-style: none;
-    width: 100%;
-    font-weight: bold;
-    color: #2a4069;
-}
-
-.menu2 li { 
-    float: left;
-    display: inline;
-    margin: 2px 5px;
-}
-
-.dropdown ul { 
-    display: block;
-    background: #ffffcc;
-    width: 150px;
-    margin: 0px;
-    padding: 0px;
-    padding-top: 10px;
-}
-
-.menu2 li ul li { 
-    padding: 5px;
-    display: block;
-    float: none;
-}
-
-.menu2 li.selected {
-/*    text-decoration: underline;*/
-    background: #ffff77;
-}
-
-.menu2 a:link, .menu2 a:visited {
-    background: transparent;
-    color: black;
-    font-weight: bold;
-    text-decoration: none;
-}
-
-.menu2 a:hover { 
-    color: #6AB0C5;
-}
-
-.menu2 img { 
-    float: left;
-    margin: 1px 3px;
-}
-
-#footer {
-    border-top: 1px solid #333;
-    text-align: center;
-    padding-top: 15px;
-}
-
-.spacer { 
-    clear: both;  
-}
-
-.title {
-    float: left;
-    width: 100%;
-    margin-bottom: 5px;
-}
-
-.title img {
-    float: left;
-    margin: 1px 3px;;
-}
-
-.title h1 {
-    float: left;
-    margin: 5px 10px;
-    font-size: medium;
-    font-weight: bold;
-}
-
-#body table {
-    margin: 0 auto;
-    width: 100%;
-    border-collapse: collapse;
-    border-spacing: 20px;
-}
-
-#body tr.odd {
-    background: white;
-}
-
-#body tr.even {
-    background: #F4F6F8;
-}
-
-#body table th {
-    background: #CEDBEC;
-    text-align: left;
-    padding: 5px;
-}
-
-#body table th.right {
-    text-align: right;
-}
-
-#body table td {
-    border-bottom: 1px solid #C8D6E8;
-    padding: 5px;
-}
-
-#body a, a:visited {
-    color: #2a4069;
-    text-decoration: none;
-}
-
-#body a:hover {
-    text-decoration: underline;
-}
-
-#domcontent {
-    margin: 0 auto;
-    margin-top: 25px;
-    margin-bottom: 10px;
-    width: 90%;
-}
-
-#subcontent {
-    margin: 10px auto;
-    width: 90%;
-    margin-top: 60px;
-}
-
-#setcontent { 
-    margin: 0px auto;
-    margin-top: 60px;
-    width: 90%;
-}
-
-.button {
-    margin-left: 35px;
-}
-
-.button img { 
-    float: left;
-    margin: 0px 3px;
-    border: 0;
-}
-
-.header {
-    margin: 10px 0px 20px 20px;
-    padding-bottom: 10px;
-}
-
-.header h1 {
-    font-size: medium;
-    width: 50%;
-    float: left;
-    margin: 0;
-}
-
-#setcontent h4 { 
-    margin-top: 0;
-}
-
-#infos { 
-    float: right;
-    width: 40%;
-    color: green;
-    font-weight: bold;
-    margin-right: 10px;
-    margin-bottom: 5px;
-}
-
-.info { 
-    float: left;
-    font-style: italic;
-}
-
-#notifybox {
-    margin: 20px;
-    font-weight: bold;
-}
-
-/* nouveau style */
-#topmenubar { 
-    width: 100%;
-    margin: 0 auto;
-    padding: 0;
-    background: #072342;
-    border-bottom: 2px solid #333;
-    height: 30px;
-}
diff --git a/static/stylesheets/default.css b/static/stylesheets/default.css
index 864732844..0226555c4 100644
--- a/static/stylesheets/default.css
+++ b/static/stylesheets/default.css
@@ -252,6 +252,10 @@ div.right {
     color: black;
 }
 
+img {
+    border: 0;
+}
+
 table {
     /*margin: 0 auto;*/
     width: 100%;
diff --git a/templates/common/menulist.html b/templates/common/menulist.html
index 4c5c9dc5c..3330f4c4e 100644
--- a/templates/common/menulist.html
+++ b/templates/common/menulist.html
@@ -12,7 +12,7 @@
            {% if sentry.class %}class={{ sentry.class }}{% endif %}
            {% if sentry.rel %}rel={{ sentry.rel }}{% endif %}
            {% if sentry.confirm %} onclick="return confirm('{{ sentry.confirm }}')"{% endif %}>
-          <img src="{{ sentry.img }}" border="0" alt="" />
+          {% if sentry.img %}<img src="{{ sentry.img }}" border="0" alt="" />{% endif %}
           {{ sentry.label }}
         </a>
       </li>
@@ -26,7 +26,7 @@
      {% if entry.rel %}rel={{ entry.rel }}{% endif %}
      {% if entry.confirm %} onclick="return confirm('{{ entry.confirm }}')"{% endif %}>
     
-    <img src="{{ entry.img }}" border="0" />
+    {% if entry.img %}<img src="{{ entry.img }}" alt="" />{% endif %}
     {{ entry.label }}
     </a>
   </li>
diff --git a/templates/common/table_head.html b/templates/common/table_head.html
index caa989f03..26436b9a9 100644
--- a/templates/common/table_head.html
+++ b/templates/common/table_head.html
@@ -7,7 +7,7 @@
     <th id="{{ c.name }}" width="{{ c.width }}">
     {% endif %}
       {{ c|safe }}
-      <span style="float: right"><img src="" border="0" alt="" /></span>
+      <span style="float: right"><img style="display: none" alt="" src="" /></span>
     </th>
     {% endfor %}
   </tr>