diff --git a/docs/app/shared/components/download-admin/download-admin.component.scss b/docs/app/shared/components/download-admin/download-admin.component.scss
index 01d5f42f..75c0a5de 100644
--- a/docs/app/shared/components/download-admin/download-admin.component.scss
+++ b/docs/app/shared/components/download-admin/download-admin.component.scss
@@ -9,7 +9,6 @@
 
 @include nb-install-component() {
   .btn {
-    display: block;
     font-family: nb-theme(font-main), sans-serif;
     border-radius: 3px;
     border: none;
diff --git a/docs/app/shared/components/download-form/download-form.component.html b/docs/app/shared/components/download-form/download-form.component.html
index a14fcd59..a10636fe 100644
--- a/docs/app/shared/components/download-form/download-form.component.html
+++ b/docs/app/shared/components/download-form/download-form.component.html
@@ -1,12 +1,11 @@
 <nb-card>
   <nb-card-header>
     <span>Download</span>
-    <div class="close-icon" (click)="closeDialog()">
+    <button nbButton status="basic" appearance="ghost" class="close-icon" (click)="closeDialog()">
       <i [innerHTML]="'close' | eva: { width: 26, height: 26, fill: '#222b45' }"></i>
-    </div>
+    </button>
   </nb-card-header>
   <nb-card-body>
-
     <div id="hubspotForm"></div>
   </nb-card-body>
 </nb-card>
diff --git a/docs/app/shared/components/download-form/download-form.component.scss b/docs/app/shared/components/download-form/download-form.component.scss
index 88940b53..8fc83cbc 100644
--- a/docs/app/shared/components/download-form/download-form.component.scss
+++ b/docs/app/shared/components/download-form/download-form.component.scss
@@ -17,14 +17,12 @@
   nb-card-header {
     display: flex;
     align-items: center;
+    justify-content: flex-end;
   }
 
   .close-icon {
-    cursor: pointer;
     margin-left: auto;
-    right: 0.1rem;
-    top: 0.1rem;
-    width: fit-content;
+    padding: 0;
   }
 
   ::ng-deep .custom-form {
@@ -43,23 +41,35 @@
 
     input.hs-input {
       width: 100%;
-      font-size: nb-theme(font-size-sm);
-      padding: 0.75rem 1rem !important;
-      border: 1px solid #e4e9f2;
-      box-shadow: nb-theme(shadow-default);
-      border-radius: 0.25rem;
+      color: nb-theme(input-basic-text-color);
+      font-size: nb-theme(input-medium-text-font-size);
+      font-weight: nb-theme(input-medium-text-font-weight);
+      line-height: nb-theme(input-medium-text-line-height);
+      padding: nb-theme(input-medium-padding) !important;
+      border: nb-theme(input-border-width) nb-theme(input-border-style) nb-theme(input-basic-border-color);
+      border-radius: nb-theme(input-rectangle-border-radius);
+      background-color: nb-theme(input-basic-background-color);
+
+      &.hover {
+        background-color: nb-theme(input-basic-hover-background-color);
+        border-color: nb-theme(input-basic-hover-border-color);
+      }
 
       &.invalid {
         box-shadow: 0 0 1.25rem 0 rgba(210, 45, 45, 0.6);
       }
 
       &::placeholder {
-        color: #434a59;
-        opacity: 0.24;
+        color: nb-theme(input-basic-placeholder-text-color);
+        font-size: nb-theme(input-medium-placeholder-text-font-size);
+        font-weight: nb-theme(input-medium-placeholder-text-font-weight);
+        line-height: nb-theme(input-medium-placeholder-text-line-height);
       }
 
       &:focus {
         outline: none;
+        background-color: nb-theme(input-basic-focus-background-color);
+        border-color: nb-theme(input-basic-focus-border-color);
       }
     }
 
@@ -68,7 +78,7 @@
       margin-bottom: 1rem;
       p {
         margin-bottom: 0;
-        text-align: left ! important;
+        text-align: left !important;
         height: auto;
       }
     }
@@ -83,7 +93,8 @@
     }
 
     .hs-form-required, .hs-error-msg {
-      color: #f2545b;
+      margin-top: 0.5rem;
+      color: nb-theme(text-danger-color);
     }
 
     .hs_error_rollup {
diff --git a/docs/app/shared/components/premium-form/premium-form.component.html b/docs/app/shared/components/premium-form/premium-form.component.html
index f20a9297..45436c7b 100644
--- a/docs/app/shared/components/premium-form/premium-form.component.html
+++ b/docs/app/shared/components/premium-form/premium-form.component.html
@@ -1,9 +1,9 @@
 <nb-card>
   <nb-card-header>
-    <span>Download</span>
-    <div class="close-icon" (click)="closeDialog()">
+    <span>Premium</span>
+    <button nbButton status="basic" appearance="ghost" class="close-icon" (click)="closeDialog()">
       <i [innerHTML]="'close' | eva: { width: 26, height: 26, fill: '#222b45' }"></i>
-    </div>
+    </button>
   </nb-card-header>
   <nb-card-body>
     <div id="hubspotForm"></div>
diff --git a/docs/app/shared/components/premium-form/premium-form.component.scss b/docs/app/shared/components/premium-form/premium-form.component.scss
index a34404bc..f18ef2cf 100644
--- a/docs/app/shared/components/premium-form/premium-form.component.scss
+++ b/docs/app/shared/components/premium-form/premium-form.component.scss
@@ -17,14 +17,12 @@
   nb-card-header {
     display: flex;
     align-items: center;
+    justify-content: flex-end;
   }
 
   .close-icon {
-    cursor: pointer;
     margin-left: auto;
-    right: 0.1rem;
-    top: 0.1rem;
-    width: fit-content;
+    padding: 0;
   }
 
   ::ng-deep .custom-form {
@@ -43,23 +41,35 @@
 
     input.hs-input {
       width: 100%;
-      font-size: nb-theme(font-size-sm);
-      padding: 0.75rem 1rem !important;
-      border: 1px solid #e4e9f2;
-      box-shadow: nb-theme(shadow-default);
-      border-radius: 0.25rem;
+      color: nb-theme(input-basic-text-color);
+      font-size: nb-theme(input-medium-text-font-size);
+      font-weight: nb-theme(input-medium-text-font-weight);
+      line-height: nb-theme(input-medium-text-line-height);
+      padding: nb-theme(input-medium-padding) !important;
+      border: nb-theme(input-border-width) nb-theme(input-border-style) nb-theme(input-basic-border-color);
+      border-radius: nb-theme(input-rectangle-border-radius);
+      background-color: nb-theme(input-basic-background-color);
+
+      &.hover {
+        background-color: nb-theme(input-basic-hover-background-color);
+        border-color: nb-theme(input-basic-hover-border-color);
+      }
 
       &.invalid {
         box-shadow: 0 0 1.25rem 0 rgba(210, 45, 45, 0.6);
       }
 
       &::placeholder {
-        color: #434a59;
-        opacity: 0.24;
+        color: nb-theme(input-basic-placeholder-text-color);
+        font-size: nb-theme(input-medium-placeholder-text-font-size);
+        font-weight: nb-theme(input-medium-placeholder-text-font-weight);
+        line-height: nb-theme(input-medium-placeholder-text-line-height);
       }
 
       &:focus {
         outline: none;
+        background-color: nb-theme(input-basic-focus-background-color);
+        border-color: nb-theme(input-basic-focus-border-color);
       }
     }
 
@@ -68,7 +78,8 @@
       margin-bottom: 1rem;
       p {
         margin-bottom: 0;
-        text-align: left ! important;
+        text-align: left !important;
+        height: auto;
       }
     }
 
@@ -82,7 +93,8 @@
     }
 
     .hs-form-required, .hs-error-msg {
-      color: #f2545b;
+      margin-top: 0.5rem;
+      color: nb-theme(text-danger-color);
     }
 
     .hs_error_rollup {
@@ -90,7 +102,6 @@
     }
 
     .btn {
-      margin-top: 2rem;
       font-family: nb-theme(font-main), sans-serif;
       border-radius: 3px;
       border: none;
diff --git a/docs/app/shared/components/premium/premium.component.scss b/docs/app/shared/components/premium/premium.component.scss
index 01d5f42f..75c0a5de 100644
--- a/docs/app/shared/components/premium/premium.component.scss
+++ b/docs/app/shared/components/premium/premium.component.scss
@@ -9,7 +9,6 @@
 
 @include nb-install-component() {
   .btn {
-    display: block;
     font-family: nb-theme(font-main), sans-serif;
     border-radius: 3px;
     border: none;
diff --git a/docs/app/shared/landing-shared.module.ts b/docs/app/shared/landing-shared.module.ts
index fd1bbd91..96717414 100644
--- a/docs/app/shared/landing-shared.module.ts
+++ b/docs/app/shared/landing-shared.module.ts
@@ -1,5 +1,5 @@
 import { NgModule } from '@angular/core';
-import { NbBadgeModule, NbCardModule, NbDialogModule, NbPopoverModule } from '@nebular/theme';
+import {NbBadgeModule, NbButtonModule, NbCardModule, NbDialogModule, NbPopoverModule} from '@nebular/theme';
 import { MaterialThemeLinkComponent } from './components/material-theme-link/material-theme-link.component';
 import { CapitalizePipe } from './pipes/capitalize.pipe';
 import { EvaIconsPipe } from './pipes/eva-icons.pipe';
@@ -28,15 +28,12 @@ const pipes = [
     NbBadgeModule,
     NbCardModule,
     NbDialogModule.forChild(),
+    NbButtonModule,
   ],
   declarations: [
     ...component,
     ...pipes,
   ],
-  entryComponents: [
-    DownloadFormComponent,
-    PremiumFormComponent,
-  ],
   exports: [
     NbPopoverModule,
     ...component,