diff --git a/src/app/pages/dashboard/dashboardCalendar/DashboardCalendarCtrl.js b/src/app/pages/dashboard/dashboardCalendar/DashboardCalendarCtrl.js
index 370a68379..82a23f0ff 100644
--- a/src/app/pages/dashboard/dashboardCalendar/DashboardCalendarCtrl.js
+++ b/src/app/pages/dashboard/dashboardCalendar/DashboardCalendarCtrl.js
@@ -17,7 +17,7 @@
         center: 'title',
         right: 'month,agendaWeek,agendaDay'
       },
-      defaultDate: '2015-07-12',
+      defaultDate: '2016-03-08',
       selectable: true,
       selectHelper: true,
       select: function (start, end) {
@@ -38,55 +38,24 @@
       events: [
         {
           title: 'All Day Event',
-          start: '2015-07-01'
+          start: '2016-03-01',
+          color: layoutColors.success
         },
         {
           title: 'Long Event',
-          start: '2015-07-07',
-          end: '2015-07-10',
-          color: layoutColors.danger
-        },
-        {
-          id: 999,
-          title: 'Repeating Event',
-          start: '2015-07-09T16:00:00'
-        },
-        {
-          id: 999,
-          title: 'Repeating Event',
-          start: '2015-07-16T16:00:00'
-        },
-        {
-          title: 'Conference',
-          start: '2015-07-11',
-          end: '2015-07-13',
-          color: layoutColors.successLight
-        },
-        {
-          title: 'Meeting',
-          start: '2015-07-12T10:30:00',
-          end: '2015-07-12T12:30:00',
-          color: layoutColors.danger
-        },
-        {
-          title: 'Meeting',
-          start: '2015-07-14T14:30:00',
-          color: layoutColors.successLight
+          start: '2016-03-07',
+          end: '2016-03-10',
+          color: layoutColors.info
         },
         {
           title: 'Dinner',
-          start: '2015-07-14T20:00:00',
-          color: layoutColors.success
+          start: '2016-03-14T20:00:00',
+          color: layoutColors.warning
         },
         {
           title: 'Birthday Party',
-          start: '2015-07-13T07:00:00',
-          color: layoutColors.success
-        },
-        {
-          title: 'Click for Google',
-          url: 'http://google.com/',
-          start: '2015-07-28'
+          start: '2016-04-01T07:00:00',
+          color: layoutColors.info
         }
       ]
     });
diff --git a/src/app/pages/form/inputs/widgets/checkboxesRadios.html b/src/app/pages/form/inputs/widgets/checkboxesRadios.html
index afde305fc..17bc7f7db 100644
--- a/src/app/pages/form/inputs/widgets/checkboxesRadios.html
+++ b/src/app/pages/form/inputs/widgets/checkboxesRadios.html
@@ -1,65 +1,56 @@
-<div class="row">
-  <div class="col-md-6">
-    <div class="row checkbox-demo-row">
-      <div class="col-xs-4">
-        <label class="checkbox-inline custom-checkbox nowrap">
-          <input type="checkbox" id="inlineCheckbox01" value="option1">
-          <span>Check 1</span>
-        </label>
-      </div>
-      <div class="col-xs-4">
-        <label class="checkbox-inline custom-checkbox nowrap">
-          <input type="checkbox" id="inlineCheckbox02" value="option2">
-          <span>Check 2</span>
-        </label>
-      </div>
-      <div class="col-xs-4">
-        <label class="checkbox-inline custom-checkbox nowrap">
-          <input type="checkbox" id="inlineCheckbox03" value="option3">
-          <span>Check 3</span>
-        </label>
-      </div>
+<div class="checkbox-demo-row">
+  <div class="input-demo checkbox-demo row">
+    <div class="col-md-4">
+      <label class="checkbox-inline custom-checkbox nowrap">
+        <input type="checkbox" id="inlineCheckbox01" value="option1">
+        <span>Check 1</span>
+      </label>
     </div>
-  </div>
-  <div class="col-md-6">
-    <div class="row checkbox-demo-row">
-      <div class="col-xs-4">
-        <label class="radio-inline custom-radio nowrap">
-          <input type="radio" name="inlineRadioOptions" id="inlineRadio1" value="option1">
-          <span>Option 1</span>
-        </label>
-      </div>
-      <div class="col-xs-4">
-        <label class="radio-inline custom-radio nowrap">
-          <input type="radio" name="inlineRadioOptions" id="inlineRadio2" value="option2">
-          <span>Option 2</span>
-        </label>
-      </div>
-      <div class="col-xs-4">
-        <label class="radio-inline custom-radio nowrap">
-          <input type="radio" name="inlineRadioOptions" id="inlineRadio3" value="option3">
-          <span>Option3</span>
-        </label>
-      </div>
+    <div class="col-md-4">
+      <label class="checkbox-inline custom-checkbox nowrap">
+        <input type="checkbox" id="inlineCheckbox02" value="option2">
+        <span>Check 2</span>
+      </label>
     </div>
