diff --git a/app/src/main/java/org/thoughtcrime/securesms/maps/PlacePickerActivity.java b/app/src/main/java/org/thoughtcrime/securesms/maps/PlacePickerActivity.java
index 69256a3371..b2e46b4bb8 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/maps/PlacePickerActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/maps/PlacePickerActivity.java
@@ -5,6 +5,7 @@ import android.annotation.SuppressLint;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.content.res.ColorStateList;
+import android.content.res.Resources;
 import android.graphics.Color;
 import android.location.Address;
 import android.location.Geocoder;
@@ -26,9 +27,12 @@ import com.google.android.gms.maps.CameraUpdateFactory;
 import com.google.android.gms.maps.GoogleMap;
 import com.google.android.gms.maps.SupportMapFragment;
 import com.google.android.gms.maps.model.LatLng;
+import com.google.android.gms.maps.model.MapStyleOptions;
 
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.R;
+import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme;
+import org.thoughtcrime.securesms.util.DynamicTheme;
 
 import java.io.IOException;
 import java.util.List;
@@ -52,6 +56,8 @@ public final class PlacePickerActivity extends AppCompatActivity {
   private static final OvershootInterpolator OVERSHOOT_INTERPOLATOR = new OvershootInterpolator();
   private static final String                KEY_CHAT_COLOR         = "chat_color";
 
+  private final DynamicTheme dynamicTheme = new DynamicNoActionBarTheme();
+
   private SingleAddressBottomSheet bottomSheet;
   private Address                  currentAddress;
   private LatLng                   initialLocation;
@@ -71,10 +77,12 @@ public final class PlacePickerActivity extends AppCompatActivity {
   @Override
   public void onCreate(@Nullable Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
+    dynamicTheme.onCreate(this);
+    
     setContentView(R.layout.activity_place_picker);
 
     bottomSheet      = findViewById(R.id.bottom_sheet);
-    View                                    markerImage = findViewById(R.id.marker_image_view);
+    View markerImage = findViewById(R.id.marker_image_view);
     View fab         = findViewById(R.id.place_chosen_button);
 
     ViewCompat.setBackgroundTintList(fab, ColorStateList.valueOf(getIntent().getIntExtra(KEY_CHAT_COLOR, Color.RED)));
@@ -98,8 +106,18 @@ public final class PlacePickerActivity extends AppCompatActivity {
     if (mapFragment == null) throw new AssertionError("No map fragment");
 
     mapFragment.getMapAsync(googleMap -> {
-
       setMap(googleMap);
+      if (DynamicTheme.isDarkTheme(this)) {
+        try {
+          boolean success = googleMap.setMapStyle(MapStyleOptions.loadRawResourceStyle(this, R.raw.map_style));
+
+          if (!success) {
+            Log.e(TAG, "Style parsing failed.");
+          }
+        } catch (Resources.NotFoundException e) {
+          Log.e(TAG, "Can't find style. Error: ", e);
+        }
+      }
 
       enableMyLocationButtonIfHaveThePermission(googleMap);
 
@@ -125,6 +143,12 @@ public final class PlacePickerActivity extends AppCompatActivity {
     });
   }
 
+  @Override
+  protected void onResume() {
+    super.onResume();
+    dynamicTheme.onResume(this);
+  }
+
   private void setInitialLocation(@NonNull LatLng latLng) {
     initialLocation = latLng;
 
diff --git a/app/src/main/res/layout/activity_map_bottom_sheet_view.xml b/app/src/main/res/layout/activity_map_bottom_sheet_view.xml
index c9e1a7585d..7614b31f64 100755
--- a/app/src/main/res/layout/activity_map_bottom_sheet_view.xml
+++ b/app/src/main/res/layout/activity_map_bottom_sheet_view.xml
@@ -23,7 +23,7 @@
         <FrameLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="@color/white">
+            android:background="@color/signal_colorBackground">
 
             <LinearLayout
                 android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_place_picker.xml b/app/src/main/res/layout/activity_place_picker.xml
index 0f91f56e9a..e9ce679f59 100644
--- a/app/src/main/res/layout/activity_place_picker.xml
+++ b/app/src/main/res/layout/activity_place_picker.xml
@@ -18,7 +18,8 @@
         app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.0" />
+        app:layout_constraintVertical_bias="0.0"
+        app:backgroundColor="@color/signal_colorBackground"/>
 
     <ImageView
         android:id="@+id/marker_shadow_image_view"
diff --git a/app/src/main/res/raw/map_style.json b/app/src/main/res/raw/map_style.json
new file mode 100644
index 0000000000..049e21385f
--- /dev/null
+++ b/app/src/main/res/raw/map_style.json
@@ -0,0 +1,161 @@
+[
+  {
+    "elementType": "geometry",
+    "stylers": [
+      {
+        "color": "#242f3e"
+      }
+    ]
+  },
+  {
+    "elementType": "labels.text.fill",
+    "stylers": [
+      {
+        "color": "#746855"
+      }
+    ]
+  },
+  {
+    "elementType": "labels.text.stroke",
+    "stylers": [
+      {
+        "color": "#242f3e"
+      }
+    ]
+  },
+  {
+    "featureType": "administrative.locality",
+    "elementType": "labels.text.fill",
+    "stylers": [
+      {
+        "color": "#d59563"
+      }
+    ]
+  },
+  {
+    "featureType": "poi",
+    "elementType": "labels.text.fill",
+    "stylers": [
+      {
+        "color": "#d59563"
+      }
+    ]
+  },
+  {
+    "featureType": "poi.park",
+    "elementType": "geometry",
+    "stylers": [
+      {
+        "color": "#263c3f"
+      }
+    ]
+  },
+  {
+    "featureType": "poi.park",
+    "elementType": "labels.text.fill",
+    "stylers": [
+      {
+        "color": "#6b9a76"
+      }
+    ]
+  },
+  {
+    "featureType": "road",
+    "elementType": "geometry",
+    "stylers": [
+      {
+        "color": "#38414e"
+      }
+    ]
+  },
+  {
+    "featureType": "road",
+    "elementType": "geometry.stroke",
+    "stylers": [
+      {
+        "color": "#212a37"
+      }
+    ]
+  },
+  {
+    "featureType": "road",
+    "elementType": "labels.text.fill",
+    "stylers": [
+      {
+        "color": "#9ca5b3"
+      }
+    ]
+  },
+  {
+    "featureType": "road.highway",
+    "elementType": "geometry",
+    "stylers": [
+      {
+        "color": "#746855"
+      }
+    ]
+  },
+  {
+    "featureType": "road.highway",
+    "elementType": "geometry.stroke",
+    "stylers": [
+      {
+        "color": "#1f2835"
+      }
+    ]
+  },
+  {
+    "featureType": "road.highway",
+    "elementType": "labels.text.fill",
+    "stylers": [
+      {
+        "color": "#f3d19c"
+      }
+    ]
+  },
+  {
+    "featureType": "transit",
+    "elementType": "geometry",
+    "stylers": [
+      {
+        "color": "#2f3948"
+      }
+    ]
+  },
+  {
+    "featureType": "transit.station",
+    "elementType": "labels.text.fill",
+    "stylers": [
+      {
+        "color": "#d59563"
+      }
+    ]
+  },
+  {
+    "featureType": "water",
+    "elementType": "geometry",
+    "stylers": [
+      {
+        "color": "#17263c"
+      }
+    ]
+  },
+  {
+    "featureType": "water",
+    "elementType": "labels.text.fill",
+    "stylers": [
+      {
+        "color": "#515c6d"
+      }
+    ]
+  },
+  {
+    "featureType": "water",
+    "elementType": "labels.text.stroke",
+    "stylers": [
+      {
+        "color": "#17263c"
+      }
+    ]
+  }
+]
\ No newline at end of file