diff --git a/rtdata/languages/Catala b/rtdata/languages/Catala
index 1c89d23c5..fa7141087 100644
--- a/rtdata/languages/Catala
+++ b/rtdata/languages/Catala
@@ -491,9 +491,6 @@ PREFERENCES_APPLNEXTSTARTUP;Efectiu en reiniciar
 PREFERENCES_AUTOMONPROFILE;Usa els perfils dels monitors dels sist. operatius automàticament
 PREFERENCES_BATCH_PROCESSING;Process. per lots
 PREFERENCES_BEHAVIOR;Comportament
-PREFERENCES_CACHECLEARALL;Esborrar tot
-PREFERENCES_CACHECLEARPROFILES;Esborrar perfils
-PREFERENCES_CACHECLEARTHUMBS;Esborra minifotos
 PREFERENCES_CACHEMAXENTRIES;Màxim nombre d'entrades a la mem. cau
 PREFERENCES_CACHEOPTS;Opcions memòria cau
 PREFERENCES_CACHETHUMBHEIGHT;Màxima alçada de minifoto
diff --git a/rtdata/languages/Chinese (Simplified) b/rtdata/languages/Chinese (Simplified)
index 05b11dd4f..ff45df98b 100644
--- a/rtdata/languages/Chinese (Simplified)	
+++ b/rtdata/languages/Chinese (Simplified)	
@@ -492,9 +492,6 @@ PREFERENCES_BEHADDALL;全 '添加'
 PREFERENCES_BEHAVIOR;行为
 PREFERENCES_BEHSETALL;全 '设定'
 PREFERENCES_BLACKBODY;钨丝灯
-PREFERENCES_CACHECLEARALL;全部清除
-PREFERENCES_CACHECLEARPROFILES;清除配置
-PREFERENCES_CACHECLEARTHUMBS;清除缩略图
 PREFERENCES_CACHEMAXENTRIES;最大缓存数量
 PREFERENCES_CACHEOPTS;缓存选项
 PREFERENCES_CACHETHUMBHEIGHT;最大缩略图高度
diff --git a/rtdata/languages/Chinese (Traditional) b/rtdata/languages/Chinese (Traditional)
index d58343b6a..47a604554 100644
--- a/rtdata/languages/Chinese (Traditional)	
+++ b/rtdata/languages/Chinese (Traditional)	
@@ -239,9 +239,6 @@ PARTIALPASTE_SHARPENING;Sharpening
 PARTIALPASTE_VIGNETTING;Vignetting correction
 PARTIALPASTE_WHITEBALANCE;White balance
 PREFERENCES_APPLNEXTSTARTUP;下次啟動生效
-PREFERENCES_CACHECLEARALL;Clear All
-PREFERENCES_CACHECLEARPROFILES;Clear Profiles
-PREFERENCES_CACHECLEARTHUMBS;Clear Thumbnails
 PREFERENCES_CACHEMAXENTRIES;Maximal Number of Cache Entries
 PREFERENCES_CACHEOPTS;Cache Options
 PREFERENCES_CACHETHUMBHEIGHT;Maximal Thumbnail Height
diff --git a/rtdata/languages/Czech b/rtdata/languages/Czech
index dbc606070..4be6bdc58 100644
--- a/rtdata/languages/Czech
+++ b/rtdata/languages/Czech
@@ -989,9 +989,6 @@ PREFERENCES_BEHAVIOR;Režim
 PREFERENCES_BEHSETALL;Vše do 'Nastavit'
 PREFERENCES_BEHSETALLHINT;Nastaví všechny parametry do módu <b>Nastavit</b>.\nZměna parametrů v panelu dávkového zpracování se aplikuje jako <b>absolutní</b>, budou zobrazeny aktuální hodnoty.
 PREFERENCES_BLACKBODY;Wolfram
-PREFERENCES_CACHECLEARALL;Vymazat vše
-PREFERENCES_CACHECLEARPROFILES;Smazat profily zpracování
-PREFERENCES_CACHECLEARTHUMBS;Vymazat náhledy
 PREFERENCES_CACHEMAXENTRIES;Maximální počet záznamů v mezipaměti
 PREFERENCES_CACHEOPTS;Vlastnosti mezipaměti
 PREFERENCES_CACHETHUMBHEIGHT;Maximální výška náhledu
diff --git a/rtdata/languages/Dansk b/rtdata/languages/Dansk
index da5616b31..7658914f7 100644
--- a/rtdata/languages/Dansk
+++ b/rtdata/languages/Dansk
@@ -230,9 +230,6 @@ PARTIALPASTE_SHARPENING;Skarphed
 PARTIALPASTE_VIGNETTING;Vignettering
 PARTIALPASTE_WHITEBALANCE;Hvidbalance
 PREFERENCES_APPLNEXTSTARTUP;Anvendes ved næste opstart
-PREFERENCES_CACHECLEARALL;Ryd alt
-PREFERENCES_CACHECLEARPROFILES;Ryd profiler
-PREFERENCES_CACHECLEARTHUMBS;Ryd miniaturer
 PREFERENCES_CACHEMAXENTRIES;Maksimalt antal indskrivninger i cache
 PREFERENCES_CACHEOPTS;Cache-indstillinger
 PREFERENCES_CACHETHUMBHEIGHT;Maksimal miniaturehøjde
diff --git a/rtdata/languages/Deutsch b/rtdata/languages/Deutsch
index 3cf1b32da..fc3374db6 100644
--- a/rtdata/languages/Deutsch
+++ b/rtdata/languages/Deutsch
@@ -1099,9 +1099,6 @@ PREFERENCES_BEHAVIOR;Verhalten
 PREFERENCES_BEHSETALL;Alle setzen
 PREFERENCES_BEHSETALLHINT;Setzt alle Parameter auf <b>Setzen</b>.\nAnpassungen der Parameter in der Hintergrundstapelverarbeitung werden als <b>Absolut</b> zu den gespeicherten Werten interpretiert.
 PREFERENCES_BLACKBODY;Wolfram
