diff --git a/module/bug/css/create.css b/module/bug/css/create.css
index 0205b0f6ad..fac20ffe6a 100644
--- a/module/bug/css/create.css
+++ b/module/bug/css/create.css
@@ -32,3 +32,5 @@
 .chosen-container {max-width: 533px;}
 
 .minw-80px {min-width: 80px;}
+
+.colorpicker.input-group-btn > .btn {border-right: none}
diff --git a/module/bug/lang/en.php b/module/bug/lang/en.php
index b9c840872f..910b33990e 100644
--- a/module/bug/lang/en.php
+++ b/module/bug/lang/en.php
@@ -63,6 +63,7 @@ $lang->bug->lastEditedDateAB = 'Edited Date';
 $lang->bug->lastEditedDate   = 'Edited Date';
 $lang->bug->fromCase         = 'From case';
 $lang->bug->toCase           = 'To case';
+$lang->bug->colorTag         = 'Color tag';
 
 /* Actions. */
 $lang->bug->index              = 'Index';
diff --git a/module/bug/lang/zh-cn.php b/module/bug/lang/zh-cn.php
index bace6a6388..5b85c4ae5a 100644
--- a/module/bug/lang/zh-cn.php
+++ b/module/bug/lang/zh-cn.php
@@ -89,6 +89,7 @@ $lang->bug->saveTemplate       = '保存模板';
 $lang->bug->deleteTemplate     = '删除模板';
 $lang->bug->confirmStoryChange = '确认需求变动';
 $lang->bug->setPublic          = '设为公共模板';
+$lang->bug->colorTag           = '颜色标签';
 
 /* 查询条件列表。*/
 $lang->bug->assignToMe     = '指派给我';
diff --git a/module/bug/view/create.html.php b/module/bug/view/create.html.php
index 648f883de6..2d729bac68 100644
--- a/module/bug/view/create.html.php
+++ b/module/bug/view/create.html.php
@@ -112,7 +112,12 @@ js::set('refresh', $lang->refresh);
         <th><?php echo $lang->bug->title;?></th>
         <td colspan='2'>
           <div class='row-table'>
-            <div class='col-table w-p100'><?php echo html::input('title', $bugTitle, "class='form-control'");?></div>
+            <div class='col-table w-p100'>
+              <div class='input-group w-p100'>
+                <input type='hidden' id='color' name='color' data-provide='colorpicker' data-wrapper='input-group-btn' data-pull-menu-right='false' data-btn-tip='<?php echo $lang->bug->colorTag ?>'>
+                <?php echo html::input('title', $bugTitle, "class='form-control'");?>
+              </div>
+            </div>
             <div class='col-table'>
               <div class='input-group'>
                 <span class='input-group-addon fix-border br-0'><?php echo $lang->bug->severity;?></span>
