diff --git a/public/site_assets/bootstrap/css/bootstrap-switch.css b/public/site_assets/bootstrap/css/bootstrap-switch.css
new file mode 100644
index 00000000..7bc3c529
--- /dev/null
+++ b/public/site_assets/bootstrap/css/bootstrap-switch.css
@@ -0,0 +1,194 @@
+/* ========================================================================
+ * bootstrap-switch - v3.0.0
+ * http://www.bootstrap-switch.org
+ * ========================================================================
+ * Copyright 2012-2013 Mattia Larentis
+ *
+ * ========================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ========================================================================
+ */
+
+.bootstrap-switch {
+  display: inline-block;
+  cursor: pointer;
+  border-radius: 4px;
+  border: 1px solid;
+  border-color: #cccccc;
+  position: relative;
+  text-align: left;
+  overflow: hidden;
+  line-height: 8px;
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+  vertical-align: middle;
+  min-width: 100px;
+  -webkit-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
+  transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
+}
+.bootstrap-switch.bootstrap-switch-mini {
+  min-width: 71px;
+}
+.bootstrap-switch.bootstrap-switch-mini > div > span,
+.bootstrap-switch.bootstrap-switch-mini > div > label {
+  padding-bottom: 4px;
+  padding-top: 4px;
+  font-size: 10px;
+  line-height: 9px;
+}
+.bootstrap-switch.bootstrap-switch-mini .bootstrap-switch-mini-icons {
+  height: 1.20em;
+  line-height: 9px;
+  vertical-align: text-top;
+  text-align: center;
+  transform: scale(0.6);
+  margin-top: -1px;
+  margin-bottom: -1px;
+}
+.bootstrap-switch.bootstrap-switch-small {
+  min-width: 79px;
+}
+.bootstrap-switch.bootstrap-switch-small > div > span,
+.bootstrap-switch.bootstrap-switch-small > div > label {
+  padding-bottom: 3px;
+  padding-top: 3px;
+  font-size: 12px;
+  line-height: 18px;
+}
+.bootstrap-switch.bootstrap-switch-large {
+  min-width: 120px;
+}
+.bootstrap-switch.bootstrap-switch-large > div > span,
+.bootstrap-switch.bootstrap-switch-large > div > label {
+  padding-bottom: 9px;
+  padding-top: 9px;
+  font-size: 16px;
+  line-height: normal;
+}
+.bootstrap-switch.bootstrap-switch-animate > div {
+  -webkit-transition: margin-left 0.5s;
+  transition: margin-left 0.5s;
+}
+.bootstrap-switch.bootstrap-switch-on > div {
+  margin-left: 0%;
+}
+.bootstrap-switch.bootstrap-switch-on > div > label {
+  border-bottom-right-radius: 3px;
+  border-top-right-radius: 3px;
+}
+.bootstrap-switch.bootstrap-switch-off > div {
+  margin-left: -50%;
+}
+.bootstrap-switch.bootstrap-switch-off > div > label {
+  border-bottom-left-radius: 3px;
+  border-top-left-radius: 3px;
+}
+.bootstrap-switch.bootstrap-switch-disabled,
+.bootstrap-switch.bootstrap-switch-readonly {
+  opacity: 0.5;
+  filter: alpha(opacity=50);
+  cursor: default !important;
+}
+.bootstrap-switch.bootstrap-switch-disabled > div > span,
+.bootstrap-switch.bootstrap-switch-readonly > div > span,
+.bootstrap-switch.bootstrap-switch-disabled > div > label,
+.bootstrap-switch.bootstrap-switch-readonly > div > label {
+  cursor: default !important;
+}
+.bootstrap-switch.bootstrap-switch-focused {
+  border-color: #66afe9;
+  outline: 0;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, 0.6);
+  box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, 0.6);
+}
+.bootstrap-switch > div {
+  display: inline-block;
+  width: 150%;
+  top: 0;
+  border-radius: 4px;
+  -webkit-transform: translate3d(0, 0, 0);
+  transform: translate3d(0, 0, 0);
+}
+.bootstrap-switch > div > span,
+.bootstrap-switch > div > label {
+  -webkit-box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  box-sizing: border-box;
+  cursor: pointer;
+  display: inline-block !important;
+  height: 100%;
+  padding-bottom: 4px;
+  padding-top: 4px;
+  font-size: 14px;
+  line-height: 20px;
+}
+.bootstrap-switch > div > span {
+  text-align: center;
+  z-index: 1;
+  width: 33.333333333%;
+}
+.bootstrap-switch > div > span.bootstrap-switch-handle-on {
+  color: #f00;
+  border-bottom-left-radius: 3px;
+  border-top-left-radius: 3px;
+}
+.bootstrap-switch > div > span.bootstrap-switch-handle-off {
+  color: #000;
+  background: #eeeeee;
+  border-bottom-right-radius: 3px;
+  border-top-right-radius: 3px;
+}
+.bootstrap-switch > div > span.bootstrap-switch-primary {
+  color: #fff;
+  background: #428bca;
+}
+.bootstrap-switch > div > span.bootstrap-switch-info {
+  color: #fff;
+  background: #5bc0de;
+}
+.bootstrap-switch > div > span.bootstrap-switch-success {
+  color: #fff;
+  background: #5cb85c;
+}
+.bootstrap-switch > div > span.bootstrap-switch-warning {
+  background: #f0ad4e;
+  color: #fff;
+}
+.bootstrap-switch > div > span.bootstrap-switch-danger {
+  color: #fff;
+  background: #d9534f;
+}
+.bootstrap-switch > div > span.bootstrap-switch-default {
+  color: #000;
+  background: #eeeeee;
+}
+.bootstrap-switch > div > label {
+  text-align: center;
+  margin-top: -1px;
+  margin-bottom: -1px;
+  z-index: 100;
+  width: 33.333333333%;
+  color: #333333;
+  background: #ffffff;
+}
+.bootstrap-switch input[type='radio'],
+.bootstrap-switch input[type='checkbox'] {
+  position: absolute !important;
+  top: 0;
+  left: 0;
+  opacity: 0;
+  filter: alpha(opacity=0);
+  z-index: -1;
+}
diff --git a/public/site_assets/bootstrap/css/bootstrap-switch.min.css b/public/site_assets/bootstrap/css/bootstrap-switch.min.css
new file mode 100644
index 00000000..7e579b98
--- /dev/null
+++ b/public/site_assets/bootstrap/css/bootstrap-switch.min.css
@@ -0,0 +1,22 @@
+/* ========================================================================
+ * bootstrap-switch - v3.0.0
+ * http://www.bootstrap-switch.org
+ * ========================================================================
+ * Copyright 2012-2013 Mattia Larentis
+ *
+ * ========================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ========================================================================
+ */
+
+.bootstrap-switch{display:inline-block;cursor:pointer;border-radius:4px;border:1px solid;border-color:#ccc;position:relative;text-align:left;overflow:hidden;line-height:8px;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;vertical-align:middle;min-width:100px;-webkit-transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s;transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s}.bootstrap-switch.bootstrap-switch-mini{min-width:71px}.bootstrap-switch.bootstrap-switch-mini>div>span,.bootstrap-switch.bootstrap-switch-mini>div>label{padding-bottom:4px;padding-top:4px;font-size:10px;line-height:9px}.bootstrap-switch.bootstrap-switch-mini .bootstrap-switch-mini-icons{height:1.2em;line-height:9px;vertical-align:text-top;text-align:center;transform:scale(.6);margin-top:-1px;margin-bottom:-1px}.bootstrap-switch.bootstrap-switch-small{min-width:79px}.bootstrap-switch.bootstrap-switch-small>div>span,.bootstrap-switch.bootstrap-switch-small>div>label{padding-bottom:3px;padding-top:3px;font-size:12px;line-height:18px}.bootstrap-switch.bootstrap-switch-large{min-width:120px}.bootstrap-switch.bootstrap-switch-large>div>span,.bootstrap-switch.bootstrap-switch-large>div>label{padding-bottom:9px;padding-top:9px;font-size:16px;line-height:normal}.bootstrap-switch.bootstrap-switch-animate>div{-webkit-transition:margin-left .5s;transition:margin-left .5s}.bootstrap-switch.bootstrap-switch-on>div{margin-left:0}.bootstrap-switch.bootstrap-switch-on>div>label{border-bottom-right-radius:3px;border-top-right-radius:3px}.bootstrap-switch.bootstrap-switch-off>div{margin-left:-50%}.bootstrap-switch.bootstrap-switch-off>div>label{border-bottom-left-radius:3px;border-top-left-radius:3px}.bootstrap-switch.bootstrap-switch-disabled,.bootstrap-switch.bootstrap-switch-readonly{opacity:.5;filter:alpha(opacity=50);cursor:default!important}.bootstrap-switch.bootstrap-switch-disabled>div>span,.bootstrap-switch.bootstrap-switch-readonly>div>span,.bootstrap-switch.bootstrap-switch-disabled>div>label,.bootstrap-switch.bootstrap-switch-readonly>div>label{cursor:default!important}.bootstrap-switch.bootstrap-switch-focused{border-color:#66afe9;outline:0;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(102,175,233,.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(102,175,233,.6)}.bootstrap-switch>div{display:inline-block;width:150%;top:0;border-radius:4px;-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0)}.bootstrap-switch>div>span,.bootstrap-switch>div>label{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;cursor:pointer;display:inline-block!important;height:100%;padding-bottom:4px;padding-top:4px;font-size:14px;line-height:20px}.bootstrap-switch>div>span{text-align:center;z-index:1;width:33.33333333%}.bootstrap-switch>div>span.bootstrap-switch-handle-on{color:red;border-bottom-left-radius:3px;border-top-left-radius:3px}.bootstrap-switch>div>span.bootstrap-switch-handle-off{color:#000;background:#eee;border-bottom-right-radius:3px;border-top-right-radius:3px}.bootstrap-switch>div>span.bootstrap-switch-primary{color:#fff;background:#428bca}.bootstrap-switch>div>span.bootstrap-switch-info{color:#fff;background:#5bc0de}.bootstrap-switch>div>span.bootstrap-switch-success{color:#fff;background:#5cb85c}.bootstrap-switch>div>span.bootstrap-switch-warning{background:#f0ad4e;color:#fff}.bootstrap-switch>div>span.bootstrap-switch-danger{color:#fff;background:#d9534f}.bootstrap-switch>div>span.bootstrap-switch-default{color:#000;background:#eee}.bootstrap-switch>div>label{text-align:center;margin-top:-1px;margin-bottom:-1px;z-index:100;width:33.33333333%;color:#333;background:#fff}.bootstrap-switch input[type=radio],.bootstrap-switch input[type=checkbox]{position:absolute!important;top:0;left:0;opacity:0;filter:alpha(opacity=0);z-index:-1}
\ No newline at end of file
diff --git a/public/site_assets/bootstrap/js/bootstrap-switch.js b/public/site_assets/bootstrap/js/bootstrap-switch.js
new file mode 100644
index 00000000..3f03b1df
--- /dev/null
+++ b/public/site_assets/bootstrap/js/bootstrap-switch.js
@@ -0,0 +1,4 @@
+(function() {
+  describe("Bootstrap Switch", function() {});
+
+}).call(this);
diff --git a/public/templates/bootstrap/about/chat/default.tpl b/public/templates/bootstrap/about/chat/default.tpl
index 77bd358f..bd4e5985 100644
--- a/public/templates/bootstrap/about/chat/default.tpl
+++ b/public/templates/bootstrap/about/chat/default.tpl
@@ -1,9 +1,14 @@
-<h4 class="info">If you have your own irc client feel free to connect to our channel @ <b>IRC.FREENODE.NET {$CHATROOM|default:"#lazypoolop"}</b></h4>
-<article class="module width_full">
-<header><h3>Web Chat</h3></header>
-<div class="module_content">
-<table width="100%">
-<iframe src="https://webchat.freenode.net/?channels={$CHATROOM|default:"#lazypoolop"}" height="768" width="100%"></iframe>
-</table>
+<div class="row">
+  <div class="col-lg-12">
+    <div class="panel panel-info">
+      <div class="panel-heading">
+        <i class="fa fa-comments-o fa-fw"></i> Web Chat
+      </div>
+      <div class="panel-body">
+        <table class="table table-bordered">
+          <iframe src="https://webchat.freenode.net/?channels={$CHATROOM|default:"#lazypoolop"}" height="768" width="100%"></iframe>
+        </table>
+      </div>
+    </div>
+  </div>
 </div>
-</article>
diff --git a/public/templates/bootstrap/about/donors/default.tpl b/public/templates/bootstrap/about/donors/default.tpl
index 91b302b6..d36a9e88 100755
--- a/public/templates/bootstrap/about/donors/default.tpl
+++ b/public/templates/bootstrap/about/donors/default.tpl
@@ -1,8 +1,8 @@
-<fiv class="row">
+<div class="row">
   <div class="col-lg-12">
     <div class="panel panel-info">
       <div class="panel-heading">
-        Pool Donors
+        <i class="fa fa-bitbucket fa-fw"></i> Pool Donors
       </div>
       <div class="panel-body">
       <table class="table table-striped table-bordered table-hover">
diff --git a/public/templates/bootstrap/about/pool/default.tpl b/public/templates/bootstrap/about/pool/default.tpl
index 088b27c1..2eb16f05 100644
--- a/public/templates/bootstrap/about/pool/default.tpl
+++ b/public/templates/bootstrap/about/pool/default.tpl
@@ -2,7 +2,7 @@
     <div class="col-lg-12">
       <div class="panel panel-info">
         <div class="panel-heading">
-          {$GLOBAL.website.name}
+          <i class="fa fa-info fa-fw"></i> {$GLOBAL.website.name}
         </div>
         <div class="panel-body">
 Below is a standard FAQ.
diff --git a/public/templates/bootstrap/account/edit/cashout.tpl b/public/templates/bootstrap/account/edit/cashout.tpl
index 7ac24b9f..fc0f0c9a 100644
--- a/public/templates/bootstrap/account/edit/cashout.tpl
+++ b/public/templates/bootstrap/account/edit/cashout.tpl
@@ -6,7 +6,7 @@
   <div class="col-lg-6">
     <div class="panel panel-info">
       <div class="panel-heading">
-        Cash Out
+        <i class="fa fa-money fa-fw"></i> Cash Out
       </div>
       <div class="panel-body">
         <div class="row">
diff --git a/public/templates/bootstrap/account/edit/detail.tpl b/public/templates/bootstrap/account/edit/detail.tpl
index 5edc6184..8ce2a33f 100644
--- a/public/templates/bootstrap/account/edit/detail.tpl
+++ b/public/templates/bootstrap/account/edit/detail.tpl
@@ -5,7 +5,7 @@
   <div class="col-lg-6">
     <div class="panel panel-info">
       <div class="panel-heading">
-        Account Details
+        <i class="fa fa-edit fa-fw"></i> Account Details
       </div>
       <div class="panel-body">
         <div class="row">
diff --git a/public/templates/bootstrap/account/edit/password.tpl b/public/templates/bootstrap/account/edit/password.tpl
index 261899f4..b4fbac4a 100644
--- a/public/templates/bootstrap/account/edit/password.tpl
+++ b/public/templates/bootstrap/account/edit/password.tpl
@@ -5,7 +5,7 @@
   <div class="col-lg-6">
     <div class="panel panel-info">
       <div class="panel-heading">
-        Change Password
+        <i class="fa fa-key fa-fw"></i> Change Password
       </div>
       <div class="panel-body">
         <div class="row">
diff --git a/public/templates/bootstrap/account/edit/resetpin.tpl b/public/templates/bootstrap/account/edit/resetpin.tpl
index 07586563..601e7974 100644
--- a/public/templates/bootstrap/account/edit/resetpin.tpl
+++ b/public/templates/bootstrap/account/edit/resetpin.tpl
@@ -6,7 +6,7 @@
   <div class="col-lg-6">
     <div class="panel panel-info">
       <div class="panel-heading">
-        Reset PIN
+        <i class="fa fa-lock fa-fw"></i> Reset PIN
       </div>
       <div class="panel-body">
         <div class="row">
diff --git a/public/templates/bootstrap/account/invitations/default.tpl b/public/templates/bootstrap/account/invitations/default.tpl
index 7d3639b1..fa4352a9 100755
--- a/public/templates/bootstrap/account/invitations/default.tpl
+++ b/public/templates/bootstrap/account/invitations/default.tpl
@@ -2,7 +2,7 @@
   <div class="col-lg-4">
     <div class="panel panel-info">
       <div class="panel-heading">
-        Invitation
+        <i class="fa fa-envelope fa-fw"></i> Invitation
       </div>
       <div class="panel-body">
       
@@ -29,7 +29,7 @@
   <div class="col-lg-8">
     <div class="panel panel-info">
       <div class="panel-heading">
-        Past Invitations
+        <i class="fa fa-mail-reply fa-fw"></i> Past Invitations
       </div>
       <div class="panel-body">
       
diff --git a/public/templates/bootstrap/account/notifications/default.tpl b/public/templates/bootstrap/account/notifications/default.tpl
index 6546c6ab..9eba28d8 100755
--- a/public/templates/bootstrap/account/notifications/default.tpl
+++ b/public/templates/bootstrap/account/notifications/default.tpl
@@ -2,7 +2,7 @@
   <div class="col-lg-4">
     <div class="panel panel-info">
       <div class="panel-heading">
-        Notification Settings
+        <i class="fa fa-gear fa-fw"></i> Notification Settings
       </div>
       <div class="panel-body">
       
@@ -24,6 +24,7 @@
                 <input type="hidden" name="data[idle_worker]" value="0" />
                 <input type="checkbox" name="data[idle_worker]" id="data[idle_worker]" value="1"{nocache}{if $SETTINGS['idle_worker']|default:"0" == 1}checked{/if}{/nocache} />
                 </label>
+                <input type="checkbox" checked data-size="large">
               </td>
             </tr>
       {if $DISABLE_BLOCKNOTIFICATIONS|default:"" != 1}
@@ -68,7 +69,7 @@
   <div class="col-lg-8">
     <div class="panel panel-info">
       <div class="panel-heading">
-        Notification History
+        <i class="fa fa-clock-o fa-fw"></i> Notification History
       </div>
       <div class="panel-body">
       
diff --git a/public/templates/bootstrap/account/qrcode/default.tpl b/public/templates/bootstrap/account/qrcode/default.tpl
index 5d730ee9..df8ca293 100644
--- a/public/templates/bootstrap/account/qrcode/default.tpl
+++ b/public/templates/bootstrap/account/qrcode/default.tpl
@@ -14,11 +14,16 @@
   });
   {/literal}
 </script>
