diff --git a/post/setting.php b/post/setting.php
index 220a132f..024e28c4 100644
--- a/post/setting.php
+++ b/post/setting.php
@@ -325,6 +325,46 @@ if (isset($_POST['edit_theme_settings'])) {
     header("Location: " . $_SERVER["HTTP_REFERER"]);
 }
 
+if (isset($_POST['edit_favicon_settings'])) {
+
+    validateCSRFToken($_POST['csrf_token']);
+    
+    validateAdminRole();
+
+    // Check to see if a file is attached
+    if ($_FILES['file']['tmp_name'] != '') {
+        if ($new_file_name = checkFileUpload($_FILES['file'], array('ico'))) {
+            $file_tmp_path = $_FILES['file']['tmp_name'];
+
+            // Delete old file
+            if(file_exists("uploads/favicon.ico")) {
+                unlink("uploads/favicon.ico");
+            }
+
+            // directory in which the uploaded file will be moved
+            $upload_file_dir = "uploads/";
+            //Force File Name
+            $new_file_name = "favicon.ico";
+            $dest_path = $upload_file_dir . $new_file_name;
+
+            move_uploaded_file($file_tmp_path, $dest_path);
+
+            $_SESSION['alert_message'] = 'File successfully uploaded.';
+        }else{
+
+            $_SESSION['alert_message'] = 'There was an error moving the file to upload directory. Please make sure the upload directory is writable by web server.';
+        }
+    }
+
+    //Logging
+    mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Settings', log_action = 'Modify', log_description = '$session_name updated the favicon', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_user_id = $session_user_id");
+
+    $_SESSION['alert_message'] = "You updated the favicon";
+
+    header("Location: " . $_SERVER["HTTP_REFERER"]);
+
+}
+
 if (isset($_POST['edit_notification_settings'])) {
 
     validateCSRFToken($_POST['csrf_token']);
diff --git a/settings_theme.php b/settings_theme.php
index 401cf458..0b2879fb 100644
--- a/settings_theme.php
+++ b/settings_theme.php
@@ -44,6 +44,28 @@ require_once "inc_all_settings.php";
         </div>
     </div>
 
+    <div class="card card-dark">
+        <div class="card-header py-3">
+            <h3 class="card-title"><i class="fas fa-fw fa-image mr-2"></i>Favicon</h3>
+        </div>
+        <div class="card-body">
+            <form action="post.php" method="post" enctype="multipart/form-data" autocomplete="off">
+                <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
+
+                <img class="mb-3" src="<?php if(file_exists("uploads/favicon.ico")) { echo "uploads/favicon.ico"; } else { echo "favicon.ico"; } ?>">
+
+                <div class="form-group">
+                    <input type="file" class="form-control-file" name="file" accept=".ico">
+                </div>
+
+                <hr>
+
+                <button type="submit" name="edit_favicon_settings" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Upload Icon</button>
+
+            </form>
+        </div>
+    </div>
+
 <?php
 require_once "footer.php";
 
diff --git a/uploads/favicon.ico b/uploads/favicon.ico
new file mode 100644
index 00000000..09666cf3
Binary files /dev/null and b/uploads/favicon.ico differ