diff --git a/app/src/main/res/layout/settings_fragment.xml b/app/src/main/res/layout/settings_fragment.xml
index 07650f079..429c84612 100644
--- a/app/src/main/res/layout/settings_fragment.xml
+++ b/app/src/main/res/layout/settings_fragment.xml
@@ -141,7 +141,7 @@
             app:layout_constraintTop_toBottomOf="@+id/warningNotPaired"
             app:layout_constraintVertical_bias="1.0" />
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/reportBugButton"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -153,7 +153,7 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintWidth_percent="0.4" />
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/changeRadioButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -163,7 +163,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/scanStatusText" />
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/updateFirmwareButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml
index 3c5f149d5..37c9fad55 100644
--- a/app/src/main/res/menu/menu_main.xml
+++ b/app/src/main/res/menu/menu_main.xml
@@ -4,7 +4,7 @@
         android:id="@+id/connectStatusImage"
         android:contentDescription="@string/connection_status"
         android:icon="@drawable/cloud_off"
-        android:tint="@color/colorOnPrimary"
+        app:iconTint="@color/colorOnPrimary"
         android:title="@string/disconnected"
         app:showAsAction="ifRoom" />
     <item