diff --git a/demo-shell-ng2/app/css/muli-font.css b/demo-shell-ng2/app/css/muli-font.css
index 815486ba69..f4eff966d7 100644
--- a/demo-shell-ng2/app/css/muli-font.css
+++ b/demo-shell-ng2/app/css/muli-font.css
@@ -19,7 +19,6 @@ h3, h4 {
     font-family: 'Muli', "Helvetica", "Arial", sans-serif !important;
 }
 
-
 h5, h6 {
     font-family: 'Muli', "Helvetica", "Arial", sans-serif !important;
     margin: 24px 0 16px
@@ -29,12 +28,14 @@ blockquote {
     font-family: 'Muli', "Helvetica", "Arial", sans-serif !important;
 }
 
+input {
+    font-family: 'Muli', "Helvetica", "Arial", sans-serif !important;
+}
 
 .mdl-typography--display-4, .mdl-typography--display-4-color-contrast {
     font-family: 'Muli', "Helvetica", "Arial", sans-serif !important;
 }
 
-
 .mdl-typography--display-3, .mdl-typography--display-3-color-contrast {
     font-family: 'Muli', "Helvetica", "Arial", sans-serif !important;
 }
diff --git a/ng2-components/ng2-alfresco-viewer/src/pdfViewer.component.css b/ng2-components/ng2-alfresco-viewer/src/pdfViewer.component.css
index d7df165db3..7e9a6ba9ba 100644
--- a/ng2-components/ng2-alfresco-viewer/src/pdfViewer.component.css
+++ b/ng2-components/ng2-alfresco-viewer/src/pdfViewer.component.css
@@ -58,26 +58,28 @@
     border: none;
     display: block;
     font-size: 16px;
-    font-family: "Helvetica","Arial",sans-serif;
     padding: 4px 0;
     background: 0 0;
     text-align: right;
     color: inherit;
     width: 33px;
     margin-right: 4px;
+    height: 20px;
 }
 
 .viewer-total-pages {
-    margin-right: 22px;
-    border: none;
-    display: block;
+    border: medium none;
+    display: flex;
     font-size: 16px;
-    font-family: "Helvetica","Arial",sans-serif;
-    margin: 0;
-    padding: 3px 0;
-    background: 0 0;
-    text-align: left;
+    padding: 4px 0px;
+    background: transparent none repeat scroll 0px 0px;
+    text-align: right;
     color: inherit;
+    width: 33px;
+    margin-right: 4px;
+    height: 20px;
+    align-items: center;
+    justify-content: center;
 }
 
 .viewer-page-counter {