diff --git a/sai/modules/saimod_sys_api/tpl/saimod_sys_api.tpl b/sai/modules/saimod_sys_api/tpl/saimod_sys_api.tpl
index 5d91ff0..1718c30 100644
--- a/sai/modules/saimod_sys_api/tpl/saimod_sys_api.tpl
+++ b/sai/modules/saimod_sys_api/tpl/saimod_sys_api.tpl
@@ -4,7 +4,7 @@
     <ul class="nav nav-tabs" id="tabs_api">
         <li><a href="#!api" id="menu_all">All</a></li>
         ${tabopts}
-        <button onClick="system.load('api(new)',true);" class="btn-success" style="margin-right: 15px; height: 32px; font-size: 13px; float: right;">New</button>
+        <button onClick="system.load('api(new)',true);" class="btn-sm btn btn-success" style="margin-right: 15px; height: 32px; font-size: 13px; float: right;"><span class="glyphicon glyphicon-plus" aria-hidden="true"></span> New</button>
     </ul>
     <div class="tab-content">
         <div class="tab-pane active" id="tab_api"></div>       
diff --git a/sai/modules/saimod_sys_cron/tpl/list_entry.tpl b/sai/modules/saimod_sys_cron/tpl/list_entry.tpl
index 4b131e4..558125c 100644
--- a/sai/modules/saimod_sys_cron/tpl/list_entry.tpl
+++ b/sai/modules/saimod_sys_cron/tpl/list_entry.tpl
@@ -8,16 +8,16 @@
     <td>${last_run}</td>
     <td>${next}</td>
     <td>
-        <select id="select_status_${i}">
+        <select class="form-control" id="select_status_${i}">
             <option ${selected_0} value="0">SUCCESFULLY</option>
             <option ${selected_1} value="1">RUNNING</option>
             <option ${selected_2} value="2">FAIL</option>
             <option ${selected_3} value="3">FAIL_CLASS</option>
         </select>
-        <button type="button" class="btn-small btn-danger btn_cron_status" _class="${class}" _i="${i}">Change</button>
+        <button type="button" class="btn-sm btn btn-warning btn_cron_status" _class="${class}" _i="${i}"><span class="glyphicon glyphicon-repeat" aria-hidden="true"></span> ${change}</button>
     </td>
     <td>
-        <button type="button" class="btn-small btn-success btn_cron_edit" _class="${class}" _min="${min}" _hour="${hour}" _day="${day}" _day_week="${day_week}" _month="${month}">Edit</button>
-        <button type="button" class="btn-small btn-danger btn_cron_del" _class="${class}">Del</button>
+        <button type="button" class="btn-sm btn btn-success btn_cron_edit" _class="${class}" _min="${min}" _hour="${hour}" _day="${day}" _day_week="${day_week}" _month="${month}"><span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> ${edit}</button>
+        <button type="button" class="btn-sm btn btn-danger btn_cron_del" _class="${class}"><span class="glyphicon glyphicon-trash" aria-hidden="true"></span> ${delete}</button>
     </td>
 </tr>
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_cron/tpl/tabs.tpl b/sai/modules/saimod_sys_cron/tpl/tabs.tpl
index 7eccee0..a42c06a 100644
--- a/sai/modules/saimod_sys_cron/tpl/tabs.tpl
+++ b/sai/modules/saimod_sys_cron/tpl/tabs.tpl
@@ -18,16 +18,16 @@ Last Visit: ${last_visit}<br/>
         </tr>
         ${content}
         <tr>
-            <td><input type="text" id="input_cron_class" placeholder="class" style="width: 200px;"></td>
-            <td><input type="text" id="input_cron_min" placeholder="min" value="0" style="width: 40px;"></td>
-            <td><input type="text" id="input_cron_hour" placeholder="hour" value="0" style="width: 40px;"></td>
-            <td><input type="text" id="input_cron_day" placeholder="day" value="0" style="width: 40px;"></td>
-            <td><input type="text" id="input_cron_day_week" placeholder="day_week" value="0" style="width: 40px;"></td>
-            <td><input type="text" id="input_cron_month" placeholder="month" value="0" style="width: 40px;"></td>
+            <td><input class="form-control" type="text" id="input_cron_class" placeholder="class" style="width: 200px;"></td>
+            <td><input class="form-control" type="text" id="input_cron_min" placeholder="min" value="0" style="width: 40px;"></td>
+            <td><input class="form-control" type="text" id="input_cron_hour" placeholder="hour" value="0" style="width: 40px;"></td>
+            <td><input class="form-control" type="text" id="input_cron_day" placeholder="day" value="0" style="width: 40px;"></td>
+            <td><input class="form-control" type="text" id="input_cron_day_week" placeholder="day_week" value="0" style="width: 40px;"></td>
+            <td><input class="form-control" type="text" id="input_cron_month" placeholder="month" value="0" style="width: 40px;"></td>
             <td></td>
             <td></td>
             <td></td>
