diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -126,8 +126,13 @@
 
 option(BUILD_OKULARKIRIGAMI "Builds the touch-friendly frontend" ON)
 if (BUILD_OKULARKIRIGAMI)
-    add_subdirectory( mobile )
+    if (${KF5_VERSION} VERSION_GREATER 5.55)
+        add_subdirectory( mobile )
+    else()
+        message("You need KF5 5.56 or later to build okular mobile. If you are not interested, disable building this component with -DBUILD_OKULARKIRIGAMI=OFF")
+    endif()
 endif()
+
 option(BUILD_COVERAGE "Build the project with gcov support" OFF)
 
 if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
diff --git a/mobile/app/package/contents/ui/TableOfContents.qml b/mobile/app/package/contents/ui/TableOfContents.qml
--- a/mobile/app/package/contents/ui/TableOfContents.qml
+++ b/mobile/app/package/contents/ui/TableOfContents.qml
@@ -20,7 +20,7 @@
 import QtQuick 2.1
 import QtQuick.Controls 1.3
 import QtQuick.Controls 2.0 as QQC2
-import org.kde.kirigami 2.0 as Kirigami
+import org.kde.kirigami 2.7 as Kirigami
 
 Kirigami.Page {
     id: root
@@ -34,10 +34,22 @@
     QQC2.ToolBar {
         id: toolBarContent
         width: root.width
-        height: searchField.height
-        QQC2.TextField {
+        height: searchField.height + Kirigami.Units.largeSpacing
+        Kirigami.ActionTextField {
             id: searchField
             anchors.centerIn: parent
+            rightActions: [
+                Kirigami.Action {
+                    iconName: "edit-clear"
+                    visible: searchField.text.length > 0
+                    onTriggered: {
+                        searchField.text = ""
+                        searchField.accepted()
+                    }
+                }
+            ]
+            focusSequence: "Ctrl+F"
+            placeholderText: i18n("Search...")
         }
     }
     ScrollView {
diff --git a/mobile/app/package/contents/ui/Thumbnails.qml b/mobile/app/package/contents/ui/Thumbnails.qml
--- a/mobile/app/package/contents/ui/Thumbnails.qml
+++ b/mobile/app/package/contents/ui/Thumbnails.qml
@@ -19,20 +19,32 @@
 
 import QtQuick 2.1
 import QtQuick.Controls 2.0
-import org.kde.kirigami 2.0 as Kirigami
+import org.kde.kirigami 2.7 as Kirigami
 
 ThumbnailsBase {
     id: root
     model: documentItem.matchingPages
 
     ToolBar {
         id: toolBarContent
         width: root.width
-        height: searchField.height
-        TextField {
+        height: searchField.height + Kirigami.Units.largeSpacing
+        Kirigami.ActionTextField {
             id: searchField
-            enabled: documentItem ? documentItem.supportsSearching : false
             anchors.centerIn: parent
+            rightActions: [
+                Kirigami.Action {
+                    iconName: "edit-clear"
+                    visible: searchField.text.length > 0
+                    onTriggered: {
+                        searchField.text = ""
+                        searchField.accepted()
+                    }
+                }
+            ]
+            enabled: documentItem ? documentItem.supportsSearching : false
+            placeholderText: documentItem && documentItem.supportsSearching ? i18n("Search...") : i18n("This document isn't searchable.")
+            focusSequence: "Ctrl+F"
             onTextChanged: {
                 if (text.length > 2) {
                     documentItem.searchText(text);