diff --git a/phpBB/phpbb/avatar/helper.php b/phpBB/phpbb/avatar/helper.php
index 4c3f12b770..0638f1f69c 100644
--- a/phpBB/phpbb/avatar/helper.php
+++ b/phpBB/phpbb/avatar/helper.php
@@ -180,7 +180,7 @@ class helper
 	 * Created for Backwards Compatibility (BC).
 	 * Styles should generate their own HTML element instead.
 	 *
-	 * @deprecated 4.0.0
+	 * @deprecated 4.1.0				After admin style is reworked aswell
 	 *
 	 * @param array		$data			The avatar data array
 	 * @return string					The avatar's HTML <img> element
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php
index 7bfa29d70d..65289b041f 100644
--- a/phpBB/viewtopic.php
+++ b/phpBB/viewtopic.php
@@ -1484,7 +1484,7 @@ while ($row = $db->sql_fetchrow($result))
 				'viewonline'	=> $row['user_allow_viewonline'],
 				'allow_pm'		=> $row['user_allow_pm'],
 
-				'avatar'		=> ($user->optionget('viewavatars')) ? $this->get_user_avatar($row) : [],
+				'avatar'		=> ($user->optionget('viewavatars')) ? $avatar_helper->get_user_avatar($row) : [],
 				'age'			=> '',
 
 				'rank_title'		=> '',
diff --git a/tests/console/user/base.php b/tests/console/user/base.php
index c4e454f6f7..c0eff42a9a 100644
--- a/tests/console/user/base.php
+++ b/tests/console/user/base.php
@@ -69,7 +69,11 @@ abstract class phpbb_console_user_base extends phpbb_database_test_case
 		));
 		$user->data['user_email'] = '';
 
-		$this->user_loader = new \phpbb\user_loader($db, $phpbb_root_path, $phpEx, USERS_TABLE);
+		$avatar_helper = $this->getMockBuilder('\phpbb\avatar\helper')
+			->disableOriginalConstructor()
+			->getMock();
+
+		$this->user_loader = new \phpbb\user_loader($avatar_helper, $db, $phpbb_root_path, $phpEx, USERS_TABLE);
 
 		$driver_helper = new \phpbb\passwords\driver\helper($this->config);
 		$passwords_drivers = array(
diff --git a/tests/group/helper_test_case.php b/tests/group/helper_test_case.php
index c7abaea76e..f42dd13fa0 100644
--- a/tests/group/helper_test_case.php
+++ b/tests/group/helper_test_case.php
@@ -113,7 +113,11 @@ class phpbb_group_helper_test_case extends phpbb_test_case
 		$user = new \phpbb\user($lang, '\phpbb\datetime');
 		$user->data['user_id'] = ANONYMOUS;
 
-		$this->group_helper = new \phpbb\group\helper($auth, $cache_service, $config, $lang, $phpbb_dispatcher, $path_helper, $user);
+		$avatar_helper = $this->getMockBuilder('\phpbb\avatar\helper')
+			->disableOriginalConstructor()
+			->getMock();
+
+		$this->group_helper = new \phpbb\group\helper($auth, $avatar_helper, $cache_service, $config, $lang, $phpbb_dispatcher, $path_helper, $user);
 	}
 
 	protected function setUp(): void
diff --git a/tests/notification/base.php b/tests/notification/base.php
index 42b0febfbe..59c7956ee8 100644
--- a/tests/notification/base.php
+++ b/tests/notification/base.php
@@ -63,6 +63,9 @@ abstract class phpbb_tests_notification_base extends phpbb_database_test_case
 
 		global $db, $config, $user, $auth, $cache, $phpbb_container;
 
