diff --git a/rtdata/languages/Catala b/rtdata/languages/Catala
index a8d381a8e..f0288ac52 100644
--- a/rtdata/languages/Catala
+++ b/rtdata/languages/Catala
@@ -587,7 +587,6 @@ PREFERENCES_TAB_GENERAL;General
 PREFERENCES_TAB_IMPROC;Processament de la imatge
 PREFERENCES_TAB_SOUND;Sons
 PREFERENCES_TP_LABEL;Panell d'eines:
-PREFERENCES_TP_USEICONORTEXT;Usa les icones tab en comptes de text
 PREFERENCES_TP_VSCROLLBAR;Amaga la barra d'eines vertical
 PREFERENCES_WORKFLOW;Flux de treball
 PROFILEPANEL_COPYPPASTE;Paràmetres a copiar
diff --git a/rtdata/languages/Chinese (Simplified) b/rtdata/languages/Chinese (Simplified)
index 78667ee02..c3ae44124 100644
--- a/rtdata/languages/Chinese (Simplified)	
+++ b/rtdata/languages/Chinese (Simplified)	
@@ -661,7 +661,6 @@ PREFERENCES_TAB_IMPROC;图片处理
 PREFERENCES_TAB_SOUND;音效
 PREFERENCES_THEME;主题
 PREFERENCES_TP_LABEL;工具栏
-PREFERENCES_TP_USEICONORTEXT;标签使用图标而不是文本
 PREFERENCES_TP_VSCROLLBAR;隐藏垂直滚动栏
 PREFERENCES_TUNNELMETADATA;无损复制 Exif/IPTC/XMP 到输出文件
 PREFERENCES_USEBUNDLEDPROFILES;启用内置预设
diff --git a/rtdata/languages/Chinese (Traditional) b/rtdata/languages/Chinese (Traditional)
index 6e7698f9a..d60d772e0 100644
--- a/rtdata/languages/Chinese (Traditional)	
+++ b/rtdata/languages/Chinese (Traditional)	
@@ -1339,7 +1339,6 @@ TP_WBALANCE_TEMPERATURE;色溫
 !PREFERENCES_THUMBNAIL_INSPECTOR_RAW;Neutral raw rendering
 !PREFERENCES_THUMBNAIL_INSPECTOR_RAW_IF_NO_JPEG_FULLSIZE;Embedded JPEG if fullsize, neutral raw otherwise
 !PREFERENCES_TP_LABEL;Tool panel:
-!PREFERENCES_TP_USEICONORTEXT;Use tab icons instead of text
 !PREFERENCES_TP_VSCROLLBAR;Hide vertical scrollbar
 !PREFERENCES_TUNNELMETADATA;Copy Exif/IPTC/XMP unchanged to output file
 !PREFERENCES_USEBUNDLEDPROFILES;Use bundled profiles
diff --git a/rtdata/languages/Czech b/rtdata/languages/Czech
index 671fde250..0d05c24d5 100644
--- a/rtdata/languages/Czech
+++ b/rtdata/languages/Czech
@@ -1168,7 +1168,6 @@ PREFERENCES_THUMBNAIL_INSPECTOR_MODE;Obrázek k zobrazení
 PREFERENCES_THUMBNAIL_INSPECTOR_RAW;Neutrální vykreslení raw
 PREFERENCES_THUMBNAIL_INSPECTOR_RAW_IF_NO_JPEG_FULLSIZE;Vložený JPEG náhled pokud je v plné velikosti, jinak neutrální raw
 PREFERENCES_TP_LABEL;Panel nástrojů:
-PREFERENCES_TP_USEICONORTEXT;V záhlaví karty zobrazit ikonu namísto textu
 PREFERENCES_TP_VSCROLLBAR;Skrýt svislou posuvnou lištu
 PREFERENCES_TUNNELMETADATA;Zkopírovat nezměněná Exif/IPTC/XMP metadata do výstupního souboru
 PREFERENCES_USEBUNDLEDPROFILES;Použít přiložené profily
diff --git a/rtdata/languages/Dansk b/rtdata/languages/Dansk
index 9e1d79191..df5a815fa 100644
--- a/rtdata/languages/Dansk
+++ b/rtdata/languages/Dansk
@@ -1336,7 +1336,6 @@ TP_WBALANCE_TEMPERATURE;Temperatur
 !PREFERENCES_THUMBNAIL_INSPECTOR_RAW;Neutral raw rendering
 !PREFERENCES_THUMBNAIL_INSPECTOR_RAW_IF_NO_JPEG_FULLSIZE;Embedded JPEG if fullsize, neutral raw otherwise
 !PREFERENCES_TP_LABEL;Tool panel:
-!PREFERENCES_TP_USEICONORTEXT;Use tab icons instead of text
 !PREFERENCES_TP_VSCROLLBAR;Hide vertical scrollbar
 !PREFERENCES_TUNNELMETADATA;Copy Exif/IPTC/XMP unchanged to output file
 !PREFERENCES_USEBUNDLEDPROFILES;Use bundled profiles
diff --git a/rtdata/languages/Deutsch b/rtdata/languages/Deutsch
index d9488295e..0e3634683 100644
--- a/rtdata/languages/Deutsch
+++ b/rtdata/languages/Deutsch
@@ -1277,7 +1277,6 @@ PREFERENCES_THUMBNAIL_INSPECTOR_MODE;Bildanzeige
 PREFERENCES_THUMBNAIL_INSPECTOR_RAW;Neutrales RAW-Bild 
 PREFERENCES_THUMBNAIL_INSPECTOR_RAW_IF_NO_JPEG_FULLSIZE;Eingebundenes JPEG wenn in Originalgröße, sonst neutrales RAW-Bild
 PREFERENCES_TP_LABEL;Werkzeugbereich:
-PREFERENCES_TP_USEICONORTEXT;Symbole statt Text in Karteireitern
 PREFERENCES_TP_VSCROLLBAR;Keine vertikale Scrollbar
 PREFERENCES_TUNNELMETADATA;Exif/XMP unverändert in die Ausgabedatei übernehmen.
 PREFERENCES_USEBUNDLEDPROFILES;Standardprofile verwenden
