diff --git a/assets/images/icons/tags.svg b/assets/images/icons/tags.svg
index 84463bfd..61e057e0 100644
--- a/assets/images/icons/tags.svg
+++ b/assets/images/icons/tags.svg
@@ -3,9 +3,9 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="154px" height="152px" viewBox="0 0 154 152" enable-background="new 0 0 154 152" xml:space="preserve">
-<path fill="none" stroke="#000000" stroke-width="27.6025" d="M73.424,20.029c-1.524-1.543-4.531-2.975-6.691-3.193l-34.615-3.429
+<path fill="none" stroke="#000000" stroke-width="20" d="M73.424,20.029c-1.524-1.543-4.531-2.975-6.691-3.193l-34.615-3.429
 	c-0.165-0.004-0.341-0.02-0.515-0.026c-2.107-0.015-4.784,1.007-6.207,2.414l-7.971,7.836c-1.543,1.522-2.664,4.542-2.485,6.688
-	L17.75,65.08c0.169,2.157,1.561,5.177,3.086,6.73l63.536,64.547c0.763,0.773,1.773,1.163,2.788,1.174
+	l2.81,34.761c0.169,2.157,1.561,5.177,3.086,6.73l63.536,64.547c0.763,0.772,1.772,1.162,2.788,1.174
 	c0.999,0.008,2.013-0.366,2.785-1.125l46.974-46.248c1.546-1.521,1.567-4.04,0.047-5.571L73.424,20.029z"/>
 <path d="M41.872,39.859c2.563-2.519,5.917-3.773,9.249-3.743c3.351,0.027,6.674,1.34,9.212,3.898
 	c5.043,5.13,4.975,13.388-0.144,18.427c-2.577,2.546-5.914,3.793-9.256,3.763c-3.341-0.028-6.655-1.319-9.19-3.902
diff --git a/assets/scripts/app/templates/repos/show.hbs b/assets/scripts/app/templates/repos/show.hbs
index 01dbc972..90c5f533 100644
--- a/assets/scripts/app/templates/repos/show.hbs
+++ b/assets/scripts/app/templates/repos/show.hbs
@@ -8,6 +8,10 @@
           <h3>{{#link-to "repo" this}}{{slug}}{{/link-to}}</h3>
           <div class="github-icon"><a {{bind-attr href="controller.urlGithub"}}><img src="/images/icons/github.svg" width="21" height="21"/></a></div>
           {{view Travis.RepoShowToolsView}}
+
+          <a href="#" id="status-image-popup" name="status-images" class="open-popup" {{action "statusImages" target="view"}}>
+          <img {{bind-attr src="view.statusImageUrl"}} title="Build Status Images"/>
+          </a>
         </div>
 
         <p class="description">{{description}}</p>
diff --git a/assets/scripts/app/templates/repos/show/tools.hbs b/assets/scripts/app/templates/repos/show/tools.hbs
index ed110ae6..83cedee0 100644
--- a/assets/scripts/app/templates/repos/show/tools.hbs
+++ b/assets/scripts/app/templates/repos/show/tools.hbs
@@ -1,5 +1,5 @@
 <div id="tools">
-  <a href="#" {{action "menu" target="view"}} class="menu-popup-button"></a>
+  <a href="#" {{action "menu" target="view"}} class="menu-popup-button">Settings</a>
 
   <ul class="menu">
    {{#if view.displayRegenerateKey}}
@@ -26,9 +26,6 @@
     {{/if}}
 
   </ul>
-  <a href="#" id="status-image-popup" name="status-images" class="open-popup" {{action "statusImages" target="view"}}>
-    <img {{bind-attr src="view.statusImageUrl"}} title="Build Status Images"/>
-  </a>
 </div>
 
 <div id="regenerate-key" class="popup">
diff --git a/assets/styles/main/repository.sass b/assets/styles/main/repository.sass
index bf954620..0343480b 100644
--- a/assets/styles/main/repository.sass
+++ b/assets/styles/main/repository.sass
@@ -10,6 +10,10 @@
     display: inline-block
     margin-right: 5px
 
+  a#status-image-popup
+    display: inline-block
+    opacity: 1.0
+
   .github-icon
     width: 21px
     height: 21px
diff --git a/assets/styles/main/tools.sass b/assets/styles/main/tools.sass
index a3ddf79c..ea5614e5 100644
--- a/assets/styles/main/tools.sass
+++ b/assets/styles/main/tools.sass
@@ -12,6 +12,9 @@
     height: 24px
     text-align: left
     margin-top: -27px
+    color: #fff
+    font-size: 13px
+    padding-left: 12px
     background: #a6adad inline-image('icons/settings.svg') no-repeat
     background-size: 14px 14px
     background-position: 6px 5px
@@ -41,13 +44,6 @@
         cursor: default
         color: $color-link-disabled
 
-  a#status-image-popup
-    float: right
-    display: inline-block
-    opacity: 1.0
-    margin-top: -26px
-    margin-right: 100px
-
 #code-climate
   a
     text-decoration: underline