+		$avatar_helper = $this->getMockBuilder('\phpbb\avatar\helper')
+			->disableOriginalConstructor()
+			->getMock();
 		$db = $this->db = $this->new_dbal();
 		$config = $this->config = new \phpbb\config\config(array(
 			'allow_privmsg'			=> true,
@@ -77,7 +80,7 @@ abstract class phpbb_tests_notification_base extends phpbb_database_test_case
 		$user->data['user_id'] = 0;
 		$user->data['user_type'] = USER_NORMAL;
 		$this->user = $user;
-		$this->user_loader = new \phpbb\user_loader($this->db, $phpbb_root_path, $phpEx, 'phpbb_users');
+		$this->user_loader = new \phpbb\user_loader($avatar_helper, $this->db, $phpbb_root_path, $phpEx, 'phpbb_users');
 		$auth = $this->auth = new phpbb_mock_notifications_auth();
 		$cache_driver = new \phpbb\cache\driver\dummy();
 		$cache = $this->cache = new \phpbb\cache\service(
diff --git a/tests/notification/group_request_test.php b/tests/notification/group_request_test.php
index 9a082f08a4..d523c80f34 100644
--- a/tests/notification/group_request_test.php
+++ b/tests/notification/group_request_test.php
@@ -48,6 +48,7 @@ class phpbb_notification_group_request_test extends phpbb_tests_notification_bas
 		));
 		$this->container->set('group_helper', new \phpbb\group\helper(
 			$this->getMockBuilder('\phpbb\auth\auth')->disableOriginalConstructor()->getMock(),
+			$this->getMockBuilder('\phpbb\avatar\helper')->disableOriginalConstructor()->getMock(),
 			$this->cache,
 			$this->config,
 			new \phpbb\language\language(
diff --git a/tests/notification/submit_post_base.php b/tests/notification/submit_post_base.php
index 26be8f7da9..2d17b601a2 100644
--- a/tests/notification/submit_post_base.php
+++ b/tests/notification/submit_post_base.php
@@ -112,8 +112,12 @@ abstract class phpbb_notification_submit_post_base extends phpbb_database_test_c
 		$type_cast_helper = $this->createMock('\phpbb\request\type_cast_helper_interface');
 		$request = $this->createMock('\phpbb\request\request');
 
+		$avatar_helper = $this->getMockBuilder('\phpbb\avatar\helper')
+			->disableOriginalConstructor()
+			->getMock();
+
 		$phpbb_dispatcher = new phpbb_mock_event_dispatcher();
-		$user_loader = new \phpbb\user_loader($db, $phpbb_root_path, $phpEx, USERS_TABLE);
+		$user_loader = new \phpbb\user_loader($avatar_helper, $db, $phpbb_root_path, $phpEx, USERS_TABLE);
 
 		// Container
 		$phpbb_container = new ContainerBuilder();
diff --git a/tests/notification/user_list_trim_test.php b/tests/notification/user_list_trim_test.php
index 4ddfcb82cd..2704b36c01 100644
--- a/tests/notification/user_list_trim_test.php
+++ b/tests/notification/user_list_trim_test.php
@@ -57,7 +57,11 @@ class phpbb_notification_user_list_trim_test extends phpbb_database_test_case
 		];
 		$lang->add_lang('common');
 
-		$user_loader = new phpbb\user_loader($db, $phpbb_root_path, $phpEx, USERS_TABLE);
+		$avatar_helper = $this->getMockBuilder('\phpbb\avatar\helper')
+			->disableOriginalConstructor()
+			->getMock();
+
+		$user_loader = new phpbb\user_loader($avatar_helper, $db, $phpbb_root_path, $phpEx, USERS_TABLE);
 		$user_loader->load_users(array(2, 3, 4, 5, 6));
 
 		$this->notification = new phpbb_mock_notification_type_post(
diff --git a/tests/user/user_loader_test.php b/tests/user/user_loader_test.php
index dd00d6eb06..ec1d4e588a 100644
--- a/tests/user/user_loader_test.php
+++ b/tests/user/user_loader_test.php
@@ -25,8 +25,11 @@ class phpbb_user_loader_test extends phpbb_database_test_case
 	{
 		parent::setUp();
 
+		$avatar_helper = $this->getMockBuilder('\phpbb\avatar\helper')
+			->disableOriginalConstructor()
+			->getMock();
 		$this->db = $this->new_dbal();
-		$this->user_loader = new \phpbb\user_loader($this->db, __DIR__ . '/../../phpBB/', 'php', 'phpbb_users');
+		$this->user_loader = new \phpbb\user_loader($avatar_helper, $this->db, __DIR__ . '/../../phpBB/', 'php', 'phpbb_users');
 	}
 
 	public function test_load_get()