-<article class="module width_quarter">
-  <header><h3>API String</h3></header>
-  <div class="module_content">
-    <p>This code will allow you to import the full API string into your mobile application.</p>
-    <div id="qrcodeholder"></div>
+<div class="row">
+  <div class="col-lg-4">
+    <div class="panel panel-info">
+      <div class="panel-heading">
+        <i class="fa fa-qrcode fa-fw"></i> API String
+      </div>
+      <div class="panel-body">
+        <p>This code will allow you to import the full API string into your mobile application.</p>
+      <div id="qrcodeholder"></div>
+    </div>
   </div>
-</article>
+</div>
 {/if}
diff --git a/public/templates/bootstrap/account/transactions/default.tpl b/public/templates/bootstrap/account/transactions/default.tpl
index aff981f0..01434c21 100755
--- a/public/templates/bootstrap/account/transactions/default.tpl
+++ b/public/templates/bootstrap/account/transactions/default.tpl
@@ -3,7 +3,7 @@
   <div class="col-lg-12">
     <div class="panel panel-info">
       <div class="panel-heading">
-        Transaction Summary
+        <i class="fa fa-money fa-fw"></i> Transaction Summary
       </div>
       <div class="panel-body">
         <div class="table-responsive">
@@ -34,7 +34,7 @@
   <div class="col-lg-4">
     <div class="panel panel-info">
       <div class="panel-heading">