-            <td><button type="button" class="btn-small btn-success" id="btn_cron_add">Add</button></td>
+            <td><button type="button" class="btn-sm btn btn-success" id="btn_cron_add"><span class="glyphicon glyphicon-plus" aria-hidden="true"></span> ${add}</button></td>
         </tr>    
     </table>
 </div>
diff --git a/sai/modules/saimod_sys_files/tpl/saimod_sys_files_list.tpl b/sai/modules/saimod_sys_files/tpl/saimod_sys_files_list.tpl
index a55e065..e9ea6b8 100644
--- a/sai/modules/saimod_sys_files/tpl/saimod_sys_files_list.tpl
+++ b/sai/modules/saimod_sys_files/tpl/saimod_sys_files_list.tpl
@@ -8,9 +8,9 @@
     ${content}
     <tr>
         <br>
-        <th><form enctype="multipart/form-data" id="form_${cat}"><input type="file" name="datei_${cat}"></th>
+        <th><form enctype="multipart/form-data" id="form_${cat}"><input class="form-control" type="file" name="datei_${cat}"></th>
         <th></th>
         <th></th>
-        <th><input type="submit" class="btn btn_upload btn-success" value="Upload" cat="${cat}"></form></th>
+        <th><button type="submit" class="btn btn-sm btn_upload btn-success" cat="${cat}"><span class="glyphicon glyphicon-upload" aria-hidden="true"></span> ${upload}</button></form></th>
     </tr>
 </table>
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_files/tpl/saimod_sys_files_list_entry.tpl b/sai/modules/saimod_sys_files/tpl/saimod_sys_files_list_entry.tpl
index b685806..7500a07 100644
--- a/sai/modules/saimod_sys_files/tpl/saimod_sys_files_list_entry.tpl
+++ b/sai/modules/saimod_sys_files/tpl/saimod_sys_files_list_entry.tpl
@@ -5,8 +5,8 @@
         <a href="${url}" target="_blank">${url}</a>
     </td>
     <td>
-        <input type="button" class="btn-danger imgdelbtn" style="margin: 1px; margin-right: 3px" value="Delete" cat="${cat}" id="${name}">
+        <button class="btn-danger btn btn-sm imgdelbtn" style="margin: 1px; margin-right: 3px" cat="${cat}" id="${name}"><span class="glyphicon glyphicon-trash" aria-hidden="true"></span> ${delete}</button>
         <input type="text" id="renametext_${cat}_${i}" class="form-control" style="width: 100px; margin:0;" placeholder="new name...">
-        <input type="submit" class="btn-warning imgrnbtn" style="margin: 1px;;" value="Rename" cat="${cat}" id="${name}" textfield="#renametext_${cat}_${i}">
+        <button type="submit" class="btn-warning btn btn-sm imgrnbtn" style="margin: 1px;;" cat="${cat}" id="${name}" textfield="#renametext_${cat}_${i}"><span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> ${rename}</button>
     </td>
 </tr>
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_log/tpl/saimod_sys_log.tpl b/sai/modules/saimod_sys_log/tpl/saimod_sys_log.tpl
index d4906bf..c625106 100644
--- a/sai/modules/saimod_sys_log/tpl/saimod_sys_log.tpl
+++ b/sai/modules/saimod_sys_log/tpl/saimod_sys_log.tpl
@@ -5,7 +5,7 @@
         <li class="active"><a href="#!log" id="menu_loglist">${basic_log}</a></li>
         <li><a href="#!log(stats)" id="menu_stats">${basic_analytics}</a></li>
         <img id="loader" src="${PICPATH}ajax-loader.gif" style="margin-left: 10px; margin-top: 10px; display: none;  float: left"/>
-        <button onClick="system.load('log',true);" class="btn-success" style="margin-right: 15px; height: 32px; font-size: 13px; float: right;">Refresh</button>
+        <button onClick="system.load('log',true);" class="btn-success btn btn-sm" style="margin-right: 15px; height: 32px; font-size: 13px; float: right;"><span class="glyphicon glyphicon-refresh" aria-hidden="true"></span>&nbsp;${refresh}</button>
     </ul>
     <div class="tab-content">        
         <div class="tab-pane active" id="tab_log"></div>