diff --git a/rtdata/languages/English (UK) b/rtdata/languages/English (UK)
index 9fdef1914..11f5571e2 100644
--- a/rtdata/languages/English (UK)	
+++ b/rtdata/languages/English (UK)	
@@ -1273,7 +1273,6 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of "wh
 !PREFERENCES_THUMBNAIL_INSPECTOR_RAW;Neutral raw rendering
 !PREFERENCES_THUMBNAIL_INSPECTOR_RAW_IF_NO_JPEG_FULLSIZE;Embedded JPEG if fullsize, neutral raw otherwise
 !PREFERENCES_TP_LABEL;Tool panel:
-!PREFERENCES_TP_USEICONORTEXT;Use tab icons instead of text
 !PREFERENCES_TP_VSCROLLBAR;Hide vertical scrollbar
 !PREFERENCES_TUNNELMETADATA;Copy Exif/IPTC/XMP unchanged to output file
 !PREFERENCES_USEBUNDLEDPROFILES;Use bundled profiles
diff --git a/rtdata/languages/English (US) b/rtdata/languages/English (US)
index 944457486..a3c535277 100644
--- a/rtdata/languages/English (US)	
+++ b/rtdata/languages/English (US)	
@@ -1207,7 +1207,6 @@
 !PREFERENCES_THUMBNAIL_INSPECTOR_RAW;Neutral raw rendering
 !PREFERENCES_THUMBNAIL_INSPECTOR_RAW_IF_NO_JPEG_FULLSIZE;Embedded JPEG if fullsize, neutral raw otherwise
 !PREFERENCES_TP_LABEL;Tool panel:
-!PREFERENCES_TP_USEICONORTEXT;Use tab icons instead of text
 !PREFERENCES_TP_VSCROLLBAR;Hide vertical scrollbar
 !PREFERENCES_TUNNELMETADATA;Copy Exif/IPTC/XMP unchanged to output file
 !PREFERENCES_USEBUNDLEDPROFILES;Use bundled profiles
diff --git a/rtdata/languages/Espanol b/rtdata/languages/Espanol
index 8560fd93c..3919c34be 100644
--- a/rtdata/languages/Espanol
+++ b/rtdata/languages/Espanol
@@ -842,7 +842,6 @@ PREFERENCES_TAB_GENERAL;General
 PREFERENCES_TAB_IMPROC;Procesamiento de imágenes
 PREFERENCES_TAB_SOUND;Sonidos
 PREFERENCES_TP_LABEL;Panel de herramientas:
-PREFERENCES_TP_USEICONORTEXT;Usar iconos de pestaña en lugar de texto
 PREFERENCES_TP_VSCROLLBAR;Ocultar barra de desplazamiento vertical del panel de herramientas
 PREFERENCES_USEBUNDLEDPROFILES;Usar perfiles empaquetados
 PREFERENCES_VIEW;Balance de blancos en el dispositivo de salida (monitor, TV, proyector...)
diff --git a/rtdata/languages/Euskara b/rtdata/languages/Euskara
index e3559ff98..32d063a57 100644
--- a/rtdata/languages/Euskara
+++ b/rtdata/languages/Euskara
@@ -1337,7 +1337,6 @@ TP_WBALANCE_TEMPERATURE;Tenperatura
 !PREFERENCES_THUMBNAIL_INSPECTOR_RAW;Neutral raw rendering
 !PREFERENCES_THUMBNAIL_INSPECTOR_RAW_IF_NO_JPEG_FULLSIZE;Embedded JPEG if fullsize, neutral raw otherwise
 !PREFERENCES_TP_LABEL;Tool panel:
-!PREFERENCES_TP_USEICONORTEXT;Use tab icons instead of text
 !PREFERENCES_TP_VSCROLLBAR;Hide vertical scrollbar
 !PREFERENCES_TUNNELMETADATA;Copy Exif/IPTC/XMP unchanged to output file
 !PREFERENCES_USEBUNDLEDPROFILES;Use bundled profiles
diff --git a/rtdata/languages/Francais b/rtdata/languages/Francais
index a20f9251d..e07c41922 100644
--- a/rtdata/languages/Francais
+++ b/rtdata/languages/Francais
@@ -1167,7 +1167,6 @@ PREFERENCES_TAB_IMPROC;Traitement de l'image
 PREFERENCES_TAB_SOUND;Sons
 PREFERENCES_THEME;Thème
 PREFERENCES_TP_LABEL;Panneau des outils:
-PREFERENCES_TP_USEICONORTEXT;Utiliser des icônes au lieu de textes
 PREFERENCES_TP_VSCROLLBAR;Cacher la barre de défilement verticale
 PREFERENCES_TUNNELMETADATA;Copier les données Exif/IPTC/XMP tel quel dans le fichier de sortie
 PREFERENCES_USEBUNDLEDPROFILES;Utiliser les profils fournis
diff --git a/rtdata/languages/Greek b/rtdata/languages/Greek
index 9c7c024f9..4a406444b 100644
--- a/rtdata/languages/Greek
+++ b/rtdata/languages/Greek
@@ -1336,7 +1336,6 @@ TP_WBALANCE_TEMPERATURE;Θερμοκρασία
 !PREFERENCES_THUMBNAIL_INSPECTOR_RAW;Neutral raw rendering
 !PREFERENCES_THUMBNAIL_INSPECTOR_RAW_IF_NO_JPEG_FULLSIZE;Embedded JPEG if fullsize, neutral raw otherwise
 !PREFERENCES_TP_LABEL;Tool panel:
-!PREFERENCES_TP_USEICONORTEXT;Use tab icons instead of text
 !PREFERENCES_TP_VSCROLLBAR;Hide vertical scrollbar
 !PREFERENCES_TUNNELMETADATA;Copy Exif/IPTC/XMP unchanged to output file
 !PREFERENCES_USEBUNDLEDPROFILES;Use bundled profiles
diff --git a/rtdata/languages/Hebrew b/rtdata/languages/Hebrew
index 85bc43c05..2f67763f2 100644
--- a/rtdata/languages/Hebrew
+++ b/rtdata/languages/Hebrew
@@ -1337,7 +1337,6 @@ TP_WBALANCE_TEMPERATURE;מידת חום
 !PREFERENCES_THUMBNAIL_INSPECTOR_RAW;Neutral raw rendering
 !PREFERENCES_THUMBNAIL_INSPECTOR_RAW_IF_NO_JPEG_FULLSIZE;Embedded JPEG if fullsize, neutral raw otherwise
 !PREFERENCES_TP_LABEL;Tool panel:
