diff --git a/lib/core/styles/_index.scss b/lib/core/styles/_index.scss
index 86ce2fa968..e26c0ba8ed 100644
--- a/lib/core/styles/_index.scss
+++ b/lib/core/styles/_index.scss
@@ -19,6 +19,7 @@
 @import '../viewer/components/viewer.component';
 @import '../form/components/form.component';
 @import '../sidebar/sidebar-action-menu.component';
+@import '../viewer/components/pdfViewer.component';
 
 @mixin adf-core-theme($theme) {
     @include adf-colors-theme($theme);
@@ -38,6 +39,7 @@
     @include adf-toolbar-theme($theme);
     @include adf-userinfo-theme($theme);
     @include adf-viewer-theme($theme);
+    @include adf-pdf-viewer-theme($theme);
     @include adf-form-component-theme($theme);
     @include adf-sidebar-action-menu-theme($theme);
 }
diff --git a/lib/core/viewer/components/pdfViewer.component.html b/lib/core/viewer/components/pdfViewer.component.html
index a7bd395f93..dedb69d260 100644
--- a/lib/core/viewer/components/pdfViewer.component.html
+++ b/lib/core/viewer/components/pdfViewer.component.html
@@ -34,15 +34,14 @@
             <mat-icon>keyboard_arrow_down</mat-icon>
         </button>
 
-        <div>
-            {{ 'ADF_VIEWER.PAGE_LABEL.SHOWING' | translate }}
+        <div class="adf-pdf-viewer__toolbar-page-selector">
+            <span>{{ 'ADF_VIEWER.PAGE_LABEL.SHOWING' | translate }}</span>
             <input #page
-                class="adf-pdf-viewer__toolbar-page-selector"
                 type="text"
                 pattern="-?[0-9]*(\.[0-9]+)?"
                 value="{{ displayPage }}"
                 (keyup.enter)="inputPage(page.value)">
-            {{ 'ADF_VIEWER.PAGE_LABEL.OF' | translate }} {{ totalPages }}
+            <span>{{ 'ADF_VIEWER.PAGE_LABEL.OF' | translate }} {{ totalPages }}</span>
         </div>
 
         <adf-toolbar-divider></adf-toolbar-divider>
diff --git a/lib/core/viewer/components/pdfViewer.component.scss b/lib/core/viewer/components/pdfViewer.component.scss
index 0efe4c0b69..7770305700 100644
--- a/lib/core/viewer/components/pdfViewer.component.scss
+++ b/lib/core/viewer/components/pdfViewer.component.scss
@@ -1,38 +1,53 @@
-.adf-pdf-viewer {
-    .loader-container {
-        display: -webkit-box;      /* OLD - iOS 6-, Safari 3.1-6 */
-        display: -moz-box;         /* OLD - Firefox 19- (buggy but mostly works) */
-        display: -webkit-flex;     /* NEW - Chrome */
-        display: flex;             /* NEW, Spec - Opera 12.1, Firefox 20+ */
-        -webkit-box-flex-direction: row;
-        -moz-box-flex-direction: row;
-        -webkit-flex-direction: row;
-        flex-direction: row;
-        height:100%;
-    }
+@mixin adf-pdf-viewer-theme($theme) {
+    .adf-pdf-viewer {
+        .loader-container {
+            display: -webkit-box;      /* OLD - iOS 6-, Safari 3.1-6 */
+            display: -moz-box;         /* OLD - Firefox 19- (buggy but mostly works) */
+            display: -webkit-flex;     /* NEW - Chrome */
+            display: flex;             /* NEW, Spec - Opera 12.1, Firefox 20+ */
+            -webkit-box-flex-direction: row;
+            -moz-box-flex-direction: row;
+            -webkit-flex-direction: row;
+            flex-direction: row;
+            height:100%;
+        }
 
-    .loader-item {
-        margin: auto;
-        max-height:100px;
-        max-width:300px;
-    }
+        .loader-item {
+            margin: auto;
+            max-height:100px;
+            max-width:300px;
+        }
 
-    &__toolbar {
-        position: absolute;
-        bottom: 0;
+        &__toolbar {
+            position: absolute;
+            bottom: 5px;
 
-        left: 50%;
-        transform: translateX(-50%);
+            left: 50%;
+            transform: translateX(-50%);
 
-        &-page-selector {
-            font-size: 16px;
-            padding: 4px 0;
-            text-align: right;
-            width: 33px;
-            margin-right: 4px;
-            height: 20px;
-            outline-width: 1px;
-            outline-color: gray;
+            .adf-toolbar .mat-toolbar {
+                max-height: 48px;
+                background-color: mat-color($primary, default-contrast, 1);
+                border-width: 0;
+                border-radius: 2px;
+                box-shadow: 0 2px 2px 0 rgba(0, 0, 0, 0.24), 0 0 2px 0 rgba(0, 0, 0, 0.12);
+            }
+
+            &-page-selector {
+                padding-left: 10px;
+                padding-right: 10px;
+                font-size: 14px;
+
+                & > input {
+                    font-size: 14px;
+                    padding: 4px 0;
+                    text-align: right;
+                    width: 33px;
+                    margin-right: 4px;
+                    outline-width: 1px;
+                    outline-color: gray;
+                }
+            }
         }
     }
 }
diff --git a/lib/core/viewer/components/pdfViewerHost.component.scss b/lib/core/viewer/components/pdfViewerHost.component.scss
index 1f2503d46c..a9d85f6504 100644
--- a/lib/core/viewer/components/pdfViewerHost.component.scss
+++ b/lib/core/viewer/components/pdfViewerHost.component.scss
@@ -165,6 +165,11 @@
                 right: 0;
                 bottom: 0;
             }
+
+            * {
+                padding: 0;
+                margin: 0;
+            }
         }
 
         &.removePageBorders {
@@ -202,10 +207,7 @@
         }
     }
 
