diff --git a/app/assets/stylesheets/framework/wells.scss b/app/assets/stylesheets/framework/wells.scss
index 1a5da56cba01b5281ccd010b987261c7114f4155..175b2ee71529c0a3fd33f9ad198adc274d0efa9e 100644
--- a/app/assets/stylesheets/framework/wells.scss
+++ b/app/assets/stylesheets/framework/wells.scss
@@ -69,7 +69,7 @@
     background: $blue-100;
     border-radius: $border-radius-default;
     display: inline-block;
-    padding: 1px 1px 0.5px;
+    padding: 1px 2px 0.5px;
     text-align: center;
     vertical-align: bottom;
 
diff --git a/app/views/projects/commit/_limit_exceeded_message.html.haml b/app/views/projects/commit/_limit_exceeded_message.html.haml
index cdf1a52f5b04a5873f91379832107e3af4cd4dfb..84a52d49487334396595243863e90e9f2ecfab59 100644
--- a/app/views/projects/commit/_limit_exceeded_message.html.haml
+++ b/app/views/projects/commit/_limit_exceeded_message.html.haml
@@ -1,8 +1,8 @@
-.has-tooltip{ class: "limit-box limit-box-#{objects.to_s.singularize} prepend-left-5", data: { title: "Project has too many #{label_for_message} to search"} }
+.has-tooltip{ class: "limit-box limit-box-#{objects} prepend-left-5", data: { title: "Project has too many #{label_for_message} to search"} }
   .limit-icon
-    - if objects == :branches
+    - if objects == :branch
       = icon('code-fork')
     - else
       = icon('tag')
   .limit-message
-    %span #{objects.capitalize} unavailable
+    %span #{label_for_message.capitalize} unavailable
diff --git a/app/views/projects/commit/branches.html.haml b/app/views/projects/commit/branches.html.haml
index ed6edf6d1129f45c726809dae1e699e3272a283b..8611129b3565d0562f1a7fb8b68cf87c13c6cc8c 100644
--- a/app/views/projects/commit/branches.html.haml
+++ b/app/views/projects/commit/branches.html.haml
@@ -1,6 +1,6 @@
 - if @branches_limit_exceeded
-  = render 'limit_exceeded_message', objects: :branches, label_for_message: _('branches')
-- else
+  = render 'limit_exceeded_message', objects: :branch, label_for_message: "branches"
+- elsif @branches.any?
   - branch = commit_default_branch(@project, @branches)
   = commit_branch_link(project_ref_path(@project, branch), branch)
 
@@ -10,6 +10,6 @@
     %span.js-details-content.hide
       = commit_branches_links(@project, @branches)
       - if @tags_limit_exceeded
-        = render 'limit_exceeded_message', objects: :tags, label_for_message: _('tags')
+        = render 'limit_exceeded_message', objects: :tag, label_for_message: "tags"
       - else
         = commit_tags_links(@project, @tags)