-PREFERENCES_CACHECLEARALL;Alles löschen
-PREFERENCES_CACHECLEARPROFILES;Profile löschen
-PREFERENCES_CACHECLEARTHUMBS;Miniaturbilder löschen
 PREFERENCES_CACHEMAXENTRIES;Maximale Anzahl der Miniaturbilder im Festplatten-Cache
 PREFERENCES_CACHEOPTS;Einstellungen des Festplatten-Cache für Miniaturbilder
 PREFERENCES_CACHETHUMBHEIGHT;Maximale Höhe der Miniaturbilder
diff --git a/rtdata/languages/English (UK) b/rtdata/languages/English (UK)
index 8fcaafd56..6be9b3308 100644
--- a/rtdata/languages/English (UK)	
+++ b/rtdata/languages/English (UK)	
@@ -1102,9 +1102,6 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of "wh
 !PREFERENCES_BEHSETALL;All to 'Set'
 !PREFERENCES_BEHSETALLHINT;Set all parameters to the <b>Set</b> mode.\nAdjustments of parameters in the batch tool panel will be <b>absolute</b>, the actual values will be displayed.
 !PREFERENCES_BLACKBODY;Tungsten
-!PREFERENCES_CACHECLEARALL;Clear All
-!PREFERENCES_CACHECLEARPROFILES;Clear Processing Profiles
-!PREFERENCES_CACHECLEARTHUMBS;Clear Thumbnails
 !PREFERENCES_CACHEMAXENTRIES;Maximum number of cache entries
 !PREFERENCES_CACHEOPTS;Cache Options
 !PREFERENCES_CACHETHUMBHEIGHT;Maximum thumbnail height
diff --git a/rtdata/languages/English (US) b/rtdata/languages/English (US)
index 53a2aec91..f8ec04d1f 100644
--- a/rtdata/languages/English (US)	
+++ b/rtdata/languages/English (US)	
@@ -1026,9 +1026,6 @@
 !PREFERENCES_BEHSETALL;All to 'Set'
 !PREFERENCES_BEHSETALLHINT;Set all parameters to the <b>Set</b> mode.\nAdjustments of parameters in the batch tool panel will be <b>absolute</b>, the actual values will be displayed.
 !PREFERENCES_BLACKBODY;Tungsten
-!PREFERENCES_CACHECLEARALL;Clear All
-!PREFERENCES_CACHECLEARPROFILES;Clear Processing Profiles
-!PREFERENCES_CACHECLEARTHUMBS;Clear Thumbnails
 !PREFERENCES_CACHEMAXENTRIES;Maximum number of cache entries
 !PREFERENCES_CACHEOPTS;Cache Options
 !PREFERENCES_CACHETHUMBHEIGHT;Maximum thumbnail height
diff --git a/rtdata/languages/Espanol b/rtdata/languages/Espanol
index 4284523ab..7b0645778 100644
--- a/rtdata/languages/Espanol
+++ b/rtdata/languages/Espanol
@@ -721,9 +721,6 @@ PREFERENCES_BEHAVIOR;Comportamiento
 PREFERENCES_BEHSETALL;Todo para 'Establecer'
 PREFERENCES_BEHSETALLHINT;Todos los parámetros para el modo <b>Establecer</b>.\nLos ajustes de parámetros en el panel de la herramienta de lotes serán serán <b>absolutos</b>, se mostrarán los valores vigentes
 PREFERENCES_BLACKBODY;Tungsteno
-PREFERENCES_CACHECLEARALL;Borrar todo
-PREFERENCES_CACHECLEARPROFILES;Borrar perfiles
-PREFERENCES_CACHECLEARTHUMBS;Borrar miniaturas
 PREFERENCES_CACHEMAXENTRIES;Cantidad máxima de entradas en la memoria intermedia
 PREFERENCES_CACHEOPTS;Opciones de memoria intermedia
 PREFERENCES_CACHETHUMBHEIGHT;Altura máxima de las miniaturas
diff --git a/rtdata/languages/Euskara b/rtdata/languages/Euskara
index a604d6aef..06bfc9ae5 100644
--- a/rtdata/languages/Euskara
+++ b/rtdata/languages/Euskara
@@ -230,9 +230,6 @@ PARTIALPASTE_SHARPENING;Sharpening
 PARTIALPASTE_VIGNETTING;Vignetting correction
 PARTIALPASTE_WHITEBALANCE;White balance
 PREFERENCES_APPLNEXTSTARTUP;hurrengo abioan aplikatua 
-PREFERENCES_CACHECLEARALL;Clear All
-PREFERENCES_CACHECLEARPROFILES;Clear Profiles
-PREFERENCES_CACHECLEARTHUMBS;Clear Thumbnails
 PREFERENCES_CACHEMAXENTRIES;Maximal Number of Cache Entries
 PREFERENCES_CACHEOPTS;Cache Options
 PREFERENCES_CACHETHUMBHEIGHT;Maximal Thumbnail Height
diff --git a/rtdata/languages/Francais b/rtdata/languages/Francais
index 2bf82f6e1..19a8ce8d4 100644
--- a/rtdata/languages/Francais
+++ b/rtdata/languages/Francais
@@ -988,9 +988,6 @@ PREFERENCES_BEHAVIOR;Comportement
 PREFERENCES_BEHSETALL;Tout à 'Remplace'
 PREFERENCES_BEHSETALLHINT;Règle tous les paramètres sur le mode <b>Remplace</b>.\nLa modification des paramètres dans le panneau d'édition en par lot sera <b>absolue</b>, les valeurs réelles seront affichées
 PREFERENCES_BLACKBODY;Tungstène
