diff --git a/ng2-components/ng2-alfresco-viewer/src/pdfViewer.component.css b/ng2-components/ng2-alfresco-viewer/src/pdfViewer.component.css
index 5d0b4b8a4e..92ffd5d698 100644
--- a/ng2-components/ng2-alfresco-viewer/src/pdfViewer.component.css
+++ b/ng2-components/ng2-alfresco-viewer/src/pdfViewer.component.css
@@ -2,6 +2,10 @@
     background: #3E3E3E;
 }
 
+.viewer-loader-text {
+    text-align: center;
+}
+
 :host .page {
     margin: 10px auto !important;
     overflow: visible;
diff --git a/ng2-components/ng2-alfresco-viewer/src/pdfViewer.component.html b/ng2-components/ng2-alfresco-viewer/src/pdfViewer.component.html
index 2d2ab2b450..7ca80d4683 100644
--- a/ng2-components/ng2-alfresco-viewer/src/pdfViewer.component.html
+++ b/ng2-components/ng2-alfresco-viewer/src/pdfViewer.component.html
@@ -1,11 +1,11 @@
 <!-- Start Pdf Canvas -->
-<div id="viewer-pdf-container" class="viewer-pdf-container" (keypress)=eventHandler()>
-    <div id="viewer-viewerPdf" style="border:1px solid black;">
-        <div id="loader">
+<div id="viewer-pdf-container" class="center-element viewer-pdf-container" (keypress)=eventHandler()>
+    <div id="viewer-viewerPdf" class="center-element" >
+        <div id="viewer-loader" class="center-element" >
             <div>
                 <div id="loader-spin"  class="mdl-progress mdl-js-progress mdl-progress__indeterminate"></div>
             </div>
-            <div id="loader-text">Loading...</div>
+            <div id="viewer-loader-text" class="viewer-loader-text">Loading...</div>
         </div>
     </div>
 </div>
diff --git a/ng2-components/ng2-alfresco-viewer/src/pdfViewer.component.spec.ts b/ng2-components/ng2-alfresco-viewer/src/pdfViewer.component.spec.ts
index e7d0147e79..7008aa6457 100644
--- a/ng2-components/ng2-alfresco-viewer/src/pdfViewer.component.spec.ts
+++ b/ng2-components/ng2-alfresco-viewer/src/pdfViewer.component.spec.ts
@@ -37,6 +37,18 @@ describe('PdfViewer', () => {
                     expect(element.querySelector('#viewer-pdf-container')).not.toBeNull();
                 });
         }));
+
+        it('Loader should be present', injectAsync([TestComponentBuilder], (tcb: TestComponentBuilder) => {
+            return tcb
+                .createAsync(PdfViewerComponent)
+                .then((fixture) => {
+                    let element = fixture.nativeElement;
+
+                    fixture.detectChanges();
+
+                    expect(element.querySelector('#viewer-loader')).not.toBeNull();
+                });
+        }));
     });
 
     describe('User interaction', () => {
diff --git a/ng2-components/ng2-alfresco-viewer/src/viewer.component.css b/ng2-components/ng2-alfresco-viewer/src/viewer.component.css
index b61bab473b..0cf1352668 100644
--- a/ng2-components/ng2-alfresco-viewer/src/viewer.component.css
+++ b/ng2-components/ng2-alfresco-viewer/src/viewer.component.css
@@ -14,19 +14,6 @@
     margin: 20px;
 }
 
-#loader{
-    margin: auto;
-    padding-top: 20px;
-    width:300px;
-}
-#loader-text{
-    width:300px;
-    white-space: nowrap;
-    text-align: center;
-    position: relative;
-    color: #000;
-}
-
 #viewer-toolbar-pagination {
     margin-left: 25%;
 }