diff --git a/android/res/values/dimens.xml b/android/res/values/dimens.xml
index 5b94a898a9..9cdd2e1d07 100644
--- a/android/res/values/dimens.xml
+++ b/android/res/values/dimens.xml
@@ -1,43 +1,40 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <dimen name="drawer_width">300dp</dimen>
-    <dimen name="drawer_grad_left">297dp</dimen>
-    <dimen name="drawer_item_height">56dp</dimen>
-    <dimen name="drawer_top_padding">60dp</dimen>
-    <dimen name="icon_size">24dp</dimen>
-    <dimen name="circle_size">16dp</dimen>
+  <dimen name="drawer_width">300dp</dimen>
+  <dimen name="drawer_grad_left">297dp</dimen>
+  <dimen name="drawer_item_height">56dp</dimen>
+  <dimen name="drawer_top_padding">60dp</dimen>
+  <dimen name="icon_size">24dp</dimen>
+  <dimen name="circle_size">16dp</dimen>
 
-    <dimen name="margin_tiny">4dp</dimen>
-    <dimen name="margin_small">8dp</dimen>
-    <dimen name="margin_medium">16dp</dimen>
-    <dimen name="margin_large">32dp</dimen>
+  <dimen name="margin_tiny">4dp</dimen>
+  <dimen name="margin_small">8dp</dimen>
+  <dimen name="margin_medium">16dp</dimen>
+  <dimen name="margin_large">32dp</dimen>
 
-    <dimen name="dp_x_1">4dp</dimen>
-    <dimen name="dp_x_2">8dp</dimen>
-    <dimen name="dp_x_3">12dp</dimen>
-    <dimen name="dp_x_4">16dp</dimen>
-    <dimen name="dp_x_6">24dp</dimen>
-    <dimen name="dp_x_8">32dp</dimen>
-    <dimen name="dp_x_10">40dp</dimen>
-    <dimen name="dp_x_12">48dp</dimen>
-    <dimen name="dp_x_14">56dp</dimen>
-    <dimen name="dp_x_16">64dp</dimen>
-    <dimen name="dp_x_20">80dp</dimen>
+  <dimen name="dp_x_1">4dp</dimen>
+  <dimen name="dp_x_2">8dp</dimen>
+  <dimen name="dp_x_3">12dp</dimen>
+  <dimen name="dp_x_4">16dp</dimen>
+  <dimen name="dp_x_6">24dp</dimen>
+  <dimen name="dp_x_8">32dp</dimen>
+  <dimen name="dp_x_10">40dp</dimen>
+  <dimen name="dp_x_12">48dp</dimen>
+  <dimen name="dp_x_14">56dp</dimen>
+  <dimen name="dp_x_16">64dp</dimen>
+  <dimen name="dp_x_20">80dp</dimen>
 
-    <dimen name="sp_x_1">5dp</dimen>
-    <dimen name="sp_x_2">10sp</dimen>
-    <dimen name="sp_x_3">15sp</dimen>
-    <dimen name="sp_x_4">20sp</dimen>
-    <dimen name="sp_x_5">25sp</dimen>
-
-    <dimen name="dialog_max_height">320dp</dimen>
-    <dimen name="zoom_plus_top_margin">0dp</dimen>
-    <dimen name="zoom_margin">5dp</dimen>
-    <dimen name="zoom_margin_right">4dp</dimen>
-
-    <dimen name="map_controls_margin">7dp</dimen>
-
-    <dimen name="bottom_panel_height">46dp</dimen>
+  <dimen name="sp_x_1">5dp</dimen>
+  <dimen name="sp_x_2">10sp</dimen>
+  <dimen name="sp_x_3">15sp</dimen>
+  <dimen name="sp_x_4">20sp</dimen>
+  <dimen name="sp_x_5">25sp</dimen>
 
+  <dimen name="dialog_max_height">320dp</dimen>
+  <dimen name="zoom_plus_top_margin">0dp</dimen>
+  <dimen name="zoom_margin">5dp</dimen>
+  <dimen name="zoom_margin_right">4dp</dimen>
+  <dimen name="map_controls_margin">7dp</dimen>
+  <dimen name="bottom_panel_height">46dp</dimen>
 </resources>
