diff --git a/settings-company.php b/settings-company.php
index c4150bb5..14a5fd65 100644
--- a/settings-company.php
+++ b/settings-company.php
@@ -58,7 +58,7 @@
         </div>
       </div>
 
-      <div class="form-group">
+      <div class="form-group mb-5">
         <label>Website</label>
         <div class="input-group">
           <div class="input-group-prepend">
@@ -68,12 +68,6 @@
         </div>
       </div>
       
-      <img class="img-fluid" src="<?php echo $config_invoice_logo; ?>">
-
-      
-
-
-      
       <hr>
       
       <button type="submit" name="edit_company_settings" class="btn btn-primary">Save</button>
diff --git a/settings-invoice.php b/settings-invoice.php
index a3617af5..f6054545 100644
--- a/settings-invoice.php
+++ b/settings-invoice.php
@@ -39,18 +39,11 @@
         </div>
       </div>
 
-      <div class="form-group">
+      <div class="form-group mb-5">
         <label>Invoice Footer</label>
         <textarea class="form-control" rows="4" name="config_invoice_footer"><?php echo $config_invoice_footer; ?></textarea>
       </div>
       
-      <img class="img-fluid" src="uploads/invoice_logo.png">
-
-      <div class="form-group mb-5">
-        <label>Logo</label>
-        <input type="file" class="form-control-file" name="logo">
-      </div>
-      
       <hr>
       <button type="submit" name="edit_invoice_settings" class="btn btn-primary">Save</button>        
     
diff --git a/settings-logo.php b/settings-logo.php
new file mode 100644
index 00000000..5ccb8304
--- /dev/null
+++ b/settings-logo.php
@@ -0,0 +1,26 @@
+<?php include("header.php"); ?>
+
+<?php include("settings-nav.php"); ?>
+
+<div class="card mb-3">
+  <div class="card-header">
+    <h6 class="float-left mt-1"><i class="fa fa-image"></i> Logo</h6>
+  </div>
+  <div class="card-body">
+    <form class="p-3" action="post.php" method="post" enctype="multipart/form-data" autocomplete="off"> 
+      
+      <img class="img-fluid" src="uploads/invoice_logo.png">
+
+      <div class="form-group mb-5">
+        <label>Logo</label>
+        <input type="file" class="form-control-file" name="file">
+      </div>
+      
+      <hr>
+      <button type="submit" name="edit_invoice_settings" class="btn btn-primary">Save</button>        
+    
+    </form>
+  </div>
+</div>
+
+<?php include("footer.php");
\ No newline at end of file
diff --git a/settings-nav.php b/settings-nav.php
index 90883be1..94eb6413 100644
--- a/settings-nav.php
+++ b/settings-nav.php
@@ -4,7 +4,7 @@
     <a class="nav-link <?php if(basename($_SERVER["REQUEST_URI"]) == "settings-general.php") { echo "active"; } ?>" 
       href="settings-general.php">
       <i class="fa fa-2x fa-cog"></i><br>
-      Company
+      General
     </a> 
   </li>
 
@@ -31,6 +31,14 @@
       Invoice
     </a> 
   </li>
+
+  <li class="nav-item">
+    <a class="nav-link <?php if(basename($_SERVER["REQUEST_URI"]) == "settings-logo.php") { echo "active"; } ?>" 
+      href="settings-logo.php">
+      <i class="fa fa-2x fa-image"></i><br>
+      Logo
+    </a> 
+  </li>
  
   <li class="nav-item">
     <a class="nav-link <?php if(basename($_SERVER["REQUEST_URI"]) == "settings-backup.php") { echo "active"; } ?>"