diff --git a/s2tbx-gdal-reader/src/main/resources/org/esa/s2tbx/dataio/gdal/reader/docs/gdal/GDALReader.html b/s2tbx-gdal-reader/src/main/resources/org/esa/s2tbx/dataio/gdal/reader/docs/gdal/GDALReader.html
index 7b9245f459..cb68e32d9c 100644
--- a/s2tbx-gdal-reader/src/main/resources/org/esa/s2tbx/dataio/gdal/reader/docs/gdal/GDALReader.html
+++ b/s2tbx-gdal-reader/src/main/resources/org/esa/s2tbx/dataio/gdal/reader/docs/gdal/GDALReader.html
@@ -73,7 +73,7 @@ <h3>Import products using the GDAL library</h3>
        Vexcel MFF Raster products (*.hdr)
     </p>
 	<p>
-        The supported GDAL library versions are listed <a href="nbdocs://org.esa.s2tbx.s2tbx.s2msi.reader.ui/org/esa/s2tbx/dataio/s2/preferences/ui/msi/docs/s2tbx/S2TBXOptions.html">here</a>. If this library is already installed, then it is used; otherwise the application will use the internal distribution (3.2.1).
+        The supported GDAL library versions are listed <a href="nbdocs://org.esa.snap.snap.help/org/esa/snap/snap/help/docs/desktop/OptionsDialog.html#GDALLibraryLoaderConfig">here</a>. If this library is already installed, then it is used; otherwise the application will use the internal distribution (3.2.1).
 	   This functionality is available on machines with the Microsoft Windows, Linux and Mac OSX operating system.
     </p>
     <p>For more details please see: <a href="http://www.gdal.org/">GDAL - Geospatial Data Abstraction Library</a></p>
diff --git a/s2tbx-gdal-writer/src/main/resources/org/esa/s2tbx/dataio/gdal/writer/docs/gdal/GDALWriter.html b/s2tbx-gdal-writer/src/main/resources/org/esa/s2tbx/dataio/gdal/writer/docs/gdal/GDALWriter.html
index c255844533..9a6654f266 100644
--- a/s2tbx-gdal-writer/src/main/resources/org/esa/s2tbx/dataio/gdal/writer/docs/gdal/GDALWriter.html
+++ b/s2tbx-gdal-writer/src/main/resources/org/esa/s2tbx/dataio/gdal/writer/docs/gdal/GDALWriter.html
@@ -126,7 +126,7 @@ <h3>Export products using the GDAL library</h3>
     </table>
 
     <p>
-        The supported GDAL library versions are listed <a href="nbdocs://org.esa.s2tbx.s2tbx.s2msi.reader.ui/org/esa/s2tbx/dataio/s2/preferences/ui/msi/docs/s2tbx/S2TBXOptions.html">here</a>. If this library is already installed, then it is used; otherwise the application will use the internal distribution (3.2.1).
+        The supported GDAL library versions are listed <a href="nbdocs://org.esa.snap.snap.help/org/esa/snap/snap/help/docs/desktop/OptionsDialog.html#GDALLibraryLoaderConfig">here</a>. If this library is already installed, then it is used; otherwise the application will use the internal distribution (3.2.1).
         This functionality is available on machines with the Microsoft Windows, Linux and Mac OSX operating system.
     </p>	
     <p>For more details please see: <a href="http://www.gdal.org/">GDAL - Geospatial Data Abstraction Library</a></p>
diff --git a/s2tbx-s2msi-reader-ui/src/main/resources/org/esa/s2tbx/dataio/s2/preferences/ui/msi/docs/images/gdal_loader_config.png b/s2tbx-s2msi-reader-ui/src/main/resources/org/esa/s2tbx/dataio/s2/preferences/ui/msi/docs/images/gdal_loader_config.png
deleted file mode 100644
index ae92cc8310..0000000000
Binary files a/s2tbx-s2msi-reader-ui/src/main/resources/org/esa/s2tbx/dataio/s2/preferences/ui/msi/docs/images/gdal_loader_config.png and /dev/null differ
diff --git a/s2tbx-s2msi-reader-ui/src/main/resources/org/esa/s2tbx/dataio/s2/preferences/ui/msi/docs/images/s2cache.png b/s2tbx-s2msi-reader-ui/src/main/resources/org/esa/s2tbx/dataio/s2/preferences/ui/msi/docs/images/s2cache.png
index 9b7950a07a..7b29cdc350 100644
Binary files a/s2tbx-s2msi-reader-ui/src/main/resources/org/esa/s2tbx/dataio/s2/preferences/ui/msi/docs/images/s2cache.png and b/s2tbx-s2msi-reader-ui/src/main/resources/org/esa/s2tbx/dataio/s2/preferences/ui/msi/docs/images/s2cache.png differ
diff --git a/s2tbx-s2msi-reader-ui/src/main/resources/org/esa/s2tbx/dataio/s2/preferences/ui/msi/docs/images/s2reader.png b/s2tbx-s2msi-reader-ui/src/main/resources/org/esa/s2tbx/dataio/s2/preferences/ui/msi/docs/images/s2reader.png
index c2c3e008f6..23ff8efb57 100644
Binary files a/s2tbx-s2msi-reader-ui/src/main/resources/org/esa/s2tbx/dataio/s2/preferences/ui/msi/docs/images/s2reader.png and b/s2tbx-s2msi-reader-ui/src/main/resources/org/esa/s2tbx/dataio/s2/preferences/ui/msi/docs/images/s2reader.png differ
diff --git a/s2tbx-s2msi-reader-ui/src/main/resources/org/esa/s2tbx/dataio/s2/preferences/ui/msi/docs/s2tbx/S2TBXOptions.html b/s2tbx-s2msi-reader-ui/src/main/resources/org/esa/s2tbx/dataio/s2/preferences/ui/msi/docs/s2tbx/S2TBXOptions.html
index d4a22173c0..54cf5890d7 100644
--- a/s2tbx-s2msi-reader-ui/src/main/resources/org/esa/s2tbx/dataio/s2/preferences/ui/msi/docs/s2tbx/S2TBXOptions.html
+++ b/s2tbx-s2msi-reader-ui/src/main/resources/org/esa/s2tbx/dataio/s2/preferences/ui/msi/docs/s2tbx/S2TBXOptions.html
@@ -34,33 +34,6 @@
     </tr>
 </table>
 
-<h4>GDAL Library Loader configuration</h4>
-
-<p>
-    It is possible to configure the GDAL library loader to load one of the installed GDAL distribution from the operating system or the internal GDAL distribution within SNAP (version 3.2.1).
-</p>
-
-<img src="../images/gdal_loader_config.png" border=0/>
-
-<p><br>The internal GDAL distribution is used when no GDAL distribution is installed on the operating system or when the installed version is not compatible.
-    If the first option is selected and a GDAL distribution is installed on the operating system, SNAP will not load it until the second option is selected.
-</p>
-
-
-<h5>Compatible versions</h5>
-
-<p><br/>
-    - Windows x86 (32 bit): from GDAL 2.1.X to GDAL 3.2.X
-    <br/>
-    - Windows x64 (64 bit): from GDAL 2.1.X to GDAL 3.2.X
-    <br/>
-    - Linux x64 (64 bit): from GDAL 2.0.X to GDAL 3.2.X
-    <br/>
-    - MacOSX (64 bit): from GDAL 2.0.X to GDAL 3.2.X
-    <br/>
-</p>
-
-
 <h4>Sentinel-2 Cache</h4>
 
 <p>