diff --git a/resources/icons/emoji-categories/search.png b/resources/icons/emoji-categories/search.png
deleted file mode 100644
index f101ba9c..00000000
Binary files a/resources/icons/emoji-categories/search.png and /dev/null differ
diff --git a/resources/icons/emoji-categories/search@2x.png b/resources/icons/emoji-categories/search@2x.png
deleted file mode 100644
index 2604db45..00000000
Binary files a/resources/icons/emoji-categories/search@2x.png and /dev/null differ
diff --git a/resources/qml/TimelineRow.qml b/resources/qml/TimelineRow.qml
index cbec6d94..bfe422f8 100644
--- a/resources/qml/TimelineRow.qml
+++ b/resources/qml/TimelineRow.qml
@@ -84,7 +84,7 @@ MouseArea {
 			width: 16
 		}
 		EmojiButton {
-			visible: timelineSettings.buttons
+			visible: settings.buttonsInTimeline
 			Layout.alignment: Qt.AlignRight | Qt.AlignTop
 			Layout.preferredHeight: 16
 			width: 16
diff --git a/resources/qml/emoji/EmojiPicker.qml b/resources/qml/emoji/EmojiPicker.qml
index 9c63aa79..b76596d3 100644
--- a/resources/qml/emoji/EmojiPicker.qml
+++ b/resources/qml/emoji/EmojiPicker.qml
@@ -276,7 +276,7 @@ Popup {
                     sourceSize.height: 32
                     fillMode: Image.Pad
                     smooth: true
-                    source: "image://colorimage/:/icons/icons/emoji-categories/search.png?" + (parent.hovered ? colors.highlight : colors.buttonText)
+                    source: "image://colorimage/:/icons/icons/ui/search.png?" + (parent.hovered ? colors.highlight : colors.buttonText)
                 }
 
                 MouseArea