diff --git a/module/block/view/bugblock.html.php b/module/block/view/bugblock.html.php
index a7e34a445d..330535e18b 100644
--- a/module/block/view/bugblock.html.php
+++ b/module/block/view/bugblock.html.php
@@ -34,6 +34,17 @@
         <th class='c-status'><?php echo $lang->bug->statusAB;?></th>
       </tr>
     </thead>
+    <?php
+    $hasCustomSeverity = false;
+    foreach($lang->bug->severityList as $severityKey => $severityValue)
+    {
+        if(!empty($severityKey) and (string)$severityKey != (string)$severityValue)
+        {
+            $hasCustomSeverity = true;
+            break;
+        }
+    }
+    ?>
     <tbody>
       <?php foreach($bugs as $bug):?>
       <?php
@@ -46,7 +57,11 @@
         <td class='c-pri'><span class='label-pri label-pri-<?php echo $bug->pri?>' title='<?php echo zget($lang->bug->priList, $bug->pri);?>'><?php echo zget($lang->bug->priList, $bug->pri)?></span></td>
         <?php endif;?>
         <td class='c-severity'>
+          <?php if($hasCustomSeverity):?>
+          <span class='<?php echo 'label-severity-custom';?>' title='<?php echo zget($lang->bug->severityList, $bug->severity);?>' data-severity='<?php echo $bug->severity;?>'><?php echo zget($lang->bug->severityList, $bug->severity, $bug->severity);?></span>
+          <?php else:?>
           <span class='label-severity' title='<?php echo zget($lang->bug->severityList, $bug->severity);?>' data-severity='<?php echo $bug->severity;?>'><?php echo $bug->severity;?></span>
+          <?php endif;?>
         </td>
         <td class='c-name' style='color: <?php echo $bug->color?>' title='<?php echo $bug->title?>'><?php echo $bug->title?></td>
         <td class='c-status' title='<?php echo zget($lang->bug->statusList, $bug->status)?>'>
diff --git a/module/bug/model.php b/module/bug/model.php
index 11cef46ad5..cf0e07e8a5 100644
--- a/module/bug/model.php
+++ b/module/bug/model.php
@@ -2442,6 +2442,17 @@ class bugModel extends model
         $canBatchAction = $canBatchEdit or $canBatchConfirm or $canBatchClose or $canBatchActivate or $canBatchChangeBranch or $canBatchChangeModule or $canBatchResolve or $canBatchAssignTo;
 
         $canView = common::hasPriv('bug', 'view');
+
+        $hasCustomSeverity = false;
+        foreach($this->lang->bug->severityList as $severityKey => $severityValue)
+        {
+            if(!empty($severityKey) and (string)$severityKey != (string)$severityValue)
+            {
+                $hasCustomSeverity = true;
+                break;
+            }
+        }
+
         $bugLink = inlink('view', "bugID=$bug->id");
         $account = $this->app->user->account;
         $id = $col->id;
@@ -2482,7 +2493,14 @@ class bugModel extends model
                 }
                 break;
             case 'severity':
-                echo "<span class='label-severity' data-severity='{$bug->severity}' title='" . zget($this->lang->bug->severityList, $bug->severity) . "'></span>";
+                if($hasCustomSeverity)
+                {
+                    echo "<span class='label-severity-custom' data-severity='{$bug->severity}' title='" . zget($this->lang->bug->severityList, $bug->severity) . "'>" . zget($this->lang->bug->severityList, $bug->severity) . "</span>";
+                }
+                else
+                {
+                    echo "<span class='label-severity' data-severity='{$bug->severity}' title='" . zget($this->lang->bug->severityList, $bug->severity) . "'></span>";
+                }
                 break;
             case 'pri':
                 echo "<span class='label-pri label-pri-" . $bug->pri . "' title='" . zget($this->lang->bug->priList, $bug->pri, $bug->pri) . "'>";
diff --git a/module/bug/view/view.html.php b/module/bug/view/view.html.php
index f379b42260..a9f749418d 100644
--- a/module/bug/view/view.html.php
+++ b/module/bug/view/view.html.php
@@ -142,8 +142,25 @@
                   <td><?php if(isset($lang->bug->typeList[$bug->type])) echo $lang->bug->typeList[$bug->type]; else echo $bug->type;?></td>
                 </tr>
                 <tr>
+                  <?php
+                  $hasCustomSeverity = false;
+                  foreach($lang->bug->severityList as $severityKey => $severityValue)
+                  {
+                      if(!empty($severityKey) and (string)$severityKey != (string)$severityValue)
+                      {
+                          $hasCustomSeverity = true;
+                          break;
+                      }
+                  }
+                  ?>
                   <th><?php echo $lang->bug->severity;?></th>
