diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index b589d56..fb7f4a8 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="17" />
+    <bytecodeTargetLevel target="11" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 09ec3ac..0a57690 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -26,5 +26,5 @@
     </option>
   </component>
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_17_PREVIEW" project-jdk-name="11" project-jdk-type="JavaSDK" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK" />
 </project>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_accuracy_fail.xml b/app/src/main/res/drawable/ic_accuracy_fail.xml
index 43912e0..e55650d 100644
--- a/app/src/main/res/drawable/ic_accuracy_fail.xml
+++ b/app/src/main/res/drawable/ic_accuracy_fail.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
+    android:tint="?android:attr/colorControlNormal">
   <path
       android:fillColor="@android:color/white"
       android:pathData="M20.94,11c-0.46,-4.17 -3.77,-7.48 -7.94,-7.94L13,1h-2v2.06c-1.13,0.12 -2.19,0.46 -3.16,0.97l1.5,1.5C10.16,5.19 11.06,5 12,5c3.87,0 7,3.13 7,7 0,0.94 -0.19,1.84 -0.52,2.65l1.5,1.5c0.5,-0.96 0.84,-2.02 0.97,-3.15L23,13v-2h-2.06zM3,4.27l2.04,2.04C3.97,7.62 3.25,9.23 3.06,11L1,11v2h2.06c0.46,4.17 3.77,7.48 7.94,7.94L11,23h2v-2.06c1.77,-0.2 3.38,-0.91 4.69,-1.98L19.73,21 21,19.73 4.27,3 3,4.27zM16.27,17.54C15.09,18.45 13.61,19 12,19c-3.87,0 -7,-3.13 -7,-7 0,-1.61 0.55,-3.09 1.46,-4.27l9.81,9.81z"/>
diff --git a/app/src/main/res/drawable/ic_accuracy_ok.xml b/app/src/main/res/drawable/ic_accuracy_ok.xml
index b050330..39b37b3 100644
--- a/app/src/main/res/drawable/ic_accuracy_ok.xml
+++ b/app/src/main/res/drawable/ic_accuracy_ok.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
+    android:tint="?android:attr/colorControlNormal">
   <path
       android:fillColor="@android:color/white"
       android:pathData="M12,8c-2.21,0 -4,1.79 -4,4s1.79,4 4,4 4,-1.79 4,-4 -1.79,-4 -4,-4zM20.94,11c-0.46,-4.17 -3.77,-7.48 -7.94,-7.94L13,1h-2v2.06C6.83,3.52 3.52,6.83 3.06,11L1,11v2h2.06c0.46,4.17 3.77,7.48 7.94,7.94L11,23h2v-2.06c4.17,-0.46 7.48,-3.77 7.94,-7.94L23,13v-2h-2.06zM12,19c-3.87,0 -7,-3.13 -7,-7s3.13,-7 7,-7 7,3.13 7,7 -3.13,7 -7,7z"/>
diff --git a/app/src/main/res/drawable/ic_category_asc.xml b/app/src/main/res/drawable/ic_category_asc.xml
index b45741e..68fed1d 100644
--- a/app/src/main/res/drawable/ic_category_asc.xml
+++ b/app/src/main/res/drawable/ic_category_asc.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
+    android:tint="?android:attr/colorControlNormal">
   <path
       android:fillColor="@android:color/white"
       android:pathData="M12,2l-5.5,9h11z"/>
diff --git a/app/src/main/res/drawable/ic_distance_asc.xml b/app/src/main/res/drawable/ic_distance_asc.xml
index 957e58c..dc10609 100644
--- a/app/src/main/res/drawable/ic_distance_asc.xml
+++ b/app/src/main/res/drawable/ic_distance_asc.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
+    android:tint="?android:attr/colorControlNormal">
   <path
       android:fillColor="@android:color/white"
       android:pathData="M21,3L3,10.53v0.98l6.84,2.65L12.48,21h0.98L21,3z"/>
diff --git a/app/src/main/res/drawable/ic_manual_pos.xml b/app/src/main/res/drawable/ic_manual_pos.xml
index 5f8983c..20b8190 100644
--- a/app/src/main/res/drawable/ic_manual_pos.xml
+++ b/app/src/main/res/drawable/ic_manual_pos.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
+    android:tint="?android:attr/colorControlNormal">
   <path
       android:fillColor="@android:color/white"
       android:pathData="M13.95,13H9V8.05l5.61,-5.61C13.78,2.16 12.9,2 12,2c-4.2,0 -8,3.22 -8,8.2c0,3.32 2.67,7.25 8,11.8c5.33,-4.55 8,-8.48 8,-11.8c0,-1.01 -0.16,-1.94 -0.45,-2.8L13.95,13z"/>
diff --git a/app/src/main/res/drawable/ic_ok.xml b/app/src/main/res/drawable/ic_ok.xml
index 0432fa6..e3f1ce5 100644
--- a/app/src/main/res/drawable/ic_ok.xml
+++ b/app/src/main/res/drawable/ic_ok.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
+    android:tint="?android:attr/colorControlNormal">
   <path
       android:fillColor="@android:color/white"
       android:pathData="M9,16.17L4.83,12l-1.42,1.41L9,19 21,7l-1.41,-1.41z"/>
diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
index b1cf7fc..a93e715 100644
--- a/app/src/main/res/layout/activity_about.xml
+++ b/app/src/main/res/layout/activity_about.xml
@@ -32,7 +32,7 @@
         <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
+            android:layout_height="?android:attr/actionBarSize"
             app:contentInsetStartWithNavigation="0dp"
             app:navigationIcon="@drawable/ic_back_grey"
             app:titleMarginStart="0dp"/>
