diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index 3fc71a53e2..1d1a4691d8 100644
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -466,10 +466,9 @@
     <activity
       android:name="com.mapswithme.maps.ugc.routes.EditCategoryNameActivity"
       android:label="@string/name"/>
-
     <activity
       android:name="com.mapswithme.maps.ugc.routes.EditCategoryDescriptionActivity"
-      android:label="@string/description"/>
+      android:label="@string/description_guide"/>
 
     <service
       android:name="com.mapswithme.maps.background.WorkerService"
diff --git a/android/res/layout/fragment_bookmark_category_restriction.xml b/android/res/layout/fragment_bookmark_category_restriction.xml
index 0e1a508f01..7d6a82c2e0 100644
--- a/android/res/layout/fragment_bookmark_category_restriction.xml
+++ b/android/res/layout/fragment_bookmark_category_restriction.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              xmlns:tools="http://schemas.android.com/tools"
-              android:orientation="vertical"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent">
+<LinearLayout
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:orientation="vertical"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent">
   <android.support.v7.widget.Toolbar
     android:id="@+id/toolbar"
     style="@style/MwmWidget.ToolbarStyle"
@@ -47,6 +48,8 @@
         android:id="@+id/edit_text_field"
         android:layout_weight="1"
         android:layout_width="match_parent"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:hint="@string/name_placeholder"
         android:background="@null"
         android:layout_height="0dp"/>
       <View
diff --git a/android/res/layout/fragment_confirmation.xml b/android/res/layout/fragment_confirmation.xml
index 214fe2dfaf..18d45c2f10 100644
--- a/android/res/layout/fragment_confirmation.xml
+++ b/android/res/layout/fragment_confirmation.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
   xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:tools="http://schemas.android.com/tools"
   android:orientation="vertical"
   android:layout_width="wrap_content"
   android:layout_height="wrap_content"
@@ -12,13 +13,15 @@
     android:layout_height="wrap_content">
     <TextView
       android:id="@+id/title"
-      android:textAppearance="@style/MwmTheme.DialogTitleBase"
+      android:textAppearance="?android:attr/textAppearanceLarge"
       android:gravity="center|start"
+      android:fontFamily="@string/robotoMedium"
       android:layout_gravity="center_vertical"
       android:textStyle="bold"
       android:layout_weight="1"
       android:layout_height="wrap_content"
-      android:layout_width="0dp"/>
+      android:layout_width="0dp"
+      tools:ignore="UnusedAttribute"/>
     <ImageView
       android:id="@+id/image"
       android:layout_gravity="center_vertical"
diff --git a/android/res/layout/fragment_ugc_routes_sharing_options.xml b/android/res/layout/fragment_ugc_routes_sharing_options.xml
index 705e6f9297..c3296ff2a0 100644
--- a/android/res/layout/fragment_ugc_routes_sharing_options.xml
+++ b/android/res/layout/fragment_ugc_routes_sharing_options.xml
@@ -266,11 +266,13 @@
           android:gravity="center_vertical"
           android:layout_width="match_parent"
           android:layout_height="wrap_content"
+          android:fontFamily="@string/robotoMedium"
           android:text="@string/edit_on_web"
           android:paddingStart="@dimen/margin_base"
           android:paddingRight="@dimen/margin_base"
           android:paddingEnd="@dimen/margin_base"
-          android:paddingLeft="@dimen/margin_base"/>
+          android:paddingLeft="@dimen/margin_base"
+          tools:targetApi="jelly_bean"/>
         <include layout="@layout/list_divider"/>
         <LinearLayout
           android:id="@+id/edit_on_web_btn_container"
diff --git a/android/src/com/mapswithme/maps/ugc/routes/BaseEditUserBookmarkCategoryFragment.java b/android/src/com/mapswithme/maps/ugc/routes/BaseEditUserBookmarkCategoryFragment.java
index a96d80288f..895cf72384 100644
--- a/android/src/com/mapswithme/maps/ugc/routes/BaseEditUserBookmarkCategoryFragment.java
+++ b/android/src/com/mapswithme/maps/ugc/routes/BaseEditUserBookmarkCategoryFragment.java
@@ -6,7 +6,6 @@ import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.annotation.StringRes;
-import android.support.v4.app.ActivityCompat;
 import android.text.Editable;
 import android.text.InputFilter;
 import android.text.TextWatcher;
