diff --git a/3rdparty/qocoa/qsearchfield_nonmac.cpp b/3rdparty/qocoa/qsearchfield_nonmac.cpp
index b3c47abac..f5d16157c 100644
--- a/3rdparty/qocoa/qsearchfield_nonmac.cpp
+++ b/3rdparty/qocoa/qsearchfield_nonmac.cpp
@@ -21,6 +21,7 @@ THE SOFTWARE.
 */
 
 #include "qsearchfield.h"
+#include "../../src/ui/iconloader.h"
 
 #include <QApplication>
 #include <QEvent>
@@ -62,19 +63,22 @@ QSearchField::QSearchField(QWidget *parent) : QWidget(parent)
     connect(lineEdit, SIGNAL(textChanged(QString)),
             this, SLOT(setText(QString)));
 
+    QIcon clearIcon(IconLoader::Load("edit-clear-locationbar-ltr"));
+
     QToolButton *clearButton = new QToolButton(this);
-    QPixmap clearIcon(QString(":/Qocoa/qsearchfield_nonmac.png"));
-    clearButton->setIcon(QIcon(clearIcon));
-    clearButton->setIconSize(clearIcon.size());
-    clearButton->setFixedSize(clearIcon.size());
-    clearButton->setStyleSheet("border: none;");
+    clearButton->setIcon(clearIcon);
+    clearButton->setIconSize(QSize(16, 16));
+    clearButton->setStyleSheet("border: none; padding: 0px;");
+    clearButton->resize(clearButton->sizeHint());
     connect(clearButton, SIGNAL(clicked()), this, SLOT(clear()));
 
     pimpl = new QSearchFieldPrivate(this, lineEdit, clearButton);
 
+    const int frame_width = lineEdit->style()->pixelMetric(QStyle::PM_DefaultFrameWidth);
+
     lineEdit->setStyleSheet(QString("QLineEdit { padding-left: %1px; } ").arg(clearButton->width()));
-    const int width = qMax(lineEdit->minimumSizeHint().width(), pimpl->clearButtonPaddedWidth());
-    const int height = qMax(lineEdit->minimumSizeHint().height(), pimpl->clearButtonPaddedHeight());
+    const int width = frame_width + qMax(lineEdit->minimumSizeHint().width(), pimpl->clearButtonPaddedWidth());
+    const int height = frame_width + qMax(lineEdit->minimumSizeHint().height(), pimpl->clearButtonPaddedHeight());
     lineEdit->setMinimumSize(width, height);
 
     QVBoxLayout *layout = new QVBoxLayout(this);
diff --git a/data/Qocoa/qsearchfield_nonmac.png b/data/Qocoa/qsearchfield_nonmac.png
deleted file mode 100644
index bcbc5fd51..000000000
Binary files a/data/Qocoa/qsearchfield_nonmac.png and /dev/null differ
diff --git a/data/data.qrc b/data/data.qrc
index 9200f6bde..91bbd7ec9 100644
--- a/data/data.qrc
+++ b/data/data.qrc
@@ -291,7 +291,6 @@
         <file>providers/songkick.png</file>
         <file>providers/twitter.png</file>
         <file>providers/wikipedia.png</file>
-        <file>Qocoa/qsearchfield_nonmac.png</file>
         <file>sample.mood</file>
         <file>schema/device-schema.sql</file>
         <file>schema/jamendo.sql</file>