diff --git a/app/views/repositories/_link_to_functions.html.erb b/app/views/repositories/_link_to_functions.html.erb
index edb5e84a5..bdb534395 100644
--- a/app/views/repositories/_link_to_functions.html.erb
+++ b/app/views/repositories/_link_to_functions.html.erb
@@ -1,13 +1,22 @@
 <% if @entry && @entry.kind == 'file' %>
 
+<%
+tabs = []
+tabs << { name: 'entry', label: :button_view,
+          url: {:action => 'entry', :id => @project, :repository_id => @repository.identifier_param, :path => to_path_param(@path), :rev => @rev }
+        } if @repository.supports_cat?
+
+tabs << { name: 'changes', label: :label_history,
+          url: {:action => 'changes', :id => @project, :repository_id => @repository.identifier_param, :path => to_path_param(@path), :rev => @rev }
+        }
+tabs << { name: 'annotate', label: :button_annotate,
+          url: {:action => 'annotate', :id => @project, :repository_id => @repository.identifier_param, :path => to_path_param(@path), :rev => @rev }
+        } if @repository.supports_annotate?
+%>
+
+<%= render :partial => 'common/tabs', :locals => {:tabs => tabs, :selected_tab => action_name} %>
+
 <p>
-<% if @repository.supports_cat? %>
-    <%= link_to_if action_name != 'entry', l(:button_view), {:action => 'entry', :id => @project, :repository_id => @repository.identifier_param, :path => to_path_param(@path), :rev => @rev } %> |
-<% end %>
-<%= link_to_if action_name != 'changes', l(:label_history), {:action => 'changes', :id => @project, :repository_id => @repository.identifier_param, :path => to_path_param(@path), :rev => @rev } %> |
-<% if @repository.supports_annotate? %>
-    <%= link_to_if action_name != 'annotate', l(:button_annotate), {:action => 'annotate', :id => @project, :repository_id => @repository.identifier_param, :path => to_path_param(@path), :rev => @rev } %> |
-<% end %>
 <%= link_to(l(:button_download),
             {:action => 'raw', :id => @project,
              :repository_id => @repository.identifier_param,
diff --git a/public/stylesheets/scm.css b/public/stylesheets/scm.css
index f1c65f931..e360d170b 100644
--- a/public/stylesheets/scm.css
+++ b/public/stylesheets/scm.css
@@ -67,7 +67,7 @@ table.filecontent td.line-code pre {
 table.filecontent tr:target th.line-num { background-color:#E0E0E0; color: #777; }
 table.filecontent tr:target td.line-code { background-color:#DDEEFF; }
 
-img.filecontent { max-width: 100%; margin-top: 1em;}
+img.filecontent { max-width: 100%; }
 
 /* 12 different colors for the annonate view */
 table.annotate tr.bloc-0 {background: #FFFFBF;}