diff --git a/module/build/control.php b/module/build/control.php
index f2772a442f..767239b781 100644
--- a/module/build/control.php
+++ b/module/build/control.php
@@ -181,6 +181,7 @@ class build extends control
         }
 
         $executions = $this->product->getExecutionPairsByProduct($build->product, $build->branch, 'id_desc', $this->session->project, 'stagefilter');
+        if($build->execution and !isset($executions[$build->execution])) $executions[$build->execution] = $this->loadModel('execution')->getById($build->execution)->name;
 
         /* Get stories and bugs. */
         $orderBy = 'status_asc, stage_asc, id_desc';
diff --git a/module/build/lang/de.php b/module/build/lang/de.php
index 0164196034..385db70d1c 100644
--- a/module/build/lang/de.php
+++ b/module/build/lang/de.php
@@ -40,6 +40,7 @@ $lang->build->releasedBuild  = 'Released Build';
 $lang->build->name           = 'Name';
 $lang->build->date           = 'Datum';
 $lang->build->builder        = 'Builder';
+$lang->build->url            = 'URL';
 $lang->build->scmPath        = 'SCM Pfad';
 $lang->build->filePath       = 'Dateipfad';
 $lang->build->desc           = 'Beschreibung';
diff --git a/module/build/lang/en.php b/module/build/lang/en.php
index 75343df3d0..0b64199217 100644
--- a/module/build/lang/en.php
+++ b/module/build/lang/en.php
@@ -40,6 +40,7 @@ $lang->build->releasedBuild  = 'Released Build';
 $lang->build->name           = 'Name';
 $lang->build->date           = 'Date';
 $lang->build->builder        = 'Builder';
+$lang->build->url            = 'URL';
 $lang->build->scmPath        = 'SCM Path';
 $lang->build->filePath       = 'File Path';
 $lang->build->desc           = 'Description';
diff --git a/module/build/lang/fr.php b/module/build/lang/fr.php
index e6500fd173..7633876217 100644
--- a/module/build/lang/fr.php
+++ b/module/build/lang/fr.php
@@ -40,6 +40,7 @@ $lang->build->releasedBuild  = 'Released Build';
 $lang->build->name           = 'Nom';
 $lang->build->date           = 'Date';
 $lang->build->builder        = 'Builder';
+$lang->build->url            = 'URL';
 $lang->build->scmPath        = 'Chemin SCM';
 $lang->build->filePath       = 'Chemin Fichier';
 $lang->build->desc           = 'Description';
diff --git a/module/build/lang/zh-cn.php b/module/build/lang/zh-cn.php
index fe804daf9c..f24b21bb26 100644
--- a/module/build/lang/zh-cn.php
+++ b/module/build/lang/zh-cn.php
@@ -40,6 +40,7 @@ $lang->build->releasedBuild  = '发布版本';
 $lang->build->name           = '名称编号';
 $lang->build->date           = '打包日期';
 $lang->build->builder        = '构建者';
+$lang->build->url            = '地址';
 $lang->build->scmPath        = '源代码地址';
 $lang->build->filePath       = '下载地址';
 $lang->build->desc           = '描述';
diff --git a/module/execution/view/build.html.php b/module/execution/view/build.html.php
index c1610c1616..4a8faa823a 100644
--- a/module/execution/view/build.html.php
+++ b/module/execution/view/build.html.php
@@ -51,8 +51,7 @@
           <th class="c-id-sm"><?php echo $lang->build->id;?></th>
           <th class="c-name w-200px text-left <?php echo $hidden;?>"><?php echo $lang->build->product;?></th>
           <th class="c-name text-left"><?php echo $lang->build->name;?></th>
-          <th class="c-url"><?php echo $lang->build->scmPath;?></th>
-          <th class="c-url"><?php echo $lang->build->filePath;?></th>
+          <th class="c-url w-300px text-left"><?php echo $lang->build->url;?></th>
           <th class="c-date"><?php echo $lang->build->date;?></th>
           <th class="c-user"><?php echo $lang->build->builder;?></th>
           <th class="c-actions-5"><?php echo $lang->actions;?></th>