-        Transaction Filter
+        <i class="fa fa-search fa-fw"></i> Transaction Filter
       </div>
       <div class="panel-body">
       
@@ -75,7 +75,7 @@
   <div class="col-lg-8">
     <div class="panel panel-info">
       <div class="panel-heading">
-        Transaction History
+        <i class="fa fa-clock-o fa-fw"></i> Transaction History
       </div>
       <div class="panel-body">
 
diff --git a/public/templates/bootstrap/account/workers/default.tpl b/public/templates/bootstrap/account/workers/default.tpl
index 1de47c10..e86607d3 100755
--- a/public/templates/bootstrap/account/workers/default.tpl
+++ b/public/templates/bootstrap/account/workers/default.tpl
@@ -2,7 +2,7 @@
   <div class="col-lg-3">
     <div class="panel panel-info">
       <div class="panel-heading">
-        Add New Worker
+        <i class="fa fa-plus-square-o fa-fw"></i> Add New Worker
       </div>
 
       <form action="{$smarty.server.SCRIPT_NAME}" method="post" role="form">
@@ -28,7 +28,7 @@
   <div class="col-lg-9">
     <div class="panel panel-info">
       <div class="panel-heading">
-        Worker Configuration
+        <i class="fa fa-gears fa-fw"></i> Worker Configuration
       </div>
       
       <form action="{$smarty.server.SCRIPT_NAME}" method="post" role="form">
