diff --git a/module/project/css/build.css b/module/project/css/build.css
index 0b8d48ad93..e69de29bb2 100644
--- a/module/project/css/build.css
+++ b/module/project/css/build.css
@@ -1,2 +0,0 @@
-.icon-green-project-bug     {padding:2px 8px; background:url(theme/default/images/main/zt-icons.png) 0px  -280px;} 
-.icon-green-testtask-create {padding:2px 8px; background:url(theme/default/images/main/zt-icons.png) -60px -161px;}
diff --git a/module/todo/view/batchcreate.html.php b/module/todo/view/batchcreate.html.php
index 6bbe4c348b..3f033a919a 100755
--- a/module/todo/view/batchcreate.html.php
+++ b/module/todo/view/batchcreate.html.php
@@ -22,7 +22,7 @@
       <th class='w-70px'><?php echo $lang->todo->pri;?></th>
       <th class='w-p40 red'><?php echo $lang->todo->name;?></th>
       <th><?php echo $lang->todo->desc;?></th>
-      <th class='w-150px'><?php echo $lang->todo->beginAndEnd;?></th>
+      <th class='w-200px'><?php echo $lang->todo->beginAndEnd;?></th>
     </tr>
 
     <?php $pri = 3;?>
diff --git a/www/theme/default/style.css b/www/theme/default/style.css
index a297ad2591..bd448a10b9 100644
--- a/www/theme/default/style.css
+++ b/www/theme/default/style.css
@@ -29,12 +29,17 @@ a  {text-decoration:none;}
 i[class^="icon-"],i[class*=" icon-"],.link-icon i[class^="icon-"],.link-icon i[class*=" icon-"]{display: inline-block;min-width: 13px;min-height: 13px;}
 .outer td i[class^="icon-"],.outer td i[class*=" icon-"]{font-size: 18px;margin-right: 4px;}
 
+.icon-allProducts:before{content: "\f00a";}
+.icon-allProjects:before{content: "\f009";}
 .icon-delete:before{content: "\F014";}
+.icon-green-common-comment:before,.icon-gray-common-comment:before{content: "\f0e6";}
 .icon-green-task-cancel:before,.icon-gray-task-cancel:before{content: "\f05e";}
 .icon-green-story-toStory:before,.icon-gray-story-toStory:before{content: "\f064"}
 .icon-green-project-suspend:before,.icon-gray-project-suspend:before{content: "\f04c"}
 .icon-green-project-putoff:before,.icon-gray-project-putoff:before{content: "\f073";}
 .icon-green-story-activate:before,.icon-gray-story-activate:before,
