diff --git a/ui/ui/customer/footer.tpl b/ui/ui/customer/footer.tpl
index 33cc8aa1..4771af9f 100644
--- a/ui/ui/customer/footer.tpl
+++ b/ui/ui/customer/footer.tpl
@@ -3,7 +3,7 @@
 {if isset($_c['CompanyFooter'])}
     <footer class="main-footer">
       <div class="container-fluid">
-        <div class="pull-center">
+        <div class="company">
         {$_c['CompanyFooter']}
         </div>
         <div class="pull-right">
@@ -15,7 +15,7 @@
     </footer>
 {else}
     <footer class="main-footer">
-      <div>
+      <div class="container-fluid">
         PHPNuxBill by <a href="https://github.com/hotspotbilling/phpnuxbill" rel="nofollow noreferrer noopener"
             target="_blank">iBNuX</a>, Theme by <a href="https://adminlte.io/" rel="nofollow noreferrer noopener"
             target="_blank">AdminLTE</a>
diff --git a/ui/ui/customer/header.tpl b/ui/ui/customer/header.tpl
index 47755f1a..842b5f2b 100644
--- a/ui/ui/customer/header.tpl
+++ b/ui/ui/customer/header.tpl
@@ -124,15 +124,26 @@
             padding: 15px;
             color: rgb(100 116 139);
             border-top: 1px solid #d2d6de;
-            min-height: 10rem;
+            min-height: 8rem;
         }
         
-        .main-footer .container {
+        .main-footer .container-fluid {
           background: rgb(28 36 52);
+          max-width: 100%;
+          padding-left: 15px;
+          padding-right: 15px;
         }
         
-        .main-footer .container .pull-right {
+        .main-footer .container-fluid .company {
+          margin-bottom: 10px;
+          justify-content: center;
+          align-items: center;
+        }
+        
+        .main-footer .container-fluid .pull-right {
           background-color: rgb(28 36 52);
+          float: right;
+          margin-right: 15px;
         }
 
         .panel-primary {