-!PREFERENCES_TP_USEICONORTEXT;Use tab icons instead of text
 !PREFERENCES_TP_VSCROLLBAR;Hide vertical scrollbar
 !PREFERENCES_TUNNELMETADATA;Copy Exif/IPTC/XMP unchanged to output file
 !PREFERENCES_USEBUNDLEDPROFILES;Use bundled profiles
diff --git a/rtdata/languages/Italiano b/rtdata/languages/Italiano
index 9ee5e607a..8e012742d 100644
--- a/rtdata/languages/Italiano
+++ b/rtdata/languages/Italiano
@@ -747,7 +747,6 @@ PREFERENCES_TAB_GENERAL;Generale
 PREFERENCES_TAB_IMPROC;Elaborazione immagine
 PREFERENCES_TAB_SOUND;Suoni
 PREFERENCES_TP_LABEL;Pannello Strumenti:
-PREFERENCES_TP_USEICONORTEXT;Utilizza le icone delle schede anziché il testo
 PREFERENCES_TP_VSCROLLBAR;Nascondi la barra di scorrimento verticale
 PREFERENCES_USEBUNDLEDPROFILES;Usa profili inclusi
 PREFERENCES_VIEW;Bilanciamento del bianco del dispositivo di uscita (monitor, TV, proiettore...)
diff --git a/rtdata/languages/Japanese b/rtdata/languages/Japanese
index 2615eccb3..bf0de5028 100644
--- a/rtdata/languages/Japanese
+++ b/rtdata/languages/Japanese
@@ -1238,7 +1238,6 @@ PREFERENCES_THUMBNAIL_INSPECTOR_MODE;表示する画像
 PREFERENCES_THUMBNAIL_INSPECTOR_RAW;ニュートラルなrawレンダリング
 PREFERENCES_THUMBNAIL_INSPECTOR_RAW_IF_NO_JPEG_FULLSIZE;埋め込まれているJPEGがフルサイズの場合、指定がなければニュートラルなrawレンダリングで表示
 PREFERENCES_TP_LABEL;ツール パネル:
-PREFERENCES_TP_USEICONORTEXT;テキストの代わりにタブアイコンを使用
 PREFERENCES_TP_VSCROLLBAR;ツールパネルの垂直スクロールバーを隠す
 PREFERENCES_TUNNELMETADATA;Exif/IPTC/XMPを変更を加えずに出力ファイルにコピー
 PREFERENCES_USEBUNDLEDPROFILES;付属のプロファイルを使用
diff --git a/rtdata/languages/Latvian b/rtdata/languages/Latvian
index 212330c9c..d664e5ceb 100644
--- a/rtdata/languages/Latvian
+++ b/rtdata/languages/Latvian
@@ -1337,7 +1337,6 @@ TP_WBALANCE_TEMPERATURE;Temperatūra
 !PREFERENCES_THUMBNAIL_INSPECTOR_RAW;Neutral raw rendering
 !PREFERENCES_THUMBNAIL_INSPECTOR_RAW_IF_NO_JPEG_FULLSIZE;Embedded JPEG if fullsize, neutral raw otherwise
 !PREFERENCES_TP_LABEL;Tool panel:
-!PREFERENCES_TP_USEICONORTEXT;Use tab icons instead of text
 !PREFERENCES_TP_VSCROLLBAR;Hide vertical scrollbar
 !PREFERENCES_TUNNELMETADATA;Copy Exif/IPTC/XMP unchanged to output file
 !PREFERENCES_USEBUNDLEDPROFILES;Use bundled profiles
diff --git a/rtdata/languages/Magyar b/rtdata/languages/Magyar
index 00dc4d800..700d7d0be 100644
--- a/rtdata/languages/Magyar
+++ b/rtdata/languages/Magyar
@@ -570,7 +570,6 @@ PREFERENCES_TAB_GENERAL;Általános
 PREFERENCES_TAB_IMPROC;Képfeldolgozás
 PREFERENCES_TAB_SOUND;Hangok
 PREFERENCES_TP_LABEL;Eszközök panel:
-PREFERENCES_TP_USEICONORTEXT;Ikonok használata szöveg helyett a füleken
 PREFERENCES_TP_VSCROLLBAR;Függőleges görgetősáv elrejtése
 PREFERENCES_WORKFLOW;Munkamenet
 PROFILEPANEL_COPYPPASTE;Másolandó paraméterek
diff --git a/rtdata/languages/Nederlands b/rtdata/languages/Nederlands
index d002263bc..12b502c6a 100644
--- a/rtdata/languages/Nederlands
+++ b/rtdata/languages/Nederlands
@@ -1076,7 +1076,6 @@ PREFERENCES_TAB_GENERAL;Algemeen
 PREFERENCES_TAB_IMPROC;Beeldverwerking
 PREFERENCES_TAB_SOUND;Geluiden
 PREFERENCES_TP_LABEL;Gereedschapspaneel:
-PREFERENCES_TP_USEICONORTEXT;Gebruik iconen ipv. tekst voor de tabbladen
 PREFERENCES_TP_VSCROLLBAR;Verberg de schuifbalk van het gereedschapspaneel
 PREFERENCES_TUNNELMETADATA;Kopieer Exif/IPTC/XMP-data onveranderd naar uitvoerbestand
 PREFERENCES_USEBUNDLEDPROFILES;Gebruik gebundelde profielen
diff --git a/rtdata/languages/Norsk BM b/rtdata/languages/Norsk BM
index f61fa7a88..7af97dd4e 100644
--- a/rtdata/languages/Norsk BM	
+++ b/rtdata/languages/Norsk BM	
@@ -1336,7 +1336,6 @@ TP_WBALANCE_TEMPERATURE;Temperatur
 !PREFERENCES_THUMBNAIL_INSPECTOR_RAW;Neutral raw rendering
 !PREFERENCES_THUMBNAIL_INSPECTOR_RAW_IF_NO_JPEG_FULLSIZE;Embedded JPEG if fullsize, neutral raw otherwise
 !PREFERENCES_TP_LABEL;Tool panel:
-!PREFERENCES_TP_USEICONORTEXT;Use tab icons instead of text
 !PREFERENCES_TP_VSCROLLBAR;Hide vertical scrollbar
 !PREFERENCES_TUNNELMETADATA;Copy Exif/IPTC/XMP unchanged to output file
 !PREFERENCES_USEBUNDLEDPROFILES;Use bundled profiles
diff --git a/rtdata/languages/Polish b/rtdata/languages/Polish
index 3558870b8..7af6fad6e 100644
--- a/rtdata/languages/Polish
+++ b/rtdata/languages/Polish
@@ -797,7 +797,6 @@ PREFERENCES_TAB_GENERAL;Ogólne
 PREFERENCES_TAB_IMPROC;Przetwarzanie obrazu
 PREFERENCES_TAB_SOUND;Dźwięki
 PREFERENCES_TP_LABEL;Panel narzędzi:
-PREFERENCES_TP_USEICONORTEXT;Uzyj ikon w zakładkach zamiast tekstowych etykiet
 PREFERENCES_TP_VSCROLLBAR;Ukry pionowy pasek przesuwania
 PREFERENCES_USEBUNDLEDPROFILES;Użyj załączone profile przetwarzania
 PREFERENCES_VIEW;Balans bieli urządzenia wyjściowego (monitora, TV, projektora, widowni, etc.)
diff --git a/rtdata/languages/Polish (Latin Characters) b/rtdata/languages/Polish (Latin Characters)
index 27740a48c..4601472eb 100644
--- a/rtdata/languages/Polish (Latin Characters)	
+++ b/rtdata/languages/Polish (Latin Characters)	
@@ -797,7 +797,6 @@ PREFERENCES_TAB_GENERAL;Ogolne
 PREFERENCES_TAB_IMPROC;Przetwarzanie obrazu
 PREFERENCES_TAB_SOUND;Dzwieki
 PREFERENCES_TP_LABEL;Panel narzedzi:
-PREFERENCES_TP_USEICONORTEXT;Uzyj ikon w zakladkach zamiast tekstowych etykiet
 PREFERENCES_TP_VSCROLLBAR;Ukry pionowy pasek przesuwania
 PREFERENCES_USEBUNDLEDPROFILES;Uzyj zalaczone profile przetwarzania
 PREFERENCES_VIEW;Balans bieli urzadzenia wyjsciowego (monitora, TV, projektora, widowni, etc.)
diff --git a/rtdata/languages/Portugues (Brasil) b/rtdata/languages/Portugues (Brasil)
index ba33f8228..471c07c1c 100644
--- a/rtdata/languages/Portugues (Brasil)	
+++ b/rtdata/languages/Portugues (Brasil)	
@@ -1199,7 +1199,6 @@ PREFERENCES_THUMBNAIL_INSPECTOR_MODE;Imagem para mostrar
 PREFERENCES_THUMBNAIL_INSPECTOR_RAW;Renderização raw neutra
 PREFERENCES_THUMBNAIL_INSPECTOR_RAW_IF_NO_JPEG_FULLSIZE;JPEG incorporado se tamanho completo, raw neutro caso contrário
 PREFERENCES_TP_LABEL;Painel de ferramentas:
-PREFERENCES_TP_USEICONORTEXT;Use ícones de guias em vez de texto
 PREFERENCES_TP_VSCROLLBAR;Ocultar barra de rolagem vertical
 PREFERENCES_TUNNELMETADATA;Copiar Exif/IPTC/XMP inalterado para o arquivo de saída
 PREFERENCES_USEBUNDLEDPROFILES;Use perfis agrupados
diff --git a/rtdata/languages/Russian b/rtdata/languages/Russian
index 774e2d580..e00c6fc7a 100644
--- a/rtdata/languages/Russian
+++ b/rtdata/languages/Russian
@@ -803,7 +803,6 @@ PREFERENCES_TAB_IMPROC;Обработка изображения
 PREFERENCES_TAB_SOUND;Звуки
 PREFERENCES_THEME;Тема
 PREFERENCES_TP_LABEL;Панель инструментов:
-PREFERENCES_TP_USEICONORTEXT;Использовать иконки вместо текста
 PREFERENCES_TP_VSCROLLBAR;Спрятать вертикальную полосу прокрутки
 PREFERENCES_USEBUNDLEDPROFILES;Использовать предустановленный профиль
 PREFERENCES_VIEW;ББ устройства вывода (монитор, проектор и т.д.)
diff --git a/rtdata/languages/Serbian (Cyrilic Characters) b/rtdata/languages/Serbian (Cyrilic Characters)
index 675e710aa..35d7925dc 100644
--- a/rtdata/languages/Serbian (Cyrilic Characters)	
+++ b/rtdata/languages/Serbian (Cyrilic Characters)	
@@ -714,7 +714,6 @@ PREFERENCES_TAB_GENERAL;Опште
 PREFERENCES_TAB_IMPROC;Обрада сликe
 PREFERENCES_TAB_SOUND;Звуци
 PREFERENCES_TP_LABEL;Површ алата:
-PREFERENCES_TP_USEICONORTEXT;Користи иконице језичка уместо текста
 PREFERENCES_TP_VSCROLLBAR;Сакриј клизаче у области са алаткама
 PREFERENCES_TUNNELMETADATA;Копирај неизмењене IPTC/XMP (када је слика означена другим програмом)
 PREFERENCES_USEBUNDLEDPROFILES;Користи профиле који долазе уз програм
diff --git a/rtdata/languages/Serbian (Latin Characters) b/rtdata/languages/Serbian (Latin Characters)
index f41d7e36e..e9ab107d9 100644
--- a/rtdata/languages/Serbian (Latin Characters)	
+++ b/rtdata/languages/Serbian (Latin Characters)	
@@ -714,7 +714,6 @@ PREFERENCES_TAB_GENERAL;Opšte
 PREFERENCES_TAB_IMPROC;Obrada slike
 PREFERENCES_TAB_SOUND;Zvuci
 PREFERENCES_TP_LABEL;Površ alata:
