diff --git a/addons/point_of_sale/static/src/css/pos.css b/addons/point_of_sale/static/src/css/pos.css
index aa2e7aeab42..af0f0d8e50b 100644
--- a/addons/point_of_sale/static/src/css/pos.css
+++ b/addons/point_of_sale/static/src/css/pos.css
@@ -112,6 +112,13 @@ td {
     display: table-cell;
     position: relative;
 }
+/* firefox seems to ignore the relative positionning of the subwindow-container
+ * putting this inside subwindow-container fixes it.
+ */ 
+.pos .subwindow .subwindow-container-fix{
+    height: 100%;
+    position: relative;
+}
 
 /* ---- Scrollers ----- */
 
@@ -507,6 +514,7 @@ td {
     background-color: white;
     border-radius: 20px;
     font-family: Lato;
+    font-size: 13px;
 }
 .pos .searchbox input:focus {
     outline: none;
@@ -763,6 +771,7 @@ td {
     padding: 8px;
     border-box: 3px;
     box-sizing: border-box;
+    -moz-box-sizing: border-box;
     border-radius: 3px;
 }
 .pos .paymentline-name{
@@ -774,6 +783,7 @@ td {
     display: block;
     width: 100%;
     box-sizing: border-box;
+    -moz-box-sizing: border-box;
     outline: none;
     border: none;
     padding: 6px 8px;
@@ -796,6 +806,7 @@ td {
     padding: 5px;
     text-align: center;
     box-sizing: border-box;
+    -moz-box-sizing: border-box;
     position: absolute;
     bottom: 10px;
     left: 8px;
@@ -1281,6 +1292,7 @@ td {
     width: 180px;
     border: none;
     box-sizing: border-box;
+    -moz-box-sizing: border-box;
     border-radius: 3px;
 }
 .pos .debug-widget .status{
diff --git a/addons/point_of_sale/static/src/xml/pos.xml b/addons/point_of_sale/static/src/xml/pos.xml
index 103ab898cee..51717f4302d 100644
--- a/addons/point_of_sale/static/src/xml/pos.xml
+++ b/addons/point_of_sale/static/src/xml/pos.xml
@@ -26,20 +26,26 @@
                     <div class='window'>
                         <div class='subwindow'>
                             <div class='subwindow-container'>
-                                <div class="placeholder-OrderWidget"></div>
-                            </div>
-                        </div>
-
-                        <div class='subwindow collapsed'>
-                            <div class='subwindow-container pads'>
-                                <div class="placeholder-PaypadWidget"></div>
-                                <div class="placeholder-NumpadWidget"></div>
+                                <div class='subwindow-container-fix'>
+                                    <div class="placeholder-OrderWidget"></div>
+                                </div>
                             </div>
                         </div>
 
                         <div class='subwindow collapsed'>
                             <div class='subwindow-container'>
-                                <div class='placeholder-LeftActionBar'></div>
+                                <div class='subwindow-container-fix pads'>
+                                    <div class="placeholder-PaypadWidget"></div>
+                                    <div class="placeholder-NumpadWidget"></div>
+                                </div>
+                            </div>
+                        </div>
+
+                        <div class='subwindow collapsed'>
+                            <div class='subwindow-container'>
+                                <div class='subwindow-container-fix'>
+                                    <div class='placeholder-LeftActionBar'></div>
+                                </div>
                             </div>
                         </div>
                     </div>
@@ -48,13 +54,17 @@
                 <div class="rightpane">
                     <div class='window'>
                         <div class='subwindow'>
-                            <div class='subwindow-container screens'>
+                            <div class='subwindow-container'>
+                                <div class='subwindow-container-fix screens'>
+                                </div>
                             </div>
                         </div>
 
                         <div class='subwindow collapsed'>
                             <div class='subwindow-container'>
-                                <div class='placeholder-RightActionBar'></div>
+                                <div class='subwindow-container-fix'>
+                                    <div class='placeholder-RightActionBar'></div>
+                                </div>
                             </div>
                         </div>
                     </div>