diff --git a/OsmAnd/res/drawable-hdpi/list_activities_poi_parking.png b/OsmAnd/res/drawable-hdpi/list_activities_poi_parking.png
deleted file mode 100644
index 6ab9ec80ce..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/list_activities_poi_parking.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/marker1_enabled.png b/OsmAnd/res/drawable-hdpi/marker1_enabled.png
deleted file mode 100644
index f612d61cb3..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/marker1_enabled.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/poi_parking_pos_limit.png b/OsmAnd/res/drawable-hdpi/poi_parking_pos_limit.png
index 5b509a58dd..f0be347077 100644
Binary files a/OsmAnd/res/drawable-hdpi/poi_parking_pos_limit.png and b/OsmAnd/res/drawable-hdpi/poi_parking_pos_limit.png differ
diff --git a/OsmAnd/res/drawable-hdpi/poi_parking_pos_limit_menu.png b/OsmAnd/res/drawable-hdpi/poi_parking_pos_limit_menu.png
index cad52bba3a..57e11ae0dc 100644
Binary files a/OsmAnd/res/drawable-hdpi/poi_parking_pos_limit_menu.png and b/OsmAnd/res/drawable-hdpi/poi_parking_pos_limit_menu.png differ
diff --git a/OsmAnd/res/drawable-hdpi/poi_parking_pos_limit_menu_pushed.png b/OsmAnd/res/drawable-hdpi/poi_parking_pos_limit_menu_pushed.png
deleted file mode 100644
index 24fd9ae168..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/poi_parking_pos_limit_menu_pushed.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/poi_parking_pos_no_limit.png b/OsmAnd/res/drawable-hdpi/poi_parking_pos_no_limit.png
index af6b624e4a..31360bbaca 100644
Binary files a/OsmAnd/res/drawable-hdpi/poi_parking_pos_no_limit.png and b/OsmAnd/res/drawable-hdpi/poi_parking_pos_no_limit.png differ
diff --git a/OsmAnd/res/drawable-hdpi/poi_parking_pos_no_limit_menu.png b/OsmAnd/res/drawable-hdpi/poi_parking_pos_no_limit_menu.png
index 1348f994d1..a43924c23d 100644
Binary files a/OsmAnd/res/drawable-hdpi/poi_parking_pos_no_limit_menu.png and b/OsmAnd/res/drawable-hdpi/poi_parking_pos_no_limit_menu.png differ
diff --git a/OsmAnd/res/drawable-hdpi/poi_parking_pos_no_limit_menu_pushed.png b/OsmAnd/res/drawable-hdpi/poi_parking_pos_no_limit_menu_pushed.png
deleted file mode 100644
index 4ac5b4e302..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/poi_parking_pos_no_limit_menu_pushed.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-large/list_activities_poi_parking.png b/OsmAnd/res/drawable-large/list_activities_poi_parking.png
deleted file mode 100644
index 6ab9ec80ce..0000000000
Binary files a/OsmAnd/res/drawable-large/list_activities_poi_parking.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-large/poi_parking_pos_limit.png b/OsmAnd/res/drawable-large/poi_parking_pos_limit.png
new file mode 100644
index 0000000000..f0be347077
Binary files /dev/null and b/OsmAnd/res/drawable-large/poi_parking_pos_limit.png differ
diff --git a/OsmAnd/res/drawable-large/poi_parking_pos_no_limit.png b/OsmAnd/res/drawable-large/poi_parking_pos_no_limit.png
new file mode 100644
index 0000000000..31360bbaca
Binary files /dev/null and b/OsmAnd/res/drawable-large/poi_parking_pos_no_limit.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/icon.png b/OsmAnd/res/drawable-xhdpi/icon.png
new file mode 100644
index 0000000000..637aaccb5c
Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/icon.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/icon_free.png b/OsmAnd/res/drawable-xhdpi/icon_free.png
new file mode 100644
index 0000000000..07574afe50
Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/icon_free.png differ
diff --git a/OsmAnd/res/drawable/parking_limit_button.xml b/OsmAnd/res/drawable/parking_limit_button.xml
deleted file mode 100644
index d5d2a6adf5..0000000000
--- a/OsmAnd/res/drawable/parking_limit_button.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <item android:drawable="@drawable/poi_parking_pos_limit_menu_pushed" android:state_pressed="true"/>
-    <item android:drawable="@drawable/poi_parking_pos_limit_menu"/>
-    
-</selector>
\ No newline at end of file
diff --git a/OsmAnd/res/drawable/parking_no_limit_button.xml b/OsmAnd/res/drawable/parking_no_limit_button.xml
deleted file mode 100644
index 1cb787b27f..0000000000
--- a/OsmAnd/res/drawable/parking_no_limit_button.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <item android:drawable="@drawable/poi_parking_pos_no_limit_menu_pushed" android:state_pressed="true"/>
-    <item android:drawable="@drawable/poi_parking_pos_no_limit_menu"/>
-    
-</selector>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/navigate_mode.xml b/OsmAnd/res/layout/navigate_mode.xml
index 2e11772678..c7bd9fc231 100644
--- a/OsmAnd/res/layout/navigate_mode.xml
+++ b/OsmAnd/res/layout/navigate_mode.xml
@@ -8,12 +8,12 @@
      android:layout_marginLeft="5dp" android:layout_marginRight="5dp"
      android:gravity="center" android:layout_marginTop="10dp" android:layout_marginBottom="10dp" android:text="@string/select_navigation_mode"></TextView>
 <LinearLayout android:id="@+id/LinearLayout" android:layout_width="fill_parent" android:gravity="center" android:layout_height="wrap_content" android:orientation="horizontal">
