diff --git a/src/PlanView/SurveyItemEditor.qml b/src/PlanView/SurveyItemEditor.qml
index d5f085a2b2a0d31b66acc0969ac81ac917d5d7fd..33cffd647dc4db0b613262f19a110ac23996bf82 100644
--- a/src/PlanView/SurveyItemEditor.qml
+++ b/src/PlanView/SurveyItemEditor.qml
@@ -440,16 +440,28 @@ Rectangle {
                         Layout.fillWidth:   true
                     }
 
-                    ToolButton {
-                        id:                     windRoseButton
-                        anchors.verticalCenter: angleText.verticalCenter
-                        iconSource:             qgcPal.globalTheme === QGCPalette.Light ? "/res/wind-roseBlack.svg" : "/res/wind-rose.svg"
-                        visible:                _vehicle.fixedWing
+                    Rectangle {
+                        id:         windRoseButton
+                        width:      ScreenTools.implicitTextFieldHeight
+                        height:     width
+                        color:      qgcPal.button
+                        visible:    _vehicle.fixedWing
+
+                        QGCColoredImage {
+                            anchors.fill:   parent
+                            source:         "/res/wind-rose.svg"
+                            smooth:         true
+                            color:          qgcPal.buttonText
+                        }
 
-                        onClicked: {
-                            windRosePie.angle = Number(gridAngleText.text)
-                            var cords = windRoseButton.mapToItem(_root, 0, 0)
-                            windRosePie.popup(cords.x + windRoseButton.width / 2, cords.y + windRoseButton.height / 2)
+                        QGCMouseArea {
+                            fillItem: parent
+
+                            onClicked: {
+                                windRosePie.angle = Number(gridAngleText.text)
+                                var cords = windRoseButton.mapToItem(_root, 0, 0)
+                                windRosePie.popup(cords.x + windRoseButton.width / 2, cords.y + windRoseButton.height / 2)
+                            }
                         }
                     }
                 }
@@ -543,16 +555,28 @@ Rectangle {
                     Layout.fillWidth:  true
                 }
 
-                ToolButton {
-                    id:                     manualWindRoseButton
-                    anchors.verticalCenter: manualAngleText.verticalCenter
-                    Layout.columnSpan:      1
-                    iconSource:             qgcPal.globalTheme === QGCPalette.Light ? "/res/wind-roseBlack.svg" : "/res/wind-rose.svg"
-                    visible:                _vehicle.fixedWing
+                Rectangle {
+                    id:         manualWindRoseButton
+                    width:      ScreenTools.implicitTextFieldHeight
+                    height:     width
+                    color:      qgcPal.button
+                    visible:    _vehicle.fixedWing
 
-                    onClicked: {
-                        var cords = manualWindRoseButton.mapToItem(_root, 0, 0)
-                        windRosePie.popup(cords.x + manualWindRoseButton.width / 2, cords.y + manualWindRoseButton.height / 2)
+                    QGCColoredImage {
+                        anchors.fill:   parent
+                        source:         "/res/wind-rose.svg"
+                        smooth:         true
+                        color:          qgcPal.buttonText
+                    }
+
+                    QGCMouseArea {
+                        fillItem: parent
+
+                        onClicked: {
+                            windRosePie.angle = Number(gridAngleText.text)
+                            var cords = manualWindRoseButton.mapToItem(_root, 0, 0)
+                            windRosePie.popup(cords.x + manualWindRoseButton.width / 2, cords.y + manualWindRoseButton.height / 2)
+                        }
                     }
                 }
             }