-  </div>
-</div>
-
-<div class="row">
-  <div class="col-sm-6">
-    <div class="checkbox disabled">
-      <label class="custom-checkbox nowrap">
-        <input type="checkbox" value="" disabled>
-        <span>Checkbox is disabled</span>
+    <div class="col-md-4">
+      <label class="checkbox-inline custom-checkbox nowrap">
+        <input type="checkbox" id="inlineCheckbox03" value="option3">
+        <span>Check 3</span>
       </label>
     </div>
   </div>
-  <div class="col-sm-6">
-    <div class="radio disabled">
-      <label class="custom-radio nowrap">
-        <input type="radio" name="optionsRadios" id="optionsRadios3" value="option3" disabled>
-        <span>Disabled option</span>
+  <div class="input-demo radio-demo row">
+    <div class="col-md-4">
+      <label class="radio-inline custom-radio nowrap">
+        <input type="radio" name="inlineRadioOptions" id="inlineRadio1" value="option1">
+        <span>Option 1</span>
+      </label>
+    </div>
+    <div class="col-md-4">
+      <label class="radio-inline custom-radio nowrap">
+        <input type="radio" name="inlineRadioOptions" id="inlineRadio2" value="option2">
+        <span>Option 2</span>
+      </label>
+    </div>
+    <div class="col-md-4">
+      <label class="radio-inline custom-radio nowrap">
+        <input type="radio" name="inlineRadioOptions" id="inlineRadio3" value="option3">
+        <span>Option3</span>
       </label>
     </div>
   </div>
+</div>
+<div>
+  <div class="checkbox disabled">
+    <label class="custom-checkbox nowrap">
+      <input type="checkbox" value="" disabled>
+      <span>Checkbox is disabled</span>
+    </label>
+  </div>
+  <div class="radio disabled">
+    <label class="custom-radio nowrap">
+      <input type="radio" name="optionsRadios" id="optionsRadios3" value="option3" disabled>
+      <span>Disabled option</span>
+    </label>
+  </div>
 </div>