-PREFERENCES_TP_USEICONORTEXT;Koristi ikonice jezička umesto teksta
 PREFERENCES_TP_VSCROLLBAR;Sakrij klizače u oblasti sa alatkama
 PREFERENCES_TUNNELMETADATA;Kopiraj neizmenjene IPTC/XMP (kada je slika označena drugim programom)
 PREFERENCES_USEBUNDLEDPROFILES;Koristi profile koji dolaze uz program
diff --git a/rtdata/languages/Slovak b/rtdata/languages/Slovak
index b5ff03253..1ee8bf093 100644
--- a/rtdata/languages/Slovak
+++ b/rtdata/languages/Slovak
@@ -1380,7 +1380,6 @@ ZOOMPANEL_ZOOMOUT;Oddialiť <b>-</b>
 !PREFERENCES_THUMBNAIL_INSPECTOR_RAW;Neutral raw rendering
 !PREFERENCES_THUMBNAIL_INSPECTOR_RAW_IF_NO_JPEG_FULLSIZE;Embedded JPEG if fullsize, neutral raw otherwise
 !PREFERENCES_TP_LABEL;Tool panel:
-!PREFERENCES_TP_USEICONORTEXT;Use tab icons instead of text
 !PREFERENCES_TP_VSCROLLBAR;Hide vertical scrollbar
 !PREFERENCES_TUNNELMETADATA;Copy Exif/IPTC/XMP unchanged to output file
 !PREFERENCES_USEBUNDLEDPROFILES;Use bundled profiles
diff --git a/rtdata/languages/Suomi b/rtdata/languages/Suomi
index e0ca416d0..4c2f08850 100644
--- a/rtdata/languages/Suomi
+++ b/rtdata/languages/Suomi
@@ -1338,7 +1338,6 @@ TP_WBALANCE_TEMPERATURE;Lämpötila [K]
 !PREFERENCES_THUMBNAIL_INSPECTOR_RAW;Neutral raw rendering
 !PREFERENCES_THUMBNAIL_INSPECTOR_RAW_IF_NO_JPEG_FULLSIZE;Embedded JPEG if fullsize, neutral raw otherwise
 !PREFERENCES_TP_LABEL;Tool panel:
-!PREFERENCES_TP_USEICONORTEXT;Use tab icons instead of text
 !PREFERENCES_TP_VSCROLLBAR;Hide vertical scrollbar
 !PREFERENCES_TUNNELMETADATA;Copy Exif/IPTC/XMP unchanged to output file
 !PREFERENCES_USEBUNDLEDPROFILES;Use bundled profiles
diff --git a/rtdata/languages/Swedish b/rtdata/languages/Swedish
index 049162e68..b22c72d17 100644
--- a/rtdata/languages/Swedish
+++ b/rtdata/languages/Swedish
@@ -970,7 +970,6 @@ PREFERENCES_TAB_GENERAL;Allmän
 PREFERENCES_TAB_IMPROC;Bildbehandling
 PREFERENCES_TAB_SOUND;Ljud
 PREFERENCES_TP_LABEL;Verktygspanel:
-PREFERENCES_TP_USEICONORTEXT;Använd ikoner istället för text
 PREFERENCES_TP_VSCROLLBAR;Göm verktygpanelens vertikala skrollist
 PREFERENCES_TUNNELMETADATA;Kopiera Exif/IPTC/XMP till utfilen oförändrat
 PREFERENCES_USEBUNDLEDPROFILES;Visa förinstallerade profiler
diff --git a/rtdata/languages/Turkish b/rtdata/languages/Turkish
index bae5f69de..a8d986a5f 100644
--- a/rtdata/languages/Turkish
+++ b/rtdata/languages/Turkish
@@ -1337,7 +1337,6 @@ TP_WBALANCE_TEMPERATURE;Isı
 !PREFERENCES_THUMBNAIL_INSPECTOR_RAW;Neutral raw rendering
 !PREFERENCES_THUMBNAIL_INSPECTOR_RAW_IF_NO_JPEG_FULLSIZE;Embedded JPEG if fullsize, neutral raw otherwise
 !PREFERENCES_TP_LABEL;Tool panel:
-!PREFERENCES_TP_USEICONORTEXT;Use tab icons instead of text
 !PREFERENCES_TP_VSCROLLBAR;Hide vertical scrollbar
 !PREFERENCES_TUNNELMETADATA;Copy Exif/IPTC/XMP unchanged to output file
 !PREFERENCES_USEBUNDLEDPROFILES;Use bundled profiles
diff --git a/rtdata/languages/default b/rtdata/languages/default
index 7cf0a48cb..dd84d51a2 100644
--- a/rtdata/languages/default
+++ b/rtdata/languages/default
@@ -1206,7 +1206,6 @@ PREFERENCES_THUMBNAIL_INSPECTOR_MODE;Image to show
 PREFERENCES_THUMBNAIL_INSPECTOR_RAW;Neutral raw rendering
 PREFERENCES_THUMBNAIL_INSPECTOR_RAW_IF_NO_JPEG_FULLSIZE;Embedded JPEG if fullsize, neutral raw otherwise
 PREFERENCES_TP_LABEL;Tool panel:
-PREFERENCES_TP_USEICONORTEXT;Use tab icons instead of text
 PREFERENCES_TP_VSCROLLBAR;Hide vertical scrollbar
 PREFERENCES_TUNNELMETADATA;Copy Exif/IPTC/XMP unchanged to output file
 PREFERENCES_USEBUNDLEDPROFILES;Use bundled profiles
diff --git a/rtgui/editorpanel.cc b/rtgui/editorpanel.cc
index e7fd11a26..8fd76d212 100644
--- a/rtgui/editorpanel.cc
+++ b/rtgui/editorpanel.cc
@@ -2315,11 +2315,6 @@ void EditorPanel::updateTPVScrollbar (bool hide)
     tpc->updateTPVScrollbar (hide);
 }
 
-void EditorPanel::updateTabsUsesIcons (bool useIcons)
-{
-    tpc->updateTabsUsesIcons (useIcons);
-}
-
 void EditorPanel::updateHistogramPosition (int oldPosition, int newPosition)
 {
 
diff --git a/rtgui/editorpanel.h b/rtgui/editorpanel.h
index 054ad0a6b..3ac0d92b6 100644
--- a/rtgui/editorpanel.h
+++ b/rtgui/editorpanel.h
@@ -133,7 +133,6 @@ public:
     }
     void updateProfiles (const Glib::ustring &printerProfile, rtengine::RenderingIntent printerIntent, bool printerBPC);
     void updateTPVScrollbar (bool hide);
