diff --git a/apps/red-ui/src/app/modules/account/screens/preferences/preferences.component.html b/apps/red-ui/src/app/modules/account/screens/preferences/preferences.component.html
index cee25d2a8..4cbe5621d 100644
--- a/apps/red-ui/src/app/modules/account/screens/preferences/preferences.component.html
+++ b/apps/red-ui/src/app/modules/account/screens/preferences/preferences.component.html
@@ -15,7 +15,7 @@
                     </mat-slide-toggle>
                 </div>
 
-                <div *allow="roles.getTables" class="iqser-input-group">
+                <div *allow="roles.getTables; if: isIqserDevMode" class="iqser-input-group">
                     <label [translate]="'preferences-screen.form.table-extraction-type'"></label>
                     <input formControlName="tableExtractionType" />
                 </div>
diff --git a/apps/red-ui/src/app/modules/account/screens/preferences/preferences.component.ts b/apps/red-ui/src/app/modules/account/screens/preferences/preferences.component.ts
index be7d64c2e..0d640eb8d 100644
--- a/apps/red-ui/src/app/modules/account/screens/preferences/preferences.component.ts
+++ b/apps/red-ui/src/app/modules/account/screens/preferences/preferences.component.ts
@@ -1,19 +1,20 @@
 import { ChangeDetectionStrategy, ChangeDetectorRef, Component, OnInit } from '@angular/core';
 import { FormBuilder, FormGroup } from '@angular/forms';
 import { ActivatedRoute } from '@angular/router';
-import { BaseFormComponent, getConfig, IqserPermissionsService, LoadingService } from '@iqser/common-ui';
+import { BaseFormComponent, getConfig, IqserPermissionsService, isIqserDevMode, LoadingService } from '@iqser/common-ui';
 import { AsControl } from '@iqser/common-ui/lib/utils';
 import { Roles } from '@users/roles';
 import { PreferencesKeys, UserPreferenceService } from '@users/user-preference.service';
 
 interface PreferencesForm {
-    [k: string]: any;
     // preferences
     autoExpandFiltersOnActions: boolean;
     openScmDialogByDefault: boolean;
     tableExtractionType: string;
     // warnings preferences
     loadAllAnnotationsWarning: boolean;
+
+    [k: string]: any;
 }
 
 type Screen = 'preferences' | 'warnings-preferences';
