diff --git a/DataExtractionOSM/src/net/osmand/swing/OsmExtractionUI.java b/DataExtractionOSM/src/net/osmand/swing/OsmExtractionUI.java
index 3b9595d477..45389458bd 100644
--- a/DataExtractionOSM/src/net/osmand/swing/OsmExtractionUI.java
+++ b/DataExtractionOSM/src/net/osmand/swing/OsmExtractionUI.java
@@ -90,7 +90,9 @@ public class OsmExtractionUI implements IMapLocationListener {
 				if(!(e instanceof ThreadDeath)){
 					ExceptionHandler.handle("Error in thread " + t.getName(), e); //$NON-NLS-1$
 				}
-				defaultHandler.uncaughtException(t, e);
+				if(defaultHandler != null){
+					defaultHandler.uncaughtException(t, e);
+				}
 			}
 		});
 		
diff --git a/OsmAnd/res/drawable-hdpi/headline_close_button.png b/OsmAnd/res/drawable-hdpi/headline_close_button.png
index 50e3d030f4..99fe44d45e 100644
Binary files a/OsmAnd/res/drawable-hdpi/headline_close_button.png and b/OsmAnd/res/drawable-hdpi/headline_close_button.png differ
diff --git a/OsmAnd/res/drawable-hdpi/headline_close_button_pressed.png b/OsmAnd/res/drawable-hdpi/headline_close_button_pressed.png
index 3bcf4c4677..a459359baa 100644
Binary files a/OsmAnd/res/drawable-hdpi/headline_close_button_pressed.png and b/OsmAnd/res/drawable-hdpi/headline_close_button_pressed.png differ
diff --git a/OsmAnd/res/drawable-large/headline_close_button.png b/OsmAnd/res/drawable-large/headline_close_button.png
index 50e3d030f4..99fe44d45e 100644
Binary files a/OsmAnd/res/drawable-large/headline_close_button.png and b/OsmAnd/res/drawable-large/headline_close_button.png differ
diff --git a/OsmAnd/res/drawable-large/headline_close_button_pressed.png b/OsmAnd/res/drawable-large/headline_close_button_pressed.png
index 3bcf4c4677..a459359baa 100644
Binary files a/OsmAnd/res/drawable-large/headline_close_button_pressed.png and b/OsmAnd/res/drawable-large/headline_close_button_pressed.png differ
diff --git a/OsmAnd/res/drawable-mdpi/headline_close_button.png b/OsmAnd/res/drawable-mdpi/headline_close_button.png
index 562eb6ef57..89aab11a00 100644
Binary files a/OsmAnd/res/drawable-mdpi/headline_close_button.png and b/OsmAnd/res/drawable-mdpi/headline_close_button.png differ
diff --git a/OsmAnd/res/drawable-mdpi/headline_close_button_pressed.png b/OsmAnd/res/drawable-mdpi/headline_close_button_pressed.png
index 50d936409b..5ca5cc799f 100644
Binary files a/OsmAnd/res/drawable-mdpi/headline_close_button_pressed.png and b/OsmAnd/res/drawable-mdpi/headline_close_button_pressed.png differ
diff --git a/OsmAnd/res/layout/local_openstreetmap_list_item_category.xml b/OsmAnd/res/layout/local_openstreetmap_list_item_category.xml
index 3fd387b730..9a3d72a183 100644
--- a/OsmAnd/res/layout/local_openstreetmap_list_item_category.xml
+++ b/OsmAnd/res/layout/local_openstreetmap_list_item_category.xml
@@ -4,6 +4,7 @@
 	android:background="@drawable/tab_menu_item_small">
 
     <ImageView
+        android:src="@drawable/expandable_category_unpushed"
         android:id="@+id/explist_indicator"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/OsmAnd/src/net/osmand/AndroidUtils.java b/OsmAnd/src/net/osmand/AndroidUtils.java
index 048371146d..e4a7f3e5de 100644
--- a/OsmAnd/src/net/osmand/AndroidUtils.java
+++ b/OsmAnd/src/net/osmand/AndroidUtils.java
@@ -36,42 +36,4 @@ public class AndroidUtils {
 		});
 	}
 
-	/**
-	 * @param closeButton expand area of which element
-	 * @param left multiplier of width to add to left, 1 does nothing
-	 * @param top multiplier of height to add to top, 1 does nothing 
-	 * @param right multiplier of width to add to right, 1 does nothing
-	 * @param bottom multiplier of height to add to bottom, 1 does nothing
-	 */
-	public static void expandClickableArea(final View closeButton,
-			final int left, final int top, final int right, final int bottom) {
-		closeButton.setOnTouchListener(new OnTouchListener() {
-			@Override
-			public boolean onTouch(View v, MotionEvent event) {
-				v.post(new Runnable() {
-					@Override
-					public void run() {
-						closeButton.performClick();
-					}
-				});
-				return true;
-			}
-		});
-		// increase touch area for the button
-		final View parent = (View) closeButton.getParent();
-		parent.post(new Runnable() {
-			// Post in the parent's message queue to make sure the parent
-			// lays out its children before we call getHitRect()
-			@Override
-			public void run() {
-				Rect r = new Rect();
-				closeButton.getHitRect(r);
-				r.left -= r.width() * left;
-				r.top -= r.height() * top;
-				r.right += r.width() * right;
-				r.bottom += r.height() * bottom;
-				parent.setTouchDelegate(new TouchDelegate(r, closeButton));
-			}
-		});
-	}
 }
diff --git a/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java b/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java
index a218ec40e5..c6a3c416e0 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java
@@ -4,7 +4,6 @@ import java.io.File;
 import java.text.MessageFormat;
 import java.util.Random;
 
-import net.osmand.AndroidUtils;
 import net.osmand.Version;
 import net.osmand.access.AccessibleAlertBuilder;
 import net.osmand.plus.OsmandApplication;
@@ -223,8 +222,6 @@ public class MainMenuActivity extends Activity {
 				}
 			}
 		});
-		AndroidUtils.expandClickableArea(closeButton, 1,1,3,3);
-
 		View searchButton = window.findViewById(R.id.SearchButton);
 		searchButton.setOnClickListener(new OnClickListener() {
 			@Override
diff --git a/OsmAnd/src/net/osmand/plus/osmedit/EditingPOIActivity.java b/OsmAnd/src/net/osmand/plus/osmedit/EditingPOIActivity.java
index 65c6b7c18e..48b1109681 100644
--- a/OsmAnd/src/net/osmand/plus/osmedit/EditingPOIActivity.java
+++ b/OsmAnd/src/net/osmand/plus/osmedit/EditingPOIActivity.java
@@ -353,7 +353,7 @@ public class EditingPOIActivity implements DialogProvider {
 						}
 					});
 				}
-				v.invalidate();
+				layout.requestLayout();
 			}
 		});