-                  <td><span class='label-severity' data-severity='<?php echo $bug->severity;?>' title='<?php echo zget($lang->bug->severityList, $bug->severity)?>'></span></td>
+                  <td>
+                    <?php if($hasCustomSeverity):?>
+                    <span class='label-severity-custom' data-severity='<?php echo $bug->severity;?>' title='<?php echo zget($lang->bug->severityList, $bug->severity);?>'><?php echo zget($lang->bug->severityList, $bug->severity, $bug->severity);?></span>
+                    <?php else:?>
+                    <span class='label-severity' data-severity='<?php echo $bug->severity;?>' title='<?php echo zget($lang->bug->severityList, $bug->severity)?>'></span>
+                    <?php endif;?>
+                  </td>
                 </tr>
                 <tr>
                   <th><?php echo $lang->bug->pri;?></th>
diff --git a/module/build/view/view.html.php b/module/build/view/view.html.php
index b1f4b9f3c6..dc2aef8a36 100644
--- a/module/build/view/view.html.php
+++ b/module/build/view/view.html.php
@@ -247,13 +247,28 @@ tbody tr td:first-child input{display:none;}
                 <th class='w-100px'>   <?php common::printOrderLink('resolvedDate', $orderBy, $vars, $lang->bug->resolvedDateAB);?></th>
               </tr>
             </thead>
+            <?php
+            $hasCustomSeverity = false;
+            foreach($lang->bug->severityList as $severityKey => $severityValue)
+            {
+                if(!empty($severityKey) and (string)$severityKey != (string)$severityValue)
+                {
+                    $hasCustomSeverity = true;
+                    break;
+                }
+            }
+            ?>
             <tbody class='text-center'>
               <?php foreach($generatedBugs as $bug):?>
               <?php $bugLink = $this->createLink('bug', 'view', "bugID=$bug->id", '', true);?>
               <tr>
                 <td class='text-left'><?php printf('%03d', $bug->id);?></td>
                 <td>
+                  <?php if($hasCustomSeverity):?>
+                  <span class='label-severity-custom' data-severity='<?php echo $bug->severity;?>' title='<?php echo zget($lang->bug->severityList, $bug->severity);?>'><?php echo zget($lang->bug->severityList, $bug->severity, $bug->severity);?></span>
+                  <?php else:?>
                   <span class='label-severity' data-severity='<?php echo $bug->severity;?>' title='<?php echo zget($lang->bug->severityList, $bug->severity, $bug->severity);?>'></span>
+                  <?php endif;?>
                 </td>
                 <td class='text-left nobr' title='<?php echo $bug->title?>'><?php echo html::a($bugLink, $bug->title, '', "class='iframe' data-width='1000'");?></td>
                 <td>
diff --git a/module/my/view/bug.html.php b/module/my/view/bug.html.php
index 6701cf8356..3ed37fa17e 100644
--- a/module/my/view/bug.html.php
+++ b/module/my/view/bug.html.php
@@ -53,6 +53,17 @@
           <th class='c-actions-5'> <?php echo $lang->actions;?></th>
         </tr>
       </thead>
+      <?php
+      $hasCustomSeverity = false;
+      foreach($lang->bug->severityList as $severityKey => $severityValue)
+      {
+          if(!empty($severityKey) and (string)$severityKey != (string)$severityValue)
+          {
+              $hasCustomSeverity = true;
+              break;
+          }
+      }
+      ?>
       <tbody>
         <?php foreach($bugs as $bug):?>
         <tr>
@@ -65,7 +76,13 @@
             <?php endif;?>
             <?php printf('%03d', $bug->id);?>
           </td>
-          <td><span class='<?php echo 'label-severity';?>' data-severity='<?php echo $bug->severity;?>' title='<?php echo zget($lang->bug->severityList, $bug->severity);?>'></span></td>
+          <td>
+            <?php if($hasCustomSeverity):?>
+            <span class='<?php echo 'label-severity-custom';?>' title='<?php echo zget($lang->bug->severityList, $bug->severity);?>' data-severity='<?php echo $bug->severity;?>'><?php echo zget($lang->bug->severityList, $bug->severity, $bug->severity);?></span>
+            <?php else:?>
+            <span class='<?php echo 'label-severity';?>' data-severity='<?php echo $bug->severity;?>' title='<?php echo zget($lang->bug->severityList, $bug->severity);?>'></span>
+            <?php endif;?>
+          </td>
           <td><span class='label-pri <?php echo 'label-pri-' . $bug->pri?>' title='<?php echo zget($lang->bug->priList, $bug->pri);?>'><?php echo zget($lang->bug->priList, $bug->pri)?></span></td>
           <td><?php echo zget($lang->bug->typeList, $bug->type, '');?></td>
           <td class='text-left nobr'><?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id"), $bug->title, null, "style='color: $bug->color'");?></td>
