diff --git a/src/GUI/assets/icons8-clear-symbol-26.png b/src/GUI/assets/icons8-clear-symbol-26.png
new file mode 100644
index 000000000..bacb619bc
Binary files /dev/null and b/src/GUI/assets/icons8-clear-symbol-26.png differ
diff --git a/src/GUI/qml/SearchButton.qml b/src/GUI/qml/SearchButton.qml
index b8ebc59ab..7bf441b2f 100644
--- a/src/GUI/qml/SearchButton.qml
+++ b/src/GUI/qml/SearchButton.qml
@@ -30,6 +30,8 @@ FocusScope
         root.search("");
     }
 
+    readonly property bool canClear: (buttonText.text.length > 0)
+
     Rectangle
     {
         id: frame
@@ -41,8 +43,6 @@ FocusScope
         border.color: (mouse.containsMouse | active) ? Style.themeColor: Style.minorFrameColor
         clip: true
 
-
-
         TextInput {
             id: buttonText
             anchors.left: parent.left
@@ -86,7 +86,7 @@ FocusScope
 
         Image {
             id: searchIcon
-            source: clearButtonMouse.containsMouse ? "qrc:///up-down-arrow" :"qrc:///search-icon-small"
+            source: root.canClear ? "qrc:///clear-text-icon" :"qrc:///search-icon-small"
             anchors.right: parent.right
             anchors.rightMargin: Style.margin
             anchors.verticalCenter: parent.verticalCenter
@@ -113,11 +113,9 @@ FocusScope
             anchors.right: parent.right
             height: parent.height
             width: searchIcon.width
-            hoverEnabled: true
-
-            onClicked: {
-                clear();
-            }
+            hoverEnabled: root.canClear
+            visible: root.canClear
+            onClicked: clear();
         }
 
         Timer {
diff --git a/src/GUI/resources.qrc b/src/GUI/resources.qrc
index 645ef3db7..d0792b86f 100644
--- a/src/GUI/resources.qrc
+++ b/src/GUI/resources.qrc
@@ -108,6 +108,7 @@
         <file>qml/ToggleBox.qml</file>
         <file>qml/LocationAltitudeRow.qml</file>
         <file>qml/CatalogDelegate.qml</file>
+        <file alias="clear-text-icon">assets/icons8-clear-symbol-26.png</file>
     </qresource>
     <qresource prefix="/preview">
         <file alias="close-icon">preview-close.png</file>