diff --git a/src/app/@theme/components/header/header.component.scss b/src/app/@theme/components/header/header.component.scss
index 450e027f..5feb1bc8 100644
--- a/src/app/@theme/components/header/header.component.scss
+++ b/src/app/@theme/components/header/header.component.scss
@@ -149,12 +149,8 @@
     line-height: 1;
 
     i {
-      color: nb-theme(color-success);
+      color: nb-theme(color-fg-highlight);
       font-size: 2.25rem;
-
-      @include nb-for-theme(cosmic) {
-        color: nb-theme(link-color);
-      }
     }
   }
 
diff --git a/src/app/@theme/layouts/one-column/one-column.layout.scss b/src/app/@theme/layouts/one-column/one-column.layout.scss
index 1c4aa9d7..3eaf398f 100644
--- a/src/app/@theme/layouts/one-column/one-column.layout.scss
+++ b/src/app/@theme/layouts/one-column/one-column.layout.scss
@@ -48,7 +48,7 @@
       .main-btn {
         width: 46px;
         height: 44px;
-        padding: 0;
+        padding: 0.375rem;
         border-radius: 5px;
         transition: none;
 
diff --git a/src/app/@theme/layouts/one-column/one-column.layout.ts b/src/app/@theme/layouts/one-column/one-column.layout.ts
index b112b9e8..6675dfda 100644
--- a/src/app/@theme/layouts/one-column/one-column.layout.ts
+++ b/src/app/@theme/layouts/one-column/one-column.layout.ts
@@ -12,9 +12,9 @@ import { Component } from '@angular/core';
 
       <nb-sidebar class="menu-sidebar" tag="menu-sidebar" responsive>
         <nb-sidebar-header>
-          <button class="btn btn-hero-success main-btn">
+          <a href="https://github.com/akveo/nebular" target="_blank" class="btn btn-hero-success main-btn">
             <i class="ion ion-social-github"></i> <span>Support Us</span>
-          </button>
+          </a>
         </nb-sidebar-header>
         <ng-content select="nb-menu"></ng-content>
       </nb-sidebar>
diff --git a/src/app/@theme/layouts/sample/sample.layout.scss b/src/app/@theme/layouts/sample/sample.layout.scss
index 6f4b2826..525cf51b 100644
--- a/src/app/@theme/layouts/sample/sample.layout.scss
+++ b/src/app/@theme/layouts/sample/sample.layout.scss
@@ -89,7 +89,7 @@
       .main-btn {
         width: 46px;
         height: 44px;
-        padding: 0;
+        padding: 0.375rem;
         border-radius: 5px;
         transition: none;
 
diff --git a/src/app/@theme/layouts/sample/sample.layout.ts b/src/app/@theme/layouts/sample/sample.layout.ts
index f6b35dd4..ae46172f 100644
--- a/src/app/@theme/layouts/sample/sample.layout.ts
+++ b/src/app/@theme/layouts/sample/sample.layout.ts
@@ -19,9 +19,9 @@ import { StateService } from '../../../@core/data/state.service';
                    responsive
                    [right]="sidebar.id === 'right'">
         <nb-sidebar-header>
-          <button class="btn btn-hero-success main-btn">
+          <a href="https://github.com/akveo/nebular" target="_blank" class="btn btn-hero-success main-btn">
             <i class="ion ion-social-github"></i> <span>Support Us</span>
-          </button>
+          </a>
         </nb-sidebar-header>
         <ng-content select="nb-menu"></ng-content>
       </nb-sidebar>
diff --git a/src/app/@theme/layouts/three-columns/three-columns.layout.scss b/src/app/@theme/layouts/three-columns/three-columns.layout.scss
index b2241316..e7feb212 100644
--- a/src/app/@theme/layouts/three-columns/three-columns.layout.scss
+++ b/src/app/@theme/layouts/three-columns/three-columns.layout.scss
@@ -52,7 +52,7 @@
       .main-btn {
         width: 46px;
         height: 44px;
-        padding: 0;
+        padding: 0.375rem;
         border-radius: 5px;
         transition: none;
 
diff --git a/src/app/@theme/layouts/three-columns/three-columns.layout.ts b/src/app/@theme/layouts/three-columns/three-columns.layout.ts
index 0b6207ea..fe1e9ffe 100644
--- a/src/app/@theme/layouts/three-columns/three-columns.layout.ts
+++ b/src/app/@theme/layouts/three-columns/three-columns.layout.ts
@@ -12,9 +12,9 @@ import { Component } from '@angular/core';
 
       <nb-sidebar class="menu-sidebar" tag="menu-sidebar" responsive >
         <nb-sidebar-header>
-          <button class="btn btn-hero-success main-btn">
+          <a href="https://github.com/akveo/nebular" target="_blank" class="btn btn-hero-success main-btn">
             <i class="ion ion-social-github"></i> <span>Support Us</span>
-          </button>
+          </a>
         </nb-sidebar-header>
         <ng-content select="nb-menu"></ng-content>
       </nb-sidebar>
diff --git a/src/app/@theme/layouts/two-columns/two-columns.layout.scss b/src/app/@theme/layouts/two-columns/two-columns.layout.scss
index b2241316..e7feb212 100644
--- a/src/app/@theme/layouts/two-columns/two-columns.layout.scss
+++ b/src/app/@theme/layouts/two-columns/two-columns.layout.scss
@@ -52,7 +52,7 @@
       .main-btn {
         width: 46px;
         height: 44px;
-        padding: 0;
+        padding: 0.375rem;
         border-radius: 5px;
         transition: none;
 
diff --git a/src/app/@theme/layouts/two-columns/two-columns.layout.ts b/src/app/@theme/layouts/two-columns/two-columns.layout.ts
index 51ea0a0f..4a41f22f 100644
--- a/src/app/@theme/layouts/two-columns/two-columns.layout.ts
+++ b/src/app/@theme/layouts/two-columns/two-columns.layout.ts
@@ -12,9 +12,9 @@ import { Component } from '@angular/core';
 
       <nb-sidebar class="menu-sidebar" tag="menu-sidebar" responsive >
         <nb-sidebar-header>
-          <button class="btn btn-hero-success main-btn">
+          <a href="https://github.com/akveo/nebular" target="_blank" class="btn btn-hero-success main-btn">
             <i class="ion ion-social-github"></i> <span>Support Us</span>
-          </button>
+          </a>
         </nb-sidebar-header>
         <ng-content select="nb-menu"></ng-content>
       </nb-sidebar>
diff --git a/src/app/pages/forms/form-inputs/form-inputs.component.scss b/src/app/pages/forms/form-inputs/form-inputs.component.scss
index e07f52fb..009e3cd4 100644
--- a/src/app/pages/forms/form-inputs/form-inputs.component.scss
+++ b/src/app/pages/forms/form-inputs/form-inputs.component.scss
@@ -102,7 +102,6 @@
 
   .dropdown-menu {
     width: auto;
-
   }
 
   .form-group label {