diff --git a/module/story/css/create.css b/module/story/css/create.css
index 18c8abb6cc..0b45cba347 100644
--- a/module/story/css/create.css
+++ b/module/story/css/create.css
@@ -15,3 +15,5 @@ select {border:1px solid #ccc}
 .minw-80px {min-width: 80px;}
 .minw-60px {min-width: 60px;}
 .w-230px{width:230px;}
+
+.colorpicker.input-group-btn > .btn {border-right: none}
diff --git a/module/story/lang/en.php b/module/story/lang/en.php
index 6df6c30851..2e696f8cc2 100644
--- a/module/story/lang/en.php
+++ b/module/story/lang/en.php
@@ -75,6 +75,7 @@ $lang->story->reviewResult   = 'Reviewed result';
 $lang->story->preVersion     = 'Pre version';
 $lang->story->keywords       = 'Keyword';
 $lang->story->newStory       = 'Continue to add story.';
+$lang->story->colorTag       = 'Color tag';
 
 $lang->story->ditto       = 'Ditto';
 $lang->story->dittoNotice = 'Current story and story above it do not belong to same product!';
diff --git a/module/story/lang/zh-cn.php b/module/story/lang/zh-cn.php
index daffe2611b..4b3a15f460 100644
--- a/module/story/lang/zh-cn.php
+++ b/module/story/lang/zh-cn.php
@@ -75,6 +75,7 @@ $lang->story->reviewResult   = '评审结果';
 $lang->story->preVersion     = '之前版本';
 $lang->story->keywords       = '关键词';
 $lang->story->newStory       = '继续添加需求';
+$lang->story->colorTag       = '颜色标签';
 
 $lang->story->ditto       = '同上';
 $lang->story->dittoNotice = '该需求与上一需求不属于同一产品！';
diff --git a/module/story/view/create.html.php b/module/story/view/create.html.php
index 4f5939c761..3b54cb313f 100644
--- a/module/story/view/create.html.php
+++ b/module/story/view/create.html.php
@@ -90,7 +90,10 @@
         <td colspan='2'>
           <div class='row-table'>
             <div class='col-table'>
-              <?php echo html::input('title', $storyTitle, "class='form-control'");?>
+              <div class="input-group w-p100">
+                <input type='hidden' id='color' name='color' data-provide='colorpicker' data-wrapper='input-group-btn' data-pull-menu-right='false' data-btn-tip='<?php echo $lang->story->colorTag ?>'>
+                <?php echo html::input('title', $storyTitle, "class='form-control'");?>
+              </div>
             </div>
             <?php
             $hiddenPri = strpos(",$showFields,", ',pri,') === false;
diff --git a/module/task/css/create.css b/module/task/css/create.css
index c756136b77..c5d79d63c4 100644
--- a/module/task/css/create.css
+++ b/module/task/css/create.css
@@ -7,3 +7,5 @@
 
 .minw-80px {min-width: 80px;}
 .minw-60px {min-width: 60px;}
+
+.colorpicker.input-group-btn > .btn {border-right: none}
diff --git a/module/task/lang/en.php b/module/task/lang/en.php
index 479c6eb424..a7cc27df1d 100644
--- a/module/task/lang/en.php
+++ b/module/task/lang/en.php
@@ -85,6 +85,7 @@ $lang->task->lastEdited        = 'Last Edited';
 $lang->task->recordEstimate    = 'Hours';
 $lang->task->editEstimate      = 'Edit Hour';
 $lang->task->deleteEstimate    = 'Delete Hour';
+$lang->task->colorTag          = 'Color tag';
 
 $lang->task->ditto         = 'Ditto';
 $lang->task->dittoNotice   = "Current task and task above it do not belong to same project!";
diff --git a/module/task/lang/zh-cn.php b/module/task/lang/zh-cn.php
index 2531e988f4..e4b458b940 100644
--- a/module/task/lang/zh-cn.php
+++ b/module/task/lang/zh-cn.php
@@ -85,6 +85,7 @@ $lang->task->lastEdited        = '最后编辑';
 $lang->task->recordEstimate    = '工时';
 $lang->task->editEstimate      = '编辑工时';
 $lang->task->deleteEstimate    = '删除工时';
+$lang->task->colorTag          = '颜色标签';
 
 $lang->task->ditto         = '同上';
 $lang->task->dittoNotice   = "该任务与上一任务不属于同一项目！";
diff --git a/module/task/view/create.html.php b/module/task/view/create.html.php
index b86ec8c9a2..f484d2ecfd 100644
--- a/module/task/view/create.html.php
+++ b/module/task/view/create.html.php
@@ -59,6 +59,7 @@
           <div class='row-table'>
             <div class='col-table'>
               <div class="input-group w-p100">
+                <input type='hidden' id='color' name='color' data-provide='colorpicker' data-wrapper='input-group-btn' data-pull-menu-right='false' data-btn-tip='<?php echo $lang->task->colorTag ?>'>
                 <?php echo html::input('name', $task->name, "class='form-control'");?>
                 <span class='input-group-btn'><a href='javascript:copyStoryTitle();' id='copyButton' class='btn'><?php echo $lang->task->copyStoryTitle;?></a></span>
               </div>
diff --git a/module/testcase/css/create.css b/module/testcase/css/create.css
index 30d5ea44b6..d16de087bd 100644
--- a/module/testcase/css/create.css
+++ b/module/testcase/css/create.css
@@ -31,3 +31,5 @@
 .chosen-container {max-width: 1000px;}
 
 .minw-80px {min-width: 80px;}
+
+.colorpicker.input-group-btn > .btn {border-right: none}
diff --git a/module/testcase/lang/en.php b/module/testcase/lang/en.php
index 6dc79af0d7..5d04a8473d 100644
--- a/module/testcase/lang/en.php
+++ b/module/testcase/lang/en.php
@@ -68,6 +68,7 @@ $lang->testcase->exportTemplet      = "Export templet";
 $lang->testcase->export             = "Export data";
 $lang->testcase->confirmChange      = 'Confirm case change';
 $lang->testcase->confirmStoryChange = 'Confirm story change';
+$lang->testcase->colorTag           = 'Color tag';
 
 $lang->testcase->new = 'New';
   
diff --git a/module/testcase/lang/zh-cn.php b/module/testcase/lang/zh-cn.php
index 48e63174e7..11dbfe5c3e 100644
--- a/module/testcase/lang/zh-cn.php
+++ b/module/testcase/lang/zh-cn.php
@@ -68,6 +68,7 @@ $lang->testcase->exportTemplet      = "导出模板";
 $lang->testcase->export             = "导出数据";
 $lang->testcase->confirmChange      = '确认用例变动';
 $lang->testcase->confirmStoryChange = '确认需求变动';
+$lang->testcase->colorTag           = '颜色标签';
 
 $lang->testcase->new = '新增';
 
diff --git a/module/testcase/view/create.html.php b/module/testcase/view/create.html.php
index 3495d9f479..26ac81d4a5 100644
--- a/module/testcase/view/create.html.php
+++ b/module/testcase/view/create.html.php
@@ -84,7 +84,12 @@
         <th><?php echo $lang->testcase->title;?></th>
         <td colspan='2'>
            <div class='row-table'>
-            <div class='col-table w-p100'><?php echo html::input('title', $caseTitle, "class='form-control'");?></div>
+            <div class='col-table w-p100'>
+              <div class='input-group w-p100'>
+                <input type='hidden' id='color' name='color' data-provide='colorpicker' data-wrapper='input-group-btn' data-pull-menu-right='false' data-btn-tip='<?php echo $lang->testcase->colorTag ?>'>
+                <?php echo html::input('title', $caseTitle, "class='form-control'");?>
+              </div>
+            </div>
             <div class='col-table'>
               <div class='input-group'>
                 <span class='input-group-addon fix-border br-0'><?php echo $lang->testcase->pri;?></span>