diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e2d72dadac02f3646ab08c39ca5bfaef24690611..fbb48045189b40382195a14c1ae80c200e709dc2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,6 +9,10 @@ include:
       - "/includes/include.drupalci.variables.yml"
       - "/includes/include.drupalci.workflows.yml"
 
+composer:
+  variables:
+    DRUPAL_CORE: 10.4.1
+
 .skip-phpmd-rule: &skip-phpmd-rule
   if: '$SKIP_PHPMD == "1"'
   when: never
diff --git a/modules/ui_icons_backport/ui_icons_backport.info.yml b/modules/ui_icons_backport/ui_icons_backport.info.yml
index b52ad4d70f9646faf0036aa041224c07778e5251..edb2664ca20b3633c5c4185ab74240d6ddd7f450 100644
--- a/modules/ui_icons_backport/ui_icons_backport.info.yml
+++ b/modules/ui_icons_backport/ui_icons_backport.info.yml
@@ -1,8 +1,7 @@
 name: 'UI Icons API backport'
 type: module
-description: 'UI Icons API backport for Drupal 11.0'
+description: 'UI Icons API backport for Drupal before 11.1'
 package: User interface
-core_version_requirement: ^10.3 || ^11.0
+core_version_requirement: ^10.3 || 11.0
 lifecycle: deprecated
-lifecycle_link: https://www.drupal.org/project/drupal/issues/3471494
-  
\ No newline at end of file
+lifecycle_link: https://www.drupal.org/project/drupal/issues/3471494
\ No newline at end of file
diff --git a/modules/ui_icons_ckeditor5/tests/src/FunctionalJavascript/IconPluginTest.php b/modules/ui_icons_ckeditor5/tests/src/FunctionalJavascript/IconPluginTest.php
index 689f447e7b6148257cdd741aa48f9f35eebaa245..37cf95b1b0d7b6dc3d7fef162e471adb98644e0f 100644
--- a/modules/ui_icons_ckeditor5/tests/src/FunctionalJavascript/IconPluginTest.php
+++ b/modules/ui_icons_ckeditor5/tests/src/FunctionalJavascript/IconPluginTest.php
@@ -4,7 +4,6 @@ declare(strict_types=1);
 
 namespace Drupal\Tests\ui_icons_ckeditor5\Functional;
 
-// @todo remove for 11.1.
 @class_alias('Drupal\ui_icons_backport\IconDefinition', 'Drupal\Core\Theme\Icon\IconDefinition');
 
 use Behat\Mink\Element\NodeElement;
diff --git a/modules/ui_icons_ckeditor5/tests/src/Kernel/IconFilterControllerTest.php b/modules/ui_icons_ckeditor5/tests/src/Kernel/IconFilterControllerTest.php
index 956161f1e99bd49f7c2ec66c17200fa5fc9eabf8..285f54f72f7200c8bc0cbbe3c0c773813e8d13db 100644
--- a/modules/ui_icons_ckeditor5/tests/src/Kernel/IconFilterControllerTest.php
+++ b/modules/ui_icons_ckeditor5/tests/src/Kernel/IconFilterControllerTest.php
@@ -4,7 +4,6 @@ declare(strict_types=1);
 
 namespace Drupal\Tests\ui_icons_ckeditor5\Kernel;
 
-// @todo remove for 11.1.
 @class_alias('Drupal\ui_icons_backport\IconDefinition', 'Drupal\Core\Theme\Icon\IconDefinition');
 @class_alias('Drupal\ui_icons_backport\IconFinder', 'Drupal\Core\Theme\Icon\IconFinder');
 
diff --git a/modules/ui_icons_font/src/Plugin/IconExtractor/FontExtractor.php b/modules/ui_icons_font/src/Plugin/IconExtractor/FontExtractor.php
index 87abaf9024aee162c689c50540934ff3ef7bd5bd..b114db6c8a480b464ebf6174091c71141a7944a4 100644
--- a/modules/ui_icons_font/src/Plugin/IconExtractor/FontExtractor.php
+++ b/modules/ui_icons_font/src/Plugin/IconExtractor/FontExtractor.php
@@ -4,7 +4,6 @@ declare(strict_types=1);
 
 namespace Drupal\ui_icons_font\Plugin\IconExtractor;
 