-<Button android:contentDescription="@string/app_mode_car" android:id="@+id/CarButton" 
-    	android:layout_width="64dp" android:layout_height="64dp"  android:layout_marginLeft="10dp" android:button="@drawable/car" />
-<Button android:contentDescription="@string/app_mode_bicycle" android:id="@+id/BicycleButton" 
-    	android:layout_width="64dp" android:layout_height="64dp"  android:layout_marginLeft="10dp" android:button="@drawable/bicycle" />
-<Button android:contentDescription="@string/app_mode_pedestrian" android:id="@+id/PedestrianButton"
-    	android:layout_width="64dp" android:layout_height="64dp"  android:layout_marginLeft="10dp" android:button="@drawable/pedestrian" />
+<ImageButton android:contentDescription="@string/app_mode_car" android:id="@+id/CarButton" 
+    	android:layout_width="64dp" android:layout_height="64dp"  android:layout_marginLeft="10dp" android:src="@drawable/car_small" />
+<ImageButton android:contentDescription="@string/app_mode_bicycle" android:id="@+id/BicycleButton" 
+    	android:layout_width="64dp" android:layout_height="64dp"  android:layout_marginLeft="10dp" android:src="@drawable/bicycle_small" />
+<ImageButton android:contentDescription="@string/app_mode_pedestrian" android:id="@+id/PedestrianButton"
+    	android:layout_width="64dp" android:layout_height="64dp"  android:layout_marginLeft="10dp" android:src="@drawable/pedestrian_small" />
 </LinearLayout>
 
 
diff --git a/OsmAnd/res/layout/plugins_list_item.xml b/OsmAnd/res/layout/plugins_list_item.xml
index 4703e88563..5f3f112682 100644
--- a/OsmAnd/res/layout/plugins_list_item.xml
+++ b/OsmAnd/res/layout/plugins_list_item.xml
@@ -2,17 +2,26 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical">
+    android:orientation="vertical" >
 
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content">
+        <LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content" android:paddingLeft="5dp"
+            >
+        <CheckBox android:id="@+id/check_item" android:focusable="false" android:gravity="top" 
+            		android:layout_width="48dp"
+			        android:layout_height="48dp"/>
+        </LinearLayout>
     <TextView
         android:id="@+id/plugin_name"
         android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:drawablePadding="10dp"
