diff --git a/admin_settings_company.php b/admin_settings_company.php
index f425b336..9a739315 100644
--- a/admin_settings_company.php
+++ b/admin_settings_company.php
@@ -31,115 +31,121 @@ $company_initials = nullable_htmlentities(initials($company_name));
             <form action="post.php" method="post" enctype="multipart/form-data" autocomplete="off">
                 <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
 
-                <div class="form-group">
-                    <label>Name <strong class="text-danger">*</strong></label>
-                    <div class="input-group">
-                        <div class="input-group-prepend">
-                            <span class="input-group-text"><i class="fa fa-fw fa-building"></i></span>
-                        </div>
-                        <input type="text" class="form-control" name="name" placeholder="Company Name" value="<?php echo $company_name; ?>" required>
-                    </div>
-                </div>
-
-                <div class="card col-md-2">
-                    <div class="card-body">
-                        <img class="img-fluid" src="<?php echo "uploads/settings/$company_logo"; ?>">
-                    </div>
-                </div>
-
-                <div class="form-group">
-                    <input type="file" class="form-control-file" name="file" accept=".jpg, .jpeg, .png">
-                </div>
-
-                <div class="form-group">
-                    <label>Address</label>
-                    <div class="input-group">
-                        <div class="input-group-prepend">
-                            <span class="input-group-text"><i class="fa fa-fw fa-map-marker-alt"></i></span>
-                        </div>
-                        <input type="text" class="form-control" name="address" placeholder="Street Address" value="<?php echo $company_address; ?>">
-                    </div>
-                </div>
-
-                <div class="form-group">
-                    <label>City</label>
-                    <div class="input-group">
-                        <div class="input-group-prepend">
-                            <span class="input-group-text"><i class="fa fa-fw fa-city"></i></span>
-                        </div>
-                        <input type="text" class="form-control" name="city" placeholder="City" value="<?php echo $company_city; ?>">
-                    </div>
-                </div>
-
-                <div class="form-group">
-                    <label>State / Province</label>
-                    <div class="input-group">
-                        <div class="input-group-prepend">
-                            <span class="input-group-text"><i class="fa fa-fw fa-flag"></i></span>
-                        </div>
-                        <input type="text" class="form-control" name="state" placeholder="State or Province" value="<?php echo $company_state; ?>">
-                    </div>
-                </div>
-
-                <div class="form-group">
-                    <label>Postal Code</label>
-                    <div class="input-group">
-                        <div class="input-group-prepend">
-                            <span class="input-group-text"><i class="fab fa-fw fa-usps"></i></span>
-                        </div>
-                        <input type="text" class="form-control" name="zip" placeholder="Zip or Postal Code" value="<?php echo $company_zip; ?>">
-                    </div>
-                </div>
-
-                <div class="form-group">
-                    <label>Country</label>
-                    <div class="input-group">
-                        <div class="input-group-prepend">
-                            <span class="input-group-text"><i class="fa fa-fw fa-globe-americas"></i></span>
-                        </div>
-                        <select class="form-control select2" name="country">
-                            <option value="">- Country -</option>
-                            <?php foreach($countries_array as $country_name) { ?>
-                                <option <?php if ($company_country == $country_name) { echo "selected"; } ?>><?php echo $country_name; ?></option>
+                    <div class="row">
+                        <div class="col-md-3 text-center">
+                            <?php if(file_exists("uploads/settings/$company_logo")) { ?>
+                            <img class="img-thumbnail" src="<?php echo "uploads/settings/$company_logo"; ?>">
+                            <a href="post.php?remove_company_logo" class="btn btn-outline-danger btn-block">Remove Logo</a>
+                            <hr>
                             <?php } ?>
-                        </select>
-                    </div>
-                </div>
-
-                <div class="form-group">
-                    <label>Phone</label>
-                    <div class="input-group">
-                        <div class="input-group-prepend">
-                            <span class="input-group-text"><i class="fa fa-fw fa-phone"></i></span>
+                            <div class="form-group">
+                                <label>Upload company logo</label>
+                                <input type="file" class="form-control-file" name="file" accept=".jpg, .jpeg, .png">
+                            </div>
                         </div>
-                        <input type="text" class="form-control" name="phone" placeholder="Phone Number" value="<?php echo $company_phone; ?>">
-                    </div>
-                </div>
+                        
+                        <div class="col-md-9">
+                            <div class="form-group">
+                                <label>Name <strong class="text-danger">*</strong></label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-building"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" name="name" placeholder="Company Name" value="<?php echo $company_name; ?>" required>
+                                </div>
+                            </div>
 
-                <div class="form-group">
-                    <label>Email</label>
-                    <div class="input-group">
-                        <div class="input-group-prepend">
-                            <span class="input-group-text"><i class="fa fa-fw fa-envelope"></i></span>
+                            <div class="form-group">
+                                <label>Address</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-map-marker-alt"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" name="address" placeholder="Street Address" value="<?php echo $company_address; ?>">
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>City</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-city"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" name="city" placeholder="City" value="<?php echo $company_city; ?>">
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>State / Province</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-flag"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" name="state" placeholder="State or Province" value="<?php echo $company_state; ?>">
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Postal Code</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fab fa-fw fa-usps"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" name="zip" placeholder="Zip or Postal Code" value="<?php echo $company_zip; ?>">
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Country</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-globe-americas"></i></span>
+                                    </div>
+                                    <select class="form-control select2" name="country">
+                                        <option value="">- Country -</option>
+                                        <?php foreach($countries_array as $country_name) { ?>
+                                            <option <?php if ($company_country == $country_name) { echo "selected"; } ?>><?php echo $country_name; ?></option>
+                                        <?php } ?>
+                                    </select>
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Phone</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-phone"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" name="phone" placeholder="Phone Number" value="<?php echo $company_phone; ?>">
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Email</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-envelope"></i></span>
+                                    </div>
+                                    <input type="email" class="form-control" name="email" placeholder="Email address" value="<?php echo $company_email; ?>">
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Website</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-globe"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" name="website" placeholder="Website address" value="<?php echo $company_website; ?>">
+                                </div>
+                            </div>
+
+                            <hr>
+
+                            <button type="submit" name="edit_company" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Save</button>
                         </div>
-                        <input type="email" class="form-control" name="email" placeholder="Email address" value="<?php echo $company_email; ?>">
                     </div>
                 </div>
-
-                <div class="form-group">
-                    <label>Website</label>
-                    <div class="input-group">
-                        <div class="input-group-prepend">
-                            <span class="input-group-text"><i class="fa fa-fw fa-globe"></i></span>
-                        </div>
-                        <input type="text" class="form-control" name="website" placeholder="Website address" value="<?php echo $company_website; ?>">
-                    </div>
-                </div>
-
-                <hr>
-
-                <button type="submit" name="edit_company" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Save</button>
-
             </form>
         </div>
     </div>
diff --git a/post/admin/admin_settings_company.php b/post/admin/admin_settings_company.php
index 3c3660d9..5f11db43 100644
--- a/post/admin/admin_settings_company.php
+++ b/post/admin/admin_settings_company.php
@@ -50,3 +50,21 @@ if (isset($_POST['edit_company'])) {
     header("Location: " . $_SERVER["HTTP_REFERER"]);
 
 }
+
+if (isset($_GET['remove_company_logo'])) {
+
+    $sql = mysqli_query($mysqli,"SELECT company_logo FROM companies");
+    $row = mysqli_fetch_array($sql);
+    $company_logo = $row['company_logo']; // FileSystem Operation Logo is already sanitized
+
+    unlink("uploads/settings/$company_logo");
+
+    // Logging
+    logAction("Settings", "Edit", "$session_name deleted company logo");
+
+    $_SESSION['alert_type'] = "error";
+    $_SESSION['alert_message'] = "Removed company logo";
+
+    header("Location: " . $_SERVER["HTTP_REFERER"]);
+
+}