diff --git a/module/common/control.php b/module/common/control.php
index 927c077774..78c463bae7 100644
--- a/module/common/control.php
+++ b/module/common/control.php
@@ -274,7 +274,7 @@ class common extends control
         /* Set the icon title, try search the $method defination in $module's lang or $common's lang. */
         $title = $method;
         if(isset($lang->$method) and is_string($lang->$method)) $title = $lang->$method;
-        if(isset($lang->$module->$method) and is_string($lang->$module->$method)) $title = $lang->$module->$method;
+        if((isset($lang->$module->$method) or $app->loadLang($module)) and isset($lang->$module->$method) and is_string($lang->$module->$method)) $title = $lang->$module->$method;
 
         /* Get the icon name. */
         if(!$icon) $icon = $method;
diff --git a/module/project/view/task.html.php b/module/project/view/task.html.php
index d812548056..d54ecdc751 100644
--- a/module/project/view/task.html.php
+++ b/module/project/view/task.html.php
@@ -132,6 +132,7 @@ var browseType = '<?php echo $browseType;?>';
             <td class='a-right'>
               <?php
               if($browseType == 'needconfirm') common::printLink('task', 'confirmStoryChange', "taskid=$task->id", $lang->confirm, 'hiddenwin');
+              common::printIcon('task', 'assignTo', "projectID=$task->project&taskID=$task->id", $task);
               common::printIcon('task', 'finish', "taskID=$task->id", $task);
               common::printIcon('task', 'close',  "taskID=$task->id", $task);
               if($this->task->isClickable($task, 'edit'))   common::printIcon('task', 'edit',   "taskID=$task->id");
