diff --git a/module/project/css/kanban.css b/module/project/css/kanban.css
index d8af55f394..5839875868 100644
--- a/module/project/css/kanban.css
+++ b/module/project/css/kanban.css
@@ -99,4 +99,5 @@ table th.col-closed {width:15%}
 #kanbanHeader.affix .actions .btn {background: #114f8e; color: #f1f1f1;}
 #kanbanHeader.affix th {border-color: rgba(255,255,255,.2)}
 
-.label-delay {background-color: #e84e0f; margin-bottom: 2px;}
+.label-delay-doing {background-color: #000; margin-bottom: 2px;}
+.label-delay-wait  {background-color: #d2322d; margin-bottom: 2px;}
diff --git a/module/project/view/kanban.html.php b/module/project/view/kanban.html.php
index 7fa3daed2e..90c02ea77b 100644
--- a/module/project/view/kanban.html.php
+++ b/module/project/view/kanban.html.php
@@ -95,8 +95,14 @@
           <?php foreach($story->tasks[$col] as $task):?>
           <div class='board board-task board-task-<?php echo $col ?><?php if($task->assignedTo == $this->app->user->account) echo ' inverse';?>' data-id='<?php echo $task->id?>' id='task-<?php echo $task->id?>'>
             <div class='board-title'>
-              <?php if(isset($task->delay)) echo "<span class='label label-badge label-delay'>{$lang->project->delayed}</span>";?>
-              <?php echo html::a($this->createLink('task', 'view', "taskID=$task->id", '', true), $task->name, '', 'class="kanbanFrame" title="' . $task->name . '"');?>
+              <?php
+              if(isset($task->delay))
+              {
+                  $labelClass = $task->status == 'doing' ? 'label-delay-doing' : 'label-delay-wait';
+                  echo "<span class='label label-badge {$labelClass}'>{$lang->task->delayed}</span>";
+              }
+              echo html::a($this->createLink('task', 'view', "taskID=$task->id", '', true), $task->name, '', 'class="kanbanFrame" title="' . $task->name . '"');
+              ?>
               <div class='board-actions'>
                 <button type='button' class='btn btn-mini btn-link btn-info-toggle'><i class='icon-angle-down'></i></button>
                 <div class='dropdown'>
diff --git a/module/task/lang/en.php b/module/task/lang/en.php
index d467c60e29..bc6e0e01d4 100644
--- a/module/task/lang/en.php
+++ b/module/task/lang/en.php
@@ -17,6 +17,7 @@ $lang->task->batchChangeModule  = "Batch Change Module";
 $lang->task->edit               = "Update";
 $lang->task->delete             = "Delete";
 $lang->task->deleted            = "Deleted";
+$lang->task->delayed            = 'Delayed';
 $lang->task->view               = "Info";
 $lang->task->logEfforts         = "Man-Hour Log";
 $lang->task->record             = "Est.";
diff --git a/module/task/lang/zh-cn.php b/module/task/lang/zh-cn.php
index 70af463d99..db8aad1c37 100644
--- a/module/task/lang/zh-cn.php
+++ b/module/task/lang/zh-cn.php
@@ -17,6 +17,7 @@ $lang->task->batchChangeModule  = "批量修改模块";
 $lang->task->edit               = "编辑";
 $lang->task->delete             = "删除";
 $lang->task->deleted            = "已删除";
+$lang->task->delayed            = '延期';
 $lang->task->view               = "查看任务";
 $lang->task->logEfforts         = "记录工时";
 $lang->task->record             = "工时";