diff --git a/assets/scripts/app/templates/builds/show.hbs b/assets/scripts/app/templates/builds/show.hbs
index fe83e0e9..d9ba5756 100644
--- a/assets/scripts/app/templates/builds/show.hbs
+++ b/assets/scripts/app/templates/builds/show.hbs
@@ -8,31 +8,27 @@
       </div>
 
       <div class="runtime">
-           <img src="/images/icons/run-time.svg"/>
-           {{#if build.isFinished}}ran{{else}}running{{/if}} for {{formatDuration build.duration}}
+        {{#if build.isFinished}}ran{{else}}running{{/if}} for {{formatDuration build.duration}}
       </div>
 
       <div class="finished">
-        <img src="/images/icons/finished.svg"/>
         {{formatTime build.finishedAt}}
       </div>
 
-      <div class="tags">
-        <img src="/images/icons/tags.svg"/>
-        {{formatTime build.finishedAt}}
-      </div>
+      {{#if build.tagName}}
+        <div class="tags">
+          {{build.tagName}}
+        </div>
+      {{/if}}
 
       <div class="commit-changes">
-        <img src="/images/icons/github.svg"/>
         <div class="text"><a class="commit" {{bind-attr href="controller.urlGithubCommit"}}>Commit {{formatSha commit.sha}}</a></div>
       </div>
       <div class="commit-changes">
         {{#if build.pullRequest}}
-          <img src="/images/icons/github.svg"/>
           <div class="text"><a class="compare" {{bind-attr href="build.commit.compareUrl"}}>#{{build.pullRequestNumber}}: {{build.pullRequestTitle}}</a></div>
         {{else}}
           {{#if build.commit.compareUrl}}
-            <img src="/images/icons/github.svg"/>
             <div class="text"><a class="compare" {{bind-attr href="build.commit.compareUrl"}}>Compare {{shortCompareShas build.commit.compareUrl}}</a></div>
           {{/if}}
         {{/if}}
@@ -47,9 +43,7 @@
     - {{formatMessage build.commit.subject repoBinding=build.repo}}
     </div>
 
-    <pre class="body">
-{{formatMessage build.commit.body repoBinding=build.repo pre=true}}
-    </pre>
+    <pre class="body">{{formatMessage build.commit.body repoBinding=build.repo pre=true}}</pre>
 
     <div class="footer">
       <div class="author">
@@ -75,4 +69,4 @@
   {{else}}
     {{view Travis.LogView jobBinding="build.jobs.firstObject"}}
   {{/if}}
-{{/if}}
\ No newline at end of file
+{{/if}}
diff --git a/assets/scripts/app/templates/jobs/show.hbs b/assets/scripts/app/templates/jobs/show.hbs
index 2158964d..c54d33c4 100644
--- a/assets/scripts/app/templates/jobs/show.hbs
+++ b/assets/scripts/app/templates/jobs/show.hbs
@@ -7,14 +7,33 @@
         </div>
 
         <div class="runtime">
-           {{#if job.isFinished}}ran{{else}}running{{/if}} for {{formatDuration job.duration}} 
+           {{#if job.isFinished}}ran{{else}}running{{/if}} for {{formatDuration job.duration}}
         </div>
 
         <div class="finished">
           {{formatTime job.finishedAt}}
         </div>
+
+        {{#if job.tagName}}
+          <div class="tags">
+            {{job.tagName}}
+          </div>
+        {{/if}}
+
+        <div class="commit-changes">
+          <div class="text"><a class="commit" {{bind-attr href="controller.urlGithubCommit"}}>Commit {{formatSha job.commit.sha}}</a></div>
+        </div>
+        <div class="commit-changes">
+          {{#if build.pullRequest}}
+            <div class="text"><a class="compare" {{bind-attr href="job.commit.compareUrl"}}>#{{build.pullRequestNumber}}: {{job.build.pullRequestTitle}}</a></div>
+          {{else}}
+            {{#if build.commit.compareUrl}}
+              <div class="text"><a class="compare" {{bind-attr href="job.commit.compareUrl"}}>Compare {{shortCompareShas job.build.commit.compareUrl}}</a></div>
+            {{/if}}
+          {{/if}}
+        </div>
       </div>
-   
+
       <div class="branch" {{bind-attr title="job.commit.branch"}}>
         {{job.commit.branch}}
       </div>
@@ -23,9 +42,7 @@
         - {{formatMessage job.commit.subject repoBinding=job.repo}}
       </div>
 
-      <pre class="body">
-{{formatMessage job.commit.body repoBinding=job.repo pre=true}}
-      </pre>
+      <pre class="body">{{formatMessage job.commit.body repoBinding=job.repo pre=true}}</pre>
 
       <div class="footer">
         <div class="author">
@@ -38,17 +55,6 @@
             {{/if}}
           {{/unless}}
         </div>
-
-        <div class="commit-changes">
-          <div class="text"><a class="commit" {{bind-attr href="controller.urlGithubCommit"}}>Commit {{formatSha job.commit.sha}}</a></div><img src="/images/icons/github.svg" height="15"/>
-          {{#if job.build.pullRequest}}
-            <div class="text"><a class="compare" {{bind-attr href="job.commit.compareUrl"}} >#{{job.build.pullRequestNumber}}: {{job.build.pullRequestTitle}}</a></div><img src="/images/icons/github.svg"/>
-          {{else}}
-            {{#if job.commit.compareUrl}}
-              <div class="text"><a class="compare" {{bind-attr href="job.commit.compareUrl"}}>Compare {{shortCompareShas job.commit.compareUrl}}</a></div><img src="/images/icons/github.svg"/>
-            {{/if}}
-          {{/if}}
-        </div>
       </div>
     </div>
 
diff --git a/assets/scripts/app/templates/repos/show.hbs b/assets/scripts/app/templates/repos/show.hbs
index cc9b0b2a..ec99feb8 100644
--- a/assets/scripts/app/templates/repos/show.hbs
+++ b/assets/scripts/app/templates/repos/show.hbs
@@ -7,13 +7,14 @@
         <div id="repo-header">
           <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}}
 
           <div class="status-image">
             <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>
+
+          {{view Travis.RepoShowToolsView}}
         </div>
 
         <p class="description">{{description}}</p>
diff --git a/assets/styles/main/repository.sass b/assets/styles/main/repository.sass
index dff0150c..88f1361a 100644
--- a/assets/styles/main/repository.sass
+++ b/assets/styles/main/repository.sass
@@ -14,7 +14,8 @@
     width: 90px
     height: 25px
     display: inline-block
-    
+    margin-left: 15px
+
     a#status-image-popup
       display: inline-block
       opacity: 1.0
diff --git a/assets/styles/main/summary.sass b/assets/styles/main/summary.sass
index c71566dc..fc3ad1a9 100644
--- a/assets/styles/main/summary.sass
+++ b/assets/styles/main/summary.sass
@@ -24,7 +24,6 @@
   @include clearfix
   @include border-radius(4px)
   background-color: #fafafa
-  min-height: 30px
   padding: 2px 11px
   margin-bottom: 20px
   padding-bottom: 10px
@@ -51,7 +50,6 @@
   .body
     min-width: 500px
     display: block
-    min-height: 30px
     font-size: 12px
     font-family: Monaco, 'Liberation Mono', Courier, monospace
     margin-bottom: 0px
@@ -60,7 +58,7 @@
 
     a
       text-decoration: underline
-  
+
   .build-status
     @include border-radius(4px)
     color: white
@@ -74,58 +72,56 @@
       padding-left: 21px
 
   .runtime
+    background-image: inline-image('icons/run-time.svg')
+
+  .finished
+    background-image: inline-image('icons/finished.svg')
+
+  .tags
+    background-image: inline-image('icons/tags.svg')
+
+  .commit-changes
+    background-image: inline-image('icons/github.svg')
+
+  .runtime
+    margin-top: 5px
+
+  .runtime, .finished, .tags, .commit-changes
+    background-position: left center
+    background-repeat: no-repeat
+    background-size: 14px 14px
+    padding-left: 20px
     font-size: 13px
     display: block
     width: 100%
     text-align: left
-    line-height: 25px
-    margin: 5px 0 0 12px
-
-    img
-      height: 13px
-      width: 13px
-      opacity: 0.5
-      padding-right: 4px
-
-  .finished
-    font-size: 13px
-    width: 100%
-    text-align: left
-    line-height: 25px
+    line-height: 23px
     margin-left: 12px
 
-    img
-      height: 13px
-      width: 13px
-      opacity: 0.5
-      padding-right: 4px
-
-  .tags
-    font-size: 13px
-    width: 100%
-    text-align: left
-    line-height: 25px
-    margin-left: 12px
-
-    img
-      height: 13px
-      width: 13px
-      opacity: 0.5
-      padding-right: 4px
-
   .commit-changes
     text-align: left
     text-decoration: underline
     width: inherit
+
+    div
+      display: inline
+      clear: none
+
+    a
+      text-overflow: ellipsis
+      white-space: nowrap
+      overflow: hidden
+
+  .commit-changes
+    background: inline-image('icons/github.svg') left center no-repeat
+    background-size: 13px 13px
+    text-align: left
+    text-decoration: underline
+    width: inherit
     font-size: 13px
     margin-left: 12px
-
-    img
-      margin-right: 2px
-      height: 13px
-      width: 13px
-      opacity: 0.5
-      padding-right: 4px
+    padding-left: 20px
+    line-height: 20px
 
     div
       display: inline
@@ -159,6 +155,7 @@
 
     .author
       float: left
+      margin-top: 10px
 
       div
         display: inline
@@ -202,7 +199,7 @@
   .message
     white-space: normal
     min-width: 0
-  
+
     pre
       font-size: 12px
       display: inline-block