@@ -36,6 +37,7 @@ export class PreferencesComponent extends BaseFormComponent implements OnInit {
     initialFormValue: PreferencesForm;
     readonly roles = Roles;
     readonly config = getConfig();
+    readonly isIqserDevMode = isIqserDevMode();
 
     constructor(
         route: ActivatedRoute,
diff --git a/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.html b/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.html
index b69d61abe..91355c5a9 100644
--- a/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.html
+++ b/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.html
@@ -42,7 +42,7 @@
 
             <iqser-circle-button
                 (action)="getTables()"
-                *allow="roles.getTables"
+                *allow="roles.getTables; if: isIqserDevMode"
                 [icon]="'red:csv'"
                 [tooltip]="'file-preview.get-tables' | translate"
                 class="ml-2"
@@ -58,7 +58,7 @@
             <!-- Dev Mode Features-->
             <iqser-circle-button
                 (action)="downloadOriginalFile(file)"
-                *ngIf="userPreferenceService.isIqserDevMode"
+                *ngIf="isIqserDevMode"
                 [tooltip]="'file-preview.download-original-file' | translate"
                 [type]="circleButtonTypes.primary"
                 class="ml-8"
diff --git a/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.ts b/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.ts
index fce0b7098..09f0279a1 100644
--- a/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.ts
+++ b/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.ts
@@ -12,8 +12,10 @@ import {
     TemplateRef,
     ViewChild,
 } from '@angular/core';
-import { saveAs } from 'file-saver';
+import { MatDialog } from '@angular/material/dialog';
 import { ActivatedRouteSnapshot, NavigationExtras, Router } from '@angular/router';
+import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
+import { ComponentCanDeactivate } from '@guards/can-deactivate.guard';
 import {
     CircleButtonTypes,
     ConfirmOption,
@@ -25,58 +27,57 @@ import {
     IConfirmationDialogData,
     IqserDialog,
     IqserPermissionsService,
+    isIqserDevMode,
     LoadingService,
     Toaster,
 } from '@iqser/common-ui';
-import { MatDialog } from '@angular/material/dialog';
-import { ManualRedactionEntryTypes, ManualRedactionEntryWrapper } from '@models/file/manual-redaction-entry.wrapper';
+import { copyLocalStorageFiltersValues, FilterService, NestedFilter, processFilters } from '@iqser/common-ui/lib/filtering';
+import { TenantsService } from '@iqser/common-ui/lib/tenants';
+import { AutoUnsubscribe, Bind, bool, Debounce, List, OnAttach, OnDetach } from '@iqser/common-ui/lib/utils';
 import { AnnotationWrapper } from '@models/file/annotation.wrapper';
-import { AnnotationDrawService } from '../pdf-viewer/services/annotation-draw.service';
-import { AnnotationProcessingService } from './services/annotation-processing.service';
+import { ManualRedactionEntryTypes, ManualRedactionEntryWrapper } from '@models/file/manual-redaction-entry.wrapper';
 import { Dictionary, File, ViewModes } from '@red/domain';
-import { PermissionsService } from '@services/permissions.service';
-import { combineLatest, first, firstValueFrom, of, pairwise } from 'rxjs';
-import { PreferencesKeys, UserPreferenceService } from '@users/user-preference.service';
-import { byId, byPage, download, handleFilterDelta, hasChanges } from '../../utils';
-import { FilesService } from '@services/files/files.service';
-import { FileManagementService } from '@services/files/file-management.service';
-import { catchError, filter, map, startWith, switchMap, tap } from 'rxjs/operators';
-import { FilesMapService } from '@services/files/files-map.service';
-import { ViewModeService } from './services/view-mode.service';
-import { ReanalysisService } from '@services/reanalysis.service';
-import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
-import { FilePreviewStateService } from './services/file-preview-state.service';
-import { filePreviewScreenProviders } from './file-preview-providers';
-import { ManualRedactionService } from './services/manual-redaction.service';
+import { ConfigService } from '@services/config.service';
+import { DossierTemplatesService } from '@services/dossier-templates/dossier-templates.service';
 import { DossiersService } from '@services/dossiers/dossiers.service';
-import { PageRotationService } from '../pdf-viewer/services/page-rotation.service';
-import { ComponentCanDeactivate } from '@guards/can-deactivate.guard';
-import { FilePreviewDialogService } from './services/file-preview-dialog.service';
-import { FileDataService } from './services/file-data.service';
-import { ALL_HOTKEYS, TextPopups } from './utils/constants';
+import { FileManagementService } from '@services/files/file-management.service';
+import { FilesMapService } from '@services/files/files-map.service';
+import { FilesService } from '@services/files/files.service';
+import { PermissionsService } from '@services/permissions.service';
+import { ReanalysisService } from '@services/reanalysis.service';
+import { Roles } from '@users/roles';
+import { PreferencesKeys, UserPreferenceService } from '@users/user-preference.service';
+import { saveAs } from 'file-saver';
+import JSZip from 'jszip';
 import { NGXLogger } from 'ngx-logger';
-import { StampService } from './services/stamp.service';
-import { PdfViewer } from '../pdf-viewer/services/pdf-viewer.service';
+import { combineLatest, first, firstValueFrom, of, pairwise } from 'rxjs';
+import { catchError, filter, map, startWith, switchMap, tap } from 'rxjs/operators';
+import { byId, byPage, download, handleFilterDelta, hasChanges } from '../../utils';
+import { AnnotationDrawService } from '../pdf-viewer/services/annotation-draw.service';
 import { REDAnnotationManager } from '../pdf-viewer/services/annotation-manager.service';
+import { REDDocumentViewer } from '../pdf-viewer/services/document-viewer.service';
+import { PageRotationService } from '../pdf-viewer/services/page-rotation.service';
+import { PdfViewer } from '../pdf-viewer/services/pdf-viewer.service';
+import { ReadableRedactionsService } from '../pdf-viewer/services/readable-redactions.service';
 import { ViewerHeaderService } from '../pdf-viewer/services/viewer-header.service';
 import { ROTATION_ACTION_BUTTONS, ViewerEvents } from '../pdf-viewer/utils/constants';
-import { SkippedService } from './services/skipped.service';
-import { REDDocumentViewer } from '../pdf-viewer/services/document-viewer.service';
-import { AnnotationsListingService } from './services/annotations-listing.service';
-import { PdfProxyService } from './services/pdf-proxy.service';
-import { ConfigService } from '@services/config.service';
-import { ReadableRedactionsService } from '../pdf-viewer/services/readable-redactions.service';
-import { Roles } from '@users/roles';
-import { RedactTextDialogComponent } from './dialogs/redact-text-dialog/redact-text-dialog.component';
-import { DossierTemplatesService } from '@services/dossier-templates/dossier-templates.service';
-import { copyLocalStorageFiltersValues, FilterService, NestedFilter, processFilters } from '@iqser/common-ui/lib/filtering';
-import { AutoUnsubscribe, Bind, bool, Debounce, List, OnAttach, OnDetach } from '@iqser/common-ui/lib/utils';
-import { TenantsService } from '@iqser/common-ui/lib/tenants';
 import { AddHintDialogComponent } from './dialogs/add-hint-dialog/add-hint-dialog.component';
 import { AddAnnotationDialogComponent } from './dialogs/docu-mine/add-annotation-dialog/add-annotation-dialog.component';
-import { RedactTextData } from './utils/dialog-types';
+import { RedactTextDialogComponent } from './dialogs/redact-text-dialog/redact-text-dialog.component';
+import { filePreviewScreenProviders } from './file-preview-providers';
+import { AnnotationProcessingService } from './services/annotation-processing.service';
+import { AnnotationsListingService } from './services/annotations-listing.service';
+import { FileDataService } from './services/file-data.service';
+import { FilePreviewDialogService } from './services/file-preview-dialog.service';
+import { FilePreviewStateService } from './services/file-preview-state.service';
+import { ManualRedactionService } from './services/manual-redaction.service';
+import { PdfProxyService } from './services/pdf-proxy.service';
+import { SkippedService } from './services/skipped.service';
+import { StampService } from './services/stamp.service';
 import { TablesService } from './services/tables.service';
-import JSZip from 'jszip';
+import { ViewModeService } from './services/view-mode.service';
+import { ALL_HOTKEYS, TextPopups } from './utils/constants';
+import { RedactTextData } from './utils/dialog-types';
 
 const textActions = [TextPopups.REDACT_TEXT, TextPopups.ADD_HINT, TextPopups.ADD_FALSE_POSITIVE];
 
@@ -89,13 +90,6 @@ export class FilePreviewScreenComponent
     extends AutoUnsubscribe
     implements AfterViewInit, OnInit, OnDestroy, OnAttach, OnDetach, ComponentCanDeactivate
 {
-    readonly circleButtonTypes = CircleButtonTypes;
-    readonly roles = Roles;
-    fullScreen = false;
-    readonly fileId = this.state.fileId;
-    readonly dossierId = this.state.dossierId;
-    readonly lastAssignee = computed(() => this.getLastAssignee());
-    width: number;
     @ViewChild('annotationFilterTemplate', {
         read: TemplateRef,
         static: false,
@@ -103,6 +97,14 @@ export class FilePreviewScreenComponent
     private readonly _filterTemplate: TemplateRef<unknown>;
     @ViewChild('actionsWrapper', { static: false }) private readonly _actionsWrapper: ElementRef;
     readonly #isDocumine = getConfig().IS_DOCUMINE;
+    readonly circleButtonTypes = CircleButtonTypes;
+    readonly roles = Roles;
+    fullScreen = false;
+    readonly fileId = this.state.fileId;
+    readonly dossierId = this.state.dossierId;
+    readonly lastAssignee = computed(() => this.getLastAssignee());
+    width: number;
+    readonly isIqserDevMode = isIqserDevMode();
 
     constructor(
         readonly pdf: PdfViewer,