+.icon-green-bug-activate:before,.icon-gray-bug-activate:before,
+.icon-green-task-activate:before,.icon-gray-task-activate:before
 .icon-green-project-activate:before,.icon-gray-project-activate:before{content: "\f011";color:#058100;}
 .icon-green-bug-icon-wrench:before,.icon-gray-bug-icon-wrench:before{content: "\f085";}
 .icon-green-group-managepriv:before,.icon-gray-group-managepriv:before{content: "\f023";}
@@ -48,6 +53,7 @@ i[class^="icon-"],i[class*=" icon-"],.link-icon i[class^="icon-"],.link-icon i[c
 .icon-green-testtask-runCase:before,.icon-gray-testtask-runCase:before{content: "\f04b";}
 .icon-green-common-copy:before,.icon-gray-common-copy:before{content: "\f0c5";}
 .icon-green-productplan-linkBug:before,.icon-gray-productplan-linkBug:before,
+.icon-green-project-bug:before,.icon-gray-project-bug:before,
 .icon-green-bug-createBug:before,.icon-gray-bug-createBug:before{content: "\f188";}
 .icon-green-productplan-linkStory:before,.icon-gray-productplan-linkStory:before,
 .icon-green-testtask-linkCase:before,.icon-gray-testtask-linkCase:before,
@@ -55,6 +61,7 @@ i[class^="icon-"],i[class*=" icon-"],.link-icon i[class^="icon-"],.link-icon i[c
 .icon-green-testtask-unlinkCase:before,.icon-gray-testtask-unlinkCase:before{content: "\f127";}
 .icon-green-story-change:before,.icon-gray-story-change:before{content: "\f074";}
 .icon-green-bug-confirmBug:before,.icon-gray-bug-confirmBug:before,
+.icon-green-task-confirmStoryChange:before,.icon-gray-task-confirmStoryChange:before,
 .icon-green-story-review:before,.icon-gray-story-review:before{content: "\f002";}
 .icon-green-task-close:before,.icon-gray-task-close:before,
 .icon-green-story-close:before,.icon-gray-story-close:before,
@@ -67,8 +74,10 @@ i[class^="icon-"],i[class*=" icon-"],.link-icon i[class^="icon-"],.link-icon i[c
 .icon-green-testtask-start:before,.icon-gray-testtask-start:before,
 .icon-green-project-start:before,.icon-gray-project-start:before{content: "\f04b";}
 .icon-green-task-assignTo:before,.icon-gray-task-assignTo:before,.icon-green-bug-assignTo:before,.icon-gray-bug-assignTo:before{content: "\f0a4";}
-.icon-green-common-delete:before,.icon-gray-common-delete:before{content: "\f00d";}
-.icon-green-common-edit:before,.icon-gray-common-edit:before{content: "\f040";}
+.icon-green-common-delete:before,.icon-gray-common-delete:before,
+.icon-green-task-deleteEstimate:before,.icon-gray-task-deleteEstimate:before{content: "\f00d";}
+.icon-green-common-edit:before,.icon-gray-common-edit:before
+.icon-green-task-editEstimate:before,.icon-gray-task-editEstimate:before{content: "\f040";}
 .icon-green-todo-finish:before,.icon-gray-todo-finish:before,
 .icon-green-bug-resolve:before,.icon-gray-bug-resolve:before,
 .icon-green-task-finish:before,.icon-gray-task-finish:before{content: "\f058";}
@@ -603,10 +612,6 @@ table.data-table td:last-child{padding-right: 20px;}
 .pri4{border-color: #475da8;color: #475da8}
 .pri5{border-color: #6989c5;color: #6989c5}
 .pri6{border-color: #9ebee5;color: #9ebee5}
-#searchicon  {padding:2px 8px; background:url(images/main/zt-icons.png) -102px -80px; margin-left:10px;}
-.icon-allProducts, .icon-allProjects {padding:2px 10px 2px 8px; background:url(images/main/zt-icons.png) 0px  -161px;}
-
-.icon-green-common-comment {padding:2px 8px; background:url(images/main/zt-icons.png) -20px 0px no-repeat;} 
 
 /* Story icons. */
 .icon-green-story-createCase {padding:2px 8px; background:url(images/main/zt-icons.png) -120px -201px;}
@@ -615,15 +620,6 @@ table.data-table td:last-child{padding-right: 20px;}
 .icon-green-project-unlinkStory {padding:2px 5px 2px 10px; background:url(images/main/zt-icons.png) -60px 0px;}
 .icon-green-productplan-unlinkStory, .icon-green-productplan-unlinkBug{padding:2px 5px 2px 10px; background:url(images/main/zt-icons.png) -60px 0px;}
 
-/* Task icons. */
-.icon-green-task-confirmStoryChange {padding:2px 8px; background:url(images/main/zt-icons.png) -60px  -201px;}
-
-.icon-green-task-activate {padding:2px 8px; background:url(images/main/zt-icons.png) -120px  -241px;} 
-.icon-gray-task-activate  {padding:2px 8px; background:url(images/main/zt-icons.png) -120px  -262px;} 
-
-.icon-green-task-editEstimate    {padding:2px 8px; background:url(images/main/zt-icons.png)  0px  0px no-repeat;} 
-.icon-green-task-deleteEstimate  {padding:2px 8px; background:url(images/main/zt-icons.png) -60px 0px no-repeat;}
-
 /* Bug icons. */
 .severity1,.severity2,.severity3,.severity4,.severity5,.severity6{display:inline-block;width: 16px;height: 16px;line-height: 16px;font-weight: bold; text-align: center; font-size: 12px; color: #fff; -moz-border-radius:50%; -webkit-border-radius:50%; border-radius:50%;}
 .severity1 {background-color: #d71319;}
@@ -635,9 +631,6 @@ table.data-table td:last-child{padding-right: 20px;}
 
 .icon-green-bug-confirmStoryChange {padding:2px 8px;  background:url(images/main/zt-icons.png) -40px -282px;}
 
-.icon-green-bug-activate   {padding:2px 8px;  background:url(images/main/zt-icons.png) -120px -241px;} 
-.icon-gray-bug-activate    {padding:2px 8px;  background:url(images/main/zt-icons.png) -120px -261px;} 
-
 #featurebar .f-right .icon-green-bug-customFields {padding:2px 8px;  background:url(images/main/zt-icons.png) -141px -282px;} 
 
 /* Case icons. */