diff --git a/android/res/values/styles.xml b/android/res/values/styles.xml
index 49bc15c9f8..fcf0cbda25 100644
--- a/android/res/values/styles.xml
+++ b/android/res/values/styles.xml
@@ -1,125 +1,125 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
 
-    <style name="AppTheme" parent="android:Theme.Light" />
+  <style name="AppTheme" parent="android:Theme.Light"/>
 
-    <string name="robotoLight">sans-serif-light</string>
-    <string name="robotoRegular">"sans-serif"</string>
+  <string name="robotoLight">sans-serif-light</string>
+  <string name="robotoRegular">"sans-serif"</string>
 
 
-    <style name="Widget.MapButtonZoom" parent="android:Widget.Holo.ImageButton">
-        <item name="android:background">@drawable/btn_zoom_bg_selector</item>
-        <item name="android:layout_margin">@dimen/zoom_margin</item>
-        <item name="android:layout_marginBottom">@dimen/zoom_margin</item>
-        <item name="android:padding">0dp</item>
-    </style>
+  <style name="Widget.MapButtonZoom" parent="android:Widget.Holo.ImageButton">
+    <item name="android:background">@drawable/btn_zoom_bg_selector</item>
+    <item name="android:layout_margin">@dimen/zoom_margin</item>
+    <item name="android:layout_marginBottom">@dimen/zoom_margin</item>
+    <item name="android:padding">0dp</item>
+  </style>
 
-    <style name="Widget.MapButtonBottom" parent="android:Widget.Holo.ImageButton">
-        <item name="android:background">@color/bg_menu</item>
-    </style>
+  <style name="Widget.MapButtonBottom" parent="android:Widget.Holo.ImageButton">
+    <item name="android:background">@color/bg_menu</item>
+  </style>
 
-    <style name="tagGreenText" parent="@style/Holo.TextAppearance.Medium.Light">
-        <item name="android:background">@color/base_green</item>
-        <item name="android:paddingLeft">@dimen/dp_x_3</item>
-        <item name="android:paddingRight">@dimen/dp_x_3</item>
-        <item name="android:paddingBottom">@dimen/dp_x_2</item>
-        <item name="android:paddingTop">@dimen/dp_x_2</item>
-        <item name="android:textColor">@android:color/white</item>
-        <item name="android:singleLine">true</item>
-        <item name="android:ellipsize">marquee</item>
-        <item name="android:gravity">center</item>
-        <item name="android:fontFamily" tools:targetApi="jelly_bean">sans-serif</item>
-    </style>
+  <style name="tagGreenText" parent="@style/Holo.TextAppearance.Medium.Light">
+    <item name="android:background">@color/base_green</item>
+    <item name="android:paddingLeft">@dimen/dp_x_3</item>
+    <item name="android:paddingRight">@dimen/dp_x_3</item>
+    <item name="android:paddingBottom">@dimen/dp_x_2</item>
+    <item name="android:paddingTop">@dimen/dp_x_2</item>
+    <item name="android:textColor">@android:color/white</item>
+    <item name="android:singleLine">true</item>
+    <item name="android:ellipsize">marquee</item>
+    <item name="android:gravity">center</item>
+    <item name="android:fontFamily" tools:targetApi="jelly_bean">sans-serif</item>
+  </style>
 
-    <style name="tagGreenText.Small" parent="@style/tagGreenText">
-        <item name="android:textSize">@dimen/sp_x_3</item>
-        <item name="android:paddingBottom">@dimen/dp_x_1</item>
-        <item name="android:paddingTop">@dimen/dp_x_1</item>
-    </style>
+  <style name="tagGreenText.Small" parent="@style/tagGreenText">
+    <item name="android:textSize">@dimen/sp_x_3</item>
+    <item name="android:paddingBottom">@dimen/dp_x_1</item>
+    <item name="android:paddingTop">@dimen/dp_x_1</item>
+  </style>
 
-    <style name="tagGreenText.Large" parent="@style/tagGreenText">
-        <item name="android:textSize">@dimen/sp_x_5</item>
-        <item name="android:fontFamily" tools:targetApi="jelly_bean">sans-serif-light</item>
-    </style>
+  <style name="tagGreenText.Large" parent="@style/tagGreenText">
+    <item name="android:textSize">@dimen/sp_x_5</item>
+    <item name="android:fontFamily" tools:targetApi="jelly_bean">sans-serif-light</item>
+  </style>
 