diff --git a/app/src/main/res/layout/activity_geofavorite_detail.xml b/app/src/main/res/layout/activity_geofavorite_detail.xml
index 040ff0d..f948998 100644
--- a/app/src/main/res/layout/activity_geofavorite_detail.xml
+++ b/app/src/main/res/layout/activity_geofavorite_detail.xml
@@ -43,7 +43,7 @@
                 <androidx.appcompat.widget.Toolbar
                     android:id="@+id/toolbar"
                     android:layout_width="match_parent"
-                    android:layout_height="?attr/actionBarSize"
+                    android:layout_height="?android:attr/actionBarSize"
                     app:contentInsetStart="0dp"
                     app:layout_collapseMode="pin"
                     android:background="@android:color/transparent">
@@ -51,8 +51,8 @@
                     <!-- Back button -->
                     <ImageView
                         android:id="@+id/back_bt"
-                        android:layout_width="?attr/actionBarSize"
-                        android:layout_height="?attr/actionBarSize"
+                        android:layout_width="?android:attr/actionBarSize"
+                        android:layout_height="?android:attr/actionBarSize"
                         android:layout_gravity="start"
                         android:padding="16dp"
                         android:src="@drawable/ic_back_grey"
@@ -62,8 +62,8 @@
                     <!-- Manual position button -->
                     <ImageView
                         android:id="@+id/manual_pos_bt"
-                        android:layout_width="?attr/actionBarSize"
-                        android:layout_height="?attr/actionBarSize"
+                        android:layout_width="?android:attr/actionBarSize"
+                        android:layout_height="?android:attr/actionBarSize"
                         android:layout_gravity="end"
                         android:padding="16dp"
                         android:src="@drawable/ic_manual_pos"
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 643f2b1..a22be09 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -42,7 +42,7 @@
             android:id="@+id/scrollView"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="?attr/colorPrimary">
+            android:background="?android:attr/colorPrimary">
 
             <LinearLayout
                 android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_map_picker.xml b/app/src/main/res/layout/activity_map_picker.xml
index 2ddc01c..de40dcf 100644
--- a/app/src/main/res/layout/activity_map_picker.xml
+++ b/app/src/main/res/layout/activity_map_picker.xml
@@ -20,8 +20,8 @@
 
         <ImageView
             android:id="@+id/back_bt"
-            android:layout_width="?attr/actionBarSize"
-            android:layout_height="?attr/actionBarSize"
+            android:layout_width="?android:attr/actionBarSize"
+            android:layout_height="?android:attr/actionBarSize"
             android:layout_gravity="start"
             android:padding="16dp"
             android:src="@drawable/ic_back_grey"
@@ -30,8 +30,8 @@
 
         <ImageView
             android:id="@+id/ok_bt"
-            android:layout_width="?attr/actionBarSize"
-            android:layout_height="?attr/actionBarSize"
+            android:layout_width="?android:attr/actionBarSize"
+            android:layout_height="?android:attr/actionBarSize"
             android:layout_gravity="end"
             android:padding="16dp"
             android:src="@drawable/ic_ok"
diff --git a/app/src/main/res/layout/fragment_geofavorite_list.xml b/app/src/main/res/layout/fragment_geofavorite_list.xml
index 7500a3b..20cc276 100644
--- a/app/src/main/res/layout/fragment_geofavorite_list.xml
+++ b/app/src/main/res/layout/fragment_geofavorite_list.xml
@@ -18,7 +18,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:fitsSystemWindows="true"
-            app:contentScrim="?attr/colorPrimary"
+            app:contentScrim="?android:attr/colorPrimary"
             app:layout_scrollFlags="scroll|enterAlways"
             app:toolbarId="@+id/toolbar" >
 
diff --git a/app/src/main/res/values-v23/styles.xml b/app/src/main/res/values-v23/styles.xml
index 28bd979..d6eea91 100644
--- a/app/src/main/res/values-v23/styles.xml
+++ b/app/src/main/res/values-v23/styles.xml
@@ -19,7 +19,7 @@
 <resources>
 
     <style name="AppTheme" parent="BaseTheme">
-        <item name="android:statusBarColor">?attr/colorPrimary</item>
+        <item name="android:statusBarColor">?android:attr/colorPrimary</item>
         <item name="android:windowLightStatusBar">true</item>
     </style>
 
diff --git a/app/src/main/res/values-v27/styles.xml b/app/src/main/res/values-v27/styles.xml
index 6a0946a..cebe19c 100644
--- a/app/src/main/res/values-v27/styles.xml
+++ b/app/src/main/res/values-v27/styles.xml
@@ -19,9 +19,9 @@
 <resources>
 
     <style name="AppTheme" parent="BaseTheme">
-        <item name="android:statusBarColor">?attr/colorPrimary</item>
+        <item name="android:statusBarColor">?android:attr/colorPrimary</item>
         <item name="android:windowLightStatusBar">true</item>
-        <item name="android:navigationBarColor">?attr/colorPrimary</item>
+        <item name="android:navigationBarColor">?android:attr/colorPrimary</item>
         <item name="android:windowLightNavigationBar">true</item>
     </style>
 
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 6893995..f77f048 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -19,7 +19,7 @@
     <!-- Base application theme. -->
     <style name="BaseTheme" parent="Theme.MaterialComponents.DayNight.NoActionBar">
         <item name="colorAccent">@color/defaultBrand</item>
-        <item name="colorControlNormal">?attr/colorAccent</item>
+        <item name="colorControlNormal">?android:attr/colorAccent</item>
         <item name="windowActionModeOverlay">true</item>
         <!-- App bar -->
         <item name="colorPrimary">@color/systemBar</item>