-PREFERENCES_CACHECLEARALL;Tout nettoyer
-PREFERENCES_CACHECLEARPROFILES;Nettoyer les profils
-PREFERENCES_CACHECLEARTHUMBS;Nettoyer les vignettes
 PREFERENCES_CACHEMAXENTRIES;Nombre maximal d'éléments dans le Cache
 PREFERENCES_CACHEOPTS;Options du Cache
 PREFERENCES_CACHETHUMBHEIGHT;Hauteur maximale des vignettes
diff --git a/rtdata/languages/Greek b/rtdata/languages/Greek
index 0c416e421..cf9aef8ae 100644
--- a/rtdata/languages/Greek
+++ b/rtdata/languages/Greek
@@ -230,9 +230,6 @@ PARTIALPASTE_SHARPENING;Sharpening
 PARTIALPASTE_VIGNETTING;Vignetting correction
 PARTIALPASTE_WHITEBALANCE;White balance
 PREFERENCES_APPLNEXTSTARTUP;εφαρμόζεται στην επόμενη εκκίνηση
-PREFERENCES_CACHECLEARALL;Clear All
-PREFERENCES_CACHECLEARPROFILES;Clear Profiles
-PREFERENCES_CACHECLEARTHUMBS;Clear Thumbnails
 PREFERENCES_CACHEMAXENTRIES;Maximal Number of Cache Entries
 PREFERENCES_CACHEOPTS;Cache Options
 PREFERENCES_CACHETHUMBHEIGHT;Maximal Thumbnail Height
diff --git a/rtdata/languages/Hebrew b/rtdata/languages/Hebrew
index 358045544..e8814d80f 100644
--- a/rtdata/languages/Hebrew
+++ b/rtdata/languages/Hebrew
@@ -230,9 +230,6 @@ PARTIALPASTE_SHARPENING;Sharpening
 PARTIALPASTE_VIGNETTING;Vignetting correction
 PARTIALPASTE_WHITEBALANCE;White balance
 PREFERENCES_APPLNEXTSTARTUP;ייושם באתחול הבא
-PREFERENCES_CACHECLEARALL;Clear All
-PREFERENCES_CACHECLEARPROFILES;Clear Profiles
-PREFERENCES_CACHECLEARTHUMBS;Clear Thumbnails
 PREFERENCES_CACHEMAXENTRIES;Maximal Number of Cache Entries
 PREFERENCES_CACHEOPTS;Cache Options
 PREFERENCES_CACHETHUMBHEIGHT;Maximal Thumbnail Height
diff --git a/rtdata/languages/Italiano b/rtdata/languages/Italiano
index e8a49771a..1c24cc52e 100644
--- a/rtdata/languages/Italiano
+++ b/rtdata/languages/Italiano
@@ -627,9 +627,6 @@ PREFERENCES_BEHAVIOR;Comportamento
 PREFERENCES_BEHSETALL;Tutti a 'Imposta'
 PREFERENCES_BEHSETALLHINT;Imposta tutti i parametri nella modalità <b>Imposta</b>.\nLe regolazioni dei parametri nel pannello strumenti batch saranno <b>assoluti</b>, verranno mostrati i valori reali.
 PREFERENCES_BLACKBODY;Tungsteno
-PREFERENCES_CACHECLEARALL;Rimuovi tutto
-PREFERENCES_CACHECLEARPROFILES;Rimuovi i profili di sviluppo
-PREFERENCES_CACHECLEARTHUMBS;Rimuovi le miniature
 PREFERENCES_CACHEMAXENTRIES;Numero massimo di voci in memoria
 PREFERENCES_CACHEOPTS;Opzioni della memoria
 PREFERENCES_CACHETHUMBHEIGHT;Massima altezza delle miniature
diff --git a/rtdata/languages/Japanese b/rtdata/languages/Japanese
index 0bc015fe9..bc5fa66e0 100644
--- a/rtdata/languages/Japanese
+++ b/rtdata/languages/Japanese
@@ -1056,9 +1056,6 @@ PREFERENCES_BEHAVIOR;ビヘイビア
 PREFERENCES_BEHSETALL;すべて '設定'
 PREFERENCES_BEHSETALLHINT;すべてのパラメータを <b>設定</b>モードにします\nバッチツールパネルで設定される調整値が、各画像の既定値に取って代わり<b>同一</b>になります
 PREFERENCES_BLACKBODY;タングステン
-PREFERENCES_CACHECLEARALL;すべてクリア
-PREFERENCES_CACHECLEARPROFILES;プロファイルのクリア
-PREFERENCES_CACHECLEARTHUMBS;サムネイルのクリア
 PREFERENCES_CACHEMAXENTRIES;キャッシュエントリーの最大数
 PREFERENCES_CACHEOPTS;cache オプション
 PREFERENCES_CACHETHUMBHEIGHT;サムネイル縦の最大値
diff --git a/rtdata/languages/Latvian b/rtdata/languages/Latvian
index 23887cfb1..2a3ca3759 100644
--- a/rtdata/languages/Latvian
+++ b/rtdata/languages/Latvian
@@ -230,9 +230,6 @@ PARTIALPASTE_SHARPENING;Asināšana
 PARTIALPASTE_VIGNETTING;Vinjetes labošana
 PARTIALPASTE_WHITEBALANCE;Baltā līdzsvarss
 PREFERENCES_APPLNEXTSTARTUP;lietos nākamā reizē
