diff --git a/src/PHPCensor/View/Build/view.phtml b/src/PHPCensor/View/Build/view.phtml
index 7c3068aa..1c6917e0 100644
--- a/src/PHPCensor/View/Build/view.phtml
+++ b/src/PHPCensor/View/Build/view.phtml
@@ -25,12 +25,12 @@
                         <th><?php Lang::out('branch'); ?></th>
                         <td style="text-align: right">
                             <a target="_blank" href="<?= $build->getBranchLink(); ?>">
-                                <span class="label label-default"><?= $build->getBranch(); ?></span>
+                                <i class="fa fa-code-fork"></i> <?= $build->getBranch(); ?>
                             </a>
-                            <?php if ($tag = $build->getTag()): ?> /
-                                <a target="_blank" href="<?= $build->getTagLink(); ?>">
-                                    <span class='label label-info'><?= $tag; ?></span>
-                                </a>
+                            <?php if ($tag = $build->getTag()): ?> 
+                                (<a target="_blank" href="<?= $build->getTagLink(); ?>">
+                                    <i class="fa fa-tag"></i> <?= $tag; ?>
+                                </a>)
                             <?php endif; ?>
                         </td>
                     </tr>
@@ -40,7 +40,7 @@
                         <td style="text-align: right">
                             <?php
                                 $environment = $build->getEnvironment();
-                                echo !empty($environment) ? ('<span class="label label-default">' . $environment . '</span>') : '—' ;
+                                echo !empty($environment) ? ('<i class="fa fa-gear"> ' . $environment) : '—' ;
                             ?>
                         </td>
                     </tr>
@@ -48,12 +48,14 @@
                     <tr>
                         <th><?php Lang::out('merged_branches'); ?></th>
                         <td style="text-align: right">
