diff --git a/src/Squidex/app/shared/components/asset.component.html b/src/Squidex/app/shared/components/asset.component.html
index 96e1f7633..af8ff345b 100644
--- a/src/Squidex/app/shared/components/asset.component.html
+++ b/src/Squidex/app/shared/components/asset.component.html
@@ -15,17 +15,17 @@
             <div class="file-overlay">
                 <div class="file-overlay-background"></div>
                 
-                <a class="file-edit" (click)="renameDialog.show()">
+                <a class="file-edit" (click)="renameDialog.show()" *ngIf="!hideIcons">
                     <i class="icon-pencil"></i>
                 </a>
-                <a class="file-download" [attr.href]="asset | sqxAssetUrl" target="_blank">
+                <a class="file-download" [attr.href]="asset | sqxAssetUrl" target="_blank" *ngIf="!hideIcons">
                     <i class="icon-download"></i>
                 </a>
 
-                <a class="file-delete" (click)="deleting.emit(asset)" *ngIf="!closeMode">
+                <a class="file-delete" (click)="deleting.emit(asset)" *ngIf="!closeMode && !hideIcons">
                     <i class="icon-delete"></i>
                 </a>
-                <a class="file-delete" (click)="closing.emit(asset)" *ngIf="closeMode">
+                <a class="file-delete" (click)="closing.emit(asset)" *ngIf="closeMode && !hideIcons">
                     <i class="icon-close"></i>
                 </a>
 
diff --git a/src/Squidex/app/shared/components/asset.component.ts b/src/Squidex/app/shared/components/asset.component.ts
index d559efba6..1a78c7dc4 100644
--- a/src/Squidex/app/shared/components/asset.component.ts
+++ b/src/Squidex/app/shared/components/asset.component.ts
@@ -44,6 +44,9 @@ export class AssetComponent extends AppComponentBase implements OnInit {
     @Input()
     public closeMode = false;
 
+    @Input()
+    public hideIcons = false;
+
     @Output()
     public loaded = new EventEmitter<AssetDto>();
 
diff --git a/src/Squidex/app/shared/components/rich-editor.component.html b/src/Squidex/app/shared/components/rich-editor.component.html
index 413c8e708..a1a7f69ba 100644
--- a/src/Squidex/app/shared/components/rich-editor.component.html
+++ b/src/Squidex/app/shared/components/rich-editor.component.html
@@ -15,7 +15,7 @@
             <div class="modal-body">
                 <form [formGroup]="assetsForm" (ngSubmit)="closeAssetDialog()">
                     <div class="row">
-                        <sqx-asset class="col-3" *ngFor="let asset of assetsItems" [asset]="asset" (clicked)="onAssetClicked($event)" ></sqx-asset>
+                        <sqx-asset class="col-3" *ngFor="let asset of assetsItems" [asset]="asset" [hideIcons]="true" (clicked)="onAssetClicked($event)" ></sqx-asset>
                     </div>
                     <div class="clearfix" *ngIf="assetsPager.numberOfItems > 0">
                         <div class="float-right pagination">
diff --git a/src/Squidex/app/shared/components/rich-editor.component.ts b/src/Squidex/app/shared/components/rich-editor.component.ts
index b88b56988..f95670a4d 100644
--- a/src/Squidex/app/shared/components/rich-editor.component.ts
+++ b/src/Squidex/app/shared/components/rich-editor.component.ts
@@ -35,6 +35,7 @@ export class RichEditorComponent extends AppComponentBase implements ControlValu
     public assetsItems: ImmutableArray<AssetDto>;
     public assetsPager = new Pager(0, 0, 12);
     private assetUrlGenerator: AssetUrlPipe;
+    private assetsMimeTypes: Array<string> = ['image/png', 'image/jpeg', 'image/jpg', 'image/gif'];
 
     @ViewChild('editor')
     public editor: ElementRef;
@@ -56,7 +57,7 @@ export class RichEditorComponent extends AppComponentBase implements ControlValu
 
     private load() {
         this.appNameOnce()
-            .switchMap(app => this.assetsService.getAssets(app, this.assetsPager.pageSize, this.assetsPager.skip))
+            .switchMap(app => this.assetsService.getAssets(app, this.assetsPager.pageSize, this.assetsPager.skip, undefined, this.assetsMimeTypes))
             .subscribe(dtos => {
                 this.assetsItems = ImmutableArray.of(dtos.items);
                 this.assetsPager = this.assetsPager.setCount(dtos.total);
@@ -111,7 +112,7 @@ export class RichEditorComponent extends AppComponentBase implements ControlValu
                             self.tinyEditor.setContent(this.value || '');
                         }, 500);
                 },
-                removed_menuitems: 'newdocument', plugins: 'code,image', target: this.editor.nativeElement, file_picker_types: 'image', file_picker_callback: (cb: any, value: any, meta: any) => {
+                removed_menuitems: 'newdocument', plugins: 'code,image', target: this.editor.nativeElement, file_picker_types: 'image', convert_urls: false, file_picker_callback: (cb: any, value: any, meta: any) => {
                     self.load();
                     self.assetsDialog.show();
                     self.assetSelectorClickHandler = {