-PREFERENCES_CACHECLEARALL;Attīrīt visu
-PREFERENCES_CACHECLEARPROFILES;Attīrīt Profilus
-PREFERENCES_CACHECLEARTHUMBS;Attīrīt sīktēlus
 PREFERENCES_CACHEMAXENTRIES;Maksimālais keša ierakstu skaits
 PREFERENCES_CACHEOPTS;Keša opcijas
 PREFERENCES_CACHETHUMBHEIGHT;Keša maksimālais sīktēla augstums
diff --git a/rtdata/languages/Magyar b/rtdata/languages/Magyar
index 4e463a8fd..9bd662821 100644
--- a/rtdata/languages/Magyar
+++ b/rtdata/languages/Magyar
@@ -475,9 +475,6 @@ PREFERENCES_APPLNEXTSTARTUP;újraindítás után érvényes
 PREFERENCES_AUTOMONPROFILE;Oprendszerben beállított monitor-színprofil automatikus használata
 PREFERENCES_BATCH_PROCESSING;Kötegelt feldolgozás
 PREFERENCES_BEHAVIOR;Viselkedés
-PREFERENCES_CACHECLEARALL;Teljes gyorsítótár törlése
-PREFERENCES_CACHECLEARPROFILES;Feldolg. param. törlése
-PREFERENCES_CACHECLEARTHUMBS;Előnézeti képek törlése
 PREFERENCES_CACHEMAXENTRIES;Gyorsítótárban tárolt képek max. száma
 PREFERENCES_CACHEOPTS;Gyorsítótár beállítások
 PREFERENCES_CACHETHUMBHEIGHT;Előnézeti kép maximális magassága
diff --git a/rtdata/languages/Nederlands b/rtdata/languages/Nederlands
index fd0036952..15f7b959b 100644
--- a/rtdata/languages/Nederlands
+++ b/rtdata/languages/Nederlands
@@ -912,9 +912,6 @@ PREFERENCES_BEHAVIOR;Gedrag
 PREFERENCES_BEHSETALL;Alles op 'Activeer'
 PREFERENCES_BEHSETALLHINT;Zet alle parameters in de <b>Activeer</b> mode.\nWijzigingen van parameters in de batch tool zijn <b>absoluut</b>. De actuele waarden worden gebruikt.
 PREFERENCES_BLACKBODY;Tungsten(wolfraam)
-PREFERENCES_CACHECLEARALL;Wis alles
-PREFERENCES_CACHECLEARPROFILES;Wis profielen
-PREFERENCES_CACHECLEARTHUMBS;Wis miniaturen
 PREFERENCES_CACHEMAXENTRIES;Maximaal aantal elementen in cache
 PREFERENCES_CACHEOPTS;Cache-opties
 PREFERENCES_CACHETHUMBHEIGHT;Maximale hoogte miniaturen
diff --git a/rtdata/languages/Norsk BM b/rtdata/languages/Norsk BM
index 4a4995aef..958ed12ad 100644
--- a/rtdata/languages/Norsk BM	
+++ b/rtdata/languages/Norsk BM	
@@ -230,9 +230,6 @@ PARTIALPASTE_SHARPENING;Oppskarping
 PARTIALPASTE_VIGNETTING;Vignetteringskorreksjon
 PARTIALPASTE_WHITEBALANCE;Hvitbalanse
 PREFERENCES_APPLNEXTSTARTUP;Endres ved neste oppstart
-PREFERENCES_CACHECLEARALL;Slett alle
-PREFERENCES_CACHECLEARPROFILES;Slett profiler
-PREFERENCES_CACHECLEARTHUMBS;Slett thumbnails
 PREFERENCES_CACHEMAXENTRIES;Maksimalt antall cache oppføringer
 PREFERENCES_CACHEOPTS;Cache innstillinger
 PREFERENCES_CACHETHUMBHEIGHT;Maksimal Thumbnail Høyde
diff --git a/rtdata/languages/Polish b/rtdata/languages/Polish
index b271178e0..3e853bf20 100644
--- a/rtdata/languages/Polish
+++ b/rtdata/languages/Polish
@@ -676,9 +676,6 @@ PREFERENCES_BEHAVIOR;Zachowanie
 PREFERENCES_BEHSETALL;'Ustaw' wszystkie
 PREFERENCES_BEHSETALLHINT;Ustaw wszystkie narzędzia w tryb <b>Ustaw</b>.\nZmiany parametrów w panelu edycji zbiorczej zostaną traktowane jako <b>absolutne</b>, nie biorąc pod uwagę poprzednich wartości.
 PREFERENCES_BLACKBODY;Wolfram
-PREFERENCES_CACHECLEARALL;Wyczyść wszystko
-PREFERENCES_CACHECLEARPROFILES;Wyczyść profile
-PREFERENCES_CACHECLEARTHUMBS;Wyczyść miniaturki
 PREFERENCES_CACHEMAXENTRIES;Maksymalna liczba wpisów w pamięci podręcznej
 PREFERENCES_CACHEOPTS;Opcje pamięci podręcznej
 PREFERENCES_CACHETHUMBHEIGHT;Maksymalna wysokość miniatury
diff --git a/rtdata/languages/Polish (Latin Characters) b/rtdata/languages/Polish (Latin Characters)
index 310a1ed13..f847eb6b9 100644
--- a/rtdata/languages/Polish (Latin Characters)	
+++ b/rtdata/languages/Polish (Latin Characters)	
@@ -676,9 +676,6 @@ PREFERENCES_BEHAVIOR;Zachowanie
 PREFERENCES_BEHSETALL;'Ustaw' wszystkie
 PREFERENCES_BEHSETALLHINT;Ustaw wszystkie narzedzia w tryb <b>Ustaw</b>.\nZmiany parametrow w panelu edycji zbiorczej zostana traktowane jako <b>absolutne</b>, nie biorac pod uwage poprzednich wartosci.
 PREFERENCES_BLACKBODY;Wolfram
