diff --git a/module/task/css/common.css b/module/task/css/common.css
index 98aa13731a..08778de2e4 100644
--- a/module/task/css/common.css
+++ b/module/task/css/common.css
@@ -14,8 +14,14 @@
 .team-number {display: inline-block; width: 20px; height: 20px; line-height: 20px; border-radius: 10px; text-align: center; background: #f4f5f7;}
 #taskTeamEditor tr td:first-child .icon { position: absolute; top: 42px; left: 10.5px; display: block; font-size: 8px; color: #9ea3bd;;}
 #taskTeamEditor tr:last-child td:first-child .icon, #taskTeamEditor tr.member-last td:first-child .icon {display: none;}
-
+#taskTeamEditor tr .input-control {display: inline-block; width: 130px; }
+#taskTeamEditor tr .input-control + .input-control {margin-left: 12px; border-left: 1px solid #eee;}
 #modalTeam .modal-content input[type="text"]::input-placeholder{color: #c4c4c4;text-align: left;}
 #modalTeam .modal-content input[type="text"]::-webkit-input-placeholder{color: #c4c4c4;text-align: left;}
 #modalTeam .modal-content input[type="text"]::-moz-placeholder{color: #c4c4c4;text-align: left;}
 #modalTeam .modal-content input[type="text"]::-ms-input-placeholder{color: #c4c4c4;text-align: left;}
+
+#modalTeam .input-control input[type="text"]::input-placeholder{text-align: right;}
+#modalTeam .input-control input[type="text"]::-webkit-input-placeholder{text-align: right;}
+#modalTeam .input-control input[type="text"]::-moz-placeholder{text-align: right;}
+#modalTeam .input-control input[type="text"]::-ms-input-placeholder{text-align: right;}
\ No newline at end of file
diff --git a/module/task/view/taskteam.html.php b/module/task/view/taskteam.html.php
index 9bbb22f2e9..28ca7dee5f 100644
--- a/module/task/view/taskteam.html.php
+++ b/module/task/view/taskteam.html.php
@@ -37,12 +37,18 @@ if($task->mode == 'multi' and $app->rawMethod == 'activate') $hourDisabled = fal
   </td>
   <td>
     <div class='input-group'>
-      <span class="input-group-addon <?php echo zget($requiredFields, 'estimate', '', ' required');?>"><?php echo $lang->task->estimate?></span>
-      <?php echo html::input("teamEstimate[]", (float)$member->estimate, "class='form-control text-center' placeholder='{$lang->task->hour}'" . ($hourDisabled ? ' readonly' : ''))?>
-      <span class='input-group-addon fix-border'><?php echo $lang->task->consumed?></span>
-      <?php echo html::input("teamConsumed[]", (float)$member->consumed, "class='form-control text-center' readonly placeholder='{$lang->task->hour}'")?>
-      <span class='input-group-addon fix-border'><?php echo $lang->task->left?></span>
-      <?php echo html::input("teamLeft[]", (float)$member->left, "class='form-control text-center' placeholder='{$lang->task->hour}'" . ($hourDisabled ? ' readonly' : ''))?>
+      <div class="input-control has-icon-right">
+        <?php echo html::input("teamEstimate[]", (float)$member->estimate, "class='form-control text-center' placeholder='{$lang->task->estimate}'" . ($hourDisabled ? ' readonly' : ''))?>
+        <label class="input-control-icon-right">h</label>
+      </div>
+      <div class="input-control has-icon-right">
+        <?php echo html::input("teamConsumed[]", (float)$member->consumed, "class='form-control text-center' readonly placeholder='{$lang->task->consumed}'")?>
+        <label class="input-control-icon-right">h</label>
+      </div>
+      <div class="input-control has-icon-right">
+      <?php echo html::input("teamLeft[]", (float)$member->left, "class='form-control text-center' placeholder='{$lang->task->left}'" . ($hourDisabled ? ' readonly' : ''))?>
+        <label class="input-control-icon-right">h</label>
+      </div>
     </div>
   </td>
   <td class='w-130px sort-handler'>
@@ -73,12 +79,18 @@ if($task->mode == 'multi' and $app->rawMethod == 'activate') $hourDisabled = fal
     </div>
     <?php else:?>
     <div class='input-group'>
-      <span class="input-group-addon <?php echo zget($requiredFields, 'estimate', '', ' required');?>"><?php echo $lang->task->estimate?></span>
-      <?php echo html::input("teamEstimate[]", '', "class='form-control text-center' placeholder='{$lang->task->hour}'")?>
-      <span class='input-group-addon fix-border'><?php echo $lang->task->consumed?></span>
-      <?php echo html::input("teamConsumed[]", 0, "class='form-control text-center' readonly placeholder='{$lang->task->hour}'")?>
-      <span class='input-group-addon fix-border'><?php echo $lang->task->left?></span>
-      <?php echo html::input("teamLeft[]", '', "class='form-control text-center' placeholder='{$lang->task->hour}'")?>
+      <div class="input-control has-icon-right">
+        <?php echo html::input("teamEstimate[]", '', "class='form-control text-center' placeholder='{$lang->task->estimate}'")?>
+        <label class="input-control-icon-right">h</label>
+      </div>
+      <div class="input-control has-icon-right">
+        <?php echo html::input("teamConsumed[]", 0, "class='form-control text-center' readonly placeholder='{$lang->task->consumed}'")?>
+        <label class="input-control-icon-right">h</label>
+      </div>
+      <div class="input-control has-icon-right">
+        <?php echo html::input("teamLeft[]", '', "class='form-control text-center' placeholder='{$lang->task->left}'")?>
+        <label class="input-control-icon-right">h</label>
+      </div>
     </div>
     <?php endif;?>
   </td>