@@ -68,8 +67,12 @@
             <?php if($build->branchName) echo "<span class='label label-outline label-badge'>{$build->branchName}</span>"?>
             <?php echo html::a($this->createLink('build', 'view', "build=$build->id"), $build->name);?>
           </td>
-          <td class="c-url" title="<?php echo $build->scmPath?>"><?php  echo strpos($build->scmPath,  'http') === 0 ? html::a($build->scmPath)  : $build->scmPath;?></td>
-          <td class="c-url" title="<?php echo $build->filePath?>"><?php echo strpos($build->filePath, 'http') === 0 ? html::a($build->filePath) : $build->filePath;?></td>
+          <td class="c-url text-left">
+            <?php
+            if($build->scmPath)  echo "<div><i class='icon icon-code' title='{$lang->build->scmPath}'></i> <span title='{$build->scmPath}'>" . (strpos($build->scmPath,  'http') === 0 ? html::a($build->scmPath)  : $build->scmPath) . '</span></div>';
+            if($build->filePath) echo "<div><i class='icon icon-file-archive' title='{$lang->build->filePath}'></i> <span title='{$build->filePath}'>" . (strpos($build->filePath, 'http') === 0 ? html::a($build->filePath) : $build->filePath) . '</span></div>';
+            ?>
+          </td>
           <td class="c-date"><?php echo $build->date?></td>
           <td class="c-user em"><?php echo zget($users, $build->builder);?></td>
           <td class="c-actions"><?php echo $this->build->buildOperateMenu($build, 'browse', "executionID={$execution->id}&productID={$productID}");?></td>
diff --git a/module/project/view/build.html.php b/module/project/view/build.html.php
index e38be60903..7fe72a1081 100644
--- a/module/project/view/build.html.php
+++ b/module/project/view/build.html.php
@@ -50,13 +50,12 @@
           <th class="c-id-sm"><?php echo $lang->build->id;?></th>
           <th class="c-name text-left"><?php echo $lang->build->name;?></th>
           <?php if($project->hasProduct):?>
-          <th class="c-name w-200px text-left"><?php echo $lang->build->product;?></th>
+          <th class="c-name w-150px text-left"><?php echo $lang->build->product;?></th>
           <?php endif;?>
           <?php if($project->multiple):?>
-          <th class="c-name text-left"><?php echo $lang->executionCommon;?></th>
+          <th class="c-name w-150px text-left"><?php echo $lang->executionCommon;?></th>
           <?php endif;?>
-          <th class="c-url"><?php echo $lang->build->scmPath;?></th>
-          <th class="c-url"><?php echo $lang->build->filePath;?></th>
+          <th class="c-url w-300px text-left"><?php echo $lang->build->url;?></th>
           <th class="c-date"><?php echo $lang->build->date;?></th>
           <th class="c-user"><?php echo $lang->build->builder;?></th>
           <th class="c-actions-5"><?php echo $lang->actions;?></th>
@@ -97,8 +96,12 @@
           </td>
           <?php endif;?>
           <?php endif;?>
-          <td class="c-url" title="<?php echo $build->scmPath?>"><?php  echo strpos($build->scmPath,  'http') === 0 ? html::a($build->scmPath)  : $build->scmPath;?></td>
-          <td class="c-url" title="<?php echo $build->filePath?>"><?php echo strpos($build->filePath, 'http') === 0 ? html::a($build->filePath) : $build->filePath;?></td>
+          <td class="c-url text-left">
+            <?php
+            if($build->scmPath)  echo "<div><i class='icon icon-code' title='{$lang->build->scmPath}'></i> <span title='{$build->scmPath}'>" . (strpos($build->scmPath,  'http') === 0 ? html::a($build->scmPath)  : $build->scmPath) . '</span></div>';
+            if($build->filePath) echo "<div><i class='icon icon-file-archive' title='{$lang->build->filePath}'></i> <span title='{$build->filePath}'>" . (strpos($build->filePath, 'http') === 0 ? html::a($build->filePath) : $build->filePath) . '</span></div>';
+            ?>
+          </td>
           <td class="c-date"><?php echo $build->date?></td>
           <td class="c-user em"><?php echo zget($users, $build->builder);?></td>
           <td class="c-actions"><?php echo $this->build->buildOperateMenu($build, 'browse');?></td>