diff --git a/sai/modules/saimod_sys_login/tpl/login.tpl b/sai/modules/saimod_sys_login/tpl/login.tpl
index b72e9f0..71b62b8 100644
--- a/sai/modules/saimod_sys_login/tpl/login.tpl
+++ b/sai/modules/saimod_sys_login/tpl/login.tpl
@@ -26,7 +26,7 @@
         </div>        
         <div class="help-block"></div>
         <input type="hidden" />
-        <button class="btn-sm btn-primary" style="clear: left; height: 32px; font-size: 13px;" type="submit" id="login_submit"><span class="glyphicon glyphicon-log-in" aria-hidden="true"></span> ${basic_login}</button>
+        <button class="btn-sm btn btn-primary" style="clear: left; height: 32px; font-size: 13px;" type="submit" id="login_submit"><span class="glyphicon glyphicon-log-in" aria-hidden="true"></span> ${basic_login}</button>
     </div>
 </form>
 <a href="#" id="register_link">${basic_text_register}</a></br>
diff --git a/sai/modules/saimod_sys_login/tpl/logout.tpl b/sai/modules/saimod_sys_login/tpl/logout.tpl
index 375c89f..0524f74 100644
--- a/sai/modules/saimod_sys_login/tpl/logout.tpl
+++ b/sai/modules/saimod_sys_login/tpl/logout.tpl
@@ -96,7 +96,7 @@
     <div class="control-group">
         <div class="help-block"></div>
         <input type="hidden" />
-        <button class="btn-sm btn-primary" style="clear: left; height: 32px; font-size: 13px;" type="submit" id="logout_submit"><span class="glyphicon glyphicon-log-out" aria-hidden="true"></span> ${basic_logout}</button>
+        <button class="btn-sm btn btn-primary" style="clear: left; height: 32px; font-size: 13px;" type="submit" id="logout_submit"><span class="glyphicon glyphicon-log-out" aria-hidden="true"></span> ${basic_logout}</button>
     </div>
 </form>
 
diff --git a/sai/modules/saimod_sys_page/tpl/saimod_sys_page.tpl b/sai/modules/saimod_sys_page/tpl/saimod_sys_page.tpl
index 2041006..bb09bcb 100644
--- a/sai/modules/saimod_sys_page/tpl/saimod_sys_page.tpl
+++ b/sai/modules/saimod_sys_page/tpl/saimod_sys_page.tpl
@@ -4,7 +4,7 @@
     <ul class="nav nav-tabs" id="tabs_page">
         <li><a href="#!page" id="menu_all">All</a></li>
         ${tabopts}
-        <button onClick="system.load('page(new)',true);" class="btn-success" style="margin-right: 15px; height: 32px; font-size: 13px; float: right;">New</button>
+        <button onClick="system.load('page(new)',true);" class="btn btn-sm btn-success" style="margin-right: 15px; height: 32px; font-size: 13px; float: right;"><span class="glyphicon glyphicon-plus" aria-hidden="true"></span> New</button>
     </ul>
     <div class="tab-content">
         <div class="tab-pane active" id="tab_page"></div>
diff --git a/sai/modules/saimod_sys_security/tpl/saimod_sys_security.tpl b/sai/modules/saimod_sys_security/tpl/saimod_sys_security.tpl
index 55db3de..d5d2a45 100644
--- a/sai/modules/saimod_sys_security/tpl/saimod_sys_security.tpl
+++ b/sai/modules/saimod_sys_security/tpl/saimod_sys_security.tpl
@@ -5,7 +5,7 @@
         <li class="active"><a href="#!security" id="menu_users">Users</a></li>
         <li><a href="#!security(rights)" id="menu_rights">Rights</a></li>
         <img id="loader" src="${PICPATH}ajax-loader.gif" style="margin-left: 10px; margin-top: 10px; display: none;  float: left"/>
-        <input class="btn-sm btn-success" id="user_go" type="submit" value="Search" style="float: right; margin-left: 10px;"/>
+        <button class="btn-sm btn btn-success" id="user_go" type="submit" style="float: right; margin-left: 10px;"><span class="glyphicon glyphicon-search" aria-hidden="true"></span>  ${search}</button>
         <input class="input-medium search-query" id="user_search" type="text" placeholder="EMail or Username" size="30" style="float: right;"/>
     </ul>
     <div class="tab-content">
diff --git a/sai/modules/saimod_sys_security/tpl/saimod_sys_security_deleteright.tpl b/sai/modules/saimod_sys_security/tpl/saimod_sys_security_deleteright.tpl
index 9b131d8..c0e9675 100644
--- a/sai/modules/saimod_sys_security/tpl/saimod_sys_security_deleteright.tpl
+++ b/sai/modules/saimod_sys_security/tpl/saimod_sys_security_deleteright.tpl
@@ -13,5 +13,5 @@
         <td>${description}</td>
     </tr>
 </table>