-    void updateTabsUsesIcons (bool useIcons);
     void updateHistogramPosition (int oldPosition, int newPosition);
 
     void defaultMonitorProfileChanged (const Glib::ustring &profile_name, bool auto_monitor_profile);
diff --git a/rtgui/filepanel.cc b/rtgui/filepanel.cc
index 260a6f448..3cb5afa4c 100644
--- a/rtgui/filepanel.cc
+++ b/rtgui/filepanel.cc
@@ -425,8 +425,3 @@ void FilePanel::updateTPVScrollbar (bool hide)
 {
     tpc->updateTPVScrollbar (hide);
 }
-
-void FilePanel::updateTabsUsesIcons (bool useIcons)
-{
-    tpc->updateTabsUsesIcons (useIcons);
-}
diff --git a/rtgui/filepanel.h b/rtgui/filepanel.h
index b8389d1c9..3ecf7a33b 100644
--- a/rtgui/filepanel.h
+++ b/rtgui/filepanel.h
@@ -80,7 +80,6 @@ public:
 
     bool handleShortcutKey (GdkEventKey* event);
     void updateTPVScrollbar (bool hide);
-    void updateTabsUsesIcons (bool useIcons);
 
 private:
     void on_NB_switch_page(Gtk::Widget* page, guint page_num);
