diff --git a/addons/web/static/src/core/pager/pager.xml b/addons/web/static/src/core/pager/pager.xml
index 67cc4a26b07..15bf0dff42d 100644
--- a/addons/web/static/src/core/pager/pager.xml
+++ b/addons/web/static/src/core/pager/pager.xml
@@ -5,10 +5,10 @@
         <nav class="o_pager align-items-center d-flex gap-2" aria-label="Pager">
             <span class="o_pager_counter" t-on-click.stop="">
                 <t t-if="state.isEditing">
-                    <input type="text" class="o_pager_value o_input d-inline-block w-auto text-end" size="7" t-ref="autofocus" t-att-value="value" t-on-blur="onInputBlur" t-on-change="onInputChange" t-on-keydown.stop="onInputKeydown" />
+                    <input type="text" class="o_pager_value o_input d-inline-block w-auto text-end mb-n1" size="7" t-ref="autofocus" t-att-value="value" t-on-blur="onInputBlur" t-on-change="onInputChange" t-on-keydown.stop="onInputKeydown" />
                 </t>
                 <t t-else="">
-                    <span class="o_pager_value d-inline-block border-bottom border-transparent" t-esc="value" t-on-click="onValueClick" />
+                    <span class="o_pager_value d-inline-block border-bottom border-transparent mb-n1" t-esc="value" t-on-click="onValueClick" />
                 </t>
                 <span> / </span>
                 <t t-if="props.updateTotal">
diff --git a/addons/web/static/src/search/control_panel/control_panel.scss b/addons/web/static/src/search/control_panel/control_panel.scss
index f8a68cc81dd..9219fee138e 100644
--- a/addons/web/static/src/search/control_panel/control_panel.scss
+++ b/addons/web/static/src/search/control_panel/control_panel.scss
@@ -89,6 +89,7 @@
         @include media-breakpoint-down(md) {
             width: 100%;
             overflow: hidden;
+            flex-wrap: nowrap;
 
             > li {
                 margin: 0;
@@ -98,6 +99,7 @@
                 }
 
                 &.o_back_button {
+                    flex-shrink: 0;
                     &, & ~ li {
                         margin: auto 0;
                     }
@@ -191,11 +193,13 @@
         display: flex;
         flex-wrap: wrap;
         justify-content: flex-end;
-        align-items: center;
+        align-items: flex-start;
         column-gap: $o-horizontal-padding;
+        @include media-breakpoint-down(md) {
+            align-items: center;
+        }
 
         > .o_cp_pager {
-            margin: auto 0 auto auto;
             padding-left: 5px;
             text-align: center;
             user-select: none;
diff --git a/addons/web/static/src/views/form/control_panel/form_control_panel.xml b/addons/web/static/src/views/form/control_panel/form_control_panel.xml
index 69880b7d494..fc1ba5067b9 100644
--- a/addons/web/static/src/views/form/control_panel/form_control_panel.xml
+++ b/addons/web/static/src/views/form/control_panel/form_control_panel.xml
@@ -14,10 +14,10 @@
                                 <t t-call="web.Breadcrumbs" t-if="!env.config.noBreadcrumbs"/>
                             </t>
                         </t>
-                        <t t-slot="control-panel-status-indicator" />
                     </t>
                 </div>
                 <div class="o_cp_bottom_right w-auto flex-shrink-0">
+                    <t t-slot="control-panel-status-indicator" />
                     <t t-slot="control-panel-action-menu" t-if="display['bottom-left']"/>
                     <div t-if="pagerProps and pagerProps.total > 0" class="o_cp_pager" role="search">
                         <Pager t-props="pagerProps"/>
diff --git a/addons/web/static/src/views/form/form_status_indicator/form_status_indicator.xml b/addons/web/static/src/views/form/form_status_indicator/form_status_indicator.xml
index e3eb409ec82..3bb05bf40c7 100644
--- a/addons/web/static/src/views/form/form_status_indicator/form_status_indicator.xml
+++ b/addons/web/static/src/views/form/form_status_indicator/form_status_indicator.xml
@@ -2,11 +2,11 @@
 <templates xml:space="preserve">
 
     <t t-name="web.FormStatusIndicator" owl="1">
-        <div class="o_form_status_indicator ms-2 d-flex align-items-center" t-att-class="{ o_form_status_indicator_new_record: props.model.root.isVirtual }">
+        <div class="o_form_status_indicator" t-att-class="{ o_form_status_indicator_new_record: props.model.root.isVirtual }">
             <div class="o_form_status_indicator_buttons d-flex" t-att-class="{ invisible: !(props.model.root.isVirtual or displayButtons) }">
                 <button
                     type="button"
-                    class="o_form_button_save btn btn-light btn-sm"
+                    class="o_form_button_save btn btn-light"
                     t-att-disabled="props.isDisabled"
                     data-hotkey="s"
                     t-on-click.stop="save"
@@ -16,7 +16,7 @@
                 </button>
                 <button
                     type="button"
-                    class="o_form_button_cancel btn btn-light btn-sm"
+                    class="o_form_button_cancel btn btn-light"
                     t-att-disabled="props.isDisabled"
                     data-hotkey="j"
                     t-on-click.stop="discard"