diff --git a/demo-shell-ng2/app/polyfills.ts b/demo-shell-ng2/app/polyfills.ts
index 600a34bd90..4a48f9b812 100644
--- a/demo-shell-ng2/app/polyfills.ts
+++ b/demo-shell-ng2/app/polyfills.ts
@@ -1,10 +1,10 @@
 /* tslint:disable */
 
-import 'core-js/es6';
+import 'core-js/es6/reflect';
 import 'core-js/es7/reflect';
+import 'zone.js/dist/zone';
 import 'intl';
 
-require('zone.js/dist/zone'); // IE 8-11
 require('element.scrollintoviewifneeded-polyfill'); // IE/FF
 
 if (process.env.ENV === 'production') {
diff --git a/demo-shell-ng2/config/webpack.common.js b/demo-shell-ng2/config/webpack.common.js
index af9c79a902..4fa6eb3dda 100644
--- a/demo-shell-ng2/config/webpack.common.js
+++ b/demo-shell-ng2/config/webpack.common.js
@@ -105,6 +105,22 @@ module.exports = {
                 from: 'node_modules/pdfjs-dist/build/pdf.worker.js',
                 to: 'pdf.worker.js'
             },
+            {
+                from: 'node_modules/web-animations-js/web-animations.min.js',
+                to: 'js/web-animations.min.js'
+            },
+            {
+                from: 'node_modules/core-js/client/core.min.js',
+                to: 'js/core.min.js'
+            },
+            {
+                from: 'node_modules/custom-event-polyfill/custom-event-polyfill.js',
+                to: 'js/custom-event-polyfill.js'
+            },
+            {
+                from: 'node_modules/intl/dist/Intl.min.js',
+                to: 'js/Intl.min.js'
+            },
             {
                 context: 'public',
                 from: '',
diff --git a/demo-shell-ng2/index.html b/demo-shell-ng2/index.html
index 222f75ec7e..227644620f 100644
--- a/demo-shell-ng2/index.html
+++ b/demo-shell-ng2/index.html
@@ -8,19 +8,15 @@
     <link rel="icon" type="image/png" href="favicon-96x96.png" sizes="96x96">
     <link href="https://fonts.googleapis.com/css?family=Muli" rel="stylesheet">
     <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
-    <!--[if IE]>
-    <script src=js/shim.min.js></script>
-    <script src=//cdnjs.cloudflare.com/ajax/libs/dom4/1.8.3/dom4.js></script>
-    <script src=js/classlist-polyfill.js></script>
-    <script src=js/web-animations.min.js></script>
-    <script src=js/typedarray.js></script>
+
     <script src=js/Blob.js></script>
+    <script src=js/core.min.js></script>
+    <script src=js/Intl.min.js></script>
+    <script src=js/classList.js></script>
+    <script src=js/web-animations.min.js></script>
     <script src=js/formdata.js></script>
-    <script src=https://npmcdn.com/angular2/es6/dev/src/testing/shims_for_IE.js></script>
-    <script src=js/es5-shim.min.js></script>
-    <script src=js/es6-shim.min.js></script>
-    <script src=js/system-polyfills.js></script>
-    <![endif]-->
+    <script src=js/typedarray.js></script>
+    <script src=js/custom-event-polyfill.js></script>
 
     <style>
         body, html {
diff --git a/demo-shell-ng2/package.json b/demo-shell-ng2/package.json
index 10ef362aef..1a16863320 100644
--- a/demo-shell-ng2/package.json
+++ b/demo-shell-ng2/package.json
@@ -72,6 +72,7 @@
     "alfresco-js-api": "1.8.0",
     "chart.js": "2.5.0",
     "core-js": "2.4.1",
+    "custom-event-polyfill": "^0.3.0",
     "dialog-polyfill": "0.4.7",
     "element.scrollintoviewifneeded-polyfill": "1.0.1",
     "intl": "1.2.5",
@@ -100,6 +101,7 @@
     "raphael": "2.2.7",
     "reflect-metadata": "0.1.9",
     "rxjs": "5.1.0",
+    "web-animations-js": "2.3.1",
     "zone.js": "0.8.12"
   },
   "devDependencies": {
diff --git a/demo-shell-ng2/public/js/classList.js b/demo-shell-ng2/public/js/classList.js
new file mode 100644
index 0000000000..794d031f94
--- /dev/null
+++ b/demo-shell-ng2/public/js/classList.js
@@ -0,0 +1,240 @@
+/*
+ * classList.js: Cross-browser full element.classList implementation.
+ * 1.1.20170427
+ *
+ * By Eli Grey, http://eligrey.com
+ * License: Dedicated to the public domain.
+ *   See https://github.com/eligrey/classList.js/blob/master/LICENSE.md
+ */
+
+/*global self, document, DOMException */
+
+/*! @source http://purl.eligrey.com/github/classList.js/blob/master/classList.js */
+
+if ("document" in self) {
+
+// Full polyfill for browsers with no classList support
+// Including IE < Edge missing SVGElement.classList
+    if (!("classList" in document.createElement("_"))
+        || document.createElementNS && !("classList" in document.createElementNS("http://www.w3.org/2000/svg","g"))) {
+
+        (function (view) {
+
+            "use strict";
+
+            if (!('Element' in view)) return;
+
+            var
+                classListProp = "classList"
+                , protoProp = "prototype"
+                , elemCtrProto = view.Element[protoProp]
+                , objCtr = Object
+                , strTrim = String[protoProp].trim || function () {
+                        return this.replace(/^\s+|\s+$/g, "");
+                    }
+                , arrIndexOf = Array[protoProp].indexOf || function (item) {
+                        var
+                            i = 0
+                            , len = this.length
+                            ;
+                        for (; i < len; i++) {
+                            if (i in this && this[i] === item) {
+                                return i;
+                            }
+                        }
+                        return -1;
+                    }
+            // Vendors: please allow content code to instantiate DOMExceptions
+                , DOMEx = function (type, message) {
+                    this.name = type;
+                    this.code = DOMException[type];
+                    this.message = message;
+                }
+                , checkTokenAndGetIndex = function (classList, token) {
+                    if (token === "") {
+                        throw new DOMEx(
+                            "SYNTAX_ERR"
+                            , "An invalid or illegal string was specified"
+                        );
+                    }
+                    if (/\s/.test(token)) {
+                        throw new DOMEx(
+                            "INVALID_CHARACTER_ERR"
+                            , "String contains an invalid character"
+                        );
+                    }
+                    return arrIndexOf.call(classList, token);
+                }
+                , ClassList = function (elem) {
+                    var
+                        trimmedClasses = strTrim.call(elem.getAttribute("class") || "")
+                        , classes = trimmedClasses ? trimmedClasses.split(/\s+/) : []
+                        , i = 0
+                        , len = classes.length
+                        ;
+                    for (; i < len; i++) {
+                        this.push(classes[i]);
+                    }
+                    this._updateClassName = function () {
+                        elem.setAttribute("class", this.toString());
+                    };
+                }
+                , classListProto = ClassList[protoProp] = []
+                , classListGetter = function () {
+                    return new ClassList(this);
+                }
+                ;
+// Most DOMException implementations don't allow calling DOMException's toString()
+// on non-DOMExceptions. Error's toString() is sufficient here.
+            DOMEx[protoProp] = Error[protoProp];
+            classListProto.item = function (i) {
+                return this[i] || null;
+            };
+            classListProto.contains = function (token) {
+                token += "";
+                return checkTokenAndGetIndex(this, token) !== -1;
+            };
+            classListProto.add = function () {
+                var
+                    tokens = arguments
+                    , i = 0
+                    , l = tokens.length
+                    , token
+                    , updated = false
+                    ;
+                do {
+                    token = tokens[i] + "";
+                    if (checkTokenAndGetIndex(this, token) === -1) {
+                        this.push(token);
+                        updated = true;
+                    }
+                }
+                while (++i < l);
+
+                if (updated) {
+                    this._updateClassName();
+                }
+            };
+            classListProto.remove = function () {
+                var
+                    tokens = arguments
+                    , i = 0
+                    , l = tokens.length
+                    , token
+                    , updated = false
+                    , index
+                    ;
+                do {
+                    token = tokens[i] + "";
+                    index = checkTokenAndGetIndex(this, token);
+                    while (index !== -1) {
+                        this.splice(index, 1);
+                        updated = true;
+                        index = checkTokenAndGetIndex(this, token);
+                    }
+                }
+                while (++i < l);
+
+                if (updated) {
+                    this._updateClassName();
+                }
+            };
+            classListProto.toggle = function (token, force) {
+                token += "";
+
+                var
+                    result = this.contains(token)
+                    , method = result ?
+                    force !== true && "remove"
+                        :
+                    force !== false && "add"
+                    ;
+
+                if (method) {
+                    this[method](token);
+                }
+
+                if (force === true || force === false) {
+                    return force;
+                } else {
+                    return !result;
+                }
+            };
+            classListProto.toString = function () {
+                return this.join(" ");
+            };
+
+            if (objCtr.defineProperty) {
+                var classListPropDesc = {
+                    get: classListGetter
+                    , enumerable: true
+                    , configurable: true
+                };
+                try {
+                    objCtr.defineProperty(elemCtrProto, classListProp, classListPropDesc);
+                } catch (ex) { // IE 8 doesn't support enumerable:true
+                    // adding undefined to fight this issue https://github.com/eligrey/classList.js/issues/36
+                    // modernie IE8-MSW7 machine has IE8 8.0.6001.18702 and is affected
+                    if (ex.number === undefined || ex.number === -0x7FF5EC54) {
+                        classListPropDesc.enumerable = false;
+                        objCtr.defineProperty(elemCtrProto, classListProp, classListPropDesc);
+                    }
+                }
+            } else if (objCtr[protoProp].__defineGetter__) {
+                elemCtrProto.__defineGetter__(classListProp, classListGetter);
+            }
+
+        }(self));
+
+    }
+
+// There is full or partial native classList support, so just check if we need
+// to normalize the add/remove and toggle APIs.
+
+    (function () {
+        "use strict";
+
+        var testElement = document.createElement("_");
+
+        testElement.classList.add("c1", "c2");
+
+        // Polyfill for IE 10/11 and Firefox <26, where classList.add and
+        // classList.remove exist but support only one argument at a time.
+        if (!testElement.classList.contains("c2")) {
+            var createMethod = function(method) {
+                var original = DOMTokenList.prototype[method];
+
+                DOMTokenList.prototype[method] = function(token) {
+                    var i, len = arguments.length;
+
+                    for (i = 0; i < len; i++) {
+                        token = arguments[i];
+                        original.call(this, token);
+                    }
+                };
+            };
+            createMethod('add');
+            createMethod('remove');
+        }
+
+        testElement.classList.toggle("c3", false);
+
+        // Polyfill for IE 10 and Firefox <24, where classList.toggle does not
+        // support the second argument.
+        if (testElement.classList.contains("c3")) {
+            var _toggle = DOMTokenList.prototype.toggle;
+
+            DOMTokenList.prototype.toggle = function(token, force) {
+                if (1 in arguments && !this.contains(token) === !force) {
+                    return force;
+                } else {
+                    return _toggle.call(this, token);
+                }
+            };
+
+        }
+
+        testElement = null;
+    }());
+
+}
diff --git a/demo-shell-ng2/public/js/promisePolyfill.js b/demo-shell-ng2/public/js/promisePolyfill.js
deleted file mode 100644
index ef7bf2e267..0000000000
--- a/demo-shell-ng2/public/js/promisePolyfill.js
+++ /dev/null
@@ -1,3 +0,0 @@
-/* Disable minification (remove `.min` from URL path) for more info */
-
-(function(undefined) {if (!('Symbol' in this && 'iterator' in this.Symbol && !!Array.prototype[Symbol.iterator] && !!Array.prototype.values && (Array.prototype[Symbol.iterator] === Array.prototype.values))) {Object.defineProperty(Array.prototype,"values",{value:Array.prototype[Symbol.iterator],enumerable:!1,writable:!1});}if (!('contains' in String.prototype)) {String.prototype.contains=String.prototype.includes;}var ArrayIterator=function(){var e=function(){var e=function(){return this.length=0,this},t=function(e){if("function"!=typeof e)throw new TypeError(e+" is not a function");return e},_=function(e,n){return this instanceof _?(Object.defineProperties(this,{__list__:{writable:!0,value:e},__context__:{writable:!0,value:n},__nextIndex__:{writable:!0,value:0}}),void(n&&(t(n.on),n.on("_add",this._onAdd.bind(this)),n.on("_delete",this._onDelete.bind(this)),n.on("_clear",this._onClear.bind(this))))):new _(e,n)};return Object.defineProperties(_.prototype,Object.assign({constructor:{value:_,configurable:!0,enumerable:!1,writable:!0},_next:{value:function(){var e;if(this.__list__)return this.__redo__&&(e=this.__redo__.shift(),void 0!==e)?e:this.__nextIndex__<this.__list__.length?this.__nextIndex__++:void this._unBind()},configurable:!0,enumerable:!1,writable:!0},next:{value:function(){return this._createResult(this._next())},configurable:!0,enumerable:!1,writable:!0},_createResult:{value:function(e){return void 0===e?{done:!0,value:void 0}:{done:!1,value:this._resolve(e)}},configurable:!0,enumerable:!1,writable:!0},_resolve:{value:function(e){return this.__list__[e]},configurable:!0,enumerable:!1,writable:!0},_unBind:{value:function(){this.__list__=null,delete this.__redo__,this.__context__&&(this.__context__.off("_add",this._onAdd.bind(this)),this.__context__.off("_delete",this._onDelete.bind(this)),this.__context__.off("_clear",this._onClear.bind(this)),this.__context__=null)},configurable:!0,enumerable:!1,writable:!0},toString:{value:function(){return"[object Iterator]"},configurable:!0,enumerable:!1,writable:!0}},{_onAdd:{value:function(e){if(!(e>=this.__nextIndex__)){if(++this.__nextIndex__,!this.__redo__)return void Object.defineProperty(this,"__redo__",{value:[e],configurable:!0,enumerable:!1,writable:!1});this.__redo__.forEach(function(t,_){t>=e&&(this.__redo__[_]=++t)},this),this.__redo__.push(e)}},configurable:!0,enumerable:!1,writable:!0},_onDelete:{value:function(e){var t;e>=this.__nextIndex__||(--this.__nextIndex__,this.__redo__&&(t=this.__redo__.indexOf(e),t!==-1&&this.__redo__.splice(t,1),this.__redo__.forEach(function(t,_){t>e&&(this.__redo__[_]=--t)},this)))},configurable:!0,enumerable:!1,writable:!0},_onClear:{value:function(){this.__redo__&&e.call(this.__redo__),this.__nextIndex__=0},configurable:!0,enumerable:!1,writable:!0}})),Object.defineProperty(_.prototype,Symbol.iterator,{value:function(){return this},configurable:!0,enumerable:!1,writable:!0}),Object.defineProperty(_.prototype,Symbol.toStringTag,{value:"Iterator",configurable:!1,enumerable:!1,writable:!1}),_}(),t=function(_,n){return this instanceof t?(e.call(this,_),n=n?String.prototype.contains.call(n,"key+value")?"key+value":String.prototype.contains.call(n,"key")?"key":"value":"value",void Object.defineProperty(this,"__kind__",{value:n,configurable:!1,enumerable:!1,writable:!1})):new t(_,n)};return Object.setPrototypeOf&&Object.setPrototypeOf(t,e.prototype),t.prototype=Object.create(e.prototype,{constructor:{value:t,configurable:!0,enumerable:!1,writable:!0},_resolve:{value:function(e){return"value"===this.__kind__?this.__list__[e]:"key+value"===this.__kind__?[e,this.__list__[e]]:e},configurable:!0,enumerable:!1,writable:!0},toString:{value:function(){return"[object Array Iterator]"},configurable:!0,enumerable:!1,writable:!0}}),t}();}).call('object' === typeof window && window || 'object' === typeof self && self || 'object' === typeof global && global || {});
diff --git a/ng2-components/ng2-alfresco-core/src/services/content.service.spec.ts b/ng2-components/ng2-alfresco-core/src/services/content.service.spec.ts
new file mode 100644
index 0000000000..b00c3e45f9
--- /dev/null
+++ b/ng2-components/ng2-alfresco-core/src/services/content.service.spec.ts
@@ -0,0 +1,54 @@
+/*!
+ * @license
+ * Copyright 2016 Alfresco Software, Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { async, TestBed } from '@angular/core/testing';
+import { AppConfigModule } from './app-config.service';
+import { ContentService } from './content.service';
+
+describe('ContentService', () => {
+    let contentService: ContentService;
+
+    beforeEach(async(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                AppConfigModule
+            ],
+            providers: [
+                ContentService
+            ]
+        }).compileComponents();
+    }));
+
+    beforeEach(() => {
+        contentService = TestBed.get(ContentService);
+    });
+
+    describe('Download blob', () => {
+
+        it('Should use native msSaveOrOpenBlob if the browser is IE', (done) => {
+
+            let navigatorAny: any = window.navigator;
+
+            navigatorAny.__defineGetter__('msSaveOrOpenBlob', () => {
+                done();
+            });
+
+            let blob = new Blob([''], {type: 'text/html'});
+            contentService.downloadBlob(blob, 'test_ie');
+        });
+    });
+});
diff --git a/ng2-components/ng2-alfresco-core/src/services/content.service.ts b/ng2-components/ng2-alfresco-core/src/services/content.service.ts
index a9da8a6637..21fec0cd89 100644
--- a/ng2-components/ng2-alfresco-core/src/services/content.service.ts
+++ b/ng2-components/ng2-alfresco-core/src/services/content.service.ts
@@ -42,12 +42,17 @@ export class ContentService {
                 }
 
                 if (blob) {
-                    let url = window.URL.createObjectURL(blob);
-                    a.href = url;
-                    a.download = fileName;
-                    a.click();
 
-                    window.URL.revokeObjectURL(url);
+                    if (typeof window.navigator !== 'undefined' && window.navigator.msSaveOrOpenBlob) {
+                         navigator.msSaveOrOpenBlob(blob, fileName);
+                    }else {
+                        let url = window.URL.createObjectURL(blob);
+                        a.href = url;
+                        a.download = fileName;
+                        a.click();
+
+                        window.URL.revokeObjectURL(url);
+                    }
                 }
             };
         }());