-PREFERENCES_CACHECLEARALL;Wyczysc wszystko
-PREFERENCES_CACHECLEARPROFILES;Wyczysc profile
-PREFERENCES_CACHECLEARTHUMBS;Wyczysc miniaturki
 PREFERENCES_CACHEMAXENTRIES;Maksymalna liczba wpisow w pamieci podrecznej
 PREFERENCES_CACHEOPTS;Opcje pamieci podrecznej
 PREFERENCES_CACHETHUMBHEIGHT;Maksymalna wysokosc miniatury
diff --git a/rtdata/languages/Portugues (Brasil) b/rtdata/languages/Portugues (Brasil)
index c737ddcfd..d8e5ccc1f 100644
--- a/rtdata/languages/Portugues (Brasil)	
+++ b/rtdata/languages/Portugues (Brasil)	
@@ -1020,9 +1020,6 @@ PREFERENCES_BEHAVIOR;Comportamento
 PREFERENCES_BEHSETALL;Tudo para 'Configurar'
 PREFERENCES_BEHSETALLHINT;Definir todos os parâmetros para o <b>Configurar</b> modo.\nAjustes de parâmetros no painel de ferramentas de lote serão <b>absoluto</b>, os valores reais serão exibidos.
 PREFERENCES_BLACKBODY;Tungstênio
-PREFERENCES_CACHECLEARALL;Limpar Tudo
-PREFERENCES_CACHECLEARPROFILES;Limpar Perfis de Processamento
-PREFERENCES_CACHECLEARTHUMBS;Limpar Miniaturas
 PREFERENCES_CACHEMAXENTRIES;Número máximo de entradas de cache
 PREFERENCES_CACHEOPTS;Opções de Cache
 PREFERENCES_CACHETHUMBHEIGHT;Altura máxima da miniatura
diff --git a/rtdata/languages/Russian b/rtdata/languages/Russian
index 3c89c4a74..176d86511 100644
--- a/rtdata/languages/Russian
+++ b/rtdata/languages/Russian
@@ -672,9 +672,6 @@ PREFERENCES_BEHAVIOR;Поведение
 PREFERENCES_BEHSETALL;Всё в "Установить"
 PREFERENCES_BEHSETALLHINT;Выставить все параметры в режим <b>Установить</b>.\nНастройки параметров в панели пакетной обработки будут <b>абсолютными</b>, будут показаны используемые значения
 PREFERENCES_BLACKBODY;Лампа накаливания
-PREFERENCES_CACHECLEARALL;Удалить все
-PREFERENCES_CACHECLEARPROFILES;Удалить параметры обработки
-PREFERENCES_CACHECLEARTHUMBS;Удалить эскизы
 PREFERENCES_CACHEMAXENTRIES;Максимальное число элементов в кэше
 PREFERENCES_CACHEOPTS;Параметры кэширования
 PREFERENCES_CACHETHUMBHEIGHT;Максимальная высота эскиза
diff --git a/rtdata/languages/Serbian (Cyrilic Characters) b/rtdata/languages/Serbian (Cyrilic Characters)
index 34c62bf06..4b570abb7 100644
--- a/rtdata/languages/Serbian (Cyrilic Characters)	
+++ b/rtdata/languages/Serbian (Cyrilic Characters)	
@@ -597,9 +597,6 @@ PREFERENCES_BEHAVIOR;Понашање
 PREFERENCES_BEHSETALL;Све у „Постави“
 PREFERENCES_BEHSETALLHINT;Поставља све параметре у режим <b>Постави</b>.\nЊихово подешавање помоћу алата из панела за заказано ће бити <b>апсолутне</b> вредности као што су и изабране.
 PREFERENCES_BLACKBODY;Обична сијалица
-PREFERENCES_CACHECLEARALL;Обриши све
-PREFERENCES_CACHECLEARPROFILES;Обриши профиле
-PREFERENCES_CACHECLEARTHUMBS;Обриши приказе
 PREFERENCES_CACHEMAXENTRIES;Највећи број мест у остави
 PREFERENCES_CACHEOPTS;Подешавање оставе
 PREFERENCES_CACHETHUMBHEIGHT;Највећа висина приказа
diff --git a/rtdata/languages/Serbian (Latin Characters) b/rtdata/languages/Serbian (Latin Characters)
index 5dd1fa04d..a5d5094c6 100644
--- a/rtdata/languages/Serbian (Latin Characters)	
+++ b/rtdata/languages/Serbian (Latin Characters)	
@@ -597,9 +597,6 @@ PREFERENCES_BEHAVIOR;Ponašanje
 PREFERENCES_BEHSETALL;Sve u „Postavi“
 PREFERENCES_BEHSETALLHINT;Postavlja sve parametre u režim <b>Postavi</b>.\nNjihovo podešavanje pomoću alata iz panela za zakazano će biti <b>apsolutne</b> vrednosti kao što su i izabrane.
 PREFERENCES_BLACKBODY;Obična sijalica
-PREFERENCES_CACHECLEARALL;Obriši sve
-PREFERENCES_CACHECLEARPROFILES;Obriši profile
-PREFERENCES_CACHECLEARTHUMBS;Obriši prikaze
 PREFERENCES_CACHEMAXENTRIES;Najveći broj mest u ostavi
 PREFERENCES_CACHEOPTS;Podešavanje ostave
 PREFERENCES_CACHETHUMBHEIGHT;Najveća visina prikaza