-                            <span class="label label-default"><?php print $build->getBranch() ?></span>
+                            <a target="_blank" href="<?= $build->getBranchLink(); ?>">
+                                <i class="fa fa-code-fork"></i> <?= $build->getBranch(); ?>
+                            </a>
                             + <?php
                             $branches = $build->getExtra('branches');
                             if (!empty($branches)) {
                                 foreach($branches as $branch) {
-                                    ?><span class="label label-default"><?php print $branch ?></span><?php
+                                    ?><i class="fa fa-code-fork"></i> <?php print $branch ?><?php
                                 }
                             } else {
                                 ?>&mdash;<?php
diff --git a/src/PHPCensor/View/Home/ajax-timeline.phtml b/src/PHPCensor/View/Home/ajax-timeline.phtml
index e6701278..bd13c520 100644
--- a/src/PHPCensor/View/Home/ajax-timeline.phtml
+++ b/src/PHPCensor/View/Home/ajax-timeline.phtml
@@ -69,17 +69,23 @@ use PHPCensor\Model\Build;
                         <?php print $build->getProject()->getTitle(); ?>
                     </a>
                     <span><?php print $environment; ?></span>
-                    -
+                    &mdash; 
                     <a href="<?php print APP_URL; ?>build/view/<?php print $build->getId(); ?>">
                         Build #<?php print $build->getId(); ?>
                     </a>
-                    -
+                    &mdash; 
                     <?php print $label; ?>
                 </h3>
 
                 <div class="timeline-body">
-                    <a href="<?php echo $build->getBranchLink();?>"><?php echo $build->getBranch(); ?></a>
-                    <?php print $branches ? ' + '.implode(', ', $branches) : ''; ?> -
+                    <a href="<?= $build->getBranchLink();?>"><i class="fa fa-code-fork"></i> <?php echo $build->getBranch(); ?></a>
+                    <?= $branches ? ' + '.implode(', ', $branches) : ''; ?>
+                    <?php if ($tag = $build->getTag()): ?>
+                        (<a href="<?= $build->getTagLink(); ?>" target="_blank">
+                            <i class="fa fa-tag"></i> <?= $tag; ?>
+                        </a>)
+                    <?php endif; ?>
+                    &mdash; 
                     <?php
                     if ($build->getCommitId() !== 'Manual') {
                         print sprintf(
@@ -92,7 +98,8 @@ use PHPCensor\Model\Build;
                         print Lang::get('manual_build');
                     }
                     ?>
-                    - <?php print $build->getCommitMessage(); ?>
+                    &mdash; 
+                    <?php print $build->getCommitMessage(); ?>
                 </div>
             </div>
         </li>
diff --git a/src/PHPCensor/View/Home/index.phtml b/src/PHPCensor/View/Home/index.phtml
index 7dcc8f3b..220cdda5 100644
--- a/src/PHPCensor/View/Home/index.phtml
+++ b/src/PHPCensor/View/Home/index.phtml
@@ -100,17 +100,23 @@ use PHPCensor\Model\Build;
                                         <?php print $build->getProject()->getTitle(); ?>
                                     </a>
                                     <span><?php print $environment; ?></span>
-                                    -
+                                    &mdash; 
                                     <a href="<?php print APP_URL; ?>build/view/<?php print $build->getId(); ?>">
                                         Build #<?php print $build->getId(); ?>
                                     </a>
-                                    -
+                                    &mdash; 
                                     <?php print $label; ?>
                                 </h3>
 
                                 <div class="timeline-body">
-                                    <a href="<?php echo $build->getBranchLink();?>"><?php echo $build->getBranch(); ?></a>
-                                    <?php print $branches ? ' + '.implode(', ', $branches) : ''; ?> -
+                                    <a href="<?= $build->getBranchLink();?>"><i class="fa fa-code-fork"></i> <?php echo $build->getBranch(); ?></a>
+                                    <?= $branches ? ' + '.implode(', ', $branches) : ''; ?>
+                                    <?php if ($tag = $build->getTag()): ?> 
+                                        (<a href="<?= $build->getTagLink(); ?>" target="_blank">
+                                            <i class="fa fa-tag"></i> <?= $tag; ?>
+                                        </a>)
+                                    <?php endif; ?>
+                                    &mdash; 
                                     <?php
                                     if ($build->getCommitId() !== 'Manual') {
                                         print sprintf(
@@ -123,7 +129,8 @@ use PHPCensor\Model\Build;
                                         print Lang::get('manual_build');
                                     }
                                     ?>
-                                    - <?php print $build->getCommitMessage(); ?>
+                                    &mdash; 
+                                    <?php print $build->getCommitMessage(); ?>
                                 </div>
                             </div>
                         </li>
diff --git a/src/PHPCensor/View/Project/ajax-builds.phtml b/src/PHPCensor/View/Project/ajax-builds.phtml
index 81b892e5..d5529e27 100644
--- a/src/PHPCensor/View/Project/ajax-builds.phtml
+++ b/src/PHPCensor/View/Project/ajax-builds.phtml
@@ -59,13 +59,13 @@ $branches = $build->getExtra('branches');
     </td>
     <td>
         <a href="<?= $build->getBranchLink(); ?>" target="_blank">
-            <span class='label label-default'><?= $build->getBranch(); ?></span>
+            <i class="fa fa-code-fork"></i> <?= $build->getBranch(); ?>
         </a>
         <?= $branches ? ' + '.implode(', ', $branches) : ''; ?>
-        <?php if ($tag = $build->getTag()): ?> /
-            <a href="<?= $build->getTagLink(); ?>" target="_blank">
-                <span class='label label-info'><?= $tag; ?></span>
-            </a>
+        <?php if ($tag = $build->getTag()): ?> 
+             (<a href="<?= $build->getTagLink(); ?>" target="_blank">
+                <i class="fa fa-tag"></i> <?= $tag; ?>
+            </a>)
         <?php endif; ?>
     </td>
     <td>