diff --git a/resources/images/impl/gui/common/searchIcon.png b/resources/images/impl/gui/common/searchIcon.png
index 5d635cd0a..013f601ba 100644
Binary files a/resources/images/impl/gui/common/searchIcon.png and b/resources/images/impl/gui/common/searchIcon.png differ
diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/SearchFieldUI.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/SearchFieldUI.java
index 4e32a2445..99c947786 100644
--- a/src/net/java/sip/communicator/impl/gui/main/contactlist/SearchFieldUI.java
+++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/SearchFieldUI.java
@@ -127,7 +127,7 @@ protected void customPaintBackground(Graphics g)
             int dy = (c.getY() + c.getHeight()) / 2
                 - searchIcon.getIconHeight()/2;
 
-            g2.drawImage(searchIcon.getImage(), 5, dy + 1, null);
+            g2.drawImage(searchIcon.getImage(), 3, dy + 1, null);
 
             if (c.getText() != null
                 && c.getText().length() > 0
@@ -171,11 +171,11 @@ protected Rectangle getVisibleEditorRect()
 
         if ((rect.width > 0) && (rect.height > 0))
         {
-            rect.x += searchIcon.getIconWidth() + 8;
-            rect.width -= searchIcon.getIconWidth() + 8;
+            rect.x += searchIcon.getIconWidth() + 5;
+            rect.width -= (searchIcon.getIconWidth() + 5);
 
-            if (isCallButtonEnabled)
-                rect.width -= callRolloverIcon.getWidth(null) + 12;
+            if (isCallIconVisible)
+                rect.width -= (callRolloverIcon.getWidth(null) + 12);
             else
                 rect.width -= 8;
 
diff --git a/src/net/java/sip/communicator/util/swing/SIPCommTextField.java b/src/net/java/sip/communicator/util/swing/SIPCommTextField.java
index 54c04f6ed..81f0f40c2 100644
--- a/src/net/java/sip/communicator/util/swing/SIPCommTextField.java
+++ b/src/net/java/sip/communicator/util/swing/SIPCommTextField.java
@@ -160,6 +160,7 @@ private void setDefaultText()
     {
         super.setText(defaultText);
         this.setForeground(defaultTextColor);
+        this.setCaretPosition(0);
     }
 
     /**
diff --git a/src/net/java/sip/communicator/util/swing/plaf/SIPCommTextFieldUI.java b/src/net/java/sip/communicator/util/swing/plaf/SIPCommTextFieldUI.java
index 1b1a6431c..9c48dc2b2 100644
--- a/src/net/java/sip/communicator/util/swing/plaf/SIPCommTextFieldUI.java
+++ b/src/net/java/sip/communicator/util/swing/plaf/SIPCommTextFieldUI.java
@@ -307,7 +307,7 @@ protected Rectangle getDeleteButtonRect()
      */
     protected Rectangle getVisibleEditorRect()
     {
-        if (!isDeleteButtonEnabled)
+        if (!isDeleteIconVisible)
         {
             return super.getVisibleEditorRect();
         }