diff --git a/addons/default/visiosoft/restate-theme/src/FileUploader.php b/addons/default/visiosoft/restate-theme/src/FileUploader.php
index 73e793f2d..609f2a4e5 100644
--- a/addons/default/visiosoft/restate-theme/src/FileUploader.php
+++ b/addons/default/visiosoft/restate-theme/src/FileUploader.php
@@ -64,9 +64,9 @@ class FileUploader
      * @param FileRepositoryInterface $files
      */
     public function __construct(
-        Factory $validator,
-        FileRotator $rotator,
-        FilesystemManager $manager,
+        Factory                 $validator,
+        FileRotator             $rotator,
+        FilesystemManager       $manager,
         FileRepositoryInterface $files
     )
     {
@@ -121,7 +121,7 @@ class FileUploader
         /**
          * Define path
          */
-        $path = $folder->getSlug() . 'FileUploader.php/' . FileSanitizer::clean($file->getClientOriginalName());
+        $path = $folder->getSlug() . '/' . $folder->getSlug() . '/' . FileSanitizer::clean($file->getClientOriginalName());
 
         /**
          * Write the file to the filesystem.
diff --git a/addons/default/visiosoft/restate-theme/src/RestateThemeSeeder.php b/addons/default/visiosoft/restate-theme/src/RestateThemeSeeder.php
index bf8fc1aa8..8dda70dd2 100644
--- a/addons/default/visiosoft/restate-theme/src/RestateThemeSeeder.php
+++ b/addons/default/visiosoft/restate-theme/src/RestateThemeSeeder.php
@@ -683,7 +683,7 @@ class RestateThemeSeeder extends Seeder
             $image = Image::make($file_path);
 
             $file = new UploadedFile($file_path,
-                uniqid() . $image->basename,
+                $image->basename,
                 $image->mime);
 
             $folders = app(FolderRepositoryInterface::class);