diff --git a/sai/modules/saimod_sys_todo/tpl/saimod_sys_todo_new.tpl b/sai/modules/saimod_sys_todo/tpl/saimod_sys_todo_new.tpl
index d8bf9ba..9f9e2a3 100644
--- a/sai/modules/saimod_sys_todo/tpl/saimod_sys_todo_new.tpl
+++ b/sai/modules/saimod_sys_todo/tpl/saimod_sys_todo_new.tpl
@@ -2,4 +2,4 @@
     <tr><td>Message</td><td><textarea style="width: 80%; height: 400px;" id="input_message"></textarea></td></tr>
 </table>
 <button id="btn_back" class="btn btn-sm btn-success" onClick="system.load('todo');" style="margin-right: 15px; height: 32px; font-size: 13px; float: left;"><span class="glyphicon glyphicon-chevron-left" aria-hidden="true"></span> ${basic_back}</button>
-<button id="btn_add" class="btn btn-sm btn-danger" style="margin-right: 15px; height: 32px; font-size: 13px; float: right;"><span class="glyphicon glyphicon-plus" aria-hidden="true"></span> ${basic_add}</button>
\ No newline at end of file
+<button id="btn_add" class="btn btn-sm btn-primary" style="margin-right: 15px; height: 32px; font-size: 13px; float: right;"><span class="glyphicon glyphicon-plus" aria-hidden="true"></span> ${basic_add}</button>
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_todo/tpl/saimod_sys_todo_todo.tpl b/sai/modules/saimod_sys_todo/tpl/saimod_sys_todo_todo.tpl
index 0ad5c34..0f77c41 100644
--- a/sai/modules/saimod_sys_todo/tpl/saimod_sys_todo_todo.tpl
+++ b/sai/modules/saimod_sys_todo/tpl/saimod_sys_todo_todo.tpl
@@ -23,4 +23,4 @@
 </table>
 <button id="btn_back" onClick="system.load('todo');" class="btn btn-sm btn-success" style="margin-right: 15px; height: 32px; font-size: 13px; float: left;"><span class="glyphicon glyphicon-chevron-left" aria-hidden="true"></span> ${basic_back}</button>
 <button id="btn_close" class="btn btn-sm btn-danger" style="display: none; margin-right: 15px; height: 32px; font-size: 13px; float: right;" todo="${ID}"><span class="glyphicon glyphicon-remove-sign" aria-hidden="true"></span> ${basic_close}</button>
-<button id="btn_open" class="btn btn-sm btn-danger" style="display: none; margin-right: 15px; height: 32px; font-size: 13px; float: right;" todo="${ID}"><span class="glyphicon glyphicon-plus-sign" aria-hidden="true"></span> ${basic_open}</button>
\ No newline at end of file
+<button id="btn_open" class="btn btn-sm btn-warning" style="display: none; margin-right: 15px; height: 32px; font-size: 13px; float: right;" todo="${ID}"><span class="glyphicon glyphicon-plus-sign" aria-hidden="true"></span> ${basic_open}</button>
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_todo/tpl/saimod_sys_todo_todo_user.tpl b/sai/modules/saimod_sys_todo/tpl/saimod_sys_todo_todo_user.tpl
index 79c71d9..009a18e 100644
--- a/sai/modules/saimod_sys_todo/tpl/saimod_sys_todo_todo_user.tpl
+++ b/sai/modules/saimod_sys_todo/tpl/saimod_sys_todo_todo_user.tpl
@@ -20,8 +20,8 @@
     </tr>
 </table>
 <button id="btn_back" onClick="system.load('todo');" class="btn btn-sm btn-success" style="margin-right: 15px; height: 32px; font-size: 13px; float: left;"><span class="glyphicon glyphicon-chevron-left" aria-hidden="true"></span> ${basic_back}</button>
-<button id="btn_edit" class="btn btn-sm btn-danger" style="margin-right: 15px; height: 32px; font-size: 13px; float: right;" todo="${ID}"><span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> ${basic_edit}</button>
+<button id="btn_edit" class="btn btn-sm btn-warning" style="margin-right: 15px; height: 32px; font-size: 13px; float: right;" todo="${ID}"><span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> ${basic_edit}</button>
 <button id="btn_close" class="btn btn-sm btn-danger" style="display: none; margin-right: 15px; height: 32px; font-size: 13px; float: right;" todo="${ID}"><span class="glyphicon glyphicon-remove-sign" aria-hidden="true"></span> ${basic_close}</button>
-<button id="btn_open" class="btn btn-sm btn-danger" style="display: none; margin-right: 15px; height: 32px; font-size: 13px; float: right;" todo="${ID}"><span class="glyphicon glyphicon-plus-sign" aria-hidden="true"></span> ${basic_open}</button>
+<button id="btn_open" class="btn btn-sm btn-primary" style="display: none; margin-right: 15px; height: 32px; font-size: 13px; float: right;" todo="${ID}"><span class="glyphicon glyphicon-plus-sign" aria-hidden="true"></span> ${basic_open}</button>
 <button id="btn_assign" class="btn btn-sm btn-success" style="${display_assign} margin-right: 15px; height: 32px; font-size: 13px; float: right;" todo="${ID}"><span class="glyphicon glyphicon-plus-sign" aria-hidden="true"></span> ${basic_assign}</button>
 <button id="btn_deassign" class="btn btn-sm btn-danger" style="${display_deassign} margin-right: 15px; height: 32px; font-size: 13px; float: right;" todo="${ID}"><span class="glyphicon glyphicon-remove-sign" aria-hidden="true"></span> ${basic_deassign}</button>
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_todo/tpl/saimod_sys_todo_todo_user_assignee.tpl b/sai/modules/saimod_sys_todo/tpl/saimod_sys_todo_todo_user_assignee.tpl
index 634bfd5..62bbe95 100644
--- a/sai/modules/saimod_sys_todo/tpl/saimod_sys_todo_todo_user_assignee.tpl
+++ b/sai/modules/saimod_sys_todo/tpl/saimod_sys_todo_todo_user_assignee.tpl
@@ -1,4 +1,4 @@
 <tr>
     <td><a href="#!security(user);username.${assignee}">${assignee}</a></td>
-    <td><button class="btn_deassign_user btn btn-sm btn-danger" style="margin-right: 15px; height: 32px; font-size: 13px; float: right;" todo="${todo_id}" user="${assignee_id}"><span class="glyphicon glyphicon-remove-sign" aria-hidden="true"></span></button></td>
+    <td>&nbsp;<button class="btn_deassign_user btn btn-sm btn-danger" style="margin-right: 15px; height: 32px; font-size: 13px; float: right;" todo="${todo_id}" user="${assignee_id}"><span class="glyphicon glyphicon-remove-sign" aria-hidden="true"></span></button></td>
 </tr>
\ No newline at end of file