diff --git a/src/sass/gtk/_common-4.0.scss b/src/sass/gtk/_common-4.0.scss
index bc1037d5..004e7140 100644
--- a/src/sass/gtk/_common-4.0.scss
+++ b/src/sass/gtk/_common-4.0.scss
@@ -538,8 +538,8 @@ entry {
   > image { // icons inside the entry
     color: mix($fg_color, $base_color, 80%);
 
-    &.left { padding-left: 0; padding-right: 5px; }
-    &.right { padding-right: 0; padding-left: 5px; }
+    &:first-child { padding-left: 0; padding-right: $container_padding; }
+    &:last-child { padding-right: 0; padding-left: $container_padding; }
   }
 
   > text > placeholder {