diff --git a/rtdata/languages/Slovak b/rtdata/languages/Slovak
index 15c4050ad..7e7fcdf86 100644
--- a/rtdata/languages/Slovak
+++ b/rtdata/languages/Slovak
@@ -274,9 +274,6 @@ PREFERENCES_ADD;Pridať
 PREFERENCES_APPLNEXTSTARTUP;Aplikovaný pri ďalšom spustení
 PREFERENCES_BATCH_PROCESSING;dávkové spracovanie
 PREFERENCES_BEHAVIOR;Správanie sa
-PREFERENCES_CACHECLEARALL;Vyčistiť všetko
-PREFERENCES_CACHECLEARPROFILES;Vyčistiť profily
-PREFERENCES_CACHECLEARTHUMBS;Vyčistiť zmenšeniny
 PREFERENCES_CACHEMAXENTRIES;Maximálny počet vstupov v cache
 PREFERENCES_CACHEOPTS;Možnosti cache
 PREFERENCES_CACHETHUMBHEIGHT;Maximálna výška zmenšenín
diff --git a/rtdata/languages/Suomi b/rtdata/languages/Suomi
index b0d075188..6e32cea61 100644
--- a/rtdata/languages/Suomi
+++ b/rtdata/languages/Suomi
@@ -230,9 +230,6 @@ PARTIALPASTE_SHARPENING;Terävöinti
 PARTIALPASTE_VIGNETTING;Vinjetoinnin korjaus
 PARTIALPASTE_WHITEBALANCE;Valkotasapaino
 PREFERENCES_APPLNEXTSTARTUP;käytössä käynnistyksen jälkeen
-PREFERENCES_CACHECLEARALL;Tyhjennä kaikki
-PREFERENCES_CACHECLEARPROFILES;Tyhjennä profiilit
-PREFERENCES_CACHECLEARTHUMBS;Tyhjennä esikatselukuvat
 PREFERENCES_CACHEMAXENTRIES;Välimuistin koko
 PREFERENCES_CACHEOPTS;Välimuistin asetukset
 PREFERENCES_CACHETHUMBHEIGHT;Suurin esikatselukuvan korkeus
diff --git a/rtdata/languages/Swedish b/rtdata/languages/Swedish
index 82b11df1e..510d6696d 100644
--- a/rtdata/languages/Swedish
+++ b/rtdata/languages/Swedish
@@ -817,9 +817,6 @@ PREFERENCES_BEHAVIOR;Uppträdande
 PREFERENCES_BEHSETALL;Sätt allt till 'Ange'
 PREFERENCES_BEHSETALLHINT;Sätt alla parametrar till <b>Ange</b>-läge.\nFörändringar i parametrar i batch-verktyget kommer att vara <b>absoluta</b> och de faktiska värdena kommer att visas.
 PREFERENCES_BLACKBODY;Glödlampa
-PREFERENCES_CACHECLEARALL;Återställ alla
-PREFERENCES_CACHECLEARPROFILES;Återställ profiler
-PREFERENCES_CACHECLEARTHUMBS;Ta bort cachade miniatyrbilder
 PREFERENCES_CACHEMAXENTRIES;Maximalt antal cachefiler
 PREFERENCES_CACHEOPTS;Cacheinställningar
 PREFERENCES_CACHETHUMBHEIGHT;Maximal höjd på miniatyrbilderna
diff --git a/rtdata/languages/Turkish b/rtdata/languages/Turkish
index 051c99217..1ab598c2c 100644
--- a/rtdata/languages/Turkish
+++ b/rtdata/languages/Turkish
@@ -230,9 +230,6 @@ PARTIALPASTE_SHARPENING;Sharpening
 PARTIALPASTE_VIGNETTING;Vignetting correction
 PARTIALPASTE_WHITEBALANCE;White balance
 PREFERENCES_APPLNEXTSTARTUP;Bir sonraki başlamada uygulacacak.
-PREFERENCES_CACHECLEARALL;Clear All
-PREFERENCES_CACHECLEARPROFILES;Clear Profiles
-PREFERENCES_CACHECLEARTHUMBS;Clear Thumbnails
 PREFERENCES_CACHEMAXENTRIES;Maximal Number of Cache Entries
 PREFERENCES_CACHEOPTS;Cache Options
 PREFERENCES_CACHETHUMBHEIGHT;Maximal Thumbnail Height
diff --git a/rtdata/languages/default b/rtdata/languages/default
index ee4291522..2a5b73e44 100644
--- a/rtdata/languages/default
+++ b/rtdata/languages/default
@@ -1046,9 +1046,11 @@ PREFERENCES_BEHAVIOR;Behavior
 PREFERENCES_BEHSETALL;All to 'Set'
 PREFERENCES_BEHSETALLHINT;Set all parameters to the <b>Set</b> mode.\nAdjustments of parameters in the batch tool panel will be <b>absolute</b>, the actual values will be displayed.
 PREFERENCES_BLACKBODY;Tungsten
-PREFERENCES_CACHECLEARALL;Clear All
-PREFERENCES_CACHECLEARPROFILES;Clear Processing Profiles
-PREFERENCES_CACHECLEARTHUMBS;Clear Thumbnails
+PREFERENCES_CACHECLEAR;Clear
+PREFERENCES_CACHECLEAR_ALL;Clear all cached files:
+PREFERENCES_CACHECLEAR_ALLBUTPROFILES;Clear all cached files except for cached processing profiles:
+PREFERENCES_CACHECLEAR_ONLYPROFILES;Clear only cached processing profiles:
+PREFERENCES_CACHECLEAR_SAFETY;Only files in the cache are cleared. Processing profiles stored alongside the source images are not touched.
 PREFERENCES_CACHEMAXENTRIES;Maximum number of cache entries
 PREFERENCES_CACHEOPTS;Cache Options
 PREFERENCES_CACHETHUMBHEIGHT;Maximum thumbnail height
