diff --git a/app/Views/login.php b/app/Views/login.php
index 94448e982..d6c161da2 100644
--- a/app/Views/login.php
+++ b/app/Views/login.php
@@ -27,9 +27,7 @@
         : $config['theme']);
     ?>
     <link rel="stylesheet" type="text/css" href="resources/bootswatch5/<?= "$theme" ?>/bootstrap.min.css">
-    <!-- inject:login:css -->
-    <link rel="stylesheet" href="css/login.min.css">
-    <!-- endinject -->
+    <link rel="stylesheet" href="css/login.css">
     <meta name="theme-color" content="#2c3e50">
 </head>
 
diff --git a/gulpfile.js b/gulpfile.js
index 277b4e532..21f2d6a73 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -88,7 +88,8 @@ gulp.task('copy-bootswatch5', function() {
 // Copy the bootstrap style into its own folder so OSPOS can select it from the collection
 gulp.task('copy-bootstrap', function() {
     pipeline(gulp.src('./node_modules/bootstrap/dist/css/bootstrap.min.css*'),gulp.dest('public/resources/bootswatch/bootstrap'));
-    return pipeline(gulp.src('./node_modules/bootstrap5/dist/css/bootstrap.min.css*', {encoding:false}),gulp.dest('public/resources/bootswatch5/bootstrap'));
+    pipeline(gulp.src('./node_modules/bootstrap5/dist/css/bootstrap.min.css*'),gulp.dest('public/resources/bootswatch5/bootstrap'));
+    return pipeline(gulp.src('./node_modules/bootstrap5/dist/css/bootstrap.rtl.min.css*'),gulp.dest('public/resources/bootswatch5/bootstrap'));
 });
 
 // /public/resources/ospos - contains the minimized files to be packed into opensourcepos.min.[css/js]
@@ -280,14 +281,6 @@ gulp.task('copy-menubar', function() {
 });
 
 
-gulp.task('inject-login', function() {
-    return pipeline(gulp.src('./app/Views/login.php'),
-        inject(gulp.src('./public/css/login.min.css', {read: false}), {addRootSlash: false, ignorePath: '/public/', starttag: '<!-- inject:login:{{ext}} -->'}),
-        gulp.dest('./app/Views')
-    );
-});
-
-
 gulp.task('build-database', function() {
     return gulp.src(['./app/Database/tables.sql','./app/Database/constraints.sql'])
         .pipe(header('-- >> This file is autogenerated from tables.sql and constraints.sql. Do not modify directly << --'))
@@ -308,6 +301,5 @@ gulp.task('default',
         'prod-css',
         'copy-fonts',
         'copy-menubar',
-        'inject-login',
         'build-database'
     ));
diff --git a/public/css/login.min.css b/public/css/login.min.css
deleted file mode 100644
index d3f82e906..000000000
--- a/public/css/login.min.css
+++ /dev/null
@@ -1 +0,0 @@
-html{height:-webkit-fill-available}body{min-height:100vh;min-height:-webkit-fill-available}.container-login,.footer{max-width:720px}.container-login{min-height:405px}.box-logo{width:40%}.logo{object-fit:contain;max-width:405px;max-height:calc(405px - 3rem)}img.logo{filter:drop-shadow(1px 0 0 rgba(255, 255, 255, .87)) drop-shadow(0 1px 0 rgba(255, 255, 255, .87)) drop-shadow(-1px 0 0 rgba(255, 255, 255, .87)) drop-shadow(0 -1px 0 rgba(255, 255, 255, .87))}.box-login{width:60%}.box-login form{width:100%}.box-login .form-floating:focus-within,.box-login .input-group:focus-within{z-index:2}.box-login input[name=username],.box-login span[id=input-username]{margin-bottom:-1px;border-bottom-right-radius:0!important;border-bottom-left-radius:0!important}.box-login input[name=password],.box-login span[id=input-password]{border-top-left-radius:0;border-top-right-radius:0}.alert div:not(:first-child){margin-top:1rem}.bi{height:1em}footer a:not(:hover){text-decoration:none}@media (max-width:767.98px){.container-login{min-height:auto}.box-login,.box-logo{width:100%}.box-logo{border-right:none!important}.logo{max-height:150px}.footer{max-width:100%;border-radius:0!important}}@media (min-width:2560px){.container-login,.footer{max-width:960px}.container-login{min-height:540px}.logo{max-height:calc(540px - 3rem)}}@media (min-width:3840px){.container-login,.footer{max-width:1140px}.container-login{min-height:641.25px}.logo{max-height:calc(641.25px - 3rem)}}@media (max-width:359.98px){.g-recaptcha{overflow-x:auto;min-height:86px}}
\ No newline at end of file
diff --git a/public/css/ospos.css b/public/css/ospos.css
index 48b049b8b..3109a47de 100644
--- a/public/css/ospos.css
+++ b/public/css/ospos.css
@@ -18,9 +18,10 @@ a.none
     padding: 0.2em;
 }
 
-@media (min-width:1300px) {
+/* Add container-xxl width from Bootstrap 5 */
+@media (min-width: 1400px) {
     .container {
-        width: 1400px;
+        width: 1320px;
     }
 }