diff --git a/public/templates/bootstrap/contactform/contactform/default.tpl b/public/templates/bootstrap/contactform/contactform/default.tpl
index 3f6116d0..384643d0 100644
--- a/public/templates/bootstrap/contactform/contactform/default.tpl
+++ b/public/templates/bootstrap/contactform/contactform/default.tpl
@@ -5,7 +5,7 @@
     <div class="col-lg-6">
       <div class="panel panel-info">
         <div class="panel-heading">
-          Contact Us
+          <i class="fa fa-envelope fa-fw"></i> Contact Us
         </div>
         <div class="panel-body">
           <div class="row">
diff --git a/public/templates/bootstrap/contactform/default.tpl b/public/templates/bootstrap/contactform/default.tpl
index 3558af49..9f46888e 100644
--- a/public/templates/bootstrap/contactform/default.tpl
+++ b/public/templates/bootstrap/contactform/default.tpl
@@ -5,7 +5,7 @@
     <div class="col-lg-6">
       <div class="panel panel-info">
         <div class="panel-heading">
-          Contact Us
+          <i class="fa fa-envelope fa-fw"></i> Contact Us
       </div>
       <div class="panel-body">
         <div class="row">
diff --git a/public/templates/bootstrap/gettingstarted/default.tpl b/public/templates/bootstrap/gettingstarted/default.tpl
index 9b4654c5..76218156 100644
--- a/public/templates/bootstrap/gettingstarted/default.tpl
+++ b/public/templates/bootstrap/gettingstarted/default.tpl
@@ -2,7 +2,7 @@
     <div class="col-lg-12">
       <div class="panel panel-info">
         <div class="panel-heading">