@@ -28,11 +27,11 @@ import java.util.Objects;
 
 public abstract class BaseEditUserBookmarkCategoryFragment extends BaseMwmToolbarFragment
 {
-  public static final String FORMAT_TEMPLATE = "%d / %d";
   public static final String BUNDLE_BOOKMARK_CATEGORY = "category";
-  public static final String TEXT_LENGTH_LIMIT = "text_length_limit";
+  private static final String FORMAT_TEMPLATE = "%d / %d";
+  private static final String TEXT_LENGTH_LIMIT = "text_length_limit";
   private static final int DEFAULT_TEXT_LENGTH_LIMIT = 42;
-  public static final String BREAK_LINE_CHAR = "\n";
+  private static final String DOUBLE_BREAK_LINE_CHAR = "\n\n";
 
   @SuppressWarnings("NullableProblems")
   @NonNull
@@ -80,7 +79,7 @@ public abstract class BaseEditUserBookmarkCategoryFragment extends BaseMwmToolba
     titleView.setText(getTitleText());
     TextView summaryView = root.findViewById(R.id.summary);
     summaryView.setText(getTopSummaryText());
-    summaryView.append(BREAK_LINE_CHAR);
+    summaryView.append(DOUBLE_BREAK_LINE_CHAR);
     summaryView.append(getBottomSummaryText());
     return root;
   }
@@ -113,9 +112,10 @@ public abstract class BaseEditUserBookmarkCategoryFragment extends BaseMwmToolba
   {
     super.onActivityResult(requestCode, resultCode, data);
     if (resultCode == Activity.RESULT_OK)
+    {
       getActivity().setResult(Activity.RESULT_OK, data);
-
-    getActivity().finish();
+      getActivity().finish();
+    }
   }
 
   @Override
@@ -148,9 +148,9 @@ public abstract class BaseEditUserBookmarkCategoryFragment extends BaseMwmToolba
   protected abstract CharSequence getEditableText();
 
   @NonNull
-  private static String makeFormattedCharsAmount(CharSequence s, int limit)
+  private static String makeFormattedCharsAmount(@Nullable CharSequence s, int limit)
   {
-    return String.format(Locale.US, FORMAT_TEMPLATE, Math.min(s.length(), limit), limit);
+    return String.format(Locale.US, FORMAT_TEMPLATE, s == null ? 0 : Math.min(s.length(), limit), limit);
   }
 
   private class TextRestrictionWatcher implements TextWatcher
@@ -159,14 +159,14 @@ public abstract class BaseEditUserBookmarkCategoryFragment extends BaseMwmToolba
     @Override
     public void beforeTextChanged(CharSequence s, int start, int count, int after)
     {
-
+      /* Do nothing by default. */
     }
 
     @Override
     public void onTextChanged(CharSequence s, int start, int before, int count)
     {
-      if (before + s.length() == 1)
-        ActivityCompat.invalidateOptionsMenu(getActivity());
+      if (s.length() == 0 || s.length() == 1)
+        getActivity().invalidateOptionsMenu();
     }
 
     @Override
diff --git a/android/src/com/mapswithme/maps/ugc/routes/EditCategoryDescriptionFragment.java b/android/src/com/mapswithme/maps/ugc/routes/EditCategoryDescriptionFragment.java
index 38a38994e1..fcc17e85a2 100644
--- a/android/src/com/mapswithme/maps/ugc/routes/EditCategoryDescriptionFragment.java
+++ b/android/src/com/mapswithme/maps/ugc/routes/EditCategoryDescriptionFragment.java
@@ -8,8 +8,14 @@ import com.mapswithme.maps.bookmarks.data.BookmarkManager;
 
 public class EditCategoryDescriptionFragment extends BaseEditUserBookmarkCategoryFragment
 {
-
   public static final int REQUEST_CODE_CUSTOM_PROPS = 100;
+  private static final int TEXT_LIMIT = 500;
+
+  @Override
+  protected int getDefaultTextLengthLimit()
+  {
+    return TEXT_LIMIT;
+  }
 
   @NonNull
   @Override
diff --git a/android/src/com/mapswithme/maps/ugc/routes/UgcRoutePropertiesFragment.java b/android/src/com/mapswithme/maps/ugc/routes/UgcRoutePropertiesFragment.java
index cc413b877d..8f525df867 100644
--- a/android/src/com/mapswithme/maps/ugc/routes/UgcRoutePropertiesFragment.java
+++ b/android/src/com/mapswithme/maps/ugc/routes/UgcRoutePropertiesFragment.java
@@ -257,11 +257,6 @@ public class UgcRoutePropertiesFragment extends BaseMwmFragment implements Bookm
         getActivity().setResult(Activity.RESULT_OK, intent);
         getActivity().finish();
       }
-      else if (resultCode == Activity.RESULT_CANCELED)
-      {
-        getActivity().setResult(Activity.RESULT_CANCELED);
-        getActivity().finish();
-      }
     }
   }