diff --git a/app/views/wiki/diff.rhtml b/app/views/wiki/diff.rhtml
index 8db2df00..512d4108 100644
--- a/app/views/wiki/diff.rhtml
+++ b/app/views/wiki/diff.rhtml
@@ -1,7 +1,6 @@
 <div class="contextual">
 <%= link_to(l(:button_edit), {:action => 'edit', :page => @page.title}, :class => 'icon icon-edit') %>
 <%= link_to(l(:label_history), {:action => 'history', :page => @page.title}, :class => 'icon icon-history') %>
-<%= link_to(l(:label_page_index), {:action => 'special', :page => 'Page_index'}, :class => 'icon icon-index') %>
 </div>
 
 <h2><%= @page.pretty_title %></h2>
diff --git a/app/views/wiki/edit.rhtml b/app/views/wiki/edit.rhtml
index 8ebd9869..99bc5fa2 100644
--- a/app/views/wiki/edit.rhtml
+++ b/app/views/wiki/edit.rhtml
@@ -1,7 +1,3 @@
-<div class="contextual">
-<%= link_to(l(:label_page_index), {:action => 'special', :page => 'Page_index'}, :class => 'icon icon-index') %>
-</div>
-
 <h2><%= @page.pretty_title %></h2>
 
 <% form_for :content, @content, :url => {:action => 'edit', :page => @page.title}, :html => {:id => 'wiki_form'} do |f| %>
diff --git a/app/views/wiki/export_multiple.rhtml b/app/views/wiki/export_multiple.rhtml
index 75052ab3..c76b08fc 100644
--- a/app/views/wiki/export_multiple.rhtml
+++ b/app/views/wiki/export_multiple.rhtml
@@ -10,7 +10,7 @@ h1, h2, h3, h4 {  font-family: Trebuchet MS,Georgia,"Times New Roman",serif; }
 </head>
 <body>
 
-<strong><%= l(:label_page_index) %></strong>
+<strong><%= l(:label_index_by_title) %></strong>
 <ul>
 <% @pages.each do |page| %>
     <li><a href="#<%= page.title %>"><%= page.pretty_title %></a></li>
diff --git a/app/views/wiki/history.rhtml b/app/views/wiki/history.rhtml
index 85b1541c..41711d72 100644
--- a/app/views/wiki/history.rhtml
+++ b/app/views/wiki/history.rhtml
@@ -1,7 +1,3 @@
-<div class="contextual">
-<%= link_to(l(:label_page_index), {:action => 'special', :page => 'Page_index'}, :class => 'icon icon-index') %>
-</div>
-
 <h2><%= @page.pretty_title %></h2>
 
 <h3><%= l(:label_history) %></h3>
diff --git a/app/views/wiki/special_page_index.rhtml b/app/views/wiki/special_page_index.rhtml
index 8d3cd8a4..db6629de 100644
--- a/app/views/wiki/special_page_index.rhtml
+++ b/app/views/wiki/special_page_index.rhtml
@@ -5,8 +5,9 @@
 <% end %>
 
 <ul><% @pages.each do |page| %>
-    <li><%= link_to page.pretty_title, :action => 'index', :page => page.title %> -
-    <%= l(:label_last_updates) %>: <%= format_time(page.updated_on) %></li>
+    <li><%= link_to page.pretty_title, {:action => 'index', :page => page.title},
+                                       :title => l(:label_updated_time, distance_of_time_in_words(Time.now, page.updated_on)) %>
+    </li>
 <% end %></ul>
 
 <% content_for :sidebar do %>