diff --git a/rtgui/guiutils.cc b/rtgui/guiutils.cc
index 1e4f4eac8..980b94765 100644
--- a/rtgui/guiutils.cc
+++ b/rtgui/guiutils.cc
@@ -1434,63 +1434,15 @@ void MyFileChooserButton::get_preferred_width_for_height_vfunc (int height, int
 
 
 
-TextOrIcon::TextOrIcon (Glib::ustring fname, Glib::ustring labelTx, Glib::ustring tooltipTx, TOITypes type)
+TextOrIcon::TextOrIcon (const Glib::ustring &fname, const Glib::ustring &labelTx, const Glib::ustring &tooltipTx)
 {
 
-    imgIcon = nullptr;
-    label = nullptr;
-    filename = fname;
-    labelText = labelTx;
-    tooltipText = tooltipTx;
+    pack_start(*Gtk::manage(new RTImage(fname)), Gtk::PACK_SHRINK, 0);
+    set_tooltip_markup("<span font_size=\"large\" font_weight=\"bold\">" + labelTx  + "</span>\n" + tooltipTx);
 
     set_name("TextOrIcon");
-
-    switchTo(type);
-}
-
-TextOrIcon::~TextOrIcon ()
-{
-    if (imgIcon) {
-        delete imgIcon;
-    }
-
-    if (label) {
-        delete label;
-    }
-}
-
-void TextOrIcon::switchTo(TOITypes type)
-{
-    switch (type) {
-    case (TOI_ICON):
-        if (!imgIcon) {
-            removeIfThere(this, label, false);
-            delete label;
-            label = nullptr;
-            imgIcon = new RTImage (filename);
-            pack_start(*imgIcon, Gtk::PACK_SHRINK, 0);
-            set_tooltip_markup ("<span font_size=\"large\" font_weight=\"bold\">" + labelText  + "</span>\n" + tooltipText);
-        }
-
-        // do nothing if imgIcon exist, which mean that it is currently being displayed
-        break;
-
-    case(TOI_TEXT):
-    default:
-        if (!label) {
-            removeIfThere(this, imgIcon, false);
-            delete imgIcon;
-            imgIcon = nullptr;
-            label = new Gtk::Label (labelText, Gtk::ALIGN_CENTER);
-            pack_start(*label, Gtk::PACK_EXPAND_WIDGET, 0);
-            set_tooltip_markup (tooltipText);
-        }
-
-        // do nothing if label exist, which mean that it is currently being displayed
-        break;
-    }
-
     show_all();
+
 }
 
 MyImageMenuItem::MyImageMenuItem(Glib::ustring label, Glib::ustring imageFileName)
diff --git a/rtgui/guiutils.h b/rtgui/guiutils.h
index fb627a78a..8816eca4f 100644
--- a/rtgui/guiutils.h
+++ b/rtgui/guiutils.h
@@ -450,11 +450,6 @@ typedef enum RTOrientation {
     RTO_Top2Bottom
 } eRTOrientation;
 
-enum TOITypes {
-    TOI_TEXT,
-    TOI_ICON
-};
-
 typedef enum RTNav {
     NAV_NONE,
     NAV_NEXT,
@@ -467,18 +462,8 @@ typedef enum RTNav {
 class TextOrIcon : public Gtk::HBox
 {
 
-protected:
-    Gtk::Image* imgIcon;
-    Gtk::Label* label;
-    Glib::ustring filename;
-    Glib::ustring labelText;
-    Glib::ustring tooltipText;
-
 public:
-    TextOrIcon (Glib::ustring filename, Glib::ustring labelTx, Glib::ustring tooltipTx, TOITypes type);
-    ~TextOrIcon ();
-
-    void switchTo(TOITypes type);
+    TextOrIcon (const Glib::ustring &filename, const Glib::ustring &labelTx, const Glib::ustring &tooltipTx);
 };
 
 class MyImageMenuItem : public Gtk::MenuItem
diff --git a/rtgui/options.cc b/rtgui/options.cc
index d20e1c198..85517b2b1 100644
--- a/rtgui/options.cc
+++ b/rtgui/options.cc
@@ -443,7 +443,6 @@ void Options::setDefaults()
 
     FileBrowserToolbarSingleRow = false;
     hideTPVScrollbar = false;
-    UseIconNoText = true;
     whiteBalanceSpotSize = 8;
     showFilmStripToolBar = false;
     menuGroupRank = true;
@@ -1342,10 +1341,6 @@ void Options::readFromFile(Glib::ustring fname)
 
 #endif
 
-                if (keyFile.has_key("GUI", "UseIconNoText")) {
-                    UseIconNoText = keyFile.get_boolean("GUI", "UseIconNoText");
-                }
-
                 if (keyFile.has_key("GUI", "HistogramWorking")) {
                     rtSettings.HistogramWorking = keyFile.get_boolean("GUI", "HistogramWorking");
                 }
@@ -2038,7 +2033,6 @@ void Options::saveToFile(Glib::ustring fname)
         keyFile.set_boolean ("GUI", "ShowFilmStripToolBar", showFilmStripToolBar);
         keyFile.set_boolean ("GUI", "FileBrowserToolbarSingleRow", FileBrowserToolbarSingleRow);
         keyFile.set_boolean ("GUI", "HideTPVScrollbar", hideTPVScrollbar);
-        keyFile.set_boolean ("GUI", "UseIconNoText", UseIconNoText);
         keyFile.set_boolean ("GUI", "HistogramWorking", rtSettings.HistogramWorking);
         keyFile.set_integer ("GUI", "CurveBBoxPosition", curvebboxpos);
 
diff --git a/rtgui/options.h b/rtgui/options.h
index 41074040f..3afeb94d9 100644
--- a/rtgui/options.h
+++ b/rtgui/options.h
@@ -294,7 +294,6 @@ public:
     int histogramDrawMode;
     bool FileBrowserToolbarSingleRow;
     bool hideTPVScrollbar;
-    bool UseIconNoText;
     int whiteBalanceSpotSize;
     int curvebboxpos; // 0=above, 1=right, 2=below, 3=left
 
diff --git a/rtgui/preferences.cc b/rtgui/preferences.cc
index dd7e4a681..a7b45c902 100644
--- a/rtgui/preferences.cc
+++ b/rtgui/preferences.cc
@@ -934,11 +934,8 @@ Gtk::Widget* Preferences::getGeneralPanel ()
     ckbHideTPVScrollbar->set_active(false);
     ckbHideTPVScrollbar->set_sensitive(false);
 #endif
-    ckbUseIconNoText = Gtk::manage ( new Gtk::CheckButton (M ("PREFERENCES_TP_USEICONORTEXT")) );
-    setExpandAlignProperties (ckbUseIconNoText, false, false, Gtk::ALIGN_START, Gtk::ALIGN_BASELINE);
     workflowGrid->attach_next_to (*hb4label, *ckbFileBrowserToolbarSingleRow, Gtk::POS_BOTTOM, 1, 1);
     workflowGrid->attach_next_to (*ckbHideTPVScrollbar, *hb4label, Gtk::POS_RIGHT, 1, 1);
-    workflowGrid->attach_next_to (*ckbUseIconNoText, *ckbHideTPVScrollbar, Gtk::POS_RIGHT, 1, 1);
     ckbAutoSaveTpOpen = Gtk::manage (new Gtk::CheckButton (M ("PREFERENCES_AUTOSAVE_TP_OPEN")));
     workflowGrid->attach_next_to (*ckbAutoSaveTpOpen, *hb4label, Gtk::POS_BOTTOM, 1, 1);
     btnSaveTpOpenNow = Gtk::manage (new Gtk::Button (M ("PREFERENCES_SAVE_TP_OPEN_NOW")));
@@ -1743,7 +1740,6 @@ void Preferences::storePreferences ()
     moptions.showFilmStripToolBar = ckbShowFilmStripToolBar->get_active();
     moptions.hideTPVScrollbar = ckbHideTPVScrollbar->get_active();
     moptions.overwriteOutputFile = chOverwriteOutputFile->get_active ();
-    moptions.UseIconNoText = ckbUseIconNoText->get_active();
 
     moptions.autoSaveTpOpen = ckbAutoSaveTpOpen->get_active();
 
@@ -1948,7 +1944,6 @@ void Preferences::fillPreferences ()
     ckbFileBrowserToolbarSingleRow->set_active (moptions.FileBrowserToolbarSingleRow);
     ckbShowFilmStripToolBar->set_active (moptions.showFilmStripToolBar);
     ckbHideTPVScrollbar->set_active (moptions.hideTPVScrollbar);
-    ckbUseIconNoText->set_active (moptions.UseIconNoText);
 
     ckbAutoSaveTpOpen->set_active (moptions.autoSaveTpOpen);
 
@@ -2332,11 +2327,6 @@ void Preferences::workflowUpdate ()
         parent->updateTPVScrollbar (moptions.hideTPVScrollbar);
     }
 
-    if (moptions.UseIconNoText != options.UseIconNoText) {
-        // Update the tool's tab titles
-        parent->updateTabsUsesIcons (moptions.UseIconNoText);
-    }
-
     if (moptions.FileBrowserToolbarSingleRow != options.FileBrowserToolbarSingleRow) {
         // Update the position of the Query toolbar
         parent->updateFBQueryTB (moptions.FileBrowserToolbarSingleRow);
diff --git a/rtgui/preferences.h b/rtgui/preferences.h
index 06521ab65..949f50376 100644
--- a/rtgui/preferences.h
+++ b/rtgui/preferences.h
@@ -197,7 +197,6 @@ class Preferences : public Gtk::Dialog, public ProfileStoreListener
     Gtk::CheckButton* ckbFileBrowserToolbarSingleRow;
     Gtk::CheckButton* ckbShowFilmStripToolBar;
     Gtk::CheckButton* ckbHideTPVScrollbar;
-    Gtk::CheckButton* ckbUseIconNoText;
 
     Gtk::CheckButton* ckbAutoSaveTpOpen;
     Gtk::Button* btnSaveTpOpenNow;
diff --git a/rtgui/rtwindow.cc b/rtgui/rtwindow.cc
index 8541504f8..a4fee1070 100644
--- a/rtgui/rtwindow.cc
+++ b/rtgui/rtwindow.cc
@@ -901,19 +901,6 @@ void RTWindow::updateTPVScrollbar (bool hide)
     }
 }
 
-void RTWindow::updateTabsUsesIcons (bool useIcons)
-{
-    fpanel->updateTabsUsesIcons (useIcons);
-
-    if (epanel) {
-        epanel->updateTabsUsesIcons (useIcons);
-    }
-
-    for (auto panel : epanels) {
-        panel.second->updateTabsUsesIcons (useIcons);
-    }
-}
-
 void RTWindow::updateFBQueryTB (bool singleRow)
 {
     fpanel->fileCatalog->updateFBQueryTB (singleRow);
diff --git a/rtgui/rtwindow.h b/rtgui/rtwindow.h
index 7bb818c7c..d5c13d515 100644
--- a/rtgui/rtwindow.h
+++ b/rtgui/rtwindow.h
@@ -110,7 +110,6 @@ public:
     void updateProfiles (const Glib::ustring &printerProfile, rtengine::RenderingIntent printerIntent, bool printerBPC);
     void updateTPVScrollbar (bool hide);
     void updateHistogramPosition (int oldPosition, int newPosition);
-    void updateTabsUsesIcons (bool useIcons);
     void updateFBQueryTB (bool singleRow);
     void updateFBToolBarVisibility (bool showFilmStripToolBar);
     bool getIsFullscreen()
diff --git a/rtgui/toolpanelcoord.cc b/rtgui/toolpanelcoord.cc
index 5d35a9ad5..deecb7682 100644
--- a/rtgui/toolpanelcoord.cc
+++ b/rtgui/toolpanelcoord.cc
@@ -199,17 +199,13 @@ ToolPanelCoordinator::ToolPanelCoordinator (bool batch) : ipc (nullptr), hasChan
     rawPanel->pack_start (*Gtk::manage (new Gtk::HSeparator), Gtk::PACK_SHRINK, 0);
     rawPanel->pack_start (*vbPanelEnd[4], Gtk::PACK_SHRINK, 0);
 
-
-
-    TOITypes type = options.UseIconNoText ? TOI_ICON : TOI_TEXT;
-
-    toiE = Gtk::manage (new TextOrIcon ("exposure.png", M ("MAIN_TAB_EXPOSURE"), M ("MAIN_TAB_EXPOSURE_TOOLTIP"), type));
-    toiD = Gtk::manage (new TextOrIcon ("detail.png", M ("MAIN_TAB_DETAIL"), M ("MAIN_TAB_DETAIL_TOOLTIP"), type));
-    toiC = Gtk::manage (new TextOrIcon ("color-circles.png", M ("MAIN_TAB_COLOR"), M ("MAIN_TAB_COLOR_TOOLTIP"), type));
-    toiW = Gtk::manage (new TextOrIcon ("atom.png", M ("MAIN_TAB_ADVANCED"), M ("MAIN_TAB_ADVANCED_TOOLTIP"), type));
-    toiT = Gtk::manage (new TextOrIcon ("transform.png", M ("MAIN_TAB_TRANSFORM"), M ("MAIN_TAB_TRANSFORM_TOOLTIP"), type));
-    toiR = Gtk::manage (new TextOrIcon ("bayer.png", M ("MAIN_TAB_RAW"), M ("MAIN_TAB_RAW_TOOLTIP"), type));
-    toiM = Gtk::manage (new TextOrIcon ("metadata.png", M ("MAIN_TAB_METADATA"), M ("MAIN_TAB_METADATA_TOOLTIP"), type));
+    toiE = Gtk::manage (new TextOrIcon ("exposure.png", M ("MAIN_TAB_EXPOSURE"), M ("MAIN_TAB_EXPOSURE_TOOLTIP")));
+    toiD = Gtk::manage (new TextOrIcon ("detail.png", M ("MAIN_TAB_DETAIL"), M ("MAIN_TAB_DETAIL_TOOLTIP")));
+    toiC = Gtk::manage (new TextOrIcon ("color-circles.png", M ("MAIN_TAB_COLOR"), M ("MAIN_TAB_COLOR_TOOLTIP")));
+    toiW = Gtk::manage (new TextOrIcon ("atom.png", M ("MAIN_TAB_ADVANCED"), M ("MAIN_TAB_ADVANCED_TOOLTIP")));
+    toiT = Gtk::manage (new TextOrIcon ("transform.png", M ("MAIN_TAB_TRANSFORM"), M ("MAIN_TAB_TRANSFORM_TOOLTIP")));
+    toiR = Gtk::manage (new TextOrIcon ("bayer.png", M ("MAIN_TAB_RAW"), M ("MAIN_TAB_RAW_TOOLTIP")));
+    toiM = Gtk::manage (new TextOrIcon ("metadata.png", M ("MAIN_TAB_METADATA"), M ("MAIN_TAB_METADATA_TOOLTIP")));
 
     toolPanelNotebook->append_page (*exposurePanelSW,  *toiE);
     toolPanelNotebook->append_page (*detailsPanelSW,   *toiD);
@@ -888,32 +884,11 @@ void ToolPanelCoordinator::updateVScrollbars (bool hide)
     }
 }
 
