diff --git a/library/src/main/java/com/rengwuxian/materialedittext/MaterialEditText.java b/library/src/main/java/com/rengwuxian/materialedittext/MaterialEditText.java
index 516722e6..41b3b7a7 100755
--- a/library/src/main/java/com/rengwuxian/materialedittext/MaterialEditText.java
+++ b/library/src/main/java/com/rengwuxian/materialedittext/MaterialEditText.java
@@ -1277,7 +1277,7 @@ private ObjectAnimator getBottomLinesAnimator(float destBottomLines) {
   protected void onDraw(@NonNull Canvas canvas) {
 
     int startX = getScrollX() + (iconLeftBitmaps == null ? 0 : (iconOuterWidth + iconPadding)) + getPaddingLeft();
-    int endX = getScrollX() + (iconRightBitmaps == null ? getWidth() : getWidth() - iconOuterWidth - iconPadding) - getPaddingRight();
+    int endX = getScrollX() + (iconRightBitmaps == null ? getWidth() : getWidth() - iconOuterWidth - iconPadding);
     int lineStartY = getScrollY() + getHeight() - getPaddingBottom();
 
     // draw the icon(s)
@@ -1509,8 +1509,8 @@ public boolean onTouchEvent(MotionEvent event) {
   private boolean insideClearButton(MotionEvent event) {
     float x = event.getX();
     float y = event.getY();
-    int startX = getScrollX() + (iconLeftBitmaps == null ? 0 : (iconOuterWidth + iconPadding));
-    int endX = getScrollX() + (iconRightBitmaps == null ? getWidth() : getWidth() - iconOuterWidth - iconPadding);
+    int startX = (iconLeftBitmaps == null ? 0 : (iconOuterWidth + iconPadding));
+    int endX = (iconRightBitmaps == null ? getWidth() : getWidth() - iconOuterWidth - iconPadding);
     int buttonLeft;
     if (isRTL()) {
       buttonLeft = startX;