diff --git a/css/80_app.css b/css/80_app.css
index 7a6dff5c2..64246010c 100644
--- a/css/80_app.css
+++ b/css/80_app.css
@@ -474,14 +474,29 @@ button[disabled].action:hover {
     white-space: nowrap;
     display: flex;
 }
-.tool-group button.add-preset {
+[dir='ltr'] .tool-group button.add-preset.add-point,
+[dir='ltr'] .tool-group button.add-preset.add-point .label {
     padding-left: 0px;
 }
-.tool-group button.add-preset .label {
-    padding-left: 0;
+[dir='ltr'] .tool-group button.add-preset:not(.add-point) {
+    padding-left: 5px;
+}
+[dir='ltr'] .tool-group button.add-preset:not(.add-point) .label {
+    padding-left: 3px;
+}
+[dir='rtl'] .tool-group button.add-preset.add-point,
+[dir='rtl'] .tool-group button.add-preset.add-point .label {
+    padding-right: 0px;
+}
+[dir='rtl'] .tool-group button.add-preset:not(.add-point) {
+    padding-right: 5px;
+}
+[dir='rtl'] .tool-group button.add-preset:not(.add-point) .label {
+    padding-right: 3px;
 }
 .narrow .tool-group button.add-preset {
-    padding-right: 0;
+    padding-right: 0 !important;
+    padding-left: 0 !important;
 }
 .tool-group button > .icon {
     flex: 0 0 20px;
diff --git a/modules/ui/modes.js b/modules/ui/modes.js
index 7a19d0277..159effa1f 100644
--- a/modules/ui/modes.js
+++ b/modules/ui/modes.js
@@ -100,7 +100,7 @@ export function uiModes(context) {
                 var preset = context.presets().item(d.id);
                 var isMaki = /^maki-/.test(preset.icon);
                 var icon = '#' + preset.icon + (isMaki ? '-11' : '');
-                var markerClass = 'add-preset add-preset-' + preset.name()
+                var markerClass = 'add-preset add-' + d.geom + ' add-preset-' + preset.name()
                     .replace(/\s+/g, '_')
                     + '-' + d.geom; //replace spaces with underscores to avoid css interpretation
                 var presetName = t('presets.presets.' + preset.id + '.name');
diff --git a/modules/ui/preset_icon.js b/modules/ui/preset_icon.js
index 9d1ac8d0b..f699272e2 100644
--- a/modules/ui/preset_icon.js
+++ b/modules/ui/preset_icon.js
@@ -74,15 +74,18 @@ export function uiPresetIcon() {
             }
         }
 
-        var midCoordinates = [[c1, w/2], [c2, w/2], [h/2, c1], [h/2, c2]];
-        for (var index in midCoordinates) {
-            var loc = midCoordinates[index];
-            fillEnter.append('circle')
-                .attr('class', 'midpoint')
-                .attr('cx', loc[0])
-                .attr('cy', loc[1])
-                .attr('r', 1.25);
+        if (!isSmall()) {
+            var midCoordinates = [[c1, w/2], [c2, w/2], [h/2, c1], [h/2, c2]];
+            for (var index in midCoordinates) {
+                var loc = midCoordinates[index];
+                fillEnter.append('circle')
+                    .attr('class', 'midpoint')
+                    .attr('cx', loc[0])
+                    .attr('cy', loc[1])
+                    .attr('r', 1.25);
+            }
         }
+
     }
 
     function renderLine(lineEnter) {