-<input id="deleteright_confirm" class="btn-danger btn" right_id="${ID}" type="submit" value="Delete"/>
-<input id="deleteright_abort" onClick="system.load('security(rights)');" class="btn" type="submit" value="Abort"/>
\ No newline at end of file
+<button id="deleteright_confirm" class="btn-danger btn btn-sm" right_id="${ID}" type="submit"><span class="glyphicon glyphicon-trash" aria-hidden="true"></span>  ${delete}</button>
+<button id="deleteright_abort" onClick="system.load('security(rights)');" class="btn-default btn btn-sm" type="submit"><span class="glyphicon glyphicon-remove-sign" aria-hidden="true"></span> ${abort}</button>
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_security/tpl/saimod_sys_security_newright.tpl b/sai/modules/saimod_sys_security/tpl/saimod_sys_security_newright.tpl
index d7d8f4c..a03bc88 100644
--- a/sai/modules/saimod_sys_security/tpl/saimod_sys_security_newright.tpl
+++ b/sai/modules/saimod_sys_security/tpl/saimod_sys_security_newright.tpl
@@ -13,4 +13,4 @@
         <td><input id="addright_description" type="text"/></td>
     </tr>
 </table>
-<input id="addright" class="btn" type="submit" value="Add"/>
\ No newline at end of file
+<button id="addright" class="btn btn-sm btn-default" type="submit"><span class="glyphicon glyphicon-plus" aria-hidden="true"></span> ${add}</button>
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_security/tpl/saimod_sys_security_user.tpl b/sai/modules/saimod_sys_security/tpl/saimod_sys_security_user.tpl
index 27c6596..ed12cec 100644
--- a/sai/modules/saimod_sys_security/tpl/saimod_sys_security_user.tpl
+++ b/sai/modules/saimod_sys_security/tpl/saimod_sys_security_user.tpl
@@ -11,6 +11,6 @@
         <input type="submit" class="btn-danger" value="delete" user="${id}" action="delete">
     </td>-->
     <td>
-        <button type="submit" class="btn-sm btn-success" value="reset_password" user="${id}" email="${email}">send EMail</button>
+        <button type="submit" class="btn-sm btn btn-success" value="reset_password" user="${id}" email="${email}"><span class="glyphicon glyphicon-envelope" aria-hidden="true"></span>  send EMail</button>
     </td>
 </tr>
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_security/tpl/saimod_sys_security_user_rights_add.tpl b/sai/modules/saimod_sys_security/tpl/saimod_sys_security_user_rights_add.tpl
index 3509b5c..d6bf69b 100644
--- a/sai/modules/saimod_sys_security/tpl/saimod_sys_security_user_rights_add.tpl
+++ b/sai/modules/saimod_sys_security/tpl/saimod_sys_security_user_rights_add.tpl
@@ -1,4 +1,4 @@
 <tr>
     <td colspan="4"><select id="adduserright_rightid">${right_options}</select></td>                
-    <td><input type="submit" id="adduserright_add" class="btn-sm btn-success" value="Add Right" user_id="${user_id}"/></td>
+    <td><button type="submit" id="adduserright_add" class="btn-sm btn btn-success" user_id="${user_id}"><span class="glyphicon glyphicon-plus" aria-hidden="true"></span>  {add_right}</button></td>
 </tr>    
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_text/tpl/saimod_sys_text.tpl b/sai/modules/saimod_sys_text/tpl/saimod_sys_text.tpl
index 984e2d9..4c0ddf1 100644
--- a/sai/modules/saimod_sys_text/tpl/saimod_sys_text.tpl
+++ b/sai/modules/saimod_sys_text/tpl/saimod_sys_text.tpl
@@ -5,8 +5,8 @@
         <li><a href="#!text" id="menu_tag_all">${basic_all}</a></li>
         <li><a href="#!text(notag)" id="menu_tag_notag">${basic_no_tag}</a></li>
         ${tabopts}
-        <input type="submit" value="${basic_add}" class="btn-small btn-success content_add" onClick="system.load('text(edittext(editor));id.${new_id};lang.${new_lang}');" style="margin-left: 15px; float: right;">
-        <input type="submit" value="${basic_show_all}" id="btn_show_all" class="btn-small btn-primary" style="margin-left: 15px; float: right;">
+        <button class="btn-sm btn btn-success content_add" onClick="system.load('text(edittext(editor));id.${new_id};lang.${new_lang}');" style="margin-left: 15px; float: right;"><span class="glyphicon glyphicon-plus" aria-hidden="true"></span> ${basic_add}</button>
+        <button type="submit" value="${basic_show_all}" id="btn_show_all" class="btn-sm btn btn-primary" style="margin-left: 15px; float: right;"><span class="glyphicon glyphicon-eye-open" aria-hidden="true"></span> ${basic_show_all}</button>
     </ul>
     <div class="tab-content" id="tab_content"></div>
 </div>