-          Getting Started Guide
+          <i class="fa fa-question fa-fw"></i> Getting Started Guide
         </div>
         <div class="panel-body">
         
diff --git a/public/templates/bootstrap/home/default.tpl b/public/templates/bootstrap/home/default.tpl
index 106b684b..e683b196 100755
--- a/public/templates/bootstrap/home/default.tpl
+++ b/public/templates/bootstrap/home/default.tpl
@@ -2,14 +2,14 @@
       <div class="col-lg-12">
         <div class="panel panel-default">
           <div class="panel-heading">
-            <h4 class="panel-title">latest News</h4>
+            <h4><i class="fa fa-info-circle fa-fw"></i> latest News</h4>
           </div>
           <div class="panel-body">
             <div class="panel-group" id="accordion">
 {section name=news loop=$NEWS}
               <div class="panel panel-default">
                 <div class="panel-heading">
-                  <a data-toggle="collapse" data-parent="#accordion" href="#collapse{$smarty.section.news.index}">{$NEWS[news].header}</a>
+                  <i class="fa fa-info fa-fw"></i> <a data-toggle="collapse" data-parent="#accordion" href="#collapse{$smarty.section.news.index}">{$NEWS[news].header}</a>
                   <br />
                   <font size="1px">posted {$NEWS[news].time|date_format:"%b %e, %Y at %H:%M"}{if $HIDEAUTHOR|default:"0" == 0} by <b>{$NEWS[news].author}</b>{/if}</font>
                 </div>