-    * {
-        padding: 0;
-        margin: 0;
-    }
+
 
     .hidden, [hidden] {
         display: none !important;
diff --git a/lib/core/viewer/components/txtViewer.component.scss b/lib/core/viewer/components/txtViewer.component.scss
index 4b58d2e074..a3c88afc85 100644
--- a/lib/core/viewer/components/txtViewer.component.scss
+++ b/lib/core/viewer/components/txtViewer.component.scss
@@ -3,5 +3,4 @@
     width: 100vw;
     overflow: hidden;
     overflow-y: scroll;
-    margin-bottom: 42px;
 }
diff --git a/lib/core/viewer/components/viewer.component.html b/lib/core/viewer/components/viewer.component.html
index 0058365c91..b3d39305dc 100644
--- a/lib/core/viewer/components/viewer.component.html
+++ b/lib/core/viewer/components/viewer.component.html
@@ -18,7 +18,7 @@
                         <mat-icon>arrow_back</mat-icon>
                     </button>
                     <img class="adf-viewer__mimeicon" [src]="mimeType | adfMimeTypeIcon">
-                    <span id="adf-viewer-display-name">{{ displayName }}</span>
+                    <span class="adf-viewer__display-name" id="adf-viewer-display-name">{{ displayName }}</span>
                 </adf-toolbar-title>
 
                 <ng-container *ngIf="mnuOpenWith">
diff --git a/lib/core/viewer/components/viewer.component.scss b/lib/core/viewer/components/viewer.component.scss
index 5bb15060cb..7104892d4e 100644
--- a/lib/core/viewer/components/viewer.component.scss
+++ b/lib/core/viewer/components/viewer.component.scss
@@ -13,6 +13,24 @@
 
         &__mimeicon {
             vertical-align: middle;
+            height: 18px;
+            width: 18px;
+        }
+
+        &-toolbar {
+            .mat-toolbar {
+                background-color: mat-color($primary, default-contrast)
+            }
+        }
+
+        &__display-name {
+            font-size: 16px;
+            opacity: 0.87;
+            line-height: 1.5;
+            letter-spacing: -0.4px;
+            font-weight: normal;
+            font-style: normal;
+            font-stretch: normal;
         }
 
         &-container {
@@ -22,6 +40,7 @@
                 overflow-y: auto;
                 overflow-x: hidden;
                 z-index: 1;
+                background-color: mat-color($background, background);
 
                 display: flex;
                 flex-direction: row;