-void ToolPanelCoordinator::updateTabsHeader (bool useIcons)
-{
-    GThreadLock lock; // All GUI access from idle_add callbacks or separate thread HAVE to be protected
-    TOITypes type = useIcons ? TOI_ICON : TOI_TEXT;
-
-    toiE->switchTo (type);
-    toiD->switchTo (type);
-    toiC->switchTo (type);
-    toiT->switchTo (type);
-    toiR->switchTo (type);
-
-    if (toiM) {
-        toiM->switchTo (type);
-    }
-}
-
 void ToolPanelCoordinator::updateTPVScrollbar (bool hide)
 {
     updateVScrollbars (hide);
 }
 
-void ToolPanelCoordinator::updateTabsUsesIcons (bool useIcons)
-{
-    updateTabsHeader (useIcons);
-}
-
 void ToolPanelCoordinator::toolSelected (ToolMode tool)
 {
     GThreadLock lock; // All GUI access from idle_add callbacks or separate thread HAVE to be protected
diff --git a/rtgui/toolpanelcoord.h b/rtgui/toolpanelcoord.h
index 3b70b392d..1c46ee54e 100644
--- a/rtgui/toolpanelcoord.h
+++ b/rtgui/toolpanelcoord.h
@@ -190,7 +190,6 @@ protected:
     void addPanel (Gtk::Box* where, FoldableToolPanel* panel, int level = 1);
     void foldThemAll (GdkEventButton* event);
     void updateVScrollbars (bool hide);
-    void updateTabsHeader (bool useIcons);
 
 private:
 
@@ -296,7 +295,6 @@ public:
     }
 
     void updateTPVScrollbar (bool hide);
-    void updateTabsUsesIcons (bool useIcons);
     bool handleShortcutKey (GdkEventKey* event);
 
     // ToolBarListener interface