diff --git a/ng2-components/ng2-alfresco-viewer/src/pdfViewer.component.css b/ng2-components/ng2-alfresco-viewer/src/pdfViewer.component.css
index 618771d3ea..53b84c982e 100644
--- a/ng2-components/ng2-alfresco-viewer/src/pdfViewer.component.css
+++ b/ng2-components/ng2-alfresco-viewer/src/pdfViewer.component.css
@@ -54,6 +54,18 @@
     color: white;
 }
 
+.viewer-toolbar-command{
+    height: 30px;
+    padding-top: 4px;
+    top: 80px;
+    left:35px;
+    width:auto;
+    position:fixed;
+    border-radius: 10px;
+    background: #3E3E3E;
+    color: white;
+}
+
 .viewer-pagenumber-input {
     border: none;
     border-bottom: 1px solid rgba(0,0,0,.12);
diff --git a/ng2-components/ng2-alfresco-viewer/src/pdfViewer.component.html b/ng2-components/ng2-alfresco-viewer/src/pdfViewer.component.html
index 6e00f93482..b423b82d65 100644
--- a/ng2-components/ng2-alfresco-viewer/src/pdfViewer.component.html
+++ b/ng2-components/ng2-alfresco-viewer/src/pdfViewer.component.html
@@ -1,5 +1,5 @@
 <!-- Start Pdf Canvas -->
-<div id="viewer-pdf-container" class="center-element viewer-pdf-container" (keypress)=eventHandler()>
+<div id="viewer-pdf-container" class="center-element viewer-pdf-container" (keypress)=eventHandler() (window:resize)="onResize($event)">
     <div id="viewer-viewerPdf" class="center-element" >
         <div id="loader-container" class="loader-container">
             <div class="loader-item">
@@ -29,3 +29,11 @@
     </div>
 </div>
 <!-- Pagination toolbar end -->
+
+<!-- Command toolbar start -->
+<div id="viewer-toolbar-command" class="viewer-toolbar-command mdl-cell--hide-tablet mdl-cell--hide-phone">
+    <div id="viewer-scale-page-button" class="button-page left" (click)="scalePage('page-fit')">
+        <i class="icon material-icons">zoom_out_map</i>
+    </div>
+</div>
+<!-- Command toolbar end -->
diff --git a/ng2-components/ng2-alfresco-viewer/src/pdfViewer.component.ts b/ng2-components/ng2-alfresco-viewer/src/pdfViewer.component.ts
index 0426c1cd70..76532843d2 100644
--- a/ng2-components/ng2-alfresco-viewer/src/pdfViewer.component.ts
+++ b/ng2-components/ng2-alfresco-viewer/src/pdfViewer.component.ts
@@ -41,9 +41,12 @@ export class PdfViewerComponent {
 
     pdfViewer: any;
 
-    renderingStates = {
-        FINISHED: 3 as number
-    };
+    currentScaleMode: string;
+    currentScale: number;
+
+    documentContainer: any;
+
+    MAX_AUTO_SCALE: number = 1.25;
 
     ngOnChanges(changes) {
         if (!this.urlFile) {
@@ -58,6 +61,11 @@ export class PdfViewerComponent {
                     this.page = 1;
                     this.displayPage = 1;
                     this.initPDFViewer(this.currentPdfDocument);
+
+                    this.currentPdfDocument.getPage(1).then(() => {
+                        this.scalePage('auto');
+                    });
+
                 }, (error) => {
                     reject(error);
                 });
@@ -77,17 +85,107 @@ export class PdfViewerComponent {
     initPDFViewer(pdfDocument: any) {
         PDFJS.verbosity = 5;
 
-        let documentContainer: any = document.getElementById('viewer-pdf-container');
+        this.documentContainer = document.getElementById('viewer-pdf-container');
         let viewer: any = document.getElementById('viewer-viewerPdf');
 
         this.pdfViewer = new PDFJS.PDFViewer({
-            container: documentContainer,
+            container: this.documentContainer,
             viewer: viewer
         });
 
         this.pdfViewer.setDocument(pdfDocument);
     }
 
+
+    /**
+     * Method to scale the page current support implementation
+     * @param {string} scaleMode - new scale mode
+     */
+    scalePage(scaleMode) {
+        this.currentScaleMode = scaleMode;
+
+        let currentPage = this.pdfViewer._pages[this.pdfViewer._currentPageNumber];
+
+        let pageWidthScale = (this.documentContainer.clientWidth) /
+            currentPage.width * currentPage.scale;
+        let pageHeightScale = (this.documentContainer.clientHeight ) /
+            currentPage.width * currentPage.scale;
+
+        let scale;
+
+        switch (this.currentScaleMode) {
+            case 'page-actual':
+                scale = 1;
+                break;
+            case 'page-width':
+                scale = pageWidthScale;
+                break;
+            case 'page-height':
+                scale = pageHeightScale;
+                break;
+            case 'page-fit':
+                scale = Math.min(pageWidthScale, pageHeightScale);
+                break;
+            case 'auto':
+                let horizontalScale;
+                if (this.isLandscape) {
+                    horizontalScale = Math.min(pageHeightScale, pageWidthScale);
+                } else {
+                    horizontalScale = pageWidthScale;
+                }
+                scale = Math.min(this.MAX_AUTO_SCALE, horizontalScale);
+
+                break;
+            default:
+                console.error('pdfViewSetScale: \'' + scaleMode + '\' is an unknown zoom value.');
+                return;
+        }
+
+        this.setScaleUpdatePages(scale);
+    }
+
+    /**
+     * Update all the pages with the newScale scale
+     * @param {number} newScale - new scale page
+     */
+    setScaleUpdatePages(newScale: number) {
+        if (!this.isSameScale(this.currentScale, newScale)) {
+            this.currentScale = newScale;
+
+            this.pdfViewer._pages.forEach(function (currentPage) {
+                currentPage.update(newScale);
+            });
+        }
+    }
+
+    /**
+     * method to check if the request scale of the page is the same for avoid unuseful re-rendering
+     *
+     * @param {number} oldScale - old scale page
+     * @param {number} newScale - new scale page
+     */
+    isSameScale(oldScale: number, newScale: number) {
+        return (newScale === oldScale);
+    }
+
+
+    /**
+     * method to check if is a land scape view
+     *
+     * @param {number} width
+     * @param {number} height
+     */
+    isLandscape(width: number, height: number) {
+        return (width > height);
+    }
+
+    /**
+     * Method triggered when the page is resized
+     */
+    onResize() {
+        this.scalePage('page-fit');
+    }
+
     /**
      * load the previous page
      */
@@ -97,12 +195,6 @@ export class PdfViewerComponent {
             this.displayPage = this.page;
 
             this.pdfViewer.currentPageNumber = this.page;
-
-            //if (this.pdfViewer.currentPage.renderingState === this.renderingStates.FINISHED) {
-            //    // remove loader
-            //} else {
-            //    // add loader
-            //}
         }
     }