diff --git a/app/views/admin/content/_form.html.erb b/app/views/admin/content/_form.html.erb
index cc7e4d4ab7..03e81b0042 100644
--- a/app/views/admin/content/_form.html.erb
+++ b/app/views/admin/content/_form.html.erb
@@ -21,13 +21,8 @@
 
     <%= render('images', { :images => @images}) unless @images.empty? %>
 
-    <div id='editor-menu'>
-      <ul class="nav nav-tabs">
-        <li id='image-link'><%= toggle_element 'carousel-wrapper', _("Images") %></li>
-      </ul>
-    </div>
-
     <div id="editor">
+      <i class='icon icon-media'></i> <span id='image-link'><%= toggle_element 'carousel-wrapper', _("Images") %></span>
       <div id='quicktags'>
         <script type="text/javascript">edToolbar('article_body_and_extended', '<%= @article.text_filter %>');</script>
       </div>
diff --git a/app/views/admin/shared/_macros.html.erb b/app/views/admin/shared/_macros.html.erb
index 5b423569f9..49397984a8 100644
--- a/app/views/admin/shared/_macros.html.erb
+++ b/app/views/admin/shared/_macros.html.erb
@@ -1,5 +1,5 @@
 <div>
-  <%= link_to_function(_("Show help on Publify macros") + " (+/-)", update_page { |page| page.visual_effect(:toggle_blind, "macros", :duration => 0.2) }) %>
+  <i class='icon icon-question-sign'></i> <%= link_to_function(_("Show help on Publify macros") + " (+/-)", update_page { |page| page.visual_effect(:toggle_blind, "macros", :duration => 0.2) }) %>
   <table class='table table-striped' id='macros' style='display: none'>
     <thead>
       <tr>
diff --git a/public/stylesheets/administration_structure.css b/public/stylesheets/administration_structure.css
index 2a06027194..c5f8c0f59c 100644
--- a/public/stylesheets/administration_structure.css
+++ b/public/stylesheets/administration_structure.css
@@ -58,24 +58,9 @@ tr:hover .action {
 #editor {
   float: left; 
   width: 100%;
-}
-
-#editor-menu {
-  width: 100%;
-  float: left;
   margin-top: 18px;
 }
 
-#editor-menu ul {
-  width: 100%;
-  margin-bottom: 0;
-}
-
-#editor-menu ul li.active a {
-  color: #808080;
-  background: #F5F5F5;
-}
-
 .separator {
   clear: both;
   margin-top: 18px;