diff --git a/application/Espo/Tools/Pdf/Tcpdf/EntityProcessor.php b/application/Espo/Tools/Pdf/Tcpdf/EntityProcessor.php
index aba9ef58e4..07f4f5dd90 100644
--- a/application/Espo/Tools/Pdf/Tcpdf/EntityProcessor.php
+++ b/application/Espo/Tools/Pdf/Tcpdf/EntityProcessor.php
@@ -33,13 +33,13 @@ use Espo\Core\{
     Utils\Config,
     Htmlizer\Htmlizer as Htmlizer,
     Htmlizer\Factory as HtmlizerFactory,
-    Pdf\Tcpdf,
 };
 
 use Espo\{
     ORM\Entity,
     Tools\Pdf\Template,
     Tools\Pdf\Data,
+    Tools\Pdf\Tcpdf\Tcpdf,
 };
 
 class EntityProcessor
diff --git a/application/Espo/Core/Pdf/Tcpdf.php b/application/Espo/Tools/Pdf/Tcpdf/Tcpdf.php
similarity index 99%
rename from application/Espo/Core/Pdf/Tcpdf.php
rename to application/Espo/Tools/Pdf/Tcpdf/Tcpdf.php
index 64a313778a..9429d5855a 100644
--- a/application/Espo/Core/Pdf/Tcpdf.php
+++ b/application/Espo/Tools/Pdf/Tcpdf/Tcpdf.php
@@ -27,7 +27,7 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\Pdf;
+namespace Espo\Tools\Pdf\Tcpdf;
 
 define('K_TCPDF_EXTERNAL_CONFIG', true);
 
@@ -61,8 +61,7 @@ define('K_TIMEZONE', 'UTC');
 
 require "vendor/tecnickcom/tcpdf/tcpdf.php";
 
-use \TCPDF_STATIC;
-use \TCPDF_FONTS;
+use TCPDF_STATIC;
 
 use Espo\Core\Utils\Util;
 
diff --git a/application/Espo/Tools/Pdf/Tcpdf/TcpdfCollectionPrinter.php b/application/Espo/Tools/Pdf/Tcpdf/TcpdfCollectionPrinter.php
index fe212019c2..2660341a16 100644
--- a/application/Espo/Tools/Pdf/Tcpdf/TcpdfCollectionPrinter.php
+++ b/application/Espo/Tools/Pdf/Tcpdf/TcpdfCollectionPrinter.php
@@ -29,17 +29,13 @@
 
 namespace Espo\Tools\Pdf\Tcpdf;
 
-use Espo\Core\{
-    Pdf\Tcpdf,
-};
-
 use Espo\{
-    ORM\Entity,
     ORM\Collection,
     Tools\Pdf\CollectionPrinter,
     Tools\Pdf\Template,
     Tools\Pdf\Contents,
     Tools\Pdf\Data,
+    Tools\Pdf\Tcpdf\Tcpdf,
 };
 
 class TcpdfCollectionPrinter implements CollectionPrinter
diff --git a/application/Espo/Tools/Pdf/Tcpdf/TcpdfContents.php b/application/Espo/Tools/Pdf/Tcpdf/TcpdfContents.php
index 45f994d02a..a447744f0f 100644
--- a/application/Espo/Tools/Pdf/Tcpdf/TcpdfContents.php
+++ b/application/Espo/Tools/Pdf/Tcpdf/TcpdfContents.php
@@ -29,12 +29,9 @@
 
 namespace Espo\Tools\Pdf\Tcpdf;
 
-use Espo\Core\{
-    Pdf\Tcpdf,
-};
-
 use Espo\{
     Tools\Pdf\Contents,
+    Tools\Pdf\Tcpdf\Tcpdf,
 };
 
 class TcpdfContents implements Contents
diff --git a/application/Espo/Tools/Pdf/Tcpdf/TcpdfEntityPrinter.php b/application/Espo/Tools/Pdf/Tcpdf/TcpdfEntityPrinter.php
index f0163eb8d1..8351be9d64 100644
--- a/application/Espo/Tools/Pdf/Tcpdf/TcpdfEntityPrinter.php
+++ b/application/Espo/Tools/Pdf/Tcpdf/TcpdfEntityPrinter.php
@@ -29,16 +29,13 @@
 
 namespace Espo\Tools\Pdf\Tcpdf;
 
-use Espo\Core\{
-    Pdf\Tcpdf,
-};
-
 use Espo\{
     ORM\Entity,
     Tools\Pdf\EntityPrinter,
     Tools\Pdf\Template,
     Tools\Pdf\Contents,
     Tools\Pdf\Data,
+    Tools\Pdf\Tcpdf\Tcpdf,
 };
 
 class TcpdfEntityPrinter implements EntityPrinter