diff --git a/rtgui/preferences.cc b/rtgui/preferences.cc
index b15e10e49..9d58244f4 100644
--- a/rtgui/preferences.cc
+++ b/rtgui/preferences.cc
@@ -1334,40 +1334,66 @@ Gtk::Widget* Preferences::getFileBrowserPanel ()
 
     fre->add (*vbre);
 
-    Gtk::Frame* frc = Gtk::manage ( new Gtk::Frame (M ("PREFERENCES_CACHEOPTS")) );
-    Gtk::VBox* vbc = Gtk::manage ( new Gtk::VBox () );
+    // Cache
+
+    Gtk::Frame* frc = Gtk::manage (new Gtk::Frame(M("PREFERENCES_CACHEOPTS")));
+    Gtk::VBox* vbc = Gtk::manage (new Gtk::VBox());
     frc->add (*vbc);
 
-    Gtk::HBox* hb3 = Gtk::manage ( new Gtk::HBox () );
-    Gtk::Label* chlab = Gtk::manage ( new Gtk::Label (M ("PREFERENCES_CACHETHUMBHEIGHT") + ":") );
-    maxThumbSize = Gtk::manage ( new Gtk::SpinButton () );
-    hb3->pack_start (*chlab, Gtk::PACK_SHRINK, 4);
-    hb3->pack_start (*maxThumbSize, Gtk::PACK_SHRINK, 4);
+    Gtk::Grid* cacheGrid = Gtk::manage(new Gtk::Grid());
+    cacheGrid->get_style_context()->add_class("grid-spacing");
+    setExpandAlignProperties(cacheGrid, false, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER);
 
-    maxThumbSize->set_digits (0);
-    maxThumbSize->set_increments (1, 10);
-    maxThumbSize->set_range (40, 800);
-    vbc->pack_start (*hb3, Gtk::PACK_SHRINK, 4);
+    Gtk::Label* maxThumbHeightLbl = Gtk::manage (new Gtk::Label(M("PREFERENCES_CACHETHUMBHEIGHT") + ":"));
+    setExpandAlignProperties(maxThumbHeightLbl, false, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER);
+    maxThumbHeightSB = Gtk::manage (new Gtk::SpinButton());
+    maxThumbHeightSB->set_digits (0);
+    maxThumbHeightSB->set_increments (1, 10);
+    maxThumbHeightSB->set_range (40, 800);
 
-    Gtk::HBox* hb4 = Gtk::manage ( new Gtk::HBox () );
-    Gtk::Label* celab = Gtk::manage ( new Gtk::Label (M ("PREFERENCES_CACHEMAXENTRIES") + ":") );
-    maxCacheEntries = Gtk::manage ( new Gtk::SpinButton () );
-    hb4->pack_start (*celab, Gtk::PACK_SHRINK, 4);
-    hb4->pack_start (*maxCacheEntries, Gtk::PACK_SHRINK, 4);
+    Gtk::Label* maxCacheEntriesLbl = Gtk::manage (new Gtk::Label(M("PREFERENCES_CACHEMAXENTRIES") + ":"));
+    setExpandAlignProperties(maxCacheEntriesLbl, false, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER);
+    maxCacheEntriesSB = Gtk::manage (new Gtk::SpinButton());
+    maxCacheEntriesSB->set_digits (0);
+    maxCacheEntriesSB->set_increments (1, 10);
+    maxCacheEntriesSB->set_range (10, 100000);
 
-    maxCacheEntries->set_digits (0);
-    maxCacheEntries->set_increments (1, 10);
-    maxCacheEntries->set_range (10, 100000);
-    vbc->pack_start (*hb4, Gtk::PACK_SHRINK, 4);
+    // Separation is needed so that a button is not accidentally clicked when one wanted
+    // to click a spinbox. Ideally, the separation wouldn't require attaching a widget, but how?
+    Gtk::Label *separator = Gtk::manage (new Gtk::Label());
 
-    Gtk::HBox* hb5 = Gtk::manage ( new Gtk::HBox () );
-    clearThumbnails = Gtk::manage ( new Gtk::Button (M ("PREFERENCES_CACHECLEARTHUMBS")) );
-    clearProfiles = Gtk::manage ( new Gtk::Button (M ("PREFERENCES_CACHECLEARPROFILES")) );
-    clearAll = Gtk::manage ( new Gtk::Button (M ("PREFERENCES_CACHECLEARALL")) );
-    hb5->pack_start (*clearThumbnails, Gtk::PACK_SHRINK, 4);
-    hb5->pack_start (*clearProfiles, Gtk::PACK_SHRINK, 4);
-    hb5->pack_start (*clearAll, Gtk::PACK_SHRINK, 4);
-    vbc->pack_start (*hb5, Gtk::PACK_SHRINK, 4);
+    Gtk::Label* clearThumbsLbl = Gtk::manage (new Gtk::Label(M("PREFERENCES_CACHECLEAR_ALLBUTPROFILES")));
+    setExpandAlignProperties(clearThumbsLbl, false, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER);
+    Gtk::Button* clearThumbsBtn = Gtk::manage (new Gtk::Button(M("PREFERENCES_CACHECLEAR")));
+
+    Gtk::Label* clearProfilesLbl = Gtk::manage (new Gtk::Label(M("PREFERENCES_CACHECLEAR_ONLYPROFILES")));
+    setExpandAlignProperties(clearProfilesLbl, false, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER);
+    Gtk::Button* clearProfilesBtn = Gtk::manage (new Gtk::Button(M("PREFERENCES_CACHECLEAR")));
+
+    Gtk::Label* clearAllLbl = Gtk::manage (new Gtk::Label(M("PREFERENCES_CACHECLEAR_ALL")));
+    setExpandAlignProperties(clearAllLbl, false, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER);
+    Gtk::Button* clearAllBtn = Gtk::manage (new Gtk::Button(M("PREFERENCES_CACHECLEAR")));
+
+    cacheGrid->attach (*maxThumbHeightLbl, 0, 0, 1, 1);
+    cacheGrid->attach (*maxThumbHeightSB, 1, 0, 1, 1);
+    cacheGrid->attach (*maxCacheEntriesLbl, 0, 1, 1, 1);
+    cacheGrid->attach (*maxCacheEntriesSB, 1, 1, 1, 1);
+    cacheGrid->attach (*separator, 0, 2, 2, 1);
+    cacheGrid->attach (*clearThumbsLbl, 0, 3, 1, 1);
+    cacheGrid->attach (*clearThumbsBtn, 1, 3, 1, 1);
+    if (moptions.saveParamsCache) {
+        cacheGrid->attach (*clearProfilesLbl, 0, 4, 1, 1);
+        cacheGrid->attach (*clearProfilesBtn, 1, 4, 1, 1);
+        cacheGrid->attach (*clearAllLbl, 0, 5, 1, 1);
+        cacheGrid->attach (*clearAllBtn, 1, 5, 1, 1);
+    }
+
+    vbc->pack_start (*cacheGrid, Gtk::PACK_SHRINK, 4);
+
+    Gtk::Label* clearSafetyLbl = Gtk::manage (new Gtk::Label(M("PREFERENCES_CACHECLEAR_SAFETY")));
+    setExpandAlignProperties(clearSafetyLbl, false, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER);
+    clearSafetyLbl->set_line_wrap(true);
+    vbc->pack_start(*clearSafetyLbl, Gtk::PACK_SHRINK, 4);
 
     Gtk::HBox* hb6 = Gtk::manage ( new Gtk::HBox () );
     Gtk::VBox* vb6 = Gtk::manage ( new Gtk::VBox () );
