diff --git a/assets/images/icons/code-climate-icon.png b/assets/images/icons/code-climate-icon.png
new file mode 100644
index 00000000..4d547a94
Binary files /dev/null and b/assets/images/icons/code-climate-icon.png differ
diff --git a/assets/images/icons/code-climate-logo.png b/assets/images/icons/code-climate-logo.png
new file mode 100644
index 00000000..4c739e45
Binary files /dev/null and b/assets/images/icons/code-climate-logo.png differ
diff --git a/assets/scripts/app/templates/repos/show/actions.hbs b/assets/scripts/app/templates/repos/show/actions.hbs
index 190794c2..19a9a0c4 100644
--- a/assets/scripts/app/templates/repos/show/actions.hbs
+++ b/assets/scripts/app/templates/repos/show/actions.hbs
@@ -1,14 +1,5 @@
 <div id="actions">
   <ul>
-    {{#if view.displayCodeClimate}}
-      <li>
-        <a href="#" name="code-climate"
-          {{action "codeClimatePopup" target="view"}}
-          {{bindAttr class=":open-popup"}}>
-          Test Coverage
-        </a>
-      </li>
-    {{/if}}
     {{#if view.displayStatusImages}}
     <li id="status-image-popup">
       <a href="#" name="status-images" class="open-popup" {{action "statusImages" target="view"}} style="margin-top: 0px;">
@@ -48,5 +39,15 @@
         <a class="download-log" {{bindAttr href="view.plainTextLogUrl"}}><img class="icon" src="/images/icons/align-justify.png" width="20" title="Download Log"/></a>
       </li>
     {{/if}}
+    {{#if view.displayCodeClimate}}
+      <li class="icon">
+        <a href="#" name="code-climate"
+          {{action "codeClimatePopup" target="view"}}
+          {{bindAttr class=":open-popup"}}>
+          <img src="/images/icons/code-climate-icon.png" title="Test Coverage with Code Climate"/>
+        </a>
+      </li>
+    {{/if}}
+
   </ul>
 </div>
diff --git a/assets/scripts/app/templates/repos/show/tools.hbs b/assets/scripts/app/templates/repos/show/tools.hbs
index cf716a07..a53d413e 100644
--- a/assets/scripts/app/templates/repos/show/tools.hbs
+++ b/assets/scripts/app/templates/repos/show/tools.hbs
@@ -43,9 +43,20 @@
 </div>
 
 <div id="code-climate" class="popup">
+  <img src="/images/icons/code-climate-logo.png" id="code-climate-logo"/>
+  <a href="#" class="close" {{action "popupClose" target="view"}}></a>
   <p>
-    Integrating <a href="https://codeclimate.com">Code Climate</a>'s code coverage reporting with your test
-    suite on Travis CI allows to track changes in coverage over time. It only takes a few steps, once you've set up your project:
+    <b>Want test coverage for your tests?</b>
+  </p>
+  <p>
+    Integrating <a href="https://codeclimate.com">Code Climate's test coverage</a> reporting with your test
+    suite on Travis CI allows to track changes in coverage over time. If you haven't tried it out already, <a
+    href="" target="_blank">sign
+    up today</a> for to improve your code's quality. New customers get 20% off for the first three months!
+  </p> 
+
+  <p>
+    It only takes a few steps, once you've set up your project:
   </p>
 
   <ol>
@@ -68,9 +79,9 @@ CodeClimate::TestReporter.start
       Add the Code Climate token to your .travis.yml:
 
 <pre>
-env:
-  global:
-    - CODECLIMATE_REPO_TOKEN=adf08323...
+addons:
+  code_climate:
+    token: adf08323...
 </pre>
     </li>
 </div>
diff --git a/assets/scripts/app/views/repo/show.coffee b/assets/scripts/app/views/repo/show.coffee
index e25366b3..bed0db46 100644
--- a/assets/scripts/app/views/repo/show.coffee
+++ b/assets/scripts/app/views/repo/show.coffee
@@ -222,9 +222,15 @@ Travis.reopen
     ).property('tab')
 
     displayCodeClimate: (->
+      console.log @get('repo.githubLanguage')
       Travis.config.code_climate == "true" and @get('repo.githubLanguage') == 'Ruby'
     ).property('repo.githubLanguage')
 
+    codeClimatePopup: ->
+      @popupCloseAll()
+      @popup('code-climate')
+      event.stopPropagation()
+
     requeueBuild: ->
       if @get('canRequeueBuild')
         @get('build').requeue()
diff --git a/assets/scripts/travis.coffee b/assets/scripts/travis.coffee
index 5f45ef68..308c36d6 100644
--- a/assets/scripts/travis.coffee
+++ b/assets/scripts/travis.coffee
@@ -75,6 +75,7 @@ $.extend Travis,
     pusher_key:   $('meta[name="travis.pusher_key"]').attr('value')
     ga_code:      $('meta[name="travis.ga_code"]').attr('value')
     code_climate: $('meta[name="travis.code_climate"]').attr('value')
+    code_climate_url: $('meta[name="travis.code_climate_url"]').attr('value')
 
   CONFIG_KEYS: ['go', 'rvm', 'gemfile', 'env', 'jdk', 'otp_release', 'php', 'node_js', 'perl', 'python', 'scala', 'compiler']
 
diff --git a/assets/styles/main/tools.sass b/assets/styles/main/tools.sass
index 792c398e..3acd8047 100644
--- a/assets/styles/main/tools.sass
+++ b/assets/styles/main/tools.sass
@@ -36,6 +36,18 @@
         cursor: default
         color: $color-link-disabled
 
+#code-climate
+  a
+    text-decoration: underline
+    font-weight: bold
+
+  img
+    &#code-climate-logo
+      float: right
+      width: 150px
+      margin-top: 5px
+      margin-right: 10px
+
 #actions
   float: right
   text-align: right
diff --git a/public/images/icons/code-climate-icon.png b/public/images/icons/code-climate-icon.png
new file mode 100644
index 00000000..4d547a94
Binary files /dev/null and b/public/images/icons/code-climate-icon.png differ
diff --git a/public/images/icons/code-climate-logo.png b/public/images/icons/code-climate-logo.png
new file mode 100644
index 00000000..4c739e45
Binary files /dev/null and b/public/images/icons/code-climate-logo.png differ
diff --git a/public/index.html b/public/index.html
index 5949c82f..fb4970ef 100644
--- a/public/index.html
+++ b/public/index.html
@@ -5,7 +5,6 @@
     <meta rel="travis.api_endpoint" href="https://api.travis-ci.org">
     <meta name="travis.pusher_key" value="5df8ac576dcccf4fd076">
     <meta name="travis.ga_code" value="UA-24868285-1">
-    <meta name="travis.code_climate" value="true">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>Travis CI - Free Hosted Continuous Integration Platform for the Open Source Community</title>
     <link rel="dns-prefetch" href="//api.travis-ci.org">