\ No newline at end of file
diff --git a/src/app/pages/maps/map-lines/MapLinesPageCtrl.js b/src/app/pages/maps/map-lines/MapLinesPageCtrl.js
index 860c012ac..5beb8ce9c 100644
--- a/src/app/pages/maps/map-lines/MapLinesPageCtrl.js
+++ b/src/app/pages/maps/map-lines/MapLinesPageCtrl.js
@@ -23,7 +23,6 @@
           linkToObject: 'london',
           images: [ {
             id: 'london',
-            color: layoutColors.warningBg,
             svgPath: targetSVG,
             title: 'London',
             latitude: 51.5002,
@@ -95,7 +94,6 @@
 
             {
               id: 'vilnius',
-              color: layoutColors.warningBg,
               svgPath: targetSVG,
               title: 'Vilnius',
               latitude: 54.6896,
@@ -255,7 +253,6 @@
 
         imagesSettings: {
           color: layoutColors.warningBg,
-          rollOverColor: layoutColors.warningBg,
           selectedColor: layoutColors.warning
         },
 
diff --git a/src/app/pages/profile/profile.html b/src/app/pages/profile/profile.html
index a60d3a95f..8f6bf51e1 100644
--- a/src/app/pages/profile/profile.html
+++ b/src/app/pages/profile/profile.html
@@ -2,7 +2,7 @@
   <div class="panel-content">
     <div class="progress-info">Your profile is 70% Complete</div>
     <div class="progress">
-      <div class="progress-bar progress-bar-success progress-bar-striped active" role="progressbar"
+      <div class="progress-bar progress-bar-primary progress-bar-striped active" role="progressbar"
            aria-valuenow="70" aria-valuemin="0" aria-valuemax="100" style="width: 70%">
       </div>
     </div>
@@ -161,21 +161,21 @@ <h3 class="with-line">Send Email Notifications</h3>
           <label class="col-xs-8">When I receive a message</label>
 
           <div class="col-xs-4">
-            <switch color="success" ng-model="switches[0]"></switch>
+            <switch color="primary" ng-model="switches[0]"></switch>
           </div>
         </div>
         <div class="form-group row clearfix">
           <label class="col-xs-8">When Someone sends me an invitation</label>
 
           <div class="col-xs-4">
-            <switch color="success" ng-model="switches[1]"></switch>
+            <switch color="primary" ng-model="switches[1]"></switch>
           </div>
         </div>
         <div class="form-group row clearfix">
           <label class="col-xs-8">When profile information changes</label>
 
           <div class="col-xs-4">
-            <switch color="success" ng-model="switches[2]"></switch>
+            <switch color="primary" ng-model="switches[2]"></switch>
           </div>
         </div>
       </div>
@@ -184,14 +184,14 @@ <h3 class="with-line">Send Email Notifications</h3>
           <label class="col-xs-8">When anyone logs into your account from a new device or browser</label>
 
           <div class="col-xs-4">
-            <switch color="success" ng-model="switches[3]"></switch>
+            <switch color="primary" ng-model="switches[3]"></switch>
           </div>
         </div>
         <div class="form-group row clearfix">
           <label class="col-xs-8">Weekly Reports</label>
 
           <div class="col-xs-4">
-            <switch color="success" ng-model="switches[4]"></switch>
+            <switch color="primary" ng-model="switches[4]"></switch>
           </div>
         </div>
 
@@ -199,12 +199,12 @@ <h3 class="with-line">Send Email Notifications</h3>
           <label class="col-xs-8">Daily Reports</label>
 
           <div class="col-xs-4">
-            <switch color="success" ng-model="switches[5]"></switch>
+            <switch color="primary" ng-model="switches[5]"></switch>
           </div>
         </div>
       </div>
     </div>
-    <button type="button" class="btn btn-success btn-with-icon save-profile">
+    <button type="button" class="btn btn-primary btn-with-icon save-profile">
       <i class="ion-android-checkmark-circle"></i>Update Profile
     </button>
   </div>
diff --git a/src/app/pages/ui/notifications/notifications.html b/src/app/pages/ui/notifications/notifications.html
index 3ec86672e..c4b6a2e23 100644
--- a/src/app/pages/ui/notifications/notifications.html
+++ b/src/app/pages/ui/notifications/notifications.html
@@ -115,7 +115,7 @@
       <div class="control">
         <label for="timeOut">Time out</label>
         <input type="text" class="form-control" id="timeOut" ng-model="options.timeOut" placeholder="ms">
-        <label for="timeOut">If you set it to 0, it will stick</label>
+        <label class="timeout-sub-label" for="timeOut">If you set it to 0, it will stick</label>
       </div>
       <div class="control">
         <label for="extendedTimeOut">Extended time out</label>
diff --git a/src/app/theme/components/pageTop/pageTop.html b/src/app/theme/components/pageTop/pageTop.html
index 9bb4841b6..c09c243eb 100644
--- a/src/app/theme/components/pageTop/pageTop.html
+++ b/src/app/theme/components/pageTop/pageTop.html
@@ -9,7 +9,7 @@
 
   <div class="user-profile clearfix">
     <div class="al-user-profile" uib-dropdown>
-      <a uib-dropdown-toggle>
+      <a uib-dropdown-toggle class="profile-toggle-link">
         <img ng-src="{{::( 'Nasta' | profilePicture )}}">
       </a>
       <ul  class="top-dropdown-menu profile-dropdown" uib-dropdown-menu>
diff --git a/src/assets/img/app/my-app-logo.png b/src/assets/img/app/my-app-logo.png
index a563c3d70..1330932db 100644
Binary files a/src/assets/img/app/my-app-logo.png and b/src/assets/img/app/my-app-logo.png differ
diff --git a/src/assets/img/favicon-16x16.png b/src/assets/img/favicon-16x16.png
index 4bb9aada5..b67bf86a8 100644
Binary files a/src/assets/img/favicon-16x16.png and b/src/assets/img/favicon-16x16.png differ
diff --git a/src/assets/img/favicon-32x32.png b/src/assets/img/favicon-32x32.png
index 8058f20f0..e2ea43cf9 100644
Binary files a/src/assets/img/favicon-32x32.png and b/src/assets/img/favicon-32x32.png differ
diff --git a/src/assets/img/favicon-96x96.png b/src/assets/img/favicon-96x96.png
index 0a0b0f9d9..06f234311 100644
Binary files a/src/assets/img/favicon-96x96.png and b/src/assets/img/favicon-96x96.png differ
diff --git a/src/index.html b/src/index.html
index 149024bfe..0e777e9d4 100644
--- a/src/index.html
+++ b/src/index.html
@@ -8,9 +8,9 @@
 
   <link href='https://fonts.googleapis.com/css?family=Roboto:400,100,100italic,300,300italic,400italic,500,500italic,700,700italic,900italic,900&subset=latin,greek,greek-ext,vietnamese,cyrillic-ext,latin-ext,cyrillic' rel='stylesheet' type='text/css'>
 
-  <link rel="icon" type="image/png" sizes="32x32" href="img/favicon-32x32.png">
-  <link rel="icon" type="image/png" sizes="96x96" href="img/favicon-96x96.png">
-  <link rel="icon" type="image/png" sizes="16x16" href="img/favicon-16x16.png">
+  <link rel="icon" type="image/png" sizes="32x32" href="assets/img/favicon-32x32.png">
+  <link rel="icon" type="image/png" sizes="96x96" href="assets/img/favicon-96x96.png">
+  <link rel="icon" type="image/png" sizes="16x16" href="assets/img/favicon-16x16.png">
 
   <!-- build:css({.tmp/serve,src}) styles/vendor.css -->
   <!-- bower:css -->
diff --git a/src/sass/app/_form.scss b/src/sass/app/_form.scss
index 7b657d061..8844cb479 100644
--- a/src/sass/app/_form.scss
+++ b/src/sass/app/_form.scss
@@ -216,7 +216,7 @@ label.custom-checkbox {
       & + span {
         color: $disabled;
         &:before {
-          border-color: $disabled-bg !important;
+          border-color: $disabled !important;
         }
       }
     }
@@ -238,7 +238,7 @@ label.custom-checkbox {
       color: $default;
       content: "\a0";
       background-color: transparent;
-      border: 1px solid #c8c8c8;
+      border: 1px solid $default;
       border-radius: 0;
       display: inline-block;
       text-align: center;
@@ -323,6 +323,10 @@ label.custom-input-danger {
   }
 }
 
+.input-demo{
+  line-height: 25px;
+}
+
 @mixin validationState($color, $focusColor) {
   .control-label {
     color: $color;
@@ -492,17 +496,18 @@ label.custom-input-danger {
   background-color: transparent;
   border: 1px solid $input-border;
   box-shadow: none;
-  border-radius: 0;
   color: #555555;
   max-width: 100%;
   font-size: 14px;
+  line-height: 26px;
   width: 100%;
   &.form-control {
     display: block;
     width: 100%;
   }
   .tag {
-    border-radius: 0;
+    border-radius: 3px;
+    font-weight: $font-normal;
     font-size: 11px;
     padding: 4px 8px;
     & [data-role="remove"]:hover {
@@ -510,20 +515,11 @@ label.custom-input-danger {
     }
   }
   input {
+    line-height: 22px;
     font-size: 11px;
   }
 }
 
-@media (max-width: $resM) {
-  .form-inline {
-    .checkbox {
-      margin-left: 15px;
-    }
-    label.custom-checkbox > span, label.custom-radio > span {
-      display: inline-block;
-    }
-  }
-}
 
 .progress-bar-primary {
   background-color: $primary;
diff --git a/src/sass/app/_notifications.scss b/src/sass/app/_notifications.scss
index 133dcd479..ae9193be9 100644
--- a/src/sass/app/_notifications.scss
+++ b/src/sass/app/_notifications.scss
@@ -43,4 +43,8 @@
   color: rgba(255, 255, 255, 0.9);
   background-color: rgba(0, 0, 0, 0.33);
   border: none;
+}
+
+.timeout-sub-label{
+  margin-top: 5px;
 }
\ No newline at end of file
diff --git a/src/sass/app/_profile.scss b/src/sass/app/_profile.scss
index a7a2881a2..3e9860c81 100644
--- a/src/sass/app/_profile.scss
+++ b/src/sass/app/_profile.scss
@@ -39,8 +39,8 @@ h3.with-line {
     padding: 15px 15px 25px;
   }
 
-  .progress-bar-success {
-    background-color: $success-light;
+  .progress-bar-primary {
+    background-color: $primary-light;
   }
 
   .form-group {
@@ -88,7 +88,7 @@ h3.with-line {
     font-size: 32px;
     background: #ffffff;
     cursor: pointer;
-    color: $success;
+    color: $primary;
     top: -11px;
     right: -11px;
     height: 26px;
@@ -127,7 +127,7 @@ h3.with-line {
   margin: 23px 0 12px 12px;
 }
 
-$snColor: $success;
+$snColor: $primary;
 $snPadding: 8px;
 a.sn-link {
   transition: none;
diff --git a/src/sass/theme/_buttons.scss b/src/sass/theme/_buttons.scss
index b98d089c8..6762f9de7 100644
--- a/src/sass/theme/_buttons.scss
+++ b/src/sass/theme/_buttons.scss
@@ -35,8 +35,10 @@ $hover: 24;
 }
 
 .open > .dropdown-toggle {
-  &.btn-primary {
+  &.btn.btn-primary {
     @include styleButton($primary, $primary - $hover);
+    background-color: $primary-bg;
+    border-color: $primary-bg;
   }
   &.btn-default {
     @include styleButton(transparent, $default);
@@ -59,13 +61,20 @@ $hover: 24;
   outline: none !important;
 }
 
-.btn-primary {
+button.btn.btn-primary {
   @include buttonColor($primary, $primary);
+  &:active, &:target {
+    background-color: $primary-bg;
+  }
 }
 
-.btn-default {
+button.btn.btn-default {
   border-width: 1px;
   @include buttonColor(transparent, $default);
+  &:active, &:target, &:focus {
+    background-color: rgba(0, 0, 0, 0.2);
+    color: $default ;
+  }
 }
 
 .btn-success {
@@ -136,7 +145,7 @@ $hover: 24;
   .progress-inner {
     background-color: darken($btnColor, 20);
   }
-  &.progress-button-perspective  {
+  &.progress-button-perspective {
     background: none;
     .content {
       background-color: $btnColor;
@@ -178,16 +187,16 @@ $hover: 24;
   }
 }
 
-.btn-raised{
-  box-shadow: 0px 2px 5px 0px rgba(0,0,0,0.35);
+.btn-raised {
+  box-shadow: 0px 2px 5px 0px rgba(0, 0, 0, 0.35);
 }
 
-.btn-mm{
+.btn-mm {
   padding: 5px 11px;
   font-size: 13px;
 }
 
-.btn-xm{
+.btn-xm {
   padding: 8px 14px;
   font-size: 16px;
 }
diff --git a/src/sass/theme/components/_pageTop.scss b/src/sass/theme/components/_pageTop.scss
index a5b04a4fb..65770fe27 100644
--- a/src/sass/theme/components/_pageTop.scss
+++ b/src/sass/theme/components/_pageTop.scss
@@ -166,3 +166,7 @@ a.collapse-menu-link {
     display: none;
   }
 }
+
+.profile-toggle-link{
+  cursor: pointer;
+}
diff --git a/src/sass/theme/dashboard/_calendar.scss b/src/sass/theme/dashboard/_calendar.scss
index 926fee5d8..21ff834df 100644
--- a/src/sass/theme/dashboard/_calendar.scss
+++ b/src/sass/theme/dashboard/_calendar.scss
@@ -734,7 +734,7 @@ body.badmin-transparent{
 
   .fc-head{
     color: $default;
-    background-color: $success-light;
+    background-color: $primary;
     td, th{
       border:none;
     }
diff --git a/src/sass/theme/dashboard/_timeline.scss b/src/sass/theme/dashboard/_timeline.scss
index a78136c4c..b9f0edc2a 100644
--- a/src/sass/theme/dashboard/_timeline.scss
+++ b/src/sass/theme/dashboard/_timeline.scss
@@ -81,6 +81,7 @@
   margin-left: 60px;
   background: $primary;
   padding: 1em;
+  border-radius: 5px;
   &:after {
     content: "";
     display: table;
@@ -137,15 +138,15 @@
 }
 
 .cd-timeline-content-yellow {
-  @include cd-timeline-color($warning);
+  @include cd-timeline-color(rgba(0,0,0,.2));
 }
 
 .cd-timeline-content-red {
-  @include cd-timeline-color($danger);
+  @include cd-timeline-color(rgba(0,0,0,.2));
 }
 
 .cd-timeline-content-blue {
-  @include cd-timeline-color($primary);
+  @include cd-timeline-color(rgba(0,0,0,.2));
 }
 
 .no-touch .cd-timeline-content .cd-read-more:hover {
diff --git a/src/sass/theme/dashboard/_todo.scss b/src/sass/theme/dashboard/_todo.scss
index 5ca9063ca..81417582b 100644
--- a/src/sass/theme/dashboard/_todo.scss
+++ b/src/sass/theme/dashboard/_todo.scss
@@ -162,7 +162,6 @@ body.badmin-transparent {
       &:hover{
         .blur-container{
           box-shadow: 0px 1px 0px 0px rgba(255, 255, 255, 0.12);
-          border-bottom: 1px solid rgba(0, 0, 0, 0.12);
         }
         .blur-box {
           height: 100%;