diff --git a/www/theme/default/style.css b/www/theme/default/style.css
index c0c49280d6..f097815f1b 100644
--- a/www/theme/default/style.css
+++ b/www/theme/default/style.css
@@ -407,7 +407,7 @@ table.tablesorter thead tr .headerSortDown {background-image: url(./images/table
 /*-----------------------ICONS --------------------*/
 .icon-search { padding-left:16px; background:url(images/main/ui-green.png) -160px 128px; border:0px;}
 .icon-add1   { padding-left:16px; background:url(images/main/ui-green.png) -32px 112px;}
-.icon-add2   { padding-left:16px; background:url(images/main/ui-gray.png) 0px 48px;}
+.icon-add2   { padding-left:16px; background:url(images/main/ui-gray.png)  0px 48px;}
 .icon-title  { padding-left:15px; background:url(images/main/ui-green.png) 2px 144px;}
 .icon-all    { padding-left:16px; background:url(images/main/ui-green.png) -173px 112px;}
 .icon-copy   { padding-left:16px; background:url(images/main/ui-green.png) -48px 160px;}
@@ -416,79 +416,63 @@ table.tablesorter thead tr .headerSortDown {background-image: url(./images/table
 .icon-arrow  { padding-left:10px;  background:url(images/main/ui-gray.png) -32px 0px;}
 
 /* Common icons. */
-.icon-green-big-common-edit             {padding:2px 8px;  background:url(images/main/zt-green.png) -1px   0px;} 
-.icon-green-small-common-edit           {padding:2px 8px;  background:url(images/main/zt-green.png) 0px   -21px;} 
-
-.icon-green-big-common-comment          {padding:2px 8px;  background:url(images/main/zt-green.png) -22px 0px;} 
-
-.icon-green-big-common-copy             {padding:2px 8px;  background:url(images/main/zt-green.png) -41px 0px;}
-.icon-green-small-common-copy           {padding:2px 8px;  background:url(images/main/zt-green.png) -40px -21px;}
-
-.icon-green-big-common-delete           {padding:2px 8px;  background:url(images/main/zt-green.png) -60px 0px;}
-.icon-green-small-common-delete         {padding:2px 8px;  background:url(images/main/zt-green.png) -60px -22px;}
-
-.icon-goback           {padding:2px 10px;  background:url(images/main/zt-green.png) 2px   -40px;}
-.icon-pre              {padding:2px 8px;  background:url(images/main/zt-green.png) -22px -40px;}
-.icon-next             {padding:2px 8px;  background:url(images/main/zt-green.png) -42px -40px;}
-
-#featurebar .f-right .icon-green-big-common-import {padding:2px 7px 2px 10px; background:url(images/main/zt-green.png) 0px   -80px;} 
-#featurebar .f-right .icon-green-big-common-export {padding:2px 7px 2px 10px;  background:url(images/main/zt-green.png) -21px -82px;} 
-.icon-green-big-common-report           {padding:2px 10px; background:url(images/main/zt-green.png) -40px -82px;} 
-
-.icon-green-big-common-splitLine        {padding:2px 10px; background:url(images/main/zt-green.png) -61px -40px;} 
-
-.pri1 {padding:2px 8px; background:url(images/main/zt-green.png) 0px    -141px no-repeat;}
-.pri2 {padding:2px 8px; background:url(images/main/zt-green.png) -20px  -141px no-repeat;}
-.pri3 {padding:2px 8px; background:url(images/main/zt-green.png) -40px  -141px no-repeat;}
-.pri4 {padding:2px 8px; background:url(images/main/zt-green.png) -60px  -141px no-repeat;}
-.pri5 {padding:2px 8px; background:url(images/main/zt-green.png) -80px  -141px no-repeat;}
-.pri6 {padding:2px 8px; background:url(images/main/zt-green.png) -100px -141px no-repeat;}
+.pri1        {padding:2px 8px;  background:url(images/main/zt-green.png) 0px    -141px;}
+.pri2        {padding:2px 8px;  background:url(images/main/zt-green.png) -20px  -141px;}
+.pri3        {padding:2px 8px;  background:url(images/main/zt-green.png) -40px  -141px;}
+.pri4        {padding:2px 8px;  background:url(images/main/zt-green.png) -60px  -141px;}
+.pri5        {padding:2px 8px;  background:url(images/main/zt-green.png) -80px  -141px;}
+.pri6        {padding:2px 8px;  background:url(images/main/zt-green.png) -100px -141px;}
+.icon-goback {padding:2px 10px; background:url(images/main/zt-green.png) 2px    -40px;}
+.icon-pre    {padding:2px 8px;  background:url(images/main/zt-green.png) -22px  -40px;}
+.icon-next   {padding:2px 8px;  background:url(images/main/zt-green.png) -42px  -40px;}
+.icon-green-big-common-edit      {padding:2px 8px;  background:url(images/main/zt-green.png) -1px   0px;} 
+.icon-green-small-common-edit    {padding:2px 8px;  background:url(images/main/zt-green.png) 0px   -21px;} 
+.icon-green-big-common-comment   {padding:2px 8px;  background:url(images/main/zt-green.png) -22px 0px;} 
+.icon-green-big-common-copy      {padding:2px 8px;  background:url(images/main/zt-green.png) -41px 0px;}
+.icon-green-small-common-copy    {padding:2px 8px;  background:url(images/main/zt-green.png) -40px -21px;}
+.icon-green-big-common-delete    {padding:2px 8px;  background:url(images/main/zt-green.png) -60px 0px;}
+.icon-green-small-common-delete  {padding:2px 8px;  background:url(images/main/zt-green.png) -60px -22px;}
+.icon-green-big-common-splitLine {padding:2px 10px; background:url(images/main/zt-green.png) -61px -40px;} 
+.icon-green-big-common-report    {padding:2px 10px; background:url(images/main/zt-green.png) -40px -82px;} 
+#featurebar .f-right .icon-green-big-common-import {padding:2px 8px; background:url(images/main/zt-green.png) 0px   -80px;} 
+#featurebar .f-right .icon-green-big-common-export {padding:2px 8px; background:url(images/main/zt-green.png) -21px -82px;} 
 
 /* Story icons. */
+.icon-green-small-story-change     {padding:2px 8px; background:url(images/main/zt-green.png) -40px  -220px;}
+.icon-gray-small-story-change      {padding:2px 8px; background:url(images/main/zt-gray.png)  -40px  -220px;}
+.icon-green-small-story-review     {padding:2px 8px; background:url(images/main/zt-green.png) -60px  -221px;}
+.icon-gray-small-story-review      {padding:2px 8px; background:url(images/main/zt-gray.png)  -60px  -221px;}
+.icon-green-small-story-createCase {padding:2px 8px; background:url(images/main/zt-green.png) -120px -221px;}
 #featurebar .f-right .icon-green-big-story-create      {padding:2px 7px 2px 10px; background:url(images/main/zt-green.png) 0px   -202px;} 
 #featurebar .f-right .icon-green-big-story-batchCreate {padding:2px 7px 2px 10px; background:url(images/main/zt-green.png) -20px -202px;} 
 
-.icon-green-small-story-change {padding:2px 8px; background:url(images/main/zt-green.png) -40px -220px;}
-.icon-gray-small-story-change  {padding:2px 8px; background:url(images/main/zt-gray.png)  -40px -220px;}
-
-.icon-green-small-story-review {padding:2px 8px; background:url(images/main/zt-green.png) -60px -221px;}
-.icon-gray-small-story-review  {padding:2px 8px; background:url(images/main/zt-gray.png)  -60px -221px;}
-
-.icon-green-small-story-createCase {padding:2px 8px; background:url(images/main/zt-green.png) -120px -221px;}
-
 /* Task icons. */
+.icon-green-small-task-assignTo {padding:2px 8px; background:url(images/main/zt-green.png) -40px  -262px;} 
+.icon-gray-small-task-assignTo  {padding:2px 8px; background:url(images/main/zt-gray.png)  -40px  -262px;} 
+.icon-green-small-task-finish   {padding:2px 8px; background:url(images/main/zt-green.png) -80px  -262px;} 
+.icon-gray-small-task-finish    {padding:2px 8px; background:url(images/main/zt-gray.png)  -80px  -262px;} 
+.icon-green-small-task-close    {padding:2px 8px; background:url(images/main/zt-green.png) -100px -261px;} 
+.icon-gray-small-task-close     {padding:2px 8px; background:url(images/main/zt-gray.png)  -100px -261px;} 
 #featurebar .f-right .icon-green-big-task-create      {padding:2px 7px 2px 10px; background:url(images/main/zt-green.png) 0px   -242px;} 
 #featurebar .f-right .icon-green-big-task-batchCreate {padding:2px 7px 2px 10px; background:url(images/main/zt-green.png) -20px -242px;} 
 
-.icon-green-small-task-finish {padding:2px 8px; background:url(images/main/zt-green.png) -80px -262px;} 
-.icon-gray-small-task-finish  {padding:2px 8px; background:url(images/main/zt-gray.png)  -80px -262px;} 
-
-.icon-green-small-task-close {padding:2px 8px; background:url(images/main/zt-green.png) -100px -261px;} 
-.icon-gray-small-task-close  {padding:2px 8px; background:url(images/main/zt-gray.png)  -100px -261px;} 
-
 /* Bug icons. */
-#featurebar .f-right .icon-green-big-bug-create, caption .f-right .icon-green-big-bug-create  {padding:2px 7px 2px 10px;  background:url(images/main/zt-green.png) 0px   -202px;} 
-
-#featurebar .f-right .icon-green-big-bug-customFields {padding:2px 7px 2px 10px;  background:url(images/main/zt-green.png) -161px   -282px;} 
-
-.icon-green-small-bug-createBug {padding:2px 8px;  background:url(images/main/zt-green.png) -40px -340px;} 
-.icon-gray-small-bug-createBug  {padding:2px 8px;  background:url(images/main/zt-gray.png)  -40px -340px;} 
-
+.severity1 {padding:2px 8px; background:url(images/main/zt-green.png) 0px    -381px;}
+.severity2 {padding:2px 8px; background:url(images/main/zt-green.png) -20px  -381px;}
+.severity3 {padding:2px 8px; background:url(images/main/zt-green.png) -40px  -381px;}
+.severity4 {padding:2px 8px; background:url(images/main/zt-green.png) -60px  -381px;}
+.severity5 {padding:2px 8px; background:url(images/main/zt-green.png) -80px  -381px;}
+.severity6 {padding:2px 8px; background:url(images/main/zt-green.png) -100px -381px;}
+.icon-green-small-bug-createBug  {padding:2px 8px;  background:url(images/main/zt-green.png) -40px -340px;} 
+.icon-gray-small-bug-createBug   {padding:2px 8px;  background:url(images/main/zt-gray.png)  -40px -340px;} 
 .icon-green-small-bug-resolve    {padding:2px 8px;  background:url(images/main/zt-green.png) -60px -301px;} 
 .icon-gray-small-bug-resolve     {padding:2px 8px;  background:url(images/main/zt-gray.png)  -60px -301px;} 
-
 .icon-green-small-bug-close      {padding:2px 8px;  background:url(images/main/zt-green.png) -80px -301px;} 
 .icon-gray-small-bug-close       {padding:2px 8px;  background:url(images/main/zt-gray.png)  -80px -301px;} 
-
-.severity1 {padding:2px 8px; background:url(images/main/zt-green.png) 0px    -381px no-repeat;}
-.severity2 {padding:2px 8px; background:url(images/main/zt-green.png) -20px  -381px no-repeat;}
-.severity3 {padding:2px 8px; background:url(images/main/zt-green.png) -40px  -381px no-repeat;}
-.severity4 {padding:2px 8px; background:url(images/main/zt-green.png) -60px  -381px no-repeat;}
-.severity5 {padding:2px 8px; background:url(images/main/zt-green.png) -80px  -381px no-repeat;}
-.severity6 {padding:2px 8px; background:url(images/main/zt-green.png) -100px -381px no-repeat;}
+#featurebar .f-right .icon-green-big-bug-create, caption .f-right .icon-green-big-bug-create  {padding:2px 8px;  background:url(images/main/zt-green.png) 0px -202px;} 
+#featurebar .f-right .icon-green-big-bug-customFields {padding:2px 8px;  background:url(images/main/zt-green.png) -161px -282px;} 
 
 /* Case icons. */
-#featurebar .f-right .icon-green-big-testcase-create      {padding:2px 7px 2px 10px; background:url(images/main/zt-green.png) 0px   -320px;} 
-#featurebar .f-right .icon-green-big-testcase-batchCreate {padding:2px 7px 2px 10px; background:url(images/main/zt-green.png) -20px -320px;} 
-
-.icon-green-small-testcase-createCase      {padding:1px 7px 1px 10px; background:url(images/main/zt-green.png) -120px   -222px;} 
+.icon-green-small-testcase-createCase {padding:1px 7px 1px 10px; background:url(images/main/zt-green.png) -120px   -222px;} 
+#featurebar .f-right .icon-green-big-testcase-create      {padding:2px 8px; background:url(images/main/zt-green.png) 0px   -320px;} 
+#featurebar .f-right .icon-green-big-testcase-batchCreate {padding:2px 8px; background:url(images/main/zt-green.png) -20px -320px;}