diff --git a/public/templates/bootstrap/master.tpl b/public/templates/bootstrap/master.tpl
index 8dad0272..a147cbc6 100644
--- a/public/templates/bootstrap/master.tpl
+++ b/public/templates/bootstrap/master.tpl
@@ -9,10 +9,7 @@
   <link rel="stylesheet" href="{$PATH}/css/ie.css" type="text/css" media="screen" />
   <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
   <![endif]-->
-  <script type="text/javascript" src="{$PATH}/js/jquery-2.0.3.min.js"></script>
-  <script type="text/javascript" src="{$PATH}/js/jquery-migrate-1.2.1.min.js"></script>
-  <script type="text/javascript" src="{$PATH}/js/jquery.equalHeight.js"></script>
-  <script type="text/javascript" src="{$PATH}/../global/js/number_format.js"></script>
+
   <!--[if IE]><script type="text/javascript" src="{$PATH}/js/excanvas.js"></script><![endif]-->
   {literal}<script>
     var zxcvbnPath = "{/literal}{$PATH}{literal}/js/zxcvbn/zxcvbn.js";
@@ -21,11 +18,30 @@
   {if $GLOBAL.statistics.analytics.enabled}
   {$GLOBAL.statistics.analytics.code nofilter}
   {/if}
-  <link href="{$PATH}/css/bootstrap.min.css" rel="stylesheet">
-  <link href="{$PATH}/font-awesome/css/font-awesome.css" rel="stylesheet">
+  
+  
+  <!--<link href="{$PATH}/css/bootstrap.min.css" rel="stylesheet">-->
+  <link rel="stylesheet" href="http://netdna.bootstrapcdn.com/bootstrap/3.1.0/css/bootstrap.min.css">
+  <link href="{$PATH}/css/bootstrap-switch.css" rel="stylesheet">
+  <!--<link href="{$PATH}/font-awesome/css/font-awesome.css" rel="stylesheet">-->
+  <link rel="stylesheet" href="http://netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.min.css">
+  
   <link href="{$PATH}/css/plugins/morris/morris-0.4.3.min.css" rel="stylesheet">
   <link href="{$PATH}/css/plugins/timeline/timeline.css" rel="stylesheet">
   <link href="{$PATH}/css/mpos.css" rel="stylesheet">
