diff --git a/app/Template/board/subtasks.php b/app/Template/board/subtasks.php
index c7f995d70..533300223 100644
--- a/app/Template/board/subtasks.php
+++ b/app/Template/board/subtasks.php
@@ -1,9 +1,7 @@
 <section id="tooltip-subtasks">
 <?php foreach ($subtasks as $subtask): ?>
-    <?= Helper\template('subtask/icons', array('subtask' => $subtask)) ?>
-
     <?= Helper\a(
-        Helper\escape($subtask['title']),
+        trim(Helper\template('subtask/icons', array('subtask' => $subtask))) . Helper\escape($subtask['title']),
         'board',
         'toggleSubtask',
         array('task_id' => $subtask['task_id'], 'subtask_id' => $subtask['id'])
@@ -13,4 +11,4 @@
 
     <br/>
 <?php endforeach ?>
-</section>
\ No newline at end of file
+</section>
diff --git a/app/Template/subtask/show.php b/app/Template/subtask/show.php
index 686b160e9..4d341f269 100644
--- a/app/Template/subtask/show.php
+++ b/app/Template/subtask/show.php
@@ -19,12 +19,11 @@
         <tr>
             <td><?= Helper\escape($subtask['title']) ?></td>
             <td>
-                <?= Helper\template('subtask/icons', array('subtask' => $subtask)) ?>
-
                 <?php if (! isset($not_editable)): ?>
-                    <?= Helper\a(Helper\escape($subtask['status_name']), 'subtask', 'toggleStatus', array('task_id' => $task['id'], 'subtask_id' => $subtask['id'])) ?>
+                    <?= Helper\a(trim(Helper\template('subtask/icons', array('subtask' => $subtask))) . Helper\escape($subtask['status_name']),
+                                 'subtask', 'toggleStatus', array('task_id' => $task['id'], 'subtask_id' => $subtask['id'])) ?>
                 <?php else: ?>
-                    <?= Helper\escape($subtask['status_name']) ?>
+                    <?= Helper\template('subtask/icons', array('subtask' => $subtask)) . Helper\escape($subtask['status_name']) ?>
                 <?php endif ?>
             </td>
             <td>