-// @todo remove for 11.1.
 @class_alias('Drupal\ui_icons_backport\IconExtractorBase', 'Drupal\Core\Theme\Icon\IconExtractorBase');
 @class_alias('Drupal\ui_icons_backport\IconDefinition', 'Drupal\Core\Theme\Icon\IconDefinition');
 @class_alias('Drupal\ui_icons_backport\IconDefinitionInterface', 'Drupal\Core\Theme\Icon\IconDefinitionInterface');
diff --git a/modules/ui_icons_font/tests/src/Unit/Plugin/IconExtractor/FontExtractorTest.php b/modules/ui_icons_font/tests/src/Unit/Plugin/IconExtractor/FontExtractorTest.php
index d30cf4ad84c2072c569fb23e6a47e94eda47a8ea..acca6f1b192a4b326dfdddd23e958439994bb456 100644
--- a/modules/ui_icons_font/tests/src/Unit/Plugin/IconExtractor/FontExtractorTest.php
+++ b/modules/ui_icons_font/tests/src/Unit/Plugin/IconExtractor/FontExtractorTest.php
@@ -5,7 +5,6 @@ declare(strict_types=1);
 // cspell:ignore corge
 namespace Drupal\Tests\ui_icons_font\Unit;
 
-// @todo remove for 11.1.
 @class_alias('Drupal\Tests\ui_icons_backport\IconTestTrait', 'Drupal\Tests\Core\Theme\Icon\IconTestTrait');
 @class_alias('Drupal\ui_icons_backport\Exception\IconPackConfigErrorException', 'Drupal\Core\Theme\Icon\Exception\IconPackConfigErrorException');
 @class_alias('Drupal\ui_icons_backport\IconDefinition', 'Drupal\Core\Theme\Icon\IconDefinition');
diff --git a/modules/ui_icons_iconify_api/tests/src/Unit/Plugin/IconExtractor/IconifyExtractorTest.php b/modules/ui_icons_iconify_api/tests/src/Unit/Plugin/IconExtractor/IconifyExtractorTest.php
index 8bbd804eab6a56d6563ae9eb424a46f5ff0ec077..98f4c4498017b7c6203d27c866d935cc695c1248 100644
--- a/modules/ui_icons_iconify_api/tests/src/Unit/Plugin/IconExtractor/IconifyExtractorTest.php
+++ b/modules/ui_icons_iconify_api/tests/src/Unit/Plugin/IconExtractor/IconifyExtractorTest.php
@@ -4,7 +4,6 @@ declare(strict_types=1);
 
 namespace Drupal\Tests\ui_icons_iconify_api\Unit\Plugin\IconExtractor;
 
-// @todo remove for 11.1.
 @class_alias('Drupal\ui_icons_backport\Exception\IconPackConfigErrorException', 'Drupal\Core\Theme\Icon\Exception\IconPackConfigErrorException');
 @class_alias('Drupal\ui_icons_backport\IconDefinition', 'Drupal\Core\Theme\Icon\IconDefinition');
 @class_alias('Drupal\ui_icons_backport\IconExtractorBase', 'Drupal\Core\Theme\Icon\IconExtractorBase');
diff --git a/modules/ui_icons_iconify_api/ui_icons_iconify_api.info.yml b/modules/ui_icons_iconify_api/ui_icons_iconify_api.info.yml
index d763025e270d59bed614c2cc7abe78766656e8e9..d21a87dc9eda182d3d0698dda6f3ef420fd1a94a 100644
--- a/modules/ui_icons_iconify_api/ui_icons_iconify_api.info.yml
+++ b/modules/ui_icons_iconify_api/ui_icons_iconify_api.info.yml
@@ -1,7 +1,9 @@
 name: 'UI Icons Iconify API'
 type: module
-description: 'Iconify API extractor to allow definition of icons from Iconify.'
+description: 'Replaced by dedicated module Iconify Icons.'
 package: User interface
 core_version_requirement: ^10.3 || ^11.0
+lifecycle: deprecated
+lifecycle_link: https://www.drupal.org/project/iconify_icons
 dependencies:
   - ui_icons:ui_icons
diff --git a/modules/ui_icons_media/tests/src/Kernel/IconSourceTest.php b/modules/ui_icons_media/tests/src/Kernel/IconSourceTest.php
index a8778bbf4b2c0ca0b3f869e768634560150ae5e9..afd006c6264f45f5d7858e4a049322bf511a619d 100644
--- a/modules/ui_icons_media/tests/src/Kernel/IconSourceTest.php
+++ b/modules/ui_icons_media/tests/src/Kernel/IconSourceTest.php
@@ -4,7 +4,6 @@ declare(strict_types=1);
 
 namespace Drupal\Tests\ui_icons_media\Kernel;
 
