diff --git a/core/themes/bartik/css/components/site-footer.css b/core/themes/bartik/css/components/site-footer.css
index 39e5a2e..7bc49c3 100644
--- a/core/themes/bartik/css/components/site-footer.css
+++ b/core/themes/bartik/css/components/site-footer.css
@@ -25,6 +25,8 @@
   [dir="rtl"] .site-footer__top .region {
     float: right;
   }
+}
+@media all and (min-width: 560px) and (max-width: 850px) {
   .site-footer__top .region:nth-child(2n+1) {
     padding-right: 10px; /* LTR */
   }
@@ -62,22 +64,6 @@
     padding-left: 0;
     padding-right: 10px;
   }
-
-  /**
-   * We need to be very specific for the padding for region-footer-second and
-   * region-footer-third, in order to suppress the padding cancellation rule in
-   * @media all and (min-width: 560px) {
-   *   [dir="rtl"] .site-footer__top .region:nth-child(2n+1) {}
-   *   [dir="rtl"] .site-footer__top .region:nth-child(2n) {}
-   * }.
-   */
-  [dir="rtl"] .site-footer__top .region.region-footer-second,
-  [dir="rtl"] .site-footer__top .region.region-footer-third {
-    padding: 10px;
-  }
-  .region-footer-third {
-    clear: none;
-  }
 }
 .site-footer h2 {
   color: #c0c0c0;
diff --git a/core/themes/bartik/templates/page.html.twig b/core/themes/bartik/templates/page.html.twig
index 1ede4ef..aedac9f 100644
--- a/core/themes/bartik/templates/page.html.twig
+++ b/core/themes/bartik/templates/page.html.twig
@@ -168,21 +168,21 @@
       </div>
     {% endif %}
     <footer class="site-footer">
-      {% if page.footer_first or page.footer_second or page.footer_third or page.footer_fourth %}
-        <div class="site-footer__top layout-container clearfix">
-          {{ page.footer_first }}
-          {{ page.footer_second }}
-          {{ page.footer_third }}
-          {{ page.footer_fourth }}
-        </div>
-      {% endif %}
-      {% if page.footer_fifth %}
-        <div class="layout-container" role="contentinfo">
-          <div class="site-footer__bottom">
-            {{ page.footer_fifth }}
+      <div class="layout-container">
+        {% if page.footer_first or page.footer_second or page.footer_third or page.footer_fourth %}
+          <div class="site-footer__top clearfix">
+            {{ page.footer_first }}
+            {{ page.footer_second }}
+            {{ page.footer_third }}
+            {{ page.footer_fourth }}
           </div>
-        </div>
-      {% endif %}
+        {% endif %}
+        {% if page.footer_fifth %}
+            <div class="site-footer__bottom">
+              {{ page.footer_fifth }}
+            </div>
+        {% endif %}
+      </div>
     </footer>
   </div>
 </div>