diff --git a/OsmAnd/res/layout/fragment_measurement_tool.xml b/OsmAnd/res/layout/fragment_measurement_tool.xml
index 3b1093abcc..79ae72fa65 100644
--- a/OsmAnd/res/layout/fragment_measurement_tool.xml
+++ b/OsmAnd/res/layout/fragment_measurement_tool.xml
@@ -81,12 +81,11 @@
             android:layout_height="1dp"
             android:background="?attr/dashboard_divider"/>
 
-        <LinearLayout
+        <FrameLayout
             android:id="@+id/points_list_container"
             android:layout_width="match_parent"
             android:layout_height="220dp"
             android:background="@color/ctx_menu_info_view_bg_dark"
-            android:orientation="vertical"
             android:visibility="gone">
 
             <include layout="@layout/card_bottom_divider"/>
@@ -94,14 +93,15 @@
             <android.support.v7.widget.RecyclerView
                 android:id="@+id/measure_points_recycler_view"
                 android:layout_width="match_parent"
-                android:layout_height="215dp"/>
+                android:layout_height="match_parent"/>
 
             <ImageView
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                android:layout_height="5dp"
+                android:layout_gravity="bottom"
                 android:scaleType="fitXY"
                 android:src="@drawable/bg_shadow_onmap"/>
-        </LinearLayout>
+        </FrameLayout>
 
         <RelativeLayout
             android:layout_width="match_parent"
diff --git a/OsmAnd/res/layout/measure_points_list_item.xml b/OsmAnd/res/layout/measure_points_list_item.xml
index 0c06b7e645..a24901c3c1 100644
--- a/OsmAnd/res/layout/measure_points_list_item.xml
+++ b/OsmAnd/res/layout/measure_points_list_item.xml
@@ -25,9 +25,11 @@
         android:layout_alignParentEnd="true"
         android:layout_alignParentRight="true"
         android:layout_centerVertical="true"
-        android:layout_marginEnd="16dp"
-        android:layout_marginStart="16dp"
         android:background="@null"
+        android:paddingBottom="12dp"
+        android:paddingEnd="16dp"
+        android:paddingStart="16dp"
+        android:paddingTop="12dp"
         tools:src="@drawable/ic_action_remove_dark"/>
 
     <LinearLayout
@@ -58,6 +60,7 @@
     </LinearLayout>
 
     <View
+        android:id="@+id/points_divider"
         android:layout_width="wrap_content"
         android:layout_height="1dp"
         android:layout_alignParentBottom="true"
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolAdapter.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolAdapter.java
index 8304957b3b..8eb26781fa 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolAdapter.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolAdapter.java
@@ -35,6 +35,10 @@ class MeasurementToolAdapter extends RecyclerView.Adapter<MeasurementToolAdapter
 	@Override
 	public Holder onCreateViewHolder(ViewGroup viewGroup, int i) {
 		View view = LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.measure_points_list_item, viewGroup, false);
+		final boolean nightMode = mapActivity.getMyApplication().getDaynightHelper().isNightModeForMapControls();
+		if (!nightMode) {
+			view.findViewById(R.id.points_divider).setBackgroundResource(R.drawable.divider);
+		}
 		return new Holder(view);
 	}