+        android:layout_height="fill_parent"
         android:textStyle="bold"
-        android:textSize="20sp" android:drawableRight="@drawable/marker1_disabled" android:drawableLeft="@drawable/list_activities_plugin_menu_symbol" android:text="@string/extra_settings" android:gravity="center_vertical" android:paddingLeft="10dp" android:paddingRight="10dp" android:background="@drawable/ic_background_plugin_listitem">
+        android:textSize="20sp" android:text="@string/extra_settings"
+         android:gravity="center_vertical" android:paddingLeft="5dp" android:paddingRight="10dp">
     </TextView>
-
+	</LinearLayout>
     <TextView
         android:id="@+id/plugin_descr"
         android:layout_width="fill_parent"
diff --git a/OsmAnd/src/net/osmand/plus/activities/PluginsActivity.java b/OsmAnd/src/net/osmand/plus/activities/PluginsActivity.java
index 63fa408920..91da8c49fe 100644
--- a/OsmAnd/src/net/osmand/plus/activities/PluginsActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/PluginsActivity.java
@@ -13,6 +13,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
+import android.widget.CheckBox;
 import android.widget.ListView;
 import android.widget.TextView;
 
@@ -23,7 +24,6 @@ public class PluginsActivity extends OsmandListActivity {
 	private List<OsmandPlugin> availablePlugins;
 	private Set<String> clickedPlugins = new LinkedHashSet<String>();
 	private Set<String> restartPlugins = new LinkedHashSet<String>();
-	private static int colorGreen = 0xff23CC6C;
 	
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
@@ -41,10 +41,15 @@ public class PluginsActivity extends OsmandListActivity {
 		setListAdapter(new OsmandPluginsAdapter(availablePlugins));
 	}
 	
+	
 	@Override
 	protected void onListItemClick(ListView l, View v, int position, long id) {
 		super.onListItemClick(l, v, position, id);
 				
+		click(position);
+	}
+
+	private void click(int position) {
 		OsmandPlugin item = getListAdapter().getItem(position);
 		boolean enable = !restartPlugins.contains(item.getId());
 		boolean ok = OsmandPlugin.enablePlugin(((OsmandApplication) getApplication()), item, enable);
@@ -80,18 +85,27 @@ public class PluginsActivity extends OsmandListActivity {
 			}
 			OsmandPlugin plugin = getItem(position);
 			boolean toBeEnabled = restartPlugins.contains(plugin.getId());
-			int resourceId = toBeEnabled ? R.drawable.marker1_enabled : R.drawable.marker1_disabled;
 			
 			final View row = v;
+			CheckBox ch = (CheckBox) row.findViewById(R.id.check_item);
+			ch.setOnClickListener(null);
+			ch.setChecked(toBeEnabled);
+			ch.setOnClickListener(new View.OnClickListener() {
+				@Override
+				public void onClick(View v) {
+					click(position);
+				}
+			});
 			TextView nameView = (TextView) row.findViewById(R.id.plugin_name);
 			nameView.setText(plugin.getName());
-			nameView.setCompoundDrawablesWithIntrinsicBounds(getResources().getDrawable(R.drawable.list_activities_plugin_menu_symbol), null, getResources().getDrawable(resourceId), null);
 			nameView.setContentDescription(plugin.getName() + " " + getString(toBeEnabled ? R.string.item_checked : R.string.item_unchecked));
 			
+			
 			TextView description = (TextView) row.findViewById(R.id.plugin_descr);
 			description.setText(plugin.getDescription());
-			description.setVisibility(clickedPlugins.contains(plugin.getId()) || !restartPlugins.contains(plugin.getId()) ? View.VISIBLE : View.GONE);
-			description.setTextColor(toBeEnabled? colorGreen : Color.LTGRAY);
+			description.setVisibility(clickedPlugins.contains(plugin.getId()) ||
+					!restartPlugins.contains(plugin.getId()) ? View.VISIBLE : View.GONE);
+			description.setTextColor(Color.LTGRAY);
 
 			return row;
 		}
diff --git a/OsmAnd/src/net/osmand/plus/activities/SettingsActivity.java b/OsmAnd/src/net/osmand/plus/activities/SettingsActivity.java
index d96c9e3e06..2c19072d61 100644
--- a/OsmAnd/src/net/osmand/plus/activities/SettingsActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/SettingsActivity.java
@@ -679,16 +679,16 @@ public class SettingsActivity extends PreferenceActivity implements OnPreference
 			builder.setView(view);
 			final AlertDialog dlg = builder.show();
 			
-			final Button[] buttons = new Button[ApplicationMode.values().length];
-			buttons[ApplicationMode.CAR.ordinal()] = (Button) view.findViewById(R.id.CarButton);
-			buttons[ApplicationMode.BICYCLE.ordinal()] = (Button) view.findViewById(R.id.BicycleButton);
-			buttons[ApplicationMode.PEDESTRIAN.ordinal()] = (Button) view.findViewById(R.id.PedestrianButton);
+			final View[] buttons = new View[ApplicationMode.values().length];
+			buttons[ApplicationMode.CAR.ordinal()] = view.findViewById(R.id.CarButton);
+			buttons[ApplicationMode.BICYCLE.ordinal()] =view.findViewById(R.id.BicycleButton);
+			buttons[ApplicationMode.PEDESTRIAN.ordinal()] = view.findViewById(R.id.PedestrianButton);
 			final Dialog scrDialog = scr.getDialog();
 			final String tlt = "   " + title;
 			for (int i = 0; i < buttons.length; i++) {
 				if (buttons[i] != null) {
 					final int ind = i;
-					final Button b = buttons[i];
+					final View b = buttons[i];
 					b.setOnClickListener(new View.OnClickListener() {
 						@Override
 						public void onClick(View v) {
diff --git a/OsmAnd/src/net/osmand/plus/parkingpoint/ParkingPositionPlugin.java b/OsmAnd/src/net/osmand/plus/parkingpoint/ParkingPositionPlugin.java
index 85532222a8..11628d1d43 100644
--- a/OsmAnd/src/net/osmand/plus/parkingpoint/ParkingPositionPlugin.java
+++ b/OsmAnd/src/net/osmand/plus/parkingpoint/ParkingPositionPlugin.java
@@ -512,7 +512,7 @@ public class ParkingPositionPlugin extends OsmandPlugin {
 			}
 		});
 		parkingPlaceControl.setText(null, null);
-		parkingPlaceControl.setImageDrawable(map.getResources().getDrawable(R.drawable.list_activities_poi_parking));
+		parkingPlaceControl.setImageDrawable(map.getResources().getDrawable(R.drawable.widget_parking));
 		return parkingPlaceControl;
 	}
 }
diff --git a/plugins/Osmand-ParkingPlugin/res/drawable-xhdpi/icon_parking.png b/plugins/Osmand-ParkingPlugin/res/drawable-xhdpi/icon_parking.png
new file mode 100644
index 0000000000..23ad317747
Binary files /dev/null and b/plugins/Osmand-ParkingPlugin/res/drawable-xhdpi/icon_parking.png differ
diff --git a/plugins/Osmand-SRTMPlugin/res/drawable-xhdpi/icon_contour.png b/plugins/Osmand-SRTMPlugin/res/drawable-xhdpi/icon_contour.png
new file mode 100644
index 0000000000..7f6c7abb2b
Binary files /dev/null and b/plugins/Osmand-SRTMPlugin/res/drawable-xhdpi/icon_contour.png differ