diff --git a/system/controllers/login.php b/system/controllers/login.php
index 4bd773f9..2ffe9772 100644
--- a/system/controllers/login.php
+++ b/system/controllers/login.php
@@ -314,11 +314,11 @@ switch ($do) {
             $ui->display('customer/login-noreg.tpl');
         } else {
             $UPLOAD_URL_PATH = str_replace($root_path, '',  $UPLOAD_PATH);
-            $login_logo = $UPLOAD_URL_PATH . DIRECTORY_SEPARATOR . 'login-logo.png';
+            $login_logo = (file_exists($UPLOAD_URL_PATH . DIRECTORY_SEPARATOR . 'login-logo')) ? $UPLOAD_URL_PATH . DIRECTORY_SEPARATOR . 'login-logo.png' : $UPLOAD_URL_PATH . DIRECTORY_SEPARATOR . 'login-logo.default.png';
             $ui->assign('login_logo', $login_logo);
-            $wallpaper = $UPLOAD_URL_PATH . DIRECTORY_SEPARATOR . 'wallpaper.png';
+            $wallpaper = (file_exists($UPLOAD_URL_PATH . DIRECTORY_SEPARATOR . 'wallpaper.png')) ? $UPLOAD_URL_PATH . DIRECTORY_SEPARATOR . 'wallpaper.png' : $UPLOAD_URL_PATH . DIRECTORY_SEPARATOR . 'wallpaper.default.png';
             $ui->assign('wallpaper', $wallpaper);
-            $favicon = (file_exists($UPLOAD_PATH . DIRECTORY_SEPARATOR . 'favicon.png')) ? $UPLOAD_URL_PATH . DIRECTORY_SEPARATOR . 'favicon.png' : $root . DIRECTORY_SEPARATOR . 'ui/ui/images/logo.png';
+            $favicon = (file_exists($UPLOAD_PATH . DIRECTORY_SEPARATOR . 'favicon.png')) ? $UPLOAD_URL_PATH . DIRECTORY_SEPARATOR . 'favicon.png' : $UPLOAD_URL_PATH . DIRECTORY_SEPARATOR . 'favicon.default.png';
             $ui->assign('favicon', $favicon);
             $ui->assign('csrf_token', $csrf_token);
             $ui->assign('_title', Lang::T('Login'));
@@ -331,5 +331,6 @@ switch ($do) {
                     break;
             }
         }
+
         break;
 }
diff --git a/system/controllers/settings.php b/system/controllers/settings.php
index 3aebdb5e..90981885 100644
--- a/system/controllers/settings.php
+++ b/system/controllers/settings.php
@@ -82,11 +82,11 @@ switch ($action) {
         }
         $ui->assign('logo', $logo);
 
-        $login_logo = $UPLOAD_URL_PATH . DIRECTORY_SEPARATOR . 'login-logo.png';
+        $login_logo = (file_exists($UPLOAD_URL_PATH . DIRECTORY_SEPARATOR . 'login-logo')) ? $UPLOAD_URL_PATH . DIRECTORY_SEPARATOR . 'login-logo.png' : $UPLOAD_URL_PATH . DIRECTORY_SEPARATOR . 'login-logo.default.png';
         $ui->assign('login_logo', $login_logo);
-        $wallpaper = $UPLOAD_URL_PATH . DIRECTORY_SEPARATOR . 'wallpaper.png';
+        $wallpaper = (file_exists($UPLOAD_URL_PATH . DIRECTORY_SEPARATOR . 'wallpaper.png')) ? $UPLOAD_URL_PATH . DIRECTORY_SEPARATOR . 'wallpaper.png' : $UPLOAD_URL_PATH . DIRECTORY_SEPARATOR . 'wallpaper.default.png';
         $ui->assign('wallpaper', $wallpaper);
-        $favicon = (file_exists($UPLOAD_PATH . DIRECTORY_SEPARATOR . 'favicon.png')) ? $UPLOAD_URL_PATH . DIRECTORY_SEPARATOR . 'favicon.png' : $root . DIRECTORY_SEPARATOR . 'ui/ui/images/logo.png';
+        $favicon = (file_exists($UPLOAD_PATH . DIRECTORY_SEPARATOR . 'favicon.png')) ? $UPLOAD_URL_PATH . DIRECTORY_SEPARATOR . 'favicon.png' : $UPLOAD_URL_PATH . DIRECTORY_SEPARATOR . 'favicon.default.png';
         $ui->assign('favicon', $favicon);
 
         $themes = [];
@@ -245,8 +245,8 @@ switch ($action) {
             r2(U . 'settings/app', 'e', 'Login page title must not exceed 25 characters');
             return;
         }
-        if (strlen($login_page_description) > 160) {
-            r2(U . 'settings/app', 'e', 'Login page description must not exceed 160 characters');
+        if (strlen($login_page_description) > 50) {
+            r2(U . 'settings/app', 'e', 'Login page description must not exceed 50 characters');
             return;
         }
 
@@ -261,7 +261,7 @@ switch ($action) {
             $favicon_type = $_FILES['login_page_favicon']['type'];
             if (in_array($favicon_type, ['image/jpeg', 'image/png']) && preg_match('/\.(jpg|jpeg|png)$/i', $_FILES['login_page_favicon']['name'])) {
                 $favicon_path = $UPLOAD_PATH . DIRECTORY_SEPARATOR . 'favicon.png';
-                File::resizeCropImage($_FILES['login_page_favicon']['tmp_name'], $favicon_path, 30, 30, 100);
+                File::resizeCropImage($_FILES['login_page_favicon']['tmp_name'], $favicon_path, 16, 16, 100);
                 $image_paths['favicon'] = $favicon_path;
                 if (file_exists($_FILES['login_page_favicon']['tmp_name'])) unlink($_FILES['login_page_favicon']['tmp_name']);
             } else {
diff --git a/system/uploads/favicon.default.png b/system/uploads/favicon.default.png
new file mode 100644
index 00000000..7b783b05
Binary files /dev/null and b/system/uploads/favicon.default.png differ
diff --git a/system/uploads/login-logo.default.png b/system/uploads/login-logo.default.png
new file mode 100644
index 00000000..b442684b
Binary files /dev/null and b/system/uploads/login-logo.default.png differ
diff --git a/system/uploads/wallpaper.default.png b/system/uploads/wallpaper.default.png
new file mode 100644
index 00000000..aa23b0f2
Binary files /dev/null and b/system/uploads/wallpaper.default.png differ
diff --git a/ui/ui/customer/login-custom-moon.tpl b/ui/ui/customer/login-custom-moon.tpl
index 3f56ca61..d4aef38e 100644
--- a/ui/ui/customer/login-custom-moon.tpl
+++ b/ui/ui/customer/login-custom-moon.tpl
@@ -535,7 +535,7 @@
                         {/if}
                         <footer>
                             © {$smarty.now|date_format:"%Y"} {$_c['CompanyName']}. All rights reserved. <br> <a
-                                href="">Privacy</a> | <a href="">Terms
+                                href="pages/Privacy_Policy.html">Privacy</a> | <a href="pages/Terms_and_Conditions.html">Terms
                                 &amp;
                                 Conditions</a>
                         </footer>