diff --git a/app/Classes/Settings/System.php b/app/Classes/Settings/System.php
index 66202ed6..5a6013e0 100644
--- a/app/Classes/Settings/System.php
+++ b/app/Classes/Settings/System.php
@@ -62,6 +62,7 @@ class System
             "SETTINGS::MISC:PHPMYADMIN:URL" => "phpmyadmin-url",
             "SETTINGS::SYSTEM:PTERODACTYL:URL" => "pterodactyl-url",
             "SETTINGS::SYSTEM:PTERODACTYL:TOKEN" => "pterodactyl-api-key",
+            "SETTINGS::SYSTEM:ENABLE_LOGIN_LOGO" => "enable-login-logo",
         ];
 
 
@@ -78,13 +79,16 @@ class System
     {
         $request->validate([
             'icon' => 'nullable|max:10000|mimes:jpg,png,jpeg',
+            'logo' => 'nullable|max:10000|mimes:jpg,png,jpeg',
             'favicon' => 'nullable|max:10000|mimes:ico',
         ]);
 
         if ($request->hasFile('icon')) {
             $request->file('icon')->storeAs('public', 'icon.png');
         }
-
+        if ($request->hasFile('logo')) {
+            $request->file('logo')->storeAs('public', 'logo.png');
+        }
         if ($request->hasFile('favicon')) {
             $request->file('favicon')->storeAs('public', 'favicon.ico');
         }
diff --git a/resources/views/admin/settings/tabs/system.blade.php b/resources/views/admin/settings/tabs/system.blade.php
index aece6bee..d3acbd5b 100644
--- a/resources/views/admin/settings/tabs/system.blade.php
+++ b/resources/views/admin/settings/tabs/system.blade.php
@@ -173,6 +173,21 @@
                             class="form-control @error('allocation-limit') is-invalid @enderror" required>
                     </div>
                 </div>
+            </div>
+
+                {{-- Design --}}
+                <div class="col-md-3 px-3">
+                    <div class="row mb-2">
+                        <div class="col text-center">
+                            <h1>{{ __('Design') }}</h1>
+                        </div>
+                    </div>
+                    <div class="custom-control mb-3 p-0">
+                        <input value="true" id="enable-login-logo" name="enable-login-logo"
+                               {{ config('SETTINGS::SYSTEM:ENABLE_LOGIN_LOGO') == 'true' ? 'checked' : '' }}
+                               type="checkbox">
+                        <label for="enable-login-logo">{{ __('Enable Logo on Loginpage') }} </label>
+                    </div>
                 <div class="form-group">
                     <div class="custom-file mb-3 mt-3">
                         <input type="file" accept="image/png,image/jpeg,image/jpg" class="custom-file-input" name="icon"
@@ -185,7 +200,19 @@
                         </span>
                     @enderror
 
+                    <div class="form-group">
+                        <div class="custom-file mb-3 mt-3">
+                            <input type="file" accept="image/png,image/jpeg,image/jpg" class="custom-file-input" name="logo"
+                                   id="logo">
+                            <label class="custom-file-label selected" for="logo">{{ __('Select Login-page Logo') }}</label>
+                        </div>
+                        @error('logo')
+                        <span class="text-danger">
+                            {{ $message }}
+                        </span>
+                        @enderror
 
+                    </div>
                     <div class="form-group">
                         <div class="custom-file mb-3">
                             <input type="file" accept="image/x-icon" class="custom-file-input" name="favicon"
@@ -200,7 +227,6 @@
                         @enderror
                     </div>
                 </div>
-            </div>
         </div>
         <div class="row">
             <button class="btn btn-primary ml-3 mt-3">{{ __('Submit') }}</button>
diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php
index 02e25132..90d556d5 100644
--- a/resources/views/auth/login.blade.php
+++ b/resources/views/auth/login.blade.php
@@ -7,6 +7,12 @@
         <div class="card card-outline card-primary">
             <div class="card-header text-center">
                 <a href="{{route('welcome')}}" class="h1"><b class="mr-1">{{config('app.name', 'Laravel')}}</b></a>
+                @if(config("SETTINGS::SYSTEM:ENABLE_LOGIN_LOGO"))
+                <img
+                     src="{{ \Illuminate\Support\Facades\Storage::disk('public')->exists('logo.png')? asset('storage/logo.png'): asset('images/controlpanel_logo.png') }}"
+                     alt="{{ config('app.name', 'Controlpanel.gg') }} Logo"
+                     style="opacity: .8;max-width:100%">
+                @endif
             </div>
             <div class="card-body">
                 <p class="login-box-msg">{{__('Sign in to start your session')}}</p>
diff --git a/resources/views/layouts/main.blade.php b/resources/views/layouts/main.blade.php
index 347b4acf..298a1ef0 100644
--- a/resources/views/layouts/main.blade.php
+++ b/resources/views/layouts/main.blade.php
@@ -188,7 +188,7 @@
                     src="{{ \Illuminate\Support\Facades\Storage::disk('public')->exists('icon.png')? asset('storage/icon.png'): asset('images/controlpanel_logo.png') }}"
                     alt="{{ config('app.name', 'Laravel') }} Logo" class="brand-image img-circle"
                     style="opacity: .8">
-                <span class="brand-text font-weight-light">{{ config('app.name', 'Laravel') }}</span>
+                <span class="brand-text font-weight-light">{{ config('app.name', 'Controlpanel.gg') }}</span>
             </a>
 
             <!-- Sidebar -->