+  
+  <script src="http://cdnjs.cloudflare.com/ajax/libs/jquery/2.0.3/jquery.min.js"></script>
+  <script src="http://netdna.bootstrapcdn.com/bootstrap/3.1.0/js/bootstrap.min.js"></script>
+  <script src="{$PATH}/js/bootstrap-switch.js"></script>
+    
+  <script src="{$PATH}/js/plugins/metisMenu/jquery.metisMenu.js"></script>
+    
+  <!-- Page-Level Plugin Scripts - Morris -->
+  <script src="{$PATH}/js/plugins/morris/raphael-2.1.0.min.js"></script>
+  <script src="{$PATH}/js/plugins/morris/morris.js"></script>
+    
+  <script src="{$PATH}/js/mpos.js"></script>
+    
 </head>
 <body>
 
@@ -52,13 +68,3 @@
       </div>
     </div>
 
-    <script src="{$PATH}/js/jquery-1.10.2.js"></script>
-    <script src="{$PATH}/js/bootstrap.min.js"></script>
-    <script src="{$PATH}/js/plugins/metisMenu/jquery.metisMenu.js"></script>
-    
-    <!-- Page-Level Plugin Scripts - Morris -->
-    <script src="{$PATH}/js/plugins/morris/raphael-2.1.0.min.js"></script>
-    <script src="{$PATH}/js/plugins/morris/morris.js"></script>
-    
-    <script src="{$PATH}/js/mpos.js"></script>
-
diff --git a/public/templates/bootstrap/tac/default.tpl b/public/templates/bootstrap/tac/default.tpl
index a6c0b96e..75c6070b 100644
--- a/public/templates/bootstrap/tac/default.tpl
+++ b/public/templates/bootstrap/tac/default.tpl
@@ -2,7 +2,7 @@
     <div class="col-lg-12">
       <div class="panel panel-info">
         <div class="panel-heading">
-          Terms &amp; Conditions
+          <i class="fa fa-book fa-fw"></i> Terms &amp; Conditions
         </div>
         <div class="panel-body">
           <p>This Agreement governs your use of {$GLOBAL.website.name}.</p>