diff --git a/addons/point_of_sale/static/src/app/screens/ticket_screen/search_bar/search_bar.xml b/addons/point_of_sale/static/src/app/screens/ticket_screen/search_bar/search_bar.xml
index 34bb8de958c..21d43b5364a 100644
--- a/addons/point_of_sale/static/src/app/screens/ticket_screen/search_bar/search_bar.xml
+++ b/addons/point_of_sale/static/src/app/screens/ticket_screen/search_bar/search_bar.xml
@@ -24,8 +24,9 @@
                             </t>
                         </ul>
                     </div>
-                    <div t-if="props.config.filter.show" class="filter radius-right btn btn-secondary py-2 dropdown-toggle h-100"
-                    t-on-click.stop="() => { state.showFilterOptions = !state.showFilterOptions }">
+                    <div t-if="props.config.filter.show" 
+                        class="filter btn btn-secondary d-flex align-items-center dropdown-toggle"
+                        t-on-click.stop="() => { state.showFilterOptions = !state.showFilterOptions }">
                         <span>
                             <t t-esc="props.config.filter.options.get(state.selectedFilter).text" />
                         </span>
diff --git a/addons/pos_hr/static/src/app/login_screen/login_screen.xml b/addons/pos_hr/static/src/app/login_screen/login_screen.xml
index 92823d699fb..2d8ba8b0a53 100644
--- a/addons/pos_hr/static/src/app/login_screen/login_screen.xml
+++ b/addons/pos_hr/static/src/app/login_screen/login_screen.xml
@@ -7,14 +7,14 @@
                     <span class="text-primary" t-esc="shopName" />
                 </div>
                 <div class="login-body d-flex d-flex flex-column flex-sm-row align-items-center justify-content-around px-3 py-4">
-                    <span class="login-element border p-3 rounded">
-                        <img class="login-barcode-img w-50"
+                    <span class="login-element border rounded">
+                        <img class="login-barcode-img img-fluid"
                              src="/point_of_sale/static/img/barcode.png" />
                         <div class="login-barcode-text mt-2">Scan your badge</div>
                     </span>
                     <span class="login-or m-2 fs-2 text-muted">or</span>
                     <span class="login-element">
-                        <button class="login-button select-cashier btn btn-lg btn-secondary py-5 px-3"
+                        <button class="login-button select-cashier btn btn-lg btn-secondary"
                                 t-on-click="selectCashier">Select Cashier</button>
                     </span>
                 </div>
diff --git a/addons/pos_hr/static/src/app/select_cashier_mixin.js b/addons/pos_hr/static/src/app/select_cashier_mixin.js
index af391375d7f..5297f02190e 100644
--- a/addons/pos_hr/static/src/app/select_cashier_mixin.js
+++ b/addons/pos_hr/static/src/app/select_cashier_mixin.js
@@ -70,6 +70,9 @@ export function useCashierSelector(
                         isSelected: false,
                     };
                 });
+            if (!employeesList.length) {
+                return;
+            }
             const { confirmed, payload: employee } = await popup.add(SelectionPopup, {
                 title: _t("Change Cashier"),
                 list: employeesList,
diff --git a/addons/pos_hr/static/src/css/pos.scss b/addons/pos_hr/static/src/css/pos.scss
index 2de48f700af..2d48ff700ab 100644
--- a/addons/pos_hr/static/src/css/pos.scss
+++ b/addons/pos_hr/static/src/css/pos.scss
@@ -20,6 +20,14 @@
     height: fit-content;
 }
 
+.screen-login img,
+.screen-login button{
+    width: 180px;
+}
+.screen-login button{
+    height: 150px;
+}
+
 @media screen and (max-width: 576px) {
     .screen-login {
         height: 450px;
diff --git a/addons/pos_restaurant/static/src/overrides/components/ticket_screen/ticket_screen.xml b/addons/pos_restaurant/static/src/overrides/components/ticket_screen/ticket_screen.xml
index 41a69041689..5bce5f3423a 100644
--- a/addons/pos_restaurant/static/src/overrides/components/ticket_screen/ticket_screen.xml
+++ b/addons/pos_restaurant/static/src/overrides/components/ticket_screen/ticket_screen.xml
@@ -4,7 +4,7 @@
     <t t-name="pos_restaurant.TicketScreen" t-inherit="point_of_sale.TicketScreen" t-inherit-mode="extension">
         <xpath expr="//div[hasclass('header-row')]//div[@name='delete']" position="before">
             <div t-if="pos.config.module_pos_restaurant" class="col p-2" name="table">Table</div>
-            <div t-if="_state.ui.filter == 'TIPPING'" class="col end narrow" name="tip">Tip</div>
+            <div t-if="_state.ui.filter == 'TIPPING'" class="col end narrow p-2" name="tip">Tip</div>
         </xpath>
         <xpath expr="//div[hasclass('order-row')]//div[@name='delete']" position="before">
             <div t-if="pos.config.module_pos_restaurant" class="col p-2" name="table">
@@ -13,7 +13,7 @@
                     <div><t t-esc="getTable(order)"></t></div>
                 </t>
             </div>
-            <div t-if="_state.ui.filter == 'TIPPING'" class="col end narrow" name="tip">
+            <div t-if="_state.ui.filter == 'TIPPING'" class="col end narrow p-2" name="tip">
                 <div t-if="ui.isSmall">Tip</div>
                 <div><TipCell order="order" /></div>
             </div>
diff --git a/addons/pos_restaurant/static/src/scss/restaurant.scss b/addons/pos_restaurant/static/src/scss/restaurant.scss
index c75fa6050a5..7d195833899 100644
--- a/addons/pos_restaurant/static/src/scss/restaurant.scss
+++ b/addons/pos_restaurant/static/src/scss/restaurant.scss
@@ -44,12 +44,12 @@
 .tip-cell {
     height: 100%;
     width: 100%;
-    text-align: right;
+    text-align: left;
     white-space: nowrap;
 
     input {
         width: 100%;
-        text-align: right;
+        text-align: left;
         font-size: medium;
         color: #555555;
         padding-bottom: 5px;