-// @todo remove for 11.1.
 @class_alias('Drupal\ui_icons_backport\IconFinder', 'Drupal\Core\Theme\Icon\IconFinder');
 
 use Drupal\Tests\media\Kernel\MediaKernelTestBase;
diff --git a/modules/ui_icons_menu/tests/src/Kernel/UiIconsMenuTest.php b/modules/ui_icons_menu/tests/src/Kernel/UiIconsMenuTest.php
index 95098b60b88799ce8e445761fd1ac9b68b4763c3..41e189b390b9f439d73639791acfc0445394bcb2 100644
--- a/modules/ui_icons_menu/tests/src/Kernel/UiIconsMenuTest.php
+++ b/modules/ui_icons_menu/tests/src/Kernel/UiIconsMenuTest.php
@@ -4,7 +4,6 @@ declare(strict_types=1);
 
 namespace Drupal\Tests\ui_icons_menu\Kernel;
 
-// @todo remove for 11.1.
 @class_alias('Drupal\ui_icons_backport\IconFinder', 'Drupal\Core\Theme\Icon\IconFinder');
 
 use Drupal\Core\Field\BaseFieldDefinition;
diff --git a/modules/ui_icons_text/tests/src/Kernel/IconEmbedFilterTest.php b/modules/ui_icons_text/tests/src/Kernel/IconEmbedFilterTest.php
index 58595957a160941b46bd7c4a2cf8005ee96a3117..ea279c8acb408f99fc148c122b0be975f74bc045 100644
--- a/modules/ui_icons_text/tests/src/Kernel/IconEmbedFilterTest.php
+++ b/modules/ui_icons_text/tests/src/Kernel/IconEmbedFilterTest.php
@@ -4,7 +4,6 @@ declare(strict_types=1);
 
 namespace Drupal\Tests\ui_icons_text\Kernel;
 
-// @todo remove for 11.1.
 @class_alias('Drupal\ui_icons_backport\IconDefinition', 'Drupal\Core\Theme\Icon\IconDefinition');
 @class_alias('Drupal\ui_icons_backport\Plugin\IconPackManagerInterface', 'Drupal\Core\Theme\Icon\Plugin\IconPackManagerInterface');
 @class_alias('Drupal\ui_icons_backport\IconFinder', 'Drupal\Core\Theme\Icon\IconFinder');
diff --git a/tests/src/Kernel/IconAutocompleteControllerKernelTest.php b/tests/src/Kernel/IconAutocompleteControllerKernelTest.php
index 78885d49f69f169ef22d4af6b1e2999539ddda6e..a1d1a5be3dc8296256e6f0caa643fe262437a5d3 100644
--- a/tests/src/Kernel/IconAutocompleteControllerKernelTest.php
+++ b/tests/src/Kernel/IconAutocompleteControllerKernelTest.php
@@ -4,7 +4,6 @@ declare(strict_types=1);
 
 namespace Drupal\Tests\ui_icons\Kernel;
 
-// @todo remove for 11.1.
 @class_alias('Drupal\ui_icons_backport\Plugin\IconPackManagerInterface', 'Drupal\Core\Theme\Icon\Plugin\IconPackManagerInterface');
 @class_alias('Drupal\ui_icons_backport\IconFinder', 'Drupal\Core\Theme\Icon\IconFinder');
 
diff --git a/tests/src/Kernel/IconPreviewKernelTest.php b/tests/src/Kernel/IconPreviewKernelTest.php
index 91464b0fa360e81f2d4cd4223151e8c1cf3eb5e8..a15c5edb09945248d49a7f45ece14d4d0be6c36d 100644
--- a/tests/src/Kernel/IconPreviewKernelTest.php
+++ b/tests/src/Kernel/IconPreviewKernelTest.php
@@ -4,9 +4,9 @@ declare(strict_types=1);
 
 namespace Drupal\Tests\ui_icons\Kernel;
 
-// @todo remove for 11.1.
 @class_alias('Drupal\ui_icons_backport\Plugin\IconPackManagerInterface', 'Drupal\Core\Theme\Icon\Plugin\IconPackManagerInterface');