diff --git a/sai/modules/saimod_sys_text/tpl/saimod_sys_text_edit_editor.tpl b/sai/modules/saimod_sys_text/tpl/saimod_sys_text_edit_editor.tpl
index cc43abd..dbffece 100644
--- a/sai/modules/saimod_sys_text/tpl/saimod_sys_text_edit_editor.tpl
+++ b/sai/modules/saimod_sys_text/tpl/saimod_sys_text_edit_editor.tpl
@@ -3,6 +3,6 @@
 <br>
 <input id="input_tags" type="text" placeholder="Tags..." value="${tags}" style="width: 98%;"/>
 <br>
-<button id="btn_back" class="btn" onClick="system.load('text');" style="margin-right: 15px; height: 32px; font-size: 13px; float: left;">${basic_back}</button>
-<button id="btn_save" text_id="${id}" text_lang="${lang}" class="btn-success" style="margin-right: 15px; height: 32px; font-size: 13px; float: right;">${basic_save}</button>
-<button id="btn_delete" text_id="${id}" text_lang="${lang}" class="btn-danger" style="margin-right: 15px; height: 32px; font-size: 13px; float: right;">${basic_delete}</button>
\ No newline at end of file
+<button id="btn_back" class="btn btn-sm btn-default" onClick="system.load('text');" style="margin-right: 15px; height: 32px; font-size: 13px; float: left;"><span class="glyphicon glyphicon-menu-left" aria-hidden="true"></span> ${basic_back}</button>
+<button id="btn_save" text_id="${id}" text_lang="${lang}" class="btn-success btn btn-sm" style="margin-right: 15px; height: 32px; font-size: 13px; float: right;"><span class="glyphicon glyphicon-floppy-disk" aria-hidden="true"></span> ${basic_save}</button>
+<button id="btn_delete" text_id="${id}" text_lang="${lang}" class="btn-danger btn btn-sm" style="margin-right: 15px; height: 32px; font-size: 13px; float: right;"><span class="glyphicon glyphicon-trash" aria-hidden="true"></span> ${basic_delete}</button>
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_todo/tpl/saimod_sys_todo.tpl b/sai/modules/saimod_sys_todo/tpl/saimod_sys_todo.tpl
index 53f5225..63116ab 100644
--- a/sai/modules/saimod_sys_todo/tpl/saimod_sys_todo.tpl
+++ b/sai/modules/saimod_sys_todo/tpl/saimod_sys_todo.tpl
@@ -6,9 +6,9 @@
         <li><a href="#!todo(doto)" id="menu_doto">DoTo</a></li>
         <li><a href="#!todo(stats)" id="menu_stats">Statistics</a></li>
         <img id="img_loader" src="${PICPATH}ajax-loader.gif" style="margin-left: 10px; margin-top: 10px; display: none;  float: left"/>
-        <button id="btn_refresh" class="btn-primary" onClick="system.load('todo',true);" style="margin-right: 15px; height: 32px; font-size: 13px; float: right;">Refresh</button>
-        <button id="btn_close_all" class="btn-danger" style="margin-right: 15px; height: 32px; font-size: 13px; float: right;">Close All</button>
-        <button id="btn_new" class="btn-success" onClick="system.load('todo(new)');" style="margin-right: 15px; height: 32px; font-size: 13px; float: right;">Add</button>
+        <button id="btn_refresh" class="btn-primary btn btn-sm" onClick="system.load('todo',true);" style="margin-right: 15px; height: 32px; font-size: 13px; float: right;"><span class="glyphicon glyphicon-refresh" aria-hidden="true"></span> ${refresh}</button>
+        <button id="btn_close_all" class="btn-danger btn btn-sm" style="margin-right: 15px; height: 32px; font-size: 13px; float: right;"><span class="glyphicon glyphicon-minus-sign" aria-hidden="true"></span> ${close_all}</button>
+        <button id="btn_new" class="btn-success btn btn-sm" onClick="system.load('todo(new)');" style="margin-right: 15px; height: 32px; font-size: 13px; float: right;"><span class="glyphicon glyphicon-plus" aria-hidden="true"></span> ${add}</button>
     </ul>
     <div class="tab-content">        
         <div class="tab-pane active" id="tab_todo"></div>