--- a/browser/themes/windows/devedition.css
+++ b/browser/themes/windows/devedition.css
@@ -21,16 +21,30 @@
   width: auto !important;
   height: auto !important;
   padding: 2px 5px !important;
   margin: 0 !important;
   border: 1px solid var(--chrome-nav-bar-controls-border-color) !important;
   box-shadow: none !important;
 }
 
+
+/* Force 1x image for back/forward button for now, otherwise it breaks the
+   layout - Bug 1165360. */
+@media (min-resolution: 1.1dppx) {
+  #back-button,
+  #forward-button {
+    list-style-image: url("chrome://browser/skin/Toolbar.png");
+  }
+  /* The back button region is already set in devedition.inc.css */
+  #forward-button {
+    -moz-image-region: rect(0px, 72px, 18px, 54px);
+  }
+}
+
 #forward-button > .toolbarbutton-icon {
   -moz-border-start: none !important;
 }
 
 /* Override a box shadow for disabled back button */
 #main-window:not([customizing]) #back-button[disabled] > .toolbarbutton-icon {
   box-shadow: none !important;
 }