diff --git a/app/src/main/res/drawable/list_item_background.xml b/app/src/main/res/drawable/list_item_background.xml
index d62f3237..6a69bcda 100644
--- a/app/src/main/res/drawable/list_item_background.xml
+++ b/app/src/main/res/drawable/list_item_background.xml
@@ -4,12 +4,12 @@
     <item>
         <selector>
             <item app:state_multiselected="true" android:state_activated="true">
-                <color android:color="?android:attr/colorControlActivated" />
+                <color android:color="?attr/colorControlActivated" />
             </item>
             <item app:state_multiselected="false" android:state_activated="true">
-                <color android:color="?android:attr/colorControlHighlight" />
+                <color android:color="?attr/colorControlHighlight" />
             </item>
         </selector>
     </item>
-    <item android:drawable="?android:attr/selectableItemBackground" />
+    <item android:drawable="?attr/selectableItemBackground" />
 </layer-list>
diff --git a/app/src/main/res/layout-sw600dp/main_activity.xml b/app/src/main/res/layout-sw600dp/main_activity.xml
index b751c8c1..36f9eaff 100644
--- a/app/src/main/res/layout-sw600dp/main_activity.xml
+++ b/app/src/main/res/layout-sw600dp/main_activity.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:baselineAligned="false"
-    android:divider="?android:attr/dividerHorizontal"
+    android:divider="?attr/dividerHorizontal"
     android:orientation="horizontal"
     android:showDividers="middle"
     tools:context=".activity.MainActivity">
diff --git a/app/src/main/res/layout/tunnel_editor_fragment.xml b/app/src/main/res/layout/tunnel_editor_fragment.xml
index 5a2bfe34..1020e34c 100644
--- a/app/src/main/res/layout/tunnel_editor_fragment.xml
+++ b/app/src/main/res/layout/tunnel_editor_fragment.xml
@@ -120,7 +120,7 @@
 
                         <TextView
                             android:id="@+id/public_key_text"
-                            style="?android:attr/editTextStyle"
+                            style="?attr/editTextStyle"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:layout_below="@+id/public_key_label"