-// @class_alias('Drupal\ui_icons_backport\IconFinder', 'Drupal\Core\Theme\Icon\IconFinder');
+@class_alias('Drupal\ui_icons_backport\IconFinder', 'Drupal\Core\Theme\Icon\IconFinder');
+
 use Drupal\Core\Theme\Icon\Plugin\IconPackManagerInterface;
 use Drupal\KernelTests\KernelTestBase;
 use Drupal\ui_icons\IconPreview;
diff --git a/tests/src/Unit/Element/IconAutocompleteUnitTest.php b/tests/src/Unit/Element/IconAutocompleteUnitTest.php
index 793e27eeb1b03cefde464cb94aa5d4a968249523..30e6b72ce899e46d728e068bf3c7a391756c10b7 100644
--- a/tests/src/Unit/Element/IconAutocompleteUnitTest.php
+++ b/tests/src/Unit/Element/IconAutocompleteUnitTest.php
@@ -4,7 +4,6 @@ declare(strict_types=1);
 
 namespace Drupal\Tests\ui_icons\Unit\Element;
 
-// @todo remove for 11.1.
 @class_alias('Drupal\ui_icons_backport\IconDefinition', 'Drupal\Core\Theme\Icon\IconDefinition');
 @class_alias('Drupal\ui_icons_backport\IconDefinitionInterface', 'Drupal\Core\Theme\Icon\IconDefinitionInterface');
 @class_alias('Drupal\ui_icons_backport\Plugin\IconPackManagerInterface', 'Drupal\Core\Theme\Icon\Plugin\IconPackManagerInterface');
diff --git a/tests/src/Unit/IconSearchTest.php b/tests/src/Unit/IconSearchTest.php
index b36d6c54cb1cb0f42eb7ae50602f0583b5c3bb9f..d1fda2af89f5e8f205b8431b21734a7b4fd74447 100644
--- a/tests/src/Unit/IconSearchTest.php
+++ b/tests/src/Unit/IconSearchTest.php
@@ -5,7 +5,6 @@ declare(strict_types=1);
 // cspell:ignore corge quux
 namespace Drupal\Tests\ui_icons\Unit\Controller;
 
-// @todo remove for 11.1.
 @class_alias('Drupal\ui_icons_backport\Plugin\IconPackManagerInterface', 'Drupal\Core\Theme\Icon\Plugin\IconPackManagerInterface');
 @class_alias('Drupal\ui_icons_backport\IconDefinition', 'Drupal\Core\Theme\Icon\IconDefinition');
 @class_alias('Drupal\ui_icons_backport\IconDefinitionInterface', 'Drupal\Core\Theme\Icon\IconDefinitionInterface');
diff --git a/tests/src/Unit/Template/IconPreviewTwigExtensionTest.php b/tests/src/Unit/Template/IconPreviewTwigExtensionTest.php
index f02f39fae7d140518a20fabb054d2938a9f8797d..3820fac137f752b09d3484c6bfba7e4ee7d9db75 100644
--- a/tests/src/Unit/Template/IconPreviewTwigExtensionTest.php
+++ b/tests/src/Unit/Template/IconPreviewTwigExtensionTest.php
@@ -4,7 +4,6 @@ declare(strict_types=1);
 
 namespace Drupal\Tests\ui_icons\Unit;
 
-// @todo remove for 11.1.
 @class_alias('Drupal\ui_icons_backport\Template\IconsTwigExtension', 'Drupal\Core\Theme\Icon\Template\IconsTwigExtension');
 @class_alias('Drupal\Tests\ui_icons_backport\IconTestTrait', 'Drupal\Tests\Core\Theme\Icon\IconTestTrait');
 
diff --git a/ui_icons.info.yml b/ui_icons.info.yml
index 45af01580d281b51f4daaa5cb1c7311ad133fed2..73e3c47adcfbf0e7f6b414d7edb92d649d543a02 100644
--- a/ui_icons.info.yml
+++ b/ui_icons.info.yml
@@ -3,6 +3,3 @@ type: module
 description: 'Core Icons main form element for Icon autocomplete.'
 package: User interface
 core_version_requirement: ^10.3 || ^11.0
-# @todo remove for 11.1
-dependencies:
-  - ui_icons:ui_icons_backport
\ No newline at end of file