diff --git a/modules/cms/widgets/mediamanager/assets/js/mediamanager-browser-min.js b/modules/cms/widgets/mediamanager/assets/js/mediamanager-browser-min.js
index 592e90f2a..b307569e6 100644
--- a/modules/cms/widgets/mediamanager/assets/js/mediamanager-browser-min.js
+++ b/modules/cms/widgets/mediamanager/assets/js/mediamanager-browser-min.js
@@ -314,7 +314,7 @@ MediaManager.prototype.uploadSending=function(file,xhr,formData){formData.append
 formData.append('X_OCTOBER_FILEUPLOAD',this.options.uniqueId)}
 MediaManager.prototype.uploadCancelAll=function(){this.dropzone.removeAllFiles(true)
 this.hideUploadUi()}
-MediaManager.prototype.uploadError=function(file,message){swal({title:'Error uploading file',text:message,confirmButtonClass:'btn-default'})}
+MediaManager.prototype.uploadError=function(file,message){$.oc.alert('Error uploading file')}
 MediaManager.prototype.cropSelectedImage=function(callback){var selectedItems=this.getSelectedItems(true)
 if(selectedItems.length!=1){alert(this.options.selectSingleImage)
 return}
@@ -337,9 +337,9 @@ this.lastSearchValue=value
 this.clearSearchTrackInputTimer()
 this.searchTrackInputTimer=window.setTimeout(this.proxy(this.updateSearchResults),300)}
 MediaManager.prototype.deleteItems=function(){var items=this.$el.get(0).querySelectorAll('[data-type="media-item"].selected')
-if(!items.length){swal({title:this.options.deleteEmpty,confirmButtonClass:'btn-default'})
+if(!items.length){$.oc.alert(this.options.deleteEmpty)
 return}
-swal({title:this.options.deleteConfirm,confirmButtonClass:'btn-default',showCancelButton:true},this.proxy(this.deleteConfirmation))}
+$.oc.confirm(this.options.deleteConfirm,this.proxy(this.deleteConfirmation))}
 MediaManager.prototype.deleteConfirmation=function(confirmed){if(!confirmed)
 return
 var items=this.$el.get(0).querySelectorAll('[data-type="media-item"].selected'),paths=[]
@@ -359,7 +359,7 @@ return false}
 MediaManager.prototype.folderCreated=function(){this.$el.find('button[data-command="create-folder"]').popup('hide')
 this.afterNavigate()}
 MediaManager.prototype.moveItems=function(ev){var items=this.$el.get(0).querySelectorAll('[data-type="media-item"].selected')
-if(!items.length){swal({title:this.options.moveEmpty,confirmButtonClass:'btn-default'})
+if(!items.length){$.oc.alert(this.options.moveEmpty)
 return}
 var data={exclude:[],path:this.$el.find('[data-type="current-folder"]').val()}
 for(var i=0,len=items.length;i<len;i++){var item=items[i],path=item.getAttribute('data-path')
diff --git a/modules/cms/widgets/mediamanager/assets/js/mediamanager-global-min.js b/modules/cms/widgets/mediamanager/assets/js/mediamanager-global-min.js
index 59150b5f6..5b78d66e4 100644
--- a/modules/cms/widgets/mediamanager/assets/js/mediamanager-global-min.js
+++ b/modules/cms/widgets/mediamanager/assets/js/mediamanager-global-min.js
@@ -13,9 +13,9 @@ this.button.addCallback(buttonInsertAudio,this.mediamanager.onInsertAudio);},onI
 hideLinkTooltips()
 this.selection.save()
 this.link.getData()
-new $.oc.mediaManager.popup({alias:'ocmediamanager',cropAndInsertButton:false,onInsert:function(items){if(!items.length){swal({title:$.oc.lang.get('mediamanager.invalid_file_empty_insert'),confirmButtonClass:'btn-default'})
+new $.oc.mediaManager.popup({alias:'ocmediamanager',cropAndInsertButton:false,onInsert:function(items){if(!items.length){$.oc.alert($.oc.lang.get('mediamanager.invalid_file_empty_insert'))
 return}
-if(items.length>1){swal({title:$.oc.lang.get('mediamanager.invalid_file_single_insert'),confirmButtonClass:'btn-default'})
+if(items.length>1){$.oc.alert($.oc.lang.get('mediamanager.invalid_file_single_insert'))
 return}
 var text=that.link.text,textIsEmpty=$.trim(text)===''
 for(var i=0,len=items.length;i<len;i++){var text=textIsEmpty?items[i].title:text
@@ -26,11 +26,11 @@ if(!this.selection.getCurrent())
 this.focus.setStart()
 this.selection.save()
 var that=this
-new $.oc.mediaManager.popup({alias:'ocmediamanager',cropAndInsertButton:true,onInsert:function(items){if(!items.length){swal({title:$.oc.lang.get('mediamanager.invalid_image_empty_insert'),confirmButtonClass:'btn-default'})
+new $.oc.mediaManager.popup({alias:'ocmediamanager',cropAndInsertButton:true,onInsert:function(items){if(!items.length){$.oc.alert($.oc.lang.get('mediamanager.invalid_image_empty_insert'))
 return}
 that.selection.restore()
 var isP=that.utils.isCurrentOrParent('P'),html='',imagesInserted=0
-for(var i=0,len=items.length;i<len;i++){if(items[i].documentType!=='image'){swal({title:$.oc.lang.get('mediamanager.invalid_image_invalid_insert','The file "'+items[i].title+'" is not an image.'),confirmButtonClass:'btn-default'})
+for(var i=0,len=items.length;i<len;i++){if(items[i].documentType!=='image'){$.oc.alert($.oc.lang.get('mediamanager.invalid_image_invalid_insert','The file "'+items[i].title+'" is not an image.'))
 continue}
 var $img=$('<img>').attr('src',items[i].publicUrl).attr('data-redactor-inserted-image','true')
 html+=that.utils.getOuterHtml($img)
@@ -50,12 +50,12 @@ var that=this
 hideLinkTooltips()
 this.selection.save()
 this.link.getData()
-new $.oc.mediaManager.popup({alias:'ocmediamanager',cropAndInsertButton:false,onInsert:function(items){if(!items.length){swal({title:$.oc.lang.get('mediamanager.invalid_video_empty_insert'),confirmButtonClass:'btn-default'})
+new $.oc.mediaManager.popup({alias:'ocmediamanager',cropAndInsertButton:false,onInsert:function(items){if(!items.length){$.oc.alert($.oc.lang.get('mediamanager.invalid_video_empty_insert'))
 return}
-if(items.length>1){swal({title:$.oc.lang.get('mediamanager.invalid_file_single_insert'),confirmButtonClass:'btn-default'})
+if(items.length>1){$.oc.alert($.oc.lang.get('mediamanager.invalid_file_single_insert'))
 return}
 var item=items[0]
-if(item.documentType!=='video'){swal({title:$.oc.lang.get('mediamanager.invalid_video_invalid_insert','The file "'+item.title+'" is not a video.'),confirmButtonClass:'btn-default'})
+if(item.documentType!=='video'){$.oc.alert($.oc.lang.get('mediamanager.invalid_video_invalid_insert','The file "'+item.title+'" is not a video.'))
 return}
 var $richEditorNode=that.core.getTextarea().closest('[data-control="richeditor"]'),$videoNode=$('<figure contenteditable="false" tabindex="0" data-ui-block="true"/>')
 $videoNode.get(0).contentEditable=false
@@ -68,12 +68,12 @@ var that=this
 hideLinkTooltips()
 this.selection.save()
 this.link.getData()
-new $.oc.mediaManager.popup({alias:'ocmediamanager',cropAndInsertButton:false,onInsert:function(items){if(!items.length){swal({title:$.oc.lang.get('mediamanager.invalid_audio_empty_insert'),confirmButtonClass:'btn-default'})
+new $.oc.mediaManager.popup({alias:'ocmediamanager',cropAndInsertButton:false,onInsert:function(items){if(!items.length){$.oc.alert($.oc.lang.get('mediamanager.invalid_audio_empty_insert'))
 return}
-if(items.length>1){swal({title:$.oc.lang.get('mediamanager.invalid_file_single_insert'),confirmButtonClass:'btn-default'})
+if(items.length>1){$.oc.alert($.oc.lang.get('mediamanager.invalid_file_single_insert'))
 return}
 var item=items[0]
-if(item.documentType!=='audio'){swal({title:$.oc.lang.get('mediamanager.invalid_audio_invalid_insert','The file "'+item.title+'" is not an audio file.'),confirmButtonClass:'btn-default'})
+if(item.documentType!=='audio'){$.oc.alert($.oc.lang.get('mediamanager.invalid_audio_invalid_insert','The file "'+item.title+'" is not an audio file.'))
 return}
 var $richEditorNode=that.core.getTextarea().closest('[data-control="richeditor"]'),$videoNode=$('<figure contenteditable="false" tabindex="0" data-ui-block="true"/>')
 $videoNode.get(0).contentEditable=false
diff --git a/modules/cms/widgets/mediamanager/assets/js/mediamanager.js b/modules/cms/widgets/mediamanager/assets/js/mediamanager.js
index ec4e0c25f..c6456864e 100644
--- a/modules/cms/widgets/mediamanager/assets/js/mediamanager.js
+++ b/modules/cms/widgets/mediamanager/assets/js/mediamanager.js
@@ -805,12 +805,7 @@
     }
 
     MediaManager.prototype.uploadError = function(file, message) {
-        swal({
-            title: 'Error uploading file',
-            text: message,
-            // type: 'error',
-            confirmButtonClass: 'btn-default'
-        })
+        $.oc.alert('Error uploading file')
     }
 
     //
@@ -888,19 +883,11 @@
         var items = this.$el.get(0).querySelectorAll('[data-type="media-item"].selected')
 
         if (!items.length) {
-            swal({
-                title: this.options.deleteEmpty,
-                confirmButtonClass: 'btn-default'
-            })
-
+            $.oc.alert(this.options.deleteEmpty)
             return
         }
 
-        swal({
-            title: this.options.deleteConfirm,
-            confirmButtonClass: 'btn-default',
-            showCancelButton: true
-        }, this.proxy(this.deleteConfirmation))
+        $.oc.confirm(this.options.deleteConfirm, this.proxy(this.deleteConfirmation))
     }
 
     MediaManager.prototype.deleteConfirmation = function(confirmed) {
@@ -972,11 +959,7 @@
         var items = this.$el.get(0).querySelectorAll('[data-type="media-item"].selected')
 
         if (!items.length) {
-            swal({
-                title: this.options.moveEmpty,
-                confirmButtonClass: 'btn-default'
-            })
-
+            $.oc.alert(this.options.moveEmpty)
             return
         }
 
diff --git a/modules/cms/widgets/mediamanager/assets/js/mediamanager.redactor.js b/modules/cms/widgets/mediamanager/assets/js/mediamanager.redactor.js
index bd695cc58..cf84ca369 100644
--- a/modules/cms/widgets/mediamanager/assets/js/mediamanager.redactor.js
+++ b/modules/cms/widgets/mediamanager/assets/js/mediamanager.redactor.js
@@ -52,20 +52,12 @@ RedactorPlugins.mediamanager = function()
                 cropAndInsertButton: false,
                 onInsert: function(items) {
                     if (!items.length) {
-                        swal({
-                            title: $.oc.lang.get('mediamanager.invalid_file_empty_insert'),
-                            // type: 'error',
-                            confirmButtonClass: 'btn-default'
-                        })
+                        $.oc.alert($.oc.lang.get('mediamanager.invalid_file_empty_insert'))
                         return
                     }
 
                     if (items.length > 1) {
-                        swal({
-                            title: $.oc.lang.get('mediamanager.invalid_file_single_insert'),
-                            // type: 'error',
-                            confirmButtonClass: 'btn-default'
-                        })
+                        $.oc.alert($.oc.lang.get('mediamanager.invalid_file_single_insert'))
                         return
                     }
 
@@ -99,11 +91,7 @@ RedactorPlugins.mediamanager = function()
                 cropAndInsertButton: true,
                 onInsert: function(items) {
                     if (!items.length) {
-                        swal({
-                            title: $.oc.lang.get('mediamanager.invalid_image_empty_insert'),
-                            // type: 'error',
-                            confirmButtonClass: 'btn-default'
-                        })
+                        $.oc.alert($.oc.lang.get('mediamanager.invalid_image_empty_insert'))
                         return
                     }
                     that.selection.restore()
@@ -116,11 +104,7 @@ RedactorPlugins.mediamanager = function()
 
                     for (var i=0, len=items.length; i<len; i++) {
                         if (items[i].documentType !== 'image') {
-                            swal({
-                                title: $.oc.lang.get('mediamanager.invalid_image_invalid_insert', 'The file "'+items[i].title+'" is not an image.'),
-                                // type: 'error',
-                                confirmButtonClass: 'btn-default'
-                            })
+                            $.oc.alert($.oc.lang.get('mediamanager.invalid_image_invalid_insert', 'The file "'+items[i].title+'" is not an image.'))
                             continue
                         }
 
@@ -170,31 +154,19 @@ RedactorPlugins.mediamanager = function()
                 cropAndInsertButton: false,
                 onInsert: function(items) {
                     if (!items.length) {
-                        swal({
-                            title: $.oc.lang.get('mediamanager.invalid_video_empty_insert'),
-                            // type: 'error',
-                            confirmButtonClass: 'btn-default'
-                        })
+                        $.oc.alert($.oc.lang.get('mediamanager.invalid_video_empty_insert'))
                         return
                     }
 
                     if (items.length > 1) {
-                        swal({
-                            title: $.oc.lang.get('mediamanager.invalid_file_single_insert'),
-                            // type: 'error',
-                            confirmButtonClass: 'btn-default'
-                        })
+                        $.oc.alert($.oc.lang.get('mediamanager.invalid_file_single_insert'))
                         return
                     }
 
                     var item = items[0]
 
                     if (item.documentType !== 'video') {
-                        swal({
-                            title: $.oc.lang.get('mediamanager.invalid_video_invalid_insert', 'The file "'+item.title+'" is not a video.'),
-                            // type: 'error',
-                            confirmButtonClass: 'btn-default'
-                        })
+                        $.oc.alert($.oc.lang.get('mediamanager.invalid_video_invalid_insert', 'The file "'+item.title+'" is not a video.'))
                         return
                     }
 
@@ -229,31 +201,19 @@ RedactorPlugins.mediamanager = function()
                 cropAndInsertButton: false,
                 onInsert: function(items) {
                     if (!items.length) {
-                        swal({
-                            title: $.oc.lang.get('mediamanager.invalid_audio_empty_insert'),
-                            // type: 'error',
-                            confirmButtonClass: 'btn-default'
-                        })
+                        $.oc.alert($.oc.lang.get('mediamanager.invalid_audio_empty_insert'))
                         return
                     }
 
                     if (items.length > 1) {
-                        swal({
-                            title: $.oc.lang.get('mediamanager.invalid_file_single_insert'),
-                            // type: 'error',
-                            confirmButtonClass: 'btn-default'
-                        })
+                        $.oc.alert($.oc.lang.get('mediamanager.invalid_file_single_insert'))
                         return
                     }
 
                     var item = items[0]
 
                     if (item.documentType !== 'audio') {
-                        swal({
-                            title: $.oc.lang.get('mediamanager.invalid_audio_invalid_insert', 'The file "'+item.title+'" is not an audio file.'),
-                            // type: 'error',
-                            confirmButtonClass: 'btn-default'
-                        })
+                        $.oc.alert($.oc.lang.get('mediamanager.invalid_audio_invalid_insert', 'The file "'+item.title+'" is not an audio file.'))
                         return
                     }