diff --git a/module/project/view/bug.html.php b/module/project/view/bug.html.php
index ec6cf88535..c508ba25ad 100644
--- a/module/project/view/bug.html.php
+++ b/module/project/view/bug.html.php
@@ -62,6 +62,17 @@
           <th class='c-actions-5'><?php echo $lang->actions;?></th>
         </tr>
       </thead>
+      <?php
+      $hasCustomSeverity = false;
+      foreach($lang->bug->severityList as $severityKey => $severityValue)
+      {
+          if(!empty($severityKey) and (string)$severityKey != (string)$severityValue)
+          {
+              $hasCustomSeverity = true;
+              break;
+          }
+      }
+      ?>
       <tbody>
       <?php foreach($bugs as $bug):?>
       <tr>
@@ -72,7 +83,13 @@
           <?php printf('%03d', $bug->id);?>
           <?php endif;?>
         </td>
-        <td><span class='<?php echo 'label-severity';?>' title='<?php echo zget($lang->bug->severityList, $bug->severity);?>' data-severity='<?php echo $bug->severity;?>'></span></td>
+        <td>
+          <?php if($hasCustomSeverity):?>
+          <span class='<?php echo 'label-severity-custom';?>' title='<?php echo zget($lang->bug->severityList, $bug->severity);?>' data-severity='<?php echo $bug->severity;?>'><?php echo zget($lang->bug->severityList, $bug->severity, $bug->severity);?></span>
+          <?php else:?>
+          <span class='<?php echo 'label-severity';?>' title='<?php echo zget($lang->bug->severityList, $bug->severity);?>' data-severity='<?php echo $bug->severity;?>'></span>
+          <?php endif;?>
+        </td>
         <td><span class='label-pri <?php echo 'label-pri-' . $bug->pri?>' title='<?php echo zget($lang->bug->priList, $bug->pri, $bug->pri)?>'><?php echo zget($lang->bug->priList, $bug->pri, $bug->pri)?></span></td>
         <td class='text-left' title="<?php echo $bug->title?>"><?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id"), $bug->title, null, "style='color: $bug->color'");?></td>
         <td><?php echo zget($users, $bug->openedBy, $bug->openedBy);?></td>
diff --git a/module/release/view/view.html.php b/module/release/view/view.html.php
index 0d09b8689e..f36b28891c 100644
--- a/module/release/view/view.html.php
+++ b/module/release/view/view.html.php
@@ -235,6 +235,17 @@
                     <th class='w-50px'>    <?php echo $lang->actions;?></th>
                   </tr>
                 </thead>
+                <?php
+                $hasCustomSeverity = false;
+                foreach($lang->bug->severityList as $severityKey => $severityValue)
+                {
+                    if(!empty($severityKey) and (string)$severityKey != (string)$severityValue)
+                    {
+                        $hasCustomSeverity = true;
+                        break;
+                    }
+                }
+                ?>
                 <tbody class='text-center'>
                   <?php foreach($leftBugs as $bug):?>
                   <?php $bugLink = $this->createLink('bug', 'view', "bugID=$bug->id", '', true);?>
@@ -249,7 +260,11 @@
                       <?php echo sprintf('%03d', $bug->id);?>
                     </td>
                     <td class='c-severity'>
+                      <?php if($hasCustomSeverity):?>
+                      <span class='<?php echo 'label-severity-custom';?>' title='<?php echo zget($lang->bug->severityList, $bug->severity);?>' data-severity='<?php echo $bug->severity;?>'><?php echo zget($lang->bug->severityList, $bug->severity, $bug->severity);?></span>
+                      <?php else:?>
                       <span class='label-severity' data-severity='<?php echo $bug->severity;?>' title='<?php echo zget($lang->bug->severityList, $bug->severity, $bug->severity);?>'></span>
+                      <?php endif;?>
                     </td>
                     <td class='text-left nobr' title='<?php echo $bug->title?>'><?php echo html::a($bugLink, $bug->title, '', "class='preview'");?></td>
                     <td><span class='status-<?php echo $bug->status?>'> <?php echo zget($lang->bug->statusList, $bug->status);?></span></td>