diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4cd43d9e0..868b985b0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,30 @@
 Change Log
 ---
+### 6.6 (2019-04-10)
+
+* New location picker
+  * Choose Mapbox or Google Maps tiles
+  * Choose Mapbox or Google Places search
+  * Google Places search restricted to subscribers due to new Google Maps pricing
+  * Use Mapbox for reverse geocoding
+  * Select from previously used locations
+  * Dark maps
+* Enable location picker in F-Droid build
+* Resume support for Amazon App Store
+* Fix Android Q background warning
+* Update translations
+  * Brazilian Portuguese - douglaslmr
+  * Dutch - revdbrink
+  * German - marmo
+  * Hebrew - elazar
+  * French - Florian_Dubois
+  * Hungarian - kaciokos
+  * Italian - dfdario
+  * Japanese - naofumi
+  * Lithuanian - gacuxz
+  * Spanish - i2nm7s, Pum
+  * Ukrainian - nathalier
+
 ### 6.5.6 (2019-03-27)
 
 * Fix crash when clearing completed on a manually sorted Google Task list
diff --git a/app/build.gradle b/app/build.gradle
index 39bcbfd37..b02d0070b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -20,8 +20,8 @@ android {
     defaultConfig {
         testApplicationId "org.tasks.test"
         applicationId "org.tasks"
-        versionCode 572
-        versionName "6.5.6"
+        versionCode 574
+        versionName "6.6"
         targetSdkVersion 28
         minSdkVersion 16
         multiDexEnabled true
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index bbe7dd0b8..d41087b71 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -501,7 +501,18 @@
 	<string name="show_list_indicators">Stichworte und Listen anzeigen</string>
 	<string name="location_remind_arrival">Bei Ankunft erinnern</string>
 	<string name="location_remind_departure">Bei Abreise erinnern</string>
+	<string name="visit_website">Website öffnen</string>
 	<string name="location_arrived">Angekommen um %s</string>
 	<string name="location_departed">Abgereist um %s</string>
 	<string name="building_notifications">Benachrichtigungen generieren</string>
+	<string name="choose_a_location">Ort auswählen</string>
+	<string name="pick_this_location">Diesen Ort auswählen</string>
+	<string name="or_choose_a_location">Oder Ort auswählen</string>
+	<string name="map_provider">Kartendienst</string>
+	<string name="map_search_provider">Suchanbieter</string>
+	<string name="missing_permissions">Fehlende Berechtigungen</string>
+	<string name="location_permission_required_geofence">Standortberechtigung wird für ortsbasierte Erinnerungen benötigt</string>
+	<string name="location_permission_required_location">Standortberechtigung wird zur Ermittlung des aktuellen Standortes benötigt</string>
+	<string name="open_map">Karte öffnen</string>
+	<string name="choose_new_location">Neuen Ort auswählen</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 9c6f5a7d2..008991003 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -492,6 +492,7 @@
 	<string name="themes">Temas adicionales</string>
 	<string name="pro_caldav_sync">Sincronización de CalDAV</string>
 	<string name="pro_multiple_google_task_accounts">Múltiples cuentas de Google Task</string>
+	<string name="pro_google_places_search">Buscar en Google Places</string>
 	<string name="pro_tasker_plugins">Extensiones los trabajo</string>
 	<string name="pro_dashclock_extension">Extensión Dashclock</string>
 	<string name="requires_pro_subscription">Requiere suscripción profesional</string>
@@ -507,7 +508,18 @@
 	<string name="show_list_indicators">Mostrar fichas de lista</string>
 	<string name="location_remind_arrival">Recordar a la llegada</string>
 	<string name="location_remind_departure">Recordar a la salida</string>
+	<string name="visit_website">Visitar página web</string>
 	<string name="location_arrived">Llegada a %s</string>
 	<string name="location_departed">Salida de %s</string>
 	<string name="building_notifications">Generando notificaciones</string>
+	<string name="choose_a_location">Escoger ubicación</string>
+	<string name="pick_this_location">Seleccionar esta ubicación</string>
+	<string name="or_choose_a_location">O elija una ubicación</string>
+	<string name="map_provider">Proveedor de mapas</string>
+	<string name="map_search_provider">Proveedor de búsquedas</string>
+	<string name="missing_permissions">Permisos ausentes</string>
+	<string name="location_permission_required_geofence">Son necesarios permisos de ubicación para los recordatorios de ubicación</string>
+	<string name="location_permission_required_location">Son necesarios permisos de ubicación para encontrar tu ubicación actual</string>
+	<string name="open_map">Abrir mapa</string>
+	<string name="choose_new_location">Escoger nueva ubicación</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 88e1f45d8..93167ce88 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -478,6 +478,7 @@ est configuré correctement</string>
 	<string name="themes">Thèmes additionnels</string>
 	<string name="pro_caldav_sync">Synchronisation de CalDAV</string>
 	<string name="pro_multiple_google_task_accounts">Plusieurs comptes Google Task</string>
+	<string name="pro_google_places_search">Recherche avec Google Places</string>
 	<string name="pro_tasker_plugins">Plugins pour Tasker</string>
 	<string name="pro_dashclock_extension">Extension Dashclock</string>
 	<string name="requires_pro_subscription">Abonnement professionnel requis</string>
@@ -493,7 +494,18 @@ est configuré correctement</string>
 	<string name="show_list_indicators">Afficher la liste des puces</string>
 	<string name="location_remind_arrival">Rappel à l\'arrivée</string>
 	<string name="location_remind_departure">Rappel au départ</string>
+	<string name="visit_website">Visiter le site internet</string>
 	<string name="location_arrived">Arrivé à %s</string>
 	<string name="location_departed">Départ %s</string>
 	<string name="building_notifications">Générer des notifications</string>
+	<string name="choose_a_location">Choisir une localisation</string>
+	<string name="pick_this_location">Sélectionner cette localisation</string>
+	<string name="or_choose_a_location">Ou choisir une localisation</string>
+	<string name="map_provider">Fournisseur de cartes</string>
+	<string name="map_search_provider">Moteurs de recherche</string>
+	<string name="missing_permissions">Permissions manquantes</string>
+	<string name="location_permission_required_geofence">La permission de la localisation est nécessaire pour les rappels de localisation</string>
+	<string name="location_permission_required_location">La permission de la localisation est nécessaire pour trouver votre localisation actuelle</string>
+	<string name="open_map">Ouvrir la carte</string>
+	<string name="choose_new_location">Choisir une nouvelle localisation</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 0243be14c..4d9f43f0f 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -498,6 +498,7 @@
 	<string name="themes">További témák</string>
 	<string name="pro_caldav_sync">CalDAV szinkronizáció</string>
 	<string name="pro_multiple_google_task_accounts">Több Google Task fiók</string>
+	<string name="pro_google_places_search">Google Helyek keresés</string>
 	<string name="pro_tasker_plugins">Tasker plugin-ok</string>
 	<string name="pro_dashclock_extension">Dashclock kiterjesztés</string>
 	<string name="requires_pro_subscription">Pro előfizetést igényel</string>
@@ -513,7 +514,18 @@
 	<string name="show_list_indicators">Listajelölők megjelenítése</string>
 	<string name="location_remind_arrival">Induláskor emlékeztet</string>
 	<string name="location_remind_departure">Érkezéskor emlékeztet</string>
+	<string name="visit_website">Weboldal megnyitása</string>
 	<string name="location_arrived">Megérkezett ekkor: %s</string>
 	<string name="location_departed">Elindult ekkor: %s</string>
 	<string name="building_notifications">Értesítések létrehozása</string>
+	<string name="choose_a_location">Hely kiválasztása</string>
+	<string name="pick_this_location">Hely kiválasztása</string>
+	<string name="or_choose_a_location">Vagy másik hely keresése</string>
+	<string name="map_provider">Térkép szolgáltató</string>
+	<string name="map_search_provider">Keresési szolgáltató</string>
+	<string name="missing_permissions">Hiányzó jogosultságok</string>
+	<string name="location_permission_required_geofence">A hely emlékeztetőkhöz helymeghatározási jogosultság szükséges</string>
+	<string name="location_permission_required_location">A jelenlegi pozíció meghatározásához helymeghatározási jogosultság szükséges</string>
+	<string name="open_map">Térkép megnyitása</string>
+	<string name="choose_new_location">Új hely kiválasztása</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index b97ca5477..0f6956ff3 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -511,7 +511,18 @@ Google Play app sia impostata correttamente</string>
 	<string name="show_list_indicators">Mostra lista chip</string>
 	<string name="location_remind_arrival">Ricorda all\'arrivo</string>
 	<string name="location_remind_departure">Ricorda alla partenza</string>
+	<string name="visit_website">Visita sito web</string>
 	<string name="location_arrived">Arrivato alle %s</string>
 	<string name="location_departed">Partito alle %s</string>
 	<string name="building_notifications">Gestione notifiche</string>
+	<string name="choose_a_location">Scegli posizione</string>
+	<string name="pick_this_location">Seleziona questa posizione</string>
+	<string name="or_choose_a_location">O scegli un\'altra posizione</string>
+	<string name="map_provider">Fornitore mappe</string>
+	<string name="map_search_provider">Cerca fornitore</string>
+	<string name="missing_permissions">Permessi mancanti</string>
+	<string name="location_permission_required_geofence">Per il promemoria su posizione sono richiesti i relativi permessi</string>
+	<string name="location_permission_required_location">Per trovare la tua posizione sono richiesti i permessi di posizione</string>
+	<string name="open_map">Apri mappa</string>
+	<string name="choose_new_location">Scegli nuova posizione</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index 01ca18668..0da08da5b 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -499,6 +499,7 @@
 	<string name="themes">ערכות נושא נוספות</string>
 	<string name="pro_caldav_sync">סינכרון CalDAV</string>
 	<string name="pro_multiple_google_task_accounts">ריבוי חשבונות Google Task</string>
+	<string name="pro_google_places_search">חיפוש ב\"Google לעסק שלי\"</string>
 	<string name="pro_tasker_plugins">תוסף Tasker</string>
 	<string name="pro_dashclock_extension">הרחבת Dashclock</string>
 	<string name="requires_pro_subscription">לא דורש הרשמה</string>
@@ -514,7 +515,18 @@
 	<string name="show_list_indicators">הצג שבבי רשימה</string>
 	<string name="location_remind_arrival">הזכר ברגע ההגעה</string>
 	<string name="location_remind_departure">הזכר ברגע העזיבה</string>
+	<string name="visit_website">מעבר לאתר האינטרנט</string>
 	<string name="location_arrived">הגיע ב-%s</string>
 	<string name="location_departed">עזב ב-%s</string>
 	<string name="building_notifications">מייצר התראות</string>
+	<string name="choose_a_location">בחרו מיקום</string>
+	<string name="pick_this_location">בחרו את המיקום הזה</string>
+	<string name="or_choose_a_location">או בחרו מיקום</string>
+	<string name="map_provider">ספק מפה</string>
+	<string name="map_search_provider">ספק חיפוש</string>
+	<string name="missing_permissions">חסרות הרשאות</string>
+	<string name="location_permission_required_geofence">הרשאות מיקום נדרשות עבור תזכורות מבוססות מיקום</string>
+	<string name="location_permission_required_location">הרשאות מיקום נדרשות על מנת למצוא את מיקומך הנוכחי</string>
+	<string name="open_map">פתיחת מפה</string>
+	<string name="choose_new_location">בחירת מיקום חדש</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index e720838b7..b5b132b15 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -512,7 +512,18 @@
 	<string name="show_list_indicators">リストチップを表示</string>
 	<string name="location_remind_arrival">到着時に通知する</string>
 	<string name="location_remind_departure">出発時に通知する</string>
+	<string name="visit_website">Webサイトを参照</string>
 	<string name="location_arrived">%s に到着</string>
 	<string name="location_departed">%s に出発</string>
 	<string name="building_notifications">通知を生成しています</string>
+	<string name="choose_a_location">場所を選択</string>
+	<string name="pick_this_location">この場所を選択</string>
+	<string name="or_choose_a_location">または場所を選ぶ</string>
+	<string name="map_provider">地図プロバイダー</string>
+	<string name="map_search_provider">プロバイダーを検索</string>
+	<string name="missing_permissions">アクセス許可がありません</string>
+	<string name="location_permission_required_geofence">場所リマインダーには位置のアクセス許可が必要です</string>
+	<string name="location_permission_required_location">現在の場所を見つけるには位置のアクセス許可が必要です</string>
+	<string name="open_map">地図を開く</string>
+	<string name="choose_new_location">新しい場所を選択</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml
index 2e385b221..792cff3fc 100644
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@@ -495,6 +495,7 @@ sukonfigūruota tinkamai.</string>
 	<string name="themes">Papildomos temos</string>
 	<string name="pro_caldav_sync">CalDAV sinchronizacija</string>
 	<string name="pro_multiple_google_task_accounts">Kelios Google Task paskyros</string>
+	<string name="pro_google_places_search">Paieška Google Places</string>
 	<string name="pro_tasker_plugins">Tasker įskiepiai</string>
 	<string name="pro_dashclock_extension">Dashclock plėtinys</string>
 	<string name="requires_pro_subscription">Reikalinga \"pro\" prenumerata</string>
@@ -510,7 +511,18 @@ sukonfigūruota tinkamai.</string>
 	<string name="show_list_indicators">Rodyti sąrašą lustų</string>
 	<string name="location_remind_arrival">Priminti atvykus</string>
 	<string name="location_remind_departure">Priminti išvykstant</string>
+	<string name="visit_website">Aplankyti svetainę</string>
 	<string name="location_arrived">Atvykta į %s</string>
 	<string name="location_departed">Išvykta iš %s</string>
 	<string name="building_notifications">Generuojami pranešimai</string>
+	<string name="choose_a_location">Pasirinkti vietą</string>
+	<string name="pick_this_location">Pasirinkti šią vietą</string>
+	<string name="or_choose_a_location">Arba pasirinkti vietą</string>
+	<string name="map_provider">Žemėlapio tiekėjas</string>
+	<string name="map_search_provider">Paieškos tiekėjas</string>
+	<string name="missing_permissions">Dingę leidimai</string>
+	<string name="location_permission_required_geofence">Vietos leidimai reikalingi priminimams pagal vietą</string>
+	<string name="location_permission_required_location">Vietos leidimai reikalingi surasti jūsų esamą vietą</string>
+	<string name="open_map">Atidaryti žemėlapį</string>
+	<string name="choose_new_location">Pasirinkti naują vietą</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 4971f87ea..edb06d33e 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -500,7 +500,18 @@
 	<string name="show_list_indicators">Toon lijst indicatie</string>
 	<string name="location_remind_arrival">Herinner bij aankomst</string>
 	<string name="location_remind_departure">Herinner bij vertrek</string>
+	<string name="visit_website">Bezoek website</string>
 	<string name="location_arrived">Aangekomen on %s</string>
 	<string name="location_departed">Vetrokken om %s</string>
 	<string name="building_notifications">Notificaties genereren</string>
+	<string name="choose_a_location">Kies een locatie</string>
+	<string name="pick_this_location">Selecteer deze locatie</string>
+	<string name="or_choose_a_location">Of kies een locatie</string>
+	<string name="map_provider">Kaart aanbieder</string>
+	<string name="map_search_provider">Zoek aanbieder</string>
+	<string name="missing_permissions">Missende rechten</string>
+	<string name="location_permission_required_geofence">Locatie rechten zijn nodig voor locatie herinneringen</string>
+	<string name="location_permission_required_location">Locatie rechten zijn nodig om je huidige locatie te vinden</string>
+	<string name="open_map">Open kaart</string>
+	<string name="choose_new_location">Kies nieuwe locatie</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 6e163ac82..18b80f3ee 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -512,7 +512,18 @@ aplicativo Google Play está configurado corretamente</string>
 	<string name="show_list_indicators">Mostrar fichas de listas</string>
 	<string name="location_remind_arrival">Lembrar ao chegar</string>
 	<string name="location_remind_departure">Lembrar ao sair</string>
+	<string name="visit_website">Visitar website</string>
 	<string name="location_arrived">Chegou às %s</string>
 	<string name="location_departed">Saiu às %s</string>
 	<string name="building_notifications">Gerando notificações</string>
+	<string name="choose_a_location">Escolher uma localização</string>
+	<string name="pick_this_location">Selecionar essa localização</string>
+	<string name="or_choose_a_location">Ou escolha uma localização</string>
+	<string name="map_provider">Provedor de mapa</string>
+	<string name="map_search_provider">Provedor de pesquisa</string>
+	<string name="missing_permissions">Permissões faltando</string>
+	<string name="location_permission_required_geofence">Permissão de Localização é necessária para lembretes de localização</string>
+	<string name="location_permission_required_location">Permissão de Localização é necessária para encontrar sua localização atual</string>
+	<string name="open_map">Abrir mapa</string>
+	<string name="choose_new_location">Escolher nova localização</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index b2b1a2b34..28bd285d9 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -67,7 +67,7 @@
 	<string name="TEA_control_repeat">Повторити</string>
 	<string name="TEA_control_gcal">Календар</string>
 	<string name="TEA_control_importance">Пріоритет</string>
-	<string name="TEA_control_location">Місцезнаходження</string>
+	<string name="TEA_control_location">Місце</string>
 	<string name="TEA_control_notes">Опис</string>
 	<string name="TEA_control_files">Файли</string>
 	<string name="TEA_control_reminders">Нагадування</string>
@@ -324,7 +324,7 @@
 	<string name="quiet_hours_summary">Без нагадувань під час тихих годин</string>
 	<string name="TLA_menu_donate">Пожертвувати</string>
 	<string name="add_reminder">Додати нагадування</string>
-	<string name="add_location">Додати місцезнаходження</string>
+	<string name="add_location">Додати місце</string>
 	<string name="remove">Вилучити</string>
 	<string name="randomly_once">Випадково раз</string>
 	<string name="randomly">Випадково</string>
@@ -499,6 +499,7 @@
 	<string name="themes">Додаткові схеми</string>
 	<string name="pro_caldav_sync">Синхронізація CalDAV</string>
 	<string name="pro_multiple_google_task_accounts">Декілька облікових записів Google Tasks</string>
+	<string name="pro_google_places_search">Пошук в Google Місця</string>
 	<string name="pro_tasker_plugins">Tasker плагіни</string>
 	<string name="pro_dashclock_extension">Розширення Dashclock</string>
 	<string name="requires_pro_subscription">Потребує преміум підписки</string>
@@ -514,7 +515,18 @@
 	<string name="show_list_indicators">Відображати індикатори списків</string>
 	<string name="location_remind_arrival">Нагадати по прибуттю</string>
 	<string name="location_remind_departure">Нагадати при відправці</string>
+	<string name="visit_website">Відвідати сторінку</string>
 	<string name="location_arrived">Прибув до %s</string>
 	<string name="location_departed">Відправився з %s</string>
 	<string name="building_notifications">Генерація нагадувань</string>
+	<string name="choose_a_location">Обрати місце</string>
+	<string name="pick_this_location">Обрати це місце</string>
+	<string name="or_choose_a_location">Або вказати інше місце</string>
+	<string name="map_provider">Провайдер мапи</string>
+	<string name="map_search_provider">Знайти провайдера</string>
+	<string name="missing_permissions">Відсутні дозволи</string>
+	<string name="location_permission_required_geofence">Для нагадувань за місцем необхідний дозвіл на перегляд місцезнаходження </string>
+	<string name="location_permission_required_location">Щоб визначити ваше місцезнаходження необхідний дозвіл на перегляд місцезнаходження </string>
+	<string name="open_map">Відкрити карту</string>
+	<string name="choose_new_location">Обрати нове місце</string>
 </resources>
\ No newline at end of file