diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 95fb16a..f4d706c 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -327,10 +327,11 @@ module ApplicationHelper
     show_button_id = id + "-show"
 
     result = ""
-    result << button_to_function('close', hide_label, hide(id) + hide(hide_button_id) + show(show_button_id), :id => hide_button_id, :class => 'hide-button with_text')
-    result < " "
     result << button_to_function('open', show_label, show(id) + show(hide_button_id) + hide(show_button_id), :id => show_button_id, :class => 'show-button with_text', :style => 'display: none;' )
 
+    result < " "
+    result << button_to_function('close', hide_label, hide(id) + hide(hide_button_id) + show(show_button_id), :id => hide_button_id, :class => 'hide-button with_text')
+
     result
   end
 
diff --git a/app/views/cms/text_html_new.rhtml b/app/views/cms/text_html_new.rhtml
index 57a56d6..84ec412 100644
--- a/app/views/cms/text_html_new.rhtml
+++ b/app/views/cms/text_html_new.rhtml
@@ -10,6 +10,6 @@
   
   <%= f.text_area('body', :cols => 64) %>
 
-  <%= submit_tag _('Save') %>
+  <%= design_display_button_submit('save', _('Save')) %>
 
 <% end %>
diff --git a/app/views/cms/view.rhtml b/app/views/cms/view.rhtml
index 86017e0..9af48bc 100644
--- a/app/views/cms/view.rhtml
+++ b/app/views/cms/view.rhtml
@@ -17,8 +17,9 @@
 <% end %>
 
 <%# subitem %>
-
-<%= toggle_panel(_('Hide subitems'), _('Show subitems'), 'article-subitems') unless @subitems.empty? %>
+<% if !@subitems.empty? && @article %>
+  <%= toggle_panel(_('Hide subitems'), _('Show subitems'), 'article-subitems') %>
+<% end %>
   
 <div id='article-subitems'>
   <div class='file-manager-title'><%= @article ? _('Subitems') : _('Articles') %></div>
@@ -36,6 +37,7 @@
     <% if @article %>
       <% button_bar(:class => 'file-manager-controls') do %>
         <%= button('new',  _('New subitem'), :action => 'new', :parent_id => @article.id) %>
+        <%= button('up', _('Go up one level'), :action => (@article.parent ? 'view' : 'index'), :id => @article.parent) %>
       <% end %>
     <% end %>
   </div>
diff --git a/public/designs/icons/default/README b/public/designs/icons/default/README
index 1514264..c9032fd 100644
--- a/public/designs/icons/default/README
+++ b/public/designs/icons/default/README
@@ -1,11 +1,22 @@
 Source and Licensing
 ====================
 
-Icon                      Source theme Source section License
-------------------------- ------------ -------------- -------
-gtk-edit.png              dlg-neu      stock/         GPLv2+
-gnome-home.png            Nuovo        apps/          GPLv2+
-gtk-new.png               Nuovo        stock/         GPLv2+
-gtk-close.png             Nuovo        stock/         GPLv2+
-gtk-open.png              Nuovo        stock/         GPLv2+
-abiword_48.png            dlg-neu      apps/          GPLv2+
+Icons are taken from GNOME/Gtk+ themes on Debian systems. Normally they are
+converted from SVG to PNG using rsvg (from package librsvg2-bin).
+
+Icon                      Source theme Source section
+------------------------- ------------ --------------
+gtk-edit.png              dlg-neu      stock/
+gnome-home.png            Nuovo        apps/
+gtk-new.png               Nuovo        stock/
+gtk-close.png             Nuovo        stock/
+gtk-open.png              Nuovo        stock/
+abiword_48.png            dlg-neu      apps/
+gtk-save.png              Nuovo        stock/
+gtk-go-up.png             Nuovo        stock/
+
+Licensing of GNOME themes
+=========================
+
+Nuovo: GPL 2 or later
+dlg-neu: GPL 2 or later
diff --git a/public/designs/icons/default/gtk-go-up.png b/public/designs/icons/default/gtk-go-up.png
new file mode 100644
index 0000000..4c4a7fe
Binary files /dev/null and b/public/designs/icons/default/gtk-go-up.png differ
diff --git a/public/designs/icons/default/gtk-save.png b/public/designs/icons/default/gtk-save.png
new file mode 100644
index 0000000..914a4ce
Binary files /dev/null and b/public/designs/icons/default/gtk-save.png differ
diff --git a/public/designs/icons/default/style.css b/public/designs/icons/default/style.css
index 4278611..4bd2ece 100644
--- a/public/designs/icons/default/style.css
+++ b/public/designs/icons/default/style.css
@@ -4,4 +4,5 @@
 .button.close { background-image: url(gtk-close.png); }
 .button.open { background-image: url(gtk-open.png); }
 .button.cms { background-image: url(abiword_48.png)}
-
+.button.save { background-image: url(gtk-save.png); }
+.button.up { background-image: url(gtk-go-up.png); }
diff --git a/public/stylesheets/button.css b/public/stylesheets/button.css
index 030bcfa..9988c59 100644
--- a/public/stylesheets/button.css
+++ b/public/stylesheets/button.css
@@ -6,18 +6,22 @@
   background-position: 0px;
 
   padding-left: 25px;
+  padding-right: 2px;
 
   float: left;
   display: block;
   height: 26px;
+
 }
 
-a.button , a.button:visited {
+.button , .button:visited {
   color: black;
   text-decoration: none;
+  border: 1px solid transparent;
 }
 
-a.button:hover {
-  background-color: #ace;
+.button:hover {
+  border: 1px solid black;
+  background-color: #eee;
 }
 
diff --git a/public/stylesheets/common.css b/public/stylesheets/common.css
index d6d67c0..183c08e 100644
--- a/public/stylesheets/common.css
+++ b/public/stylesheets/common.css
@@ -146,6 +146,7 @@ div.file-manager-button a:hover {
   padding: 2px;
   background: #579;
   color: white;
+  height: 24px;
 }
 
 .file-manager-small ul {
@@ -198,7 +199,6 @@ div.file-manager-button a:hover {
 
 #article-subitems-hide.hide-button {
   float: right;
-  margin-right: 4px;
   color: white;
 }
 #article-subitems-hide.hide-button:hover {
--
libgit2 0.21.2