diff --git a/src/Controllers/UserAvatarController.php b/src/Routes/Users/GetUserAvatar.php
similarity index 85%
rename from src/Controllers/UserAvatarController.php
rename to src/Routes/Users/GetUserAvatar.php
index 6cd9c4ae..42c363fb 100644
--- a/src/Controllers/UserAvatarController.php
+++ b/src/Routes/Users/GetUserAvatar.php
@@ -1,5 +1,5 @@
 <?php
-namespace Szurubooru\Controllers;
+namespace Szurubooru\Routes\Users;
 use Szurubooru\Dao\PublicFileDao;
 use Szurubooru\Entities\User;
 use Szurubooru\Router;
@@ -7,7 +7,7 @@ use Szurubooru\Services\NetworkingService;
 use Szurubooru\Services\ThumbnailService;
 use Szurubooru\Services\UserService;
 
-final class UserAvatarController extends AbstractController
+class GetUserAvatar extends AbstractUserRoute
 {
 	private $fileDao;
 	private $userService;
@@ -26,13 +26,21 @@ final class UserAvatarController extends AbstractController
 		$this->thumbnailService = $thumbnailService;
 	}
 
-	public function registerRoutes(Router $router)
+	public function getMethods()
 	{
-		$router->get('/api/users/:userName/avatar/:size', [$this, 'getAvatarByName']);
+		return ['GET'];
 	}
 
-	public function getAvatarByName($userName, $size)
+	public function getUrl()
 	{
+		return '/api/users/:userName/avatar/:size';
+	}
+
+	public function work()
+	{
+		$userName = $this->getArgument('userName');
+		$size = $this->getArgument('size');
+
 		try
 		{
 			$user = $this->userService->getByName($userName);
diff --git a/src/di.php b/src/di.php
index 930511e1..e8073a69 100644
--- a/src/di.php
+++ b/src/di.php
@@ -57,7 +57,6 @@ return [
 
 	'controllers' => DI\factory(function (DI\container $container) {
 		return [
-			$container->get(\Szurubooru\Controllers\UserAvatarController::class),
 		];
 	}),
 
@@ -99,6 +98,7 @@ return [
 			$container->get(\Szurubooru\Routes\Users\FinishActivation::class),
 			$container->get(\Szurubooru\Routes\Users\FinishPasswordReset::class),
 			$container->get(\Szurubooru\Routes\Users\GetUser::class),
+			$container->get(\Szurubooru\Routes\Users\GetUserAvatar::class),
 			$container->get(\Szurubooru\Routes\Users\GetUsers::class),
 			$container->get(\Szurubooru\Routes\Users\PasswordReset::class),
 			$container->get(\Szurubooru\Routes\Users\UpdateUser::class),