@@ -1386,9 +1412,11 @@ Gtk::Widget* Preferences::getFileBrowserPanel ()
     moveExtUp->signal_clicked().connect ( sigc::mem_fun (*this, &Preferences::moveExtUpPressed) );
     moveExtDown->signal_clicked().connect ( sigc::mem_fun (*this, &Preferences::moveExtDownPressed) );
     extension->signal_activate().connect ( sigc::mem_fun (*this, &Preferences::addExtPressed) );
-    clearThumbnails->signal_clicked().connect ( sigc::mem_fun (*this, &Preferences::clearThumbImagesPressed) );
-    clearProfiles->signal_clicked().connect ( sigc::mem_fun (*this, &Preferences::clearProfilesPressed) );
-    clearAll->signal_clicked().connect ( sigc::mem_fun (*this, &Preferences::clearAllPressed) );
+    clearThumbsBtn->signal_clicked().connect ( sigc::mem_fun (*this, &Preferences::clearThumbImagesPressed) );
+    if (moptions.saveParamsCache) {
+        clearProfilesBtn->signal_clicked().connect(sigc::mem_fun(*this, &Preferences::clearProfilesPressed));
+        clearAllBtn->signal_clicked().connect(sigc::mem_fun(*this, &Preferences::clearAllPressed));
+    }
 
     swFileBrowser->add(*vbFileBrowser);
     return swFileBrowser;
@@ -1701,8 +1729,8 @@ void Preferences::storePreferences ()
     }
 
     moptions.maxRecentFolders = (int)maxRecentFolders->get_value();
-    moptions.maxThumbnailHeight = (int)maxThumbSize->get_value ();
-    moptions.maxCacheEntries = (int)maxCacheEntries->get_value ();
+    moptions.maxThumbnailHeight = (int)maxThumbHeightSB->get_value ();
+    moptions.maxCacheEntries = (int)maxCacheEntriesSB->get_value ();
     moptions.overlayedFileNames = overlayedFileNames->get_active ();
     moptions.filmStripOverlayedFileNames = filmStripOverlayedFileNames->get_active();
     moptions.sameThumbSize = sameThumbSize->get_active();
@@ -1917,9 +1945,9 @@ void Preferences::fillPreferences ()
         row[extensionColumns.ext]     = moptions.parseExtensions[i];
     }
 
-    maxThumbSize->set_value (moptions.maxThumbnailHeight);
     maxRecentFolders->set_value (moptions.maxRecentFolders);
-    maxCacheEntries->set_value (moptions.maxCacheEntries);
+    maxThumbHeightSB->set_value (moptions.maxThumbnailHeight);
+    maxCacheEntriesSB->set_value (moptions.maxCacheEntries);
     overlayedFileNames->set_active (moptions.overlayedFileNames);
     filmStripOverlayedFileNames->set_active (moptions.filmStripOverlayedFileNames);
     sameThumbSize->set_active (moptions.sameThumbSize);
diff --git a/rtgui/preferences.h b/rtgui/preferences.h
index 949f50376..6019604e5 100644
--- a/rtgui/preferences.h
+++ b/rtgui/preferences.h
@@ -146,12 +146,9 @@ class Preferences : public Gtk::Dialog, public ProfileStoreListener
     Gtk::ColorButton* butCropCol;
     Gtk::ColorButton* butNavGuideCol;
 
-    Gtk::SpinButton*   maxThumbSize;
-    Gtk::SpinButton*   maxCacheEntries;
     Gtk::SpinButton*   maxRecentFolders;
-    Gtk::Button*       clearThumbnails;
-    Gtk::Button*       clearProfiles;
-    Gtk::Button*       clearAll;
+    Gtk::SpinButton*   maxThumbHeightSB;
+    Gtk::SpinButton*   maxCacheEntriesSB;
     Gtk::Entry*     extension;
     Gtk::TreeView*  extensions;
     Gtk::Button*    addExt;