diff --git a/Moonlight/Shared/Views/Admin/Servers/Images/Index.razor b/Moonlight/Shared/Views/Admin/Servers/Images/Index.razor
index e59b353f..99f3c081 100644
--- a/Moonlight/Shared/Views/Admin/Servers/Images/Index.razor
+++ b/Moonlight/Shared/Views/Admin/Servers/Images/Index.razor
@@ -1,16 +1,21 @@
 @page "/admin/servers/images"
 
 @using BlazorTable
+@using Logging.Net
 @using Microsoft.EntityFrameworkCore
 @using Moonlight.App.Database.Entities
 @using Moonlight.App.Repositories
-@using Moonlight.App.Repositories.Servers
 @using Moonlight.App.Services
+@using Moonlight.App.Services.Interop
+@using System.Text
+@using Newtonsoft.Json
 
 @inject Repository<Image> ImageRepository
 @inject Repository<ImageVariable> ImageVariableRepository
 @inject Repository<Server> ServerRepository
 @inject SmartTranslateService SmartTranslateService
+@inject ToastService ToastService
+@inject NavigationManager NavigationManager
 
 <OnlyAdmin>
     <div class="row">
@@ -23,10 +28,28 @@
                         </span>
                     </h3>
                     <div class="card-toolbar">
-                        <a href="/admin/servers/images/new" class="btn btn-sm btn-light-success">
+                        <a href="/admin/servers/images/new" class="btn btn-sm btn-light-success me-3">
                             <i class="bx bx-layer-plus"></i>
                             <TL>New image</TL>
                         </a>
+                        <InputFile OnChange="OnFileChanged" type="file" id="fileUpload" hidden="" multiple=""/>
+                        <label for="fileUpload" class="btn btn-sm btn-light-primary @(Uploading ? "disabled" : "")">
+                            @if (Uploading)
+                            {
+                                <span>@(Percent)%</span>
+                            }
+                            else
+                            {
+                                <span class="svg-icon svg-icon-2">
+                                    <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+                                        <path opacity="0.3" d="M10 4H21C21.6 4 22 4.4 22 5V7H10V4Z" fill="currentColor"></path>
+                                        <path d="M10.4 3.60001L12 6H21C21.6 6 22 6.4 22 7V19C22 19.6 21.6 20 21 20H3C2.4 20 2 19.6 2 19V4C2 3.4 2.4 3 3 3H9.20001C9.70001 3 10.2 3.20001 10.4 3.60001ZM16 11.6L12.7 8.29999C12.3 7.89999 11.7 7.89999 11.3 8.29999L8 11.6H11V17C11 17.6 11.4 18 12 18C12.6 18 13 17.6 13 17V11.6H16Z" fill="currentColor"></path>
+                                        <path opacity="0.3" d="M11 11.6V17C11 17.6 11.4 18 12 18C12.6 18 13 17.6 13 17V11.6H11Z" fill="currentColor"></path>
+                                    </svg>
+                                </span>
+                                <TL>Import</TL>
+                            }
+                        </label>
                     </div>
                 </div>
                 <div class="card-body pt-0">
@@ -86,6 +109,9 @@
     private LazyLoader LazyLoader;
 
     private Dictionary<Image, int> ServersCount = new();
+    
+    private bool Uploading = false;
+    private int Percent = 0;
 
     private async Task Load(LazyLoader lazyLoader)
     {
@@ -127,4 +153,66 @@
         ImageRepository.Delete(image);
         await LazyLoader.Reload();
     }
+    
+    private async Task OnFileChanged(InputFileChangeEventArgs arg)
+    {
+        await ToastService.CreateProcessToast("upload", SmartTranslateService.Translate("Uploading files"));
+
+        Uploading = true;
+        await InvokeAsync(StateHasChanged);
+
+        int i = 1;
+        foreach (var browserFile in arg.GetMultipleFiles())
+        {
+            if (browserFile.Size < 1024 * 1024 * 100)
+            {
+                Percent = 0;
+
+                try
+                {
+                    var stream = browserFile.OpenReadStream(1024 * 1024 * 100);
+                    var data = new byte[browserFile.Size];
+                    await stream.ReadAsync(data, 0, data.Length);
+                    Percent = 50;
+
+                    var text = Encoding.UTF8.GetString(data);
+
+                    var image = JsonConvert.DeserializeObject<Image>(text);
+                    foreach (var imageDockerImage in image.DockerImages)
+                    {
+                        imageDockerImage.Id = 0;
+                    }
+                    foreach (var imageVariable in image.Variables)
+                    {
+                        imageVariable.Id = 0;
+                    }
+                    image.Id = 0;
+
+                    image = ImageRepository.Add(image);
+
+                    NavigationManager.NavigateTo("/admin/servers/images/edit/" + image.Id);
+                }
+                catch (Exception e)
+                {
+                    await ToastService.Error(SmartTranslateService.Translate("An unknown error occured while uploading and importing the image"));
+                    Logger.Error("Error uploading file");
+                    Logger.Error(e);
+                }
+
+                await ToastService.UpdateProcessToast("upload", $"{i}/{arg.GetMultipleFiles().Count} {SmartTranslateService.Translate("complete")}");
+            }
+            else
+            {
+                await ToastService.Error(SmartTranslateService.Translate("The uploaded file should not be bigger than 100MB"));
+            }
+
+            i++;
+        }
+
+        Uploading = false;
+        await InvokeAsync(StateHasChanged);
+
+        await ToastService.UpdateProcessToast("upload", SmartTranslateService.Translate("Upload complete"));
+        await ToastService.RemoveProcessToast("upload");
+    }
 }
\ No newline at end of file