-    <style name="tagGreenText.Mid" parent="@style/tagGreenText">
-        <item name="android:textSize">@dimen/sp_x_4</item>
-    </style>
+  <style name="tagGreenText.Mid" parent="@style/tagGreenText">
+    <item name="android:textSize">@dimen/sp_x_4</item>
+  </style>
 
-    <style name="infoItem" parent="@style/Holo.TextAppearance.Large.Light">
-        <item name="android:textSize">@dimen/sp_x_5</item>
-        <item name="android:layout_marginTop">@dimen/dp_x_1</item>
-        <item name="android:fontFamily" tools:targetApi="jelly_bean">sans-serif-light</item>
-    </style>
+  <style name="infoItem" parent="@style/Holo.TextAppearance.Large.Light">
+    <item name="android:textSize">@dimen/sp_x_5</item>
+    <item name="android:layout_marginTop">@dimen/dp_x_1</item>
+    <item name="android:fontFamily" tools:targetApi="jelly_bean">sans-serif-light</item>
+  </style>
 
-    <style name="labelGreen" parent="android:Widget.TextView">
-        <item name="android:textColor">@color/base_green</item>
-        <item name="android:textSize">@dimen/sp_x_3</item>
-        <item name="android:textStyle">bold</item>
-    </style>
+  <style name="labelGreen" parent="android:Widget.TextView">
+    <item name="android:textColor">@color/base_green</item>
+    <item name="android:textSize">@dimen/sp_x_3</item>
+    <item name="android:textStyle">bold</item>
+  </style>
 
-    <style name="pinEditableParam" parent="Holo.EditText.Light">
-        <item name="android:imeOptions">actionDone</item>
-        <item name="android:textSize">@dimen/sp_x_4</item>
-    </style>
+  <style name="pinEditableParam" parent="Holo.EditText.Light">
+    <item name="android:imeOptions">actionDone</item>
+    <item name="android:textSize">@dimen/sp_x_4</item>
+  </style>
 
-    <style name="MWMMain" parent="@style/Holo.Theme.Light"></style>
+  <style name="MWMMain" parent="@style/Holo.Theme.Light"></style>
 
-    <style name="MWMMain.NoBar" parent="@style/Holo.Theme.Light.NoActionBar"></style>
+  <style name="MWMMain.NoBar" parent="@style/Holo.Theme.Light.NoActionBar"></style>
 
-    <style name="MwmSearch" parent="@style/MWMMain">
-        <item name="android:windowNoTitle">true</item>
-        <item name="android:windowContentOverlay">@null</item>
-        <item name="android:windowBackground">@color/semitransparent_black</item>
-        <item name="android:colorBackgroundCacheHint">@null</item>
-        <item name="android:windowIsTranslucent">true</item>
-        <item name="android:windowAnimationStyle">@android:style/Animation</item>
-    </style>
+  <style name="MwmSearch" parent="@style/MWMMain">
+    <item name="android:windowNoTitle">true</item>
+    <item name="android:windowContentOverlay">@null</item>
+    <item name="android:windowBackground">@color/semitransparent_black</item>
+    <item name="android:colorBackgroundCacheHint">@null</item>
+    <item name="android:windowIsTranslucent">true</item>
+    <item name="android:windowAnimationStyle">@android:style/Animation</item>
+  </style>
 
-    <!-- Dialog Holo.Light theme for Activity -->
-    <style name="MWMTheme.Dialog.Light" parent="@style/MWMMain">
-        <item name="android:windowNoTitle">true</item>
-        <item name="android:windowFrame">@null</item>
-        <item name="android:windowTitleStyle">@style/Holo.DialogWindowTitle.Light</item>
-        <item name="android:windowBackground">@drawable/dialog_full_holo_light</item>
-        <item name="android:windowIsFloating">true</item>
-        <item name="android:windowContentOverlay">@null</item>
-        <item name="android:windowAnimationStyle">@style/Holo.Animation.Dialog</item>
-        <item name="android:windowSoftInputMode">stateUnspecified|adjustPan</item>
-        <item name="android:windowActionBar">false</item>
-        <item name="android:windowActionModeOverlay">true</item>
-        <item name="android:windowCloseOnTouchOutside">false</item>
-        <item name="android:colorBackgroundCacheHint">@null</item>
-        <item name="android:buttonBarStyle">@style/Holo.ButtonBar.AlertDialog</item>
-        <item name="borderlessButtonStyle">@style/Holo.Button.Borderless.Small.Light</item>
-        <item name="listPreferredItemPaddingLeft">16dip</item>
-        <item name="listPreferredItemPaddingRight">16dip</item>
-    </style>
+  <!-- Dialog Holo.Light theme for Activity -->
+  <style name="MWMTheme.Dialog.Light" parent="@style/MWMMain">
+    <item name="android:windowNoTitle">true</item>
+    <item name="android:windowFrame">@null</item>
+    <item name="android:windowTitleStyle">@style/Holo.DialogWindowTitle.Light</item>
+    <item name="android:windowBackground">@drawable/dialog_full_holo_light</item>
+    <item name="android:windowIsFloating">true</item>
+    <item name="android:windowContentOverlay">@null</item>
+    <item name="android:windowAnimationStyle">@style/Holo.Animation.Dialog</item>
+    <item name="android:windowSoftInputMode">stateUnspecified|adjustPan</item>
+    <item name="android:windowActionBar">false</item>
+    <item name="android:windowActionModeOverlay">true</item>
+    <item name="android:windowCloseOnTouchOutside">false</item>
+    <item name="android:colorBackgroundCacheHint">@null</item>
+    <item name="android:buttonBarStyle">@style/Holo.ButtonBar.AlertDialog</item>
+    <item name="borderlessButtonStyle">@style/Holo.Button.Borderless.Small.Light</item>
+    <item name="listPreferredItemPaddingLeft">16dip</item>
+    <item name="listPreferredItemPaddingRight">16dip</item>
+  </style>
 
-    <style name="drawerSeparator">
-        <item name="android:layout_height">1dp</item>
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_marginRight">@dimen/dp_x_2</item>
-        <item name="android:layout_marginLeft">@dimen/dp_x_2</item>
-        <item name="android:background">@color/semitransparent_white</item>
-    </style>
+  <style name="drawerSeparator">
+    <item name="android:layout_height">1dp</item>
+    <item name="android:layout_width">match_parent</item>
+    <item name="android:layout_marginRight">@dimen/dp_x_2</item>
+    <item name="android:layout_marginLeft">@dimen/dp_x_2</item>
+    <item name="android:background">@color/semitransparent_white</item>
+  </style>
 
-    <style name="Widget.MapButtonDrawer">
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:minHeight">@dimen/drawer_item_height</item>
-        <item name="android:layout_width">wrap_content</item>
-        <item name="android:maxWidth">@dimen/drawer_width</item>
-        <item name="android:background">@null</item>
-        <item name="android:duplicateParentState">true</item>
-        <item name="android:textSize">@dimen/sp_x_4</item>
-        <item name="android:textColor">@color/drawer_text_selector</item>
-        <item name="android:drawablePadding">@dimen/dp_x_1</item>
-        <item name="android:paddingRight">@dimen/dp_x_2</item>
-        <item name="android:paddingLeft">@dimen/dp_x_2</item>
-        <item name="android:paddingTop">@dimen/dp_x_1</item>
-        <item name="android:paddingBottom">@dimen/dp_x_1</item>
-        <item name="android:gravity">left|center_vertical</item>
-        <item name="android:fontFamily">@string/robotoLight</item>
-    </style>
+  <style name="Widget.MapButtonDrawer">
+    <item name="android:layout_height">wrap_content</item>
+    <item name="android:minHeight">@dimen/drawer_item_height</item>
+    <item name="android:layout_width">wrap_content</item>
+    <item name="android:maxWidth">@dimen/drawer_width</item>
+    <item name="android:background">@null</item>
+    <item name="android:duplicateParentState">true</item>
+    <item name="android:textSize">@dimen/sp_x_4</item>
+    <item name="android:textColor">@color/drawer_text_selector</item>
+    <item name="android:drawablePadding">@dimen/dp_x_1</item>
+    <item name="android:paddingRight">@dimen/dp_x_2</item>
+    <item name="android:paddingLeft">@dimen/dp_x_2</item>
+    <item name="android:paddingTop">@dimen/dp_x_1</item>
+    <item name="android:paddingBottom">@dimen/dp_x_1</item>
+    <item name="android:gravity">left|center_vertical</item>
+    <item name="android:fontFamily">@string/robotoLight</item>
+  </style>
 
 </resources>
\ No newline at end of file
diff --git a/android/src/com/mapswithme/maps/SearchActivity.java b/android/src/com/mapswithme/maps/SearchActivity.java
index c776d44ee0..25fa8a68fb 100644
--- a/android/src/com/mapswithme/maps/SearchActivity.java
+++ b/android/src/com/mapswithme/maps/SearchActivity.java
@@ -43,7 +43,6 @@ import com.mapswithme.util.statistics.Statistics;
 
 public class SearchActivity extends MapsWithMeBaseListActivity implements LocationService.Listener, OnClickListener
 {
-  public static final String SEARCH_RESULT = "search_result";
   public static final String EXTRA_SCOPE = "search_scope";
   public static final String EXTRA_QUERY = "search_query";
   /// @name These constants should be equal with
@@ -62,7 +61,6 @@ public class SearchActivity extends MapsWithMeBaseListActivity implements Locati
   private static final int ALL = AROUND_POSITION | IN_VIEWPORT | SEARCH_WORLD;
   private int mSearchMode = ALL;
   //@}
-  private static final String SEARCH_MODE_SETTING = "SearchMode";
   private static final int SEARCH_LAUNCHED = 0;
   private static final int QUERY_EMPTY = 1;
   private static final int SEARCH_SKIPPED = 2;
@@ -102,21 +100,21 @@ public class SearchActivity extends MapsWithMeBaseListActivity implements Locati
   private static class SearchAdapter extends BaseAdapter
   {
     private static final String mCategories[] = {
-      "food",
-      "hotel",
-      "tourism",
-      "transport",
-      "fuel",
-      "shop",
-      "entertainment",
-      "atm",
-      "bank",
-      "parking",
-      "toilet",
-      "pharmacy",
-      "hospital",
-      "post",
-      "police"
+        "food",
+        "hotel",
+        "tourism",
+        "transport",
+        "fuel",
+        "shop",
+        "entertainment",
+        "atm",
+        "bank",
+        "parking",
+        "toilet",
+        "pharmacy",
+        "hospital",
+        "post",
+        "police"
     };
     private static final int[] mIcons = {
         R.drawable.ic_food,
@@ -429,7 +427,8 @@ public class SearchActivity extends MapsWithMeBaseListActivity implements Locati
       {
         mName = (TextView) v.findViewById(R.id.tv_search_item_title);
 
-        switch (type) {
+        switch (type)
+        {
         case CATEGORY_TYPE:
           mImageLeft = (ImageView) v.findViewById(R.id.iv_search_category);
           break;
diff --git a/android/src/com/mapswithme/util/UiUtils.java b/android/src/com/mapswithme/util/UiUtils.java
index 6fb81622ef..e36b7c7d62 100644
--- a/android/src/com/mapswithme/util/UiUtils.java
+++ b/android/src/com/mapswithme/util/UiUtils.java
@@ -1,11 +1,5 @@
 package com.mapswithme.util;
 
-import static com.mapswithme.util.Utils.checkNotNull;
-
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
-
 import android.annotation.SuppressLint;
 import android.content.res.Resources;
 import android.graphics.Bitmap;
@@ -24,6 +18,12 @@ import android.widget.TextView;
 
 import com.mapswithme.maps.Framework;
 
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+
+import static com.mapswithme.util.Utils.checkNotNull;
+
 public final class UiUtils
 {
 
@@ -90,8 +90,7 @@ public final class UiUtils
         try
         {
           hide(target);
-        }
-        catch (final Exception e)
+        } catch (final Exception e)
         {
           // ignore
         }
@@ -120,8 +119,7 @@ public final class UiUtils
       final String[] parts = type.split("-");
       final String colorString = parts[parts.length - 1];
       color = colorByName(colorString, Color.BLACK);
-    }
-    catch (final Exception e)
+    } catch (final Exception e)
     {
       e.printStackTrace();
       // We do nothing in this case
@@ -156,6 +154,7 @@ public final class UiUtils
   }
 
   private static final Map<String, Integer> COLOR_MAP = new HashMap<String, Integer>();
+
   static
   {
     COLOR_MAP.put("blue", Color.parseColor("#33ccff"));
@@ -240,5 +239,5 @@ public final class UiUtils
 
   // utility class
   private UiUtils()
-  {};
+  {}
 }