diff --git a/css/app.css b/css/app.css
index e1bd3e7f0..ddf5f2ea9 100644
--- a/css/app.css
+++ b/css/app.css
@@ -3384,6 +3384,11 @@ img.tile-removing {
   right: auto;
 }
 
+[dir='rtl'] .preset-icon-fill-area {
+  left: auto;
+  right: 10px;
+}
+
 [dir='rtl'] .map-data-control .layer-list button, [dir='rtl'] .background-control .layer-list button {
   float: left;
   border-left: none;
diff --git a/modules/util/util.js b/modules/util/util.js
index 3178425a1..7154dca4b 100644
--- a/modules/util/util.js
+++ b/modules/util/util.js
@@ -174,6 +174,9 @@ export function utilFastMouse(container) {
         rectTop = rect.top,
         clientLeft = +container.clientLeft,
         clientTop = +container.clientTop;
+    if (iD.detect().textDirection === 'rtl') {
+      rectLeft = 0;
+    }
     return function(e) {
         return [
             e.clientX - rectLeft - clientLeft,