diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index e83d123d40..a45517b369 100644
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -4,7 +4,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="org.coolreader"
       android:installLocation="auto"
-      android:versionName="3.2.10-1" android:versionCode="2101">
+      android:versionName="3.2.11-1" android:versionCode="2111">
     <supports-screens
         android:xlargeScreens="true"
         android:largeScreens="true"
@@ -28,8 +28,7 @@
     <!-- Required permission to use in-app billing. -->
     <uses-permission android:name="com.android.vending.BILLING" />
     <application android:label="@string/app_name"
-        <!--android:name="android.support.multidex.MultiDexApplication" -->
-        android:icon="@drawable/cr3_logo"
+        android:icon="@mipmap/cr3_logo"
         android:allowClearUserData="true"
         android:process="org.coolreader"
         >
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 9dd3b4e4fb..10dc400b74 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -8,8 +8,8 @@ android {
         targetSdkVersion 26
         // When new version released, version code must be incremented at least by 8
         // for compatibility with ABI versioning of split apk (see below).
-        versionCode 2101
-        versionName "3.2.10-1"
+        versionCode 2111
+        versionName "3.2.11-1"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         externalNativeBuild {
             cmake {
diff --git a/android/res/drawable-hdpi/cr3_logo_button.png b/android/res/drawable-hdpi/cr3_logo_button.png
new file mode 100644
index 0000000000..a687f72d11
Binary files /dev/null and b/android/res/drawable-hdpi/cr3_logo_button.png differ
diff --git a/android/res/drawable-ldpi/cr3_logo_button.png b/android/res/drawable-ldpi/cr3_logo_button.png
new file mode 100644
index 0000000000..5b1135f403
Binary files /dev/null and b/android/res/drawable-ldpi/cr3_logo_button.png differ
diff --git a/android/res/drawable-mdpi/cr3_logo_button.png b/android/res/drawable-mdpi/cr3_logo_button.png
new file mode 100644
index 0000000000..ef8013b018
Binary files /dev/null and b/android/res/drawable-mdpi/cr3_logo_button.png differ
diff --git a/android/res/drawable-xhdpi/cr3_logo_button.png b/android/res/drawable-xhdpi/cr3_logo_button.png
new file mode 100644
index 0000000000..ebbe0b0ab9
Binary files /dev/null and b/android/res/drawable-xhdpi/cr3_logo_button.png differ
diff --git a/android/res/drawable-xxhdpi/cr3_logo_button.png b/android/res/drawable-xxhdpi/cr3_logo_button.png
new file mode 100644
index 0000000000..1a80544085
Binary files /dev/null and b/android/res/drawable-xxhdpi/cr3_logo_button.png differ
diff --git a/android/res/drawable-xxxhdpi/cr3_logo_button.png b/android/res/drawable-xxxhdpi/cr3_logo_button.png
new file mode 100644
index 0000000000..5436d2b693
Binary files /dev/null and b/android/res/drawable-xxxhdpi/cr3_logo_button.png differ
diff --git a/android/res/layout/about_dialog_app.xml b/android/res/layout/about_dialog_app.xml
index 78df3b38fb..ad301c3531 100644
--- a/android/res/layout/about_dialog_app.xml
+++ b/android/res/layout/about_dialog_app.xml
@@ -6,7 +6,7 @@
 		<ImageView android:layout_width="wrap_content" android:layout_height="wrap_content" 
 	        android:layout_margin="8dip"
 			android:id="@+id/logo" 
-			android:src="?attr/attr_cr3_logo" android:layout_gravity="center_vertical|left">
+			android:src="@mipmap/cr3_logo" android:layout_gravity="center_vertical|left">
 		</ImageView>
 		<LinearLayout android:orientation="vertical" android:id="@+id/LinearLayout03" android:layout_height="wrap_content" android:layout_width="fill_parent">
 			<TextView android:text="Cool Reader 3.1" android:id="@+id/version" android:layout_width="fill_parent" 
diff --git a/android/res/layout/book_info_edit_dialog.xml b/android/res/layout/book_info_edit_dialog.xml
index 42475a840c..4d57658b2f 100644
--- a/android/res/layout/book_info_edit_dialog.xml
+++ b/android/res/layout/book_info_edit_dialog.xml
@@ -92,7 +92,19 @@
 				android:focusableInTouchMode="false"
 				android:background="@null"
 				android:contentDescription="@string/btn_shortcut"/>
-	    </LinearLayout>
+            <ImageButton android:id="@+id/base_dlg_btn_positive"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="5dip"
+                android:layout_marginBottom="5dip"
+                android:layout_marginLeft="5dip"
+                android:layout_marginRight="5dip"
+                android:src="?attr/cr3_button_ok_drawable"
+                android:focusable="false"
+                android:focusableInTouchMode="false"
+                android:background="@null"
+                android:contentDescription="@string/dlg_button_ok"/>
+        </LinearLayout>
         <LinearLayout 
             android:orientation="horizontal"
             android:layout_width="fill_parent"
diff --git a/android/res/layout/selection_toolbar.xml b/android/res/layout/selection_toolbar.xml
index d80ff06bc4..2fe8b6e160 100644
--- a/android/res/layout/selection_toolbar.xml
+++ b/android/res/layout/selection_toolbar.xml
@@ -7,6 +7,11 @@
     android:orientation="vertical"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
+	android:background="?attr/colorThemeGray2"
+	android:layout_marginTop="3dip"
+	android:layout_marginBottom="3dip"
+	android:layout_marginLeft="3dip"
+	android:layout_marginRight="3dip"
     android:baselineAligned="true"
     >
 
diff --git a/android/res/layout/tts_toolbar.xml b/android/res/layout/tts_toolbar.xml
index 1a453db83f..5a0c837f11 100644
--- a/android/res/layout/tts_toolbar.xml
+++ b/android/res/layout/tts_toolbar.xml
@@ -9,7 +9,9 @@
     android:background="?attr/colorThemeGray2"
     android:layout_marginTop="3dip"
     android:layout_marginBottom="3dip"
-    android:baselineAligned="true" android:layout_height="wrap_content">
+	android:layout_marginLeft="3dip"
+	android:layout_marginRight="3dip"
+	android:baselineAligned="true" android:layout_height="wrap_content">
 
 	<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	    android:id="@+id/tts_toolbar_buttons"
diff --git a/android/res/menu/cr3_file_browser_file_context_menu.xml b/android/res/menu/cr3_file_browser_file_context_menu.xml
index 8a2912f7cf..d2d95ce3b0 100644
--- a/android/res/menu/cr3_file_browser_file_context_menu.xml
+++ b/android/res/menu/cr3_file_browser_file_context_menu.xml
@@ -2,7 +2,20 @@
 <!-- Context menu for physical folder -->
 <menu
   xmlns:android="http://schemas.android.com/apk/res/android">
-<item android:title="@string/mi_folder_open" android:titleCondensed="@string/mi_folder_open" android:id="@+id/folder_open"></item>
-<item android:title="@string/mi_folder_to_favorites" android:titleCondensed="@string/mi_folder_to_favorites" android:id="@+id/folder_to_favorites"></item>
-<item android:title="@string/mi_book_root" android:titleCondensed="@string/mi_book_root" android:id="@+id/book_root"></item>
+    <item android:title="@string/mi_book_open" android:titleCondensed="@string/mi_book_open" android:id="@+id/book_open"></item>
+    <item android:title="@string/mi_book_info" android:titleCondensed="@string/mi_book_info" android:id="@+id/book_info"></item>
+    <item android:title="@string/mi_book_edit" android:titleCondensed="@string/mi_book_edit" android:id="@+id/book_edit"></item>
+    <item android:title="@string/mi_book_delete" android:titleCondensed="@string/mi_book_delete" android:id="@+id/book_delete"></item>
+    <item android:title="@string/mi_book_shortcut" android:titleCondensed="@string/mi_book_shortcut" android:id="@+id/book_shortcut"></item>
+    <item android:title="@string/mi_book_to_gd" android:titleCondensed="@string/mi_book_to_gd" android:id="@+id/book_to_gd"></item>
+    <item android:title="@string/mi_book_no_mark" android:titleCondensed="@string/mi_book_no_mark" android:id="@+id/book_no_mark"></item>
+    <item android:title="@string/mi_book_to_read" android:titleCondensed="@string/mi_book_to_read" android:id="@+id/book_to_read"></item>
+    <item android:title="@string/mi_book_reading" android:titleCondensed="@string/mi_book_reading" android:id="@+id/book_reading"></item>
+    <item android:title="@string/mi_book_finished" android:titleCondensed="@string/mi_book_finished" android:id="@+id/book_finished"></item>
+    <item android:title="@string/mi_book_rate_5" android:titleCondensed="@string/mi_book_rate_5" android:id="@+id/book_rate_5"></item>
+    <item android:title="@string/mi_book_rate_4" android:titleCondensed="@string/mi_book_rate_4" android:id="@+id/book_rate_4"></item>
+    <item android:title="@string/mi_book_rate_3" android:titleCondensed="@string/mi_book_rate_3" android:id="@+id/book_rate_3"></item>
+    <item android:title="@string/mi_book_rate_2" android:titleCondensed="@string/mi_book_rate_2" android:id="@+id/book_rate_2"></item>
+    <item android:title="@string/mi_book_rate_1" android:titleCondensed="@string/mi_book_rate_1" android:id="@+id/book_rate_1"></item>
+    <item android:title="@string/mi_book_rate_0" android:titleCondensed="@string/mi_book_rate_0" android:id="@+id/book_rate_0"></item>
 </menu>
diff --git a/android/res/mipmap-anydpi-v26/cr3_logo.xml b/android/res/mipmap-anydpi-v26/cr3_logo.xml
index ad58f378e2..8dcd7659b8 100644
--- a/android/res/mipmap-anydpi-v26/cr3_logo.xml
+++ b/android/res/mipmap-anydpi-v26/cr3_logo.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@mipmap/cr3_logo_background" />
+    <background android:drawable="@color/cr3_logo_background" />
+    <!-- background android:drawable="@drawable/cr3_logo_background" / -->
     <foreground android:drawable="@mipmap/cr3_logo_foreground" />
 </adaptive-icon>
diff --git a/android/res/mipmap-hdpi/cr3_logo.png b/android/res/mipmap-hdpi/cr3_logo.png
index 658aee13c5..7086952fe8 100644
Binary files a/android/res/mipmap-hdpi/cr3_logo.png and b/android/res/mipmap-hdpi/cr3_logo.png differ
diff --git a/android/res/mipmap-hdpi/cr3_logo_foreground.png b/android/res/mipmap-hdpi/cr3_logo_foreground.png
index 35628ea591..89731cd097 100644
Binary files a/android/res/mipmap-hdpi/cr3_logo_foreground.png and b/android/res/mipmap-hdpi/cr3_logo_foreground.png differ
diff --git a/android/res/mipmap-ldpi/cr3_logo.png b/android/res/mipmap-ldpi/cr3_logo.png
index 6442bb3f9f..88049e4f09 100644
Binary files a/android/res/mipmap-ldpi/cr3_logo.png and b/android/res/mipmap-ldpi/cr3_logo.png differ
diff --git a/android/res/mipmap-ldpi/cr3_logo_foreground.png b/android/res/mipmap-ldpi/cr3_logo_foreground.png
index 98a4d5dac3..6cd7d56a75 100644
Binary files a/android/res/mipmap-ldpi/cr3_logo_foreground.png and b/android/res/mipmap-ldpi/cr3_logo_foreground.png differ
diff --git a/android/res/mipmap-mdpi/cr3_logo.png b/android/res/mipmap-mdpi/cr3_logo.png
index f6c8431434..a687f72d11 100644
Binary files a/android/res/mipmap-mdpi/cr3_logo.png and b/android/res/mipmap-mdpi/cr3_logo.png differ
diff --git a/android/res/mipmap-mdpi/cr3_logo_foreground.png b/android/res/mipmap-mdpi/cr3_logo_foreground.png
index feefbbe1af..74da80588a 100644
Binary files a/android/res/mipmap-mdpi/cr3_logo_foreground.png and b/android/res/mipmap-mdpi/cr3_logo_foreground.png differ
diff --git a/android/res/mipmap-xhdpi/cr3_logo.png b/android/res/mipmap-xhdpi/cr3_logo.png
index 161b93e6fb..1a80544085 100644
Binary files a/android/res/mipmap-xhdpi/cr3_logo.png and b/android/res/mipmap-xhdpi/cr3_logo.png differ
diff --git a/android/res/mipmap-xhdpi/cr3_logo_foreground.png b/android/res/mipmap-xhdpi/cr3_logo_foreground.png
index d986fea04c..8cfe148b45 100644
Binary files a/android/res/mipmap-xhdpi/cr3_logo_foreground.png and b/android/res/mipmap-xhdpi/cr3_logo_foreground.png differ
diff --git a/android/res/mipmap-xxhdpi/cr3_logo.png b/android/res/mipmap-xxhdpi/cr3_logo.png
index d4939d3754..1ceb656182 100644
Binary files a/android/res/mipmap-xxhdpi/cr3_logo.png and b/android/res/mipmap-xxhdpi/cr3_logo.png differ
diff --git a/android/res/mipmap-xxhdpi/cr3_logo_foreground.png b/android/res/mipmap-xxhdpi/cr3_logo_foreground.png
index 023f1fd5fc..853fdc569d 100644
Binary files a/android/res/mipmap-xxhdpi/cr3_logo_foreground.png and b/android/res/mipmap-xxhdpi/cr3_logo_foreground.png differ
diff --git a/android/res/mipmap-xxxhdpi/cr3_logo.png b/android/res/mipmap-xxxhdpi/cr3_logo.png
index 5902cd3bec..74df0d0bd0 100644
Binary files a/android/res/mipmap-xxxhdpi/cr3_logo.png and b/android/res/mipmap-xxxhdpi/cr3_logo.png differ
diff --git a/android/res/mipmap-xxxhdpi/cr3_logo_foreground.png b/android/res/mipmap-xxxhdpi/cr3_logo_foreground.png
index 385f1c2688..2e252c625a 100644
Binary files a/android/res/mipmap-xxxhdpi/cr3_logo_foreground.png and b/android/res/mipmap-xxxhdpi/cr3_logo_foreground.png differ
diff --git a/android/res/raw/fb2genres_utf8_wo_bom.xml b/android/res/raw/fb2genres_utf8_wo_bom.xml
new file mode 100644
index 0000000000..9125bfcb22
--- /dev/null
+++ b/android/res/raw/fb2genres_utf8_wo_bom.xml
@@ -0,0 +1,933 @@
+<?xml version="1.0" encoding="utf-8"?>
+<fbgenrestransfer xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://alexs.ru/fb2/genrestable/GT.xsd">
+	<genre value="sf">
+		<root-descr lang="en" genre-title="SF, Fantasy" detailed="Alternate History, Cyberpunk, Fantasy, Science Fiction"/>
+		<root-descr lang="ru" genre-title="Фантастика, Фэнтези" detailed="НФ, Фэнтези, Мистика, Киберпанк"/>
+		<subgenres>
+			<subgenre value="sf_history">
+				<genre-descr lang="en" title="Alternative history"/>
+				<genre-descr lang="ru" title="Альтернативная история"/>
+				<genre-alt value="fantasy_alt_hist" format="fb2.0"/>
+			</subgenre>
+			<subgenre value="sf_action">
+				<genre-descr lang="en" title="Action SF"/>
+				<genre-descr lang="ru" title="Боевая Фантастика"/>
+			</subgenre>
+			<subgenre value="sf_epic">
+				<genre-descr lang="en" title="Epic SF"/>
+				<genre-descr lang="ru" title="Эпическая Фантастика"/>
+			</subgenre>
+			<subgenre value="sf_heroic">
+				<genre-descr lang="en" title="Heroic SF"/>
+				<genre-descr lang="ru" title="Героическая фантастика"/>
+			</subgenre>
+			<subgenre value="sf_detective">
+				<genre-descr lang="en" title="Detective SF"/>
+				<genre-descr lang="ru" title="Детективная Фантастика"/>
+			</subgenre>
+			<subgenre value="sf_cyberpunk">
+				<genre-descr lang="en" title="Cyberpunk"/>
+				<genre-descr lang="ru" title="Киберпанк"/>
+				<genre-alt value="sf_cyber_punk" format="fb2.0"/>
+			</subgenre>
+			<subgenre value="sf_space">
+				<genre-descr lang="en" title="Space SF"/>
+				<genre-descr lang="ru" title="Космическая Фантастика"/>
+			</subgenre>
+			<subgenre value="sf_social">
+				<genre-descr lang="en" title="Social SF"/>
+				<genre-descr lang="ru" title="Социальная фантастика"/>
+			</subgenre>
+			<subgenre value="sf_horror">
+				<genre-descr lang="en" title="Horror &amp; Mystic"/>
+				<genre-descr lang="ru" title="Ужасы и Мистика"/>
+				<genre-alt value="gay_mystery" format="fb2.0"/>
+				<genre-alt value="horror" format="fb2.0"/>
+				<genre-alt value="horror_antology" format="fb2.0"/>
+				<genre-alt value="horror_british" format="fb2.0"/>
+				<genre-alt value="horror_fantasy" format="fb2.0"/>
+				<genre-alt value="horror_erotic" format="fb2.0"/>
+				<genre-alt value="horror_ghosts" format="fb2.0"/>
+				<genre-alt value="horror_graphic" format="fb2.0"/>
+				<genre-alt value="horror_occult" format="fb2.0"/>
+				<genre-alt value="horror_ref" format="fb2.0"/>
+				<genre-alt value="horror_usa" format="fb2.0"/>
+				<genre-alt value="horror_vampires" format="fb2.0"/>
+				<genre-alt value="teens_horror" format="fb2.0"/>
+			</subgenre>
+			<subgenre value="sf_humor">
+				<genre-descr lang="en" title="Humor SF"/>
+				<genre-descr lang="ru" title="Юмористическая фантастика"/>
+			</subgenre>
+			<subgenre value="sf_fantasy">
+				<genre-descr lang="en" title="Fantasy"/>
+				<genre-descr lang="ru" title="Фэнтези"/>
+				<genre-alt value="romance_fantasy" format="fb2.0"/>
+				<genre-alt value="romance_sf" format="fb2.0"/>
+				<genre-alt value="romance_time_travel" format="fb2.0"/>
+			</subgenre>
+			<subgenre value="sf">
+				<genre-descr lang="en" title="Science Fiction"/>
+				<genre-descr lang="ru" title="Научная Фантастика"/>
+				<genre-alt value="gaming" format="fb2.0"/>
+				<genre-alt value="sf_writing" format="fb2.0"/>
+			</subgenre>
+			<subgenre value="child_sf">
+				<genre-descr lang="en" title="Science Fiction for Kids"/>
+				<genre-descr lang="ru" title="Детская Фантастика"/>
+				<genre-alt value="teens_sf" format="fb2.0"/>
+			</subgenre>
+		</subgenres>
+	</genre>
+	<genre value="detective">
+		<root-descr lang="en" genre-title="Detectives, Thrillers" detailed="Police Stories, Ironical, Espionage, Crime"/>
+		<root-descr lang="ru" genre-title="Детективы, Боевики" detailed="Полицейские, иронические, шпионские, криминальные"/>
+		<subgenres>
+			<subgenre value="det_classic">
+				<genre-descr lang="en" title="Classical Detective"/>
+				<genre-descr lang="ru" title="Классический Детектив"/>
+			</subgenre>
+			<subgenre value="det_police">
+				<genre-descr lang="en" title="Police Stories"/>
+				<genre-descr lang="ru" title="Полицейский Детектив"/>
+				<genre-alt value="thriller_police" format="fb2.0"/>
+			</subgenre>
+			<subgenre value="det_action">
+				<genre-descr lang="en" title="Action"/>
+				<genre-descr lang="ru" title="Боевики"/>
+			</subgenre>
+			<subgenre value="det_irony">
+				<genre-descr lang="en" title="Ironical Detective"/>
+				<genre-descr lang="ru" title="Иронический Детектив"/>
+			</subgenre>
+			<subgenre value="det_history">
+				<genre-descr lang="en" title="Historical Detective"/>
+				<genre-descr lang="ru" title="Исторический Детектив"/>
+			</subgenre>
+			<subgenre value="det_espionage">
+				<genre-descr lang="en" title="Espionage Detective"/>
+				<genre-descr lang="ru" title="Шпионский Детектив"/>
+			</subgenre>
+			<subgenre value="det_crime">
+				<genre-descr lang="en" title="Crime Detective"/>
+				<genre-descr lang="ru" title="Криминальный Детектив"/>
+			</subgenre>
+			<subgenre value="det_political">
+				<genre-descr lang="en" title="Political Detective"/>
+				<genre-descr lang="ru" title="Политический Детектив"/>
+			</subgenre>
+			<subgenre value="det_maniac">
+				<genre-descr lang="en" title="Maniacs"/>
+				<genre-descr lang="ru" title="Маньяки"/>
+			</subgenre>
+			<subgenre value="det_hard">
+				<genre-descr lang="en" title="Hard-boiled Detective"/>
+				<genre-descr lang="ru" title="Крутой Детектив"/>
+			</subgenre>
+			<subgenre value="thriller">
+				<genre-descr lang="en" title="Thrillers"/>
+				<genre-descr lang="ru" title="Триллеры"/>
+				<genre-alt value="thriller_mystery" format="fb2.0"/>
+			</subgenre>
+			<subgenre value="detective">
+				<genre-descr lang="en" title="Detective"/>
+				<genre-descr lang="ru" title="Детектив"/>
+				<genre-alt value="mystery" format="fb2.0"/>
+			</subgenre>
+			<subgenre value="sf_detective">
+				<genre-descr lang="en" title="Detective SF"/>
+				<genre-descr lang="ru" title="Детективная Фантастика"/>
+				<genre-alt value="teens_mysteries" format="fb2.0"/>
+			</subgenre>
+			<subgenre value="child_det">
+				<genre-descr lang="en" title="Detectives &amp; Thrillers"/>
+				<genre-descr lang="ru" title="Детские Остросюжетные"/>
+			</subgenre>
+			<subgenre value="love_detective">
+				<genre-descr lang="en" title="Detective Romance"/>
+				<genre-descr lang="ru" title="Остросюжетные Любовные Романы"/>
+			</subgenre>
+		</subgenres>
+	</genre>
+	<genre value="prose">
+		<root-descr lang="en" genre-title="Prose" detailed="Classical, History, Contemporary"/>
+		<root-descr lang="ru" genre-title="Проза" detailed="Классика, историческая, современная"/>
+		<subgenres>
+			<subgenre value="prose_classic">
+				<genre-descr lang="en" title="Classics Prose"/>
+				<genre-descr lang="ru" title="Классическая Проза"/>
+				<genre-alt value="literature" format="fb2.0"/>
+				<genre-alt value="literature_books" format="fb2.0"/>
+				<genre-alt value="literature_british" format="fb2.0"/>
+				<genre-alt value="literature_classics" format="fb2.0"/>
+				<genre-alt value="literature_drama" format="fb2.0"/>
+				<genre-alt value="literature_essay" format="fb2.0"/>
+				<genre-alt value="literature_antology" format="fb2.0"/>
+				<genre-alt value="literature_saga" format="fb2.0"/>
+				<genre-alt value="literature_short" format="fb2.0"/>
+				<genre-alt value="literature_usa" format="fb2.0"/>
+				<genre-alt value="literature_world" format="fb2.0"/>
+			</subgenre>
+			<subgenre value="prose_history">
+				<genre-descr lang="en" title="Historical Prose"/>
+				<genre-descr lang="ru" title="Историческая Проза"/>
+				<genre-alt value="literature_history" format="fb2.0"/>
+				<genre-alt value="literature_critic" format="fb2.0"/>
+			</subgenre>
+			<subgenre value="prose_contemporary">
+				<genre-descr lang="en" title="Contemporary Prose"/>
+				<genre-descr lang="ru" title="Современная Проза"/>
+				<genre-alt value="literature_political" format="fb2.0"/>
+				<genre-alt value="literature_war" format="fb2.0"/>
+				<genre-alt value="ref_writing" format="fb2.0"/>
+			</subgenre>
+			<subgenre value="prose_counter">
+				<genre-descr lang="en" title="Counterculture"/>
+				<genre-descr lang="ru" title="Контркультура"/>
+				<genre-alt value="literature_gay" format="fb2.0"/>
+			</subgenre>
+			<subgenre value="prose_rus_classsic">
+				<genre-descr lang="en" title="Russian Classics"/>
+				<genre-descr lang="ru" title="Русская Классика"/>
+				<genre-alt value="literature_rus_classsic" format="fb2.0"/>
+				<genre-alt value="prose_rus_classic" format="fb2.0"/>
+			</subgenre>
+			<subgenre value="prose_su_classics">
+				<genre-descr lang="en" title="Soviet Classics"/>
+				<genre-descr lang="ru" title="Советская Классика"/>
+				<genre-alt value="literature_su_classics" format="fb2.0"/>
+			</subgenre>
+			<subgenre value="humor_prose">
+				<genre-descr lang="en" title="Humor Prose"/>
+				<genre-descr lang="ru" title="Юмористическая Проза"/>
+			</subgenre>
+			<subgenre value="child_prose">
+				<genre-descr lang="en" title="Prose"/>
+				<genre-descr lang="ru" title="Детская Проза"/>
+				<genre-alt value="teens_literature" format="fb2.0"/>
+			</subgenre>
+		</subgenres>
+	</genre>
+	<genre value="love">
+		<root-descr lang="en" genre-title="Romance" detailed="Historical, Contemporary, Detective"/>
+		<root-descr lang="ru" genre-title="Любовные романы" detailed="Исторические, современные, остросюжетные"/>
+		<subgenres>
+			<subgenre value="love_contemporary">
+				<genre-descr lang="en" title="Contemporary Romance"/>
+				<genre-descr lang="ru" title="Современные Любовные Романы"/>
+				<genre-alt value="romance" format="fb2.0"/>
+				<genre-alt value="romance_multicultural" format="fb2.0"/>
+				<genre-alt value="romance_series" format="fb2.0"/>
+				<genre-alt value="romance_anthologies" format="fb2.0"/>
+				<genre-alt value="romance_contemporary" format="fb2.0"/>
+				<genre-alt value="literature_women" format="fb2.0"/>
+				<genre-alt value="romance_romantic_suspense" format="fb2.0"/>
+			</subgenre>
+			<subgenre value="love_history">
+				<genre-descr lang="en" title="Historical Romance"/>
+				<genre-descr lang="ru" title="Исторические Любовные Романы"/>
+				<genre-alt value="romance_regency" format="fb2.0"/>
+				<genre-alt value="romance_historical" format="fb2.0"/>
+			</subgenre>
+			<subgenre value="love_detective">
+				<genre-descr lang="en" title="Detective Romance"/>
+				<genre-descr lang="ru" title="Остросюжетные Любовные Романы"/>
+			</subgenre>
+			<subgenre value="love_short">
+				<genre-descr lang="en" title="Short Romance"/>
+				<genre-descr lang="ru" title="Короткие Любовные Романы"/>
+			</subgenre>
+			<subgenre value="love_erotica">
+				<genre-descr lang="en" title="Erotica"/>
+				<genre-descr lang="ru" title="Эротика"/>
+				<genre-alt value="literature_erotica" format="fb2.0"/>
+			</subgenre>
+		</subgenres>
+	</genre>
+	<genre value="adventure">
+		<root-descr lang="en" genre-title="Adventure" detailed="Western, Historical, Sea"/>
+		<root-descr lang="ru" genre-title="Приключения" detailed="Вестерны, исторические, морские"/>
+		<subgenres>
+			<subgenre value="adv_western">
+				<genre-descr lang="en" title="Western"/>
+				<genre-descr lang="ru" title="Вестерны"/>
+				<genre-alt value="literature_western" format="fb2.0"/>
+			</subgenre>
+			<subgenre value="adv_history">
+				<genre-descr lang="en" title="History"/>
+				<genre-descr lang="ru" title="Исторические Приключения"/>
+			</subgenre>
+			<subgenre value="adv_indian">
+				<genre-descr lang="en" title="Indians"/>
+				<genre-descr lang="ru" title="Индейцы"/>
+			</subgenre>
+			<subgenre value="adv_maritime">
+				<genre-descr lang="en" title="Maritime Fiction"/>
+				<genre-descr lang="ru" title="Морские Приключения"/>
+				<genre-alt value="literature_sea" format="fb2.0"/>
+			</subgenre>
+			<subgenre value="adv_geo">
+				<genre-descr lang="en" title="Travel &amp; Geography"/>
+				<genre-descr lang="ru" title="Путешествия и География"/>
+				<genre-alt value="gay_travel" format="fb2.0"/>
+				<genre-alt value="outdoors_travel" format="fb2.0"/>
+				<genre-alt value="travel" format="fb2.0"/>
+				<genre-alt value="travel_africa" format="fb2.0"/>
+				<genre-alt value="travel_asia" format="fb2.0"/>
+				<genre-alt value="travel_australia" format="fb2.0"/>
+				<genre-alt value="travel_canada" format="fb2.0"/>
+				<genre-alt value="travel_caribbean" format="fb2.0"/>
+				<genre-alt value="travel_europe" format="fb2.0"/>
+				<genre-alt value="travel_guidebook_series" format="fb2.0"/>
+				<genre-alt value="travel_lat_am" format="fb2.0"/>
+				<genre-alt value="travel_middle_east" format="fb2.0"/>
+				<genre-alt value="travel_polar" format="fb2.0"/>
+				<genre-alt value="travel_spec" format="fb2.0"/>
+				<genre-alt value="travel_usa" format="fb2.0"/>
+				<genre-alt value="travel_rus" format="fb2.0"/>
+				<genre-alt value="travel_ex_ussr" format="fb2.0"/>
+			</subgenre>
+			<subgenre value="adv_animal">
+				<genre-descr lang="en" title="Nature &amp; Animals"/>
+				<genre-descr lang="ru" title="Природа и Животные"/>
+				<genre-alt value="child_animals" format="fb2.0"/>
+			</subgenre>
+			<subgenre value="adventure">
+				<genre-descr lang="en" title="Other"/>
+				<genre-descr lang="ru" title="Прочее"/>
+				<genre-alt value="literature_adv" format="fb2.0"/>
+				<genre-alt value="literature_men_advent" format="fb2.0"/>
+			</subgenre>
+			<subgenre value="child_adv">
+				<genre-descr lang="en" title="Adventures for Kids"/>
+				<genre-descr lang="ru" title="Детские Приключения"/>
+			</subgenre>
+		</subgenres>
+	</genre>
+	<genre value="children">
+		<root-descr lang="en" genre-title="Children's" detailed="Fairy Tales, Fantasy, Detectives..."/>
+		<root-descr lang="ru" genre-title="Книги для детей" detailed="Сказки, фантастика, детективы..."/>
+		<subgenres>
+			<subgenre value="child_tale">
+				<genre-descr lang="en" title="Fairy Tales"/>
+				<genre-descr lang="ru" title="Сказки"/>
+				<genre-alt value="child_3" format="fb2.0"/>
+				<genre-alt value="literature_fairy" format="fb2.0"/>
+			</subgenre>
+			<subgenre value="child_verse">
+				<genre-descr lang="en" title="Verses"/>
+				<genre-descr lang="ru" title="Детские Стихи"/>
+			</subgenre>
+			<subgenre value="child_prose">
+				<genre-descr lang="en" title="Prose for Kids"/>
+				<genre-descr lang="ru" title="Детская Проза"/>
+				<genre-alt value="child_4" format="fb2.0"/>
+				<genre-alt value="child_9" format="fb2.0"/>
+				<genre-alt value="child_history" format="fb2.0"/>
+				<genre-alt value="child_characters" format="fb2.0"/>
+			</subgenre>
+			<subgenre value="child_sf">
+				<genre-descr lang="en" title="Science Fiction for Kids"/>
+				<genre-descr lang="ru" title="Детская Фантастика"/>
+			</subgenre>
+			<subgenre value="child_det">
+				<genre-descr lang="en" title="Detectives &amp; Thrillers"/>
+				<genre-descr lang="ru" title="Детские Остросюжетные"/>
+			</subgenre>
+			<subgenre value="child_adv">
+				<genre-descr lang="en" title="Adventures for Kids"/>
+				<genre-descr lang="ru" title="Детские Приключения"/>
+				<genre-alt value="teens_history" format="fb2.0"/>
+				<genre-alt value="teens_series" format="fb2.0"/>
+			</subgenre>
+			<subgenre value="child_education">
+				<genre-descr lang="en" title="Education for Kids"/>
+				<genre-descr lang="ru" title="Детская Образовательная Литература"/>
+				<genre-alt value="child_edu" format="fb2.0"/>
+				<genre-alt value="child_nature" format="fb2.0"/>
+			</subgenre>
+			<subgenre value="children">
+				<genre-descr lang="en" title="Other"/>
+				<genre-descr lang="ru" title="Прочее"/>
+				<genre-alt value="child_art" format="fb2.0"/>
+				<genre-alt value="child_obsessions" format="fb2.0"/>
+				<genre-alt value="child_people" format="fb2.0"/>
+				<genre-alt value="child_ref" format="fb2.0"/>
+				<genre-alt value="child_series" format="fb2.0"/>
+				<genre-alt value="child_sports" format="fb2.0"/>
+			</subgenre>
+		</subgenres>
+	</genre>
+	<genre value="poetry">
+		<root-descr lang="en" genre-title="Poetry, Dramaturgy" detailed="Poetry, Dramaturgy"/>
+		<root-descr lang="ru" genre-title="Поэзия, Драматургия" detailed="Поэзия, драматургия"/>
+		<subgenres>
+			<subgenre value="poetry">
+				<genre-descr lang="en" title="Poetry"/>
+				<genre-descr lang="ru" title="Поэзия"/>
+				<genre-alt value="literature_poetry" format="fb2.0"/>
+			</subgenre>
+			<subgenre value="dramaturgy">
+				<genre-descr lang="en" title="Dramaturgy"/>
+				<genre-descr lang="ru" title="Драматургия"/>
+				<genre-alt value="performance" format="fb2.0"/>
+			</subgenre>
+			<subgenre value="humor_verse">
+				<genre-descr lang="en" title="Humor Verses"/>
+				<genre-descr lang="ru" title="Юмористические Стихи"/>
+			</subgenre>
+			<subgenre value="child_verse">
+				<genre-descr lang="en" title="Verses"/>
+				<genre-descr lang="ru" title="Детские Стихи"/>
+			</subgenre>
+		</subgenres>
+	</genre>
+	<genre value="antique">
+		<root-descr lang="en" genre-title="Antique" detailed="Antique literature, Myths, Legends"/>
+		<root-descr lang="ru" genre-title="Старинное" detailed="Античная литература, мифы, легенды"/>
+		<subgenres>
+			<subgenre value="antique_ant">
+				<genre-descr lang="en" title="Antique Literature"/>
+				<genre-descr lang="ru" title="Античная Литература"/>
+			</subgenre>
+			<subgenre value="antique_european">
+				<genre-descr lang="en" title="European Literature"/>
+				<genre-descr lang="ru" title="Европейская Старинная Литература"/>
+			</subgenre>
+			<subgenre value="antique_russian">
+				<genre-descr lang="en" title="Antique Russian Literature"/>
+				<genre-descr lang="ru" title="Древнерусская Литература"/>
+			</subgenre>
+			<subgenre value="antique_east">
+				<genre-descr lang="en" title="Antique East Literature"/>
+				<genre-descr lang="ru" title="Древневосточная Литература"/>
+			</subgenre>
+			<subgenre value="antique_myths">
+				<genre-descr lang="en" title="Myths. Legends. Epos"/>
+				<genre-descr lang="ru" title="Мифы. Легенды. Эпос"/>
+				<genre-alt value="nonfiction_folklor" format="fb2.0"/>
+			</subgenre>
+			<subgenre value="antique">
+				<genre-descr lang="en" title="Other"/>
+				<genre-descr lang="ru" title="Прочее"/>
+			</subgenre>
+		</subgenres>
+	</genre>
+	<genre value="science">
+		<root-descr lang="en" genre-title="Science, Education" detailed="Physics, Philosophy, Psychology, Business literature"/>
+		<root-descr lang="ru" genre-title="Наука, Образование" detailed="Физика, философия, психология, деловая литература"/>
+		<subgenres>
+			<subgenre value="sci_history">
+				<genre-descr lang="en" title="History"/>
+				<genre-descr lang="ru" title="История"/>
+				<genre-alt value="history_africa" format="fb2.0"/>
+				<genre-alt value="history_america" format="fb2.0"/>
+				<genre-alt value="history_ancient" format="fb2.0"/>
+				<genre-alt value="history_asia" format="fb2.0"/>
+				<genre-alt value="history_australia" format="fb2.0"/>
+				<genre-alt value="history_europe" format="fb2.0"/>
+				<genre-alt value="history_study" format="fb2.0"/>
+				<genre-alt value="history_jewish" format="fb2.0"/>
+				<genre-alt value="history_middle_east" format="fb2.0"/>
+				<genre-alt value="histor_military" format="fb2.0"/>
+				<genre-alt value="history_military_science" format="fb2.0"/>
+				<genre-alt value="history_russia" format="fb2.0"/>
+				<genre-alt value="history_usa" format="fb2.0"/>
+				<genre-alt value="history_world" format="fb2.0"/>
+				<genre-alt value="nonfiction_antropology" format="fb2.0"/>
+				<genre-alt value="science_archaeology" format="fb2.0"/>
+				<genre-alt value="ref_genealogy" format="fb2.0"/>
+				<genre-alt value="science_history_philosophy" format="fb2.0"/>
+			</subgenre>
+			<subgenre value="sci_psychology">
+				<genre-descr lang="en" title="Psychology"/>
+				<genre-descr lang="ru" title="Психология"/>
+				<genre-alt value="health_mental" format="fb2.0"/>
+				<genre-alt value="health_psy" format="fb2.0"/>
+				<genre-alt value="science_behavioral_sciences" format="fb2.0"/>
+				<genre-alt value="science_psy" format="fb2.0"/>
+				<genre-alt value="teens_social" format="fb2.0"/>
+			</subgenre>
+			<subgenre value="sci_culture">
+				<genre-descr lang="en" title="Cultural Science"/>
+				<genre-descr lang="ru" title="Культурология"/>
+			</subgenre>
+			<subgenre value="sci_religion">
+				<genre-descr lang="en" title="Religious Studies"/>
+				<genre-descr lang="ru" title="Религиоведение"/>
+			</subgenre>
+			<subgenre value="sci_philosophy">
+				<genre-descr lang="en" title="Philosophy"/>
+				<genre-descr lang="ru" title="Философия"/>
+				<genre-alt value="nonfiction_philosophy" format="fb2.0"/>
+			</subgenre>
+			<subgenre value="sci_politics">
+				<genre-descr lang="en" title="Politics"/>
+				<genre-descr lang="ru" title="Политика"/>
+			</subgenre>
+			<subgenre value="sci_business">
+				<genre-descr lang="en" title="Business literature"/>
+				<genre-descr lang="ru" title="Деловая литература"/>
+				<genre-alt value="biz_accounting" format="fb2.0"/>
+				<genre-alt value="biz_life" format="fb2.0"/>
+				<genre-alt value="biz_careers" format="fb2.0"/>
+				<genre-alt value="biz_economics" format="fb2.0"/>
+				<genre-alt value="biz_finance" format="fb2.0"/>
+				<genre-alt value="biz_international" format="fb2.0"/>
+				<genre-alt value="biz_professions" format="fb2.0"/>
+				<genre-alt value="biz_investing" format="fb2.0"/>
+				<genre-alt value="biz_management" format="fb2.0"/>
+				<genre-alt value="biz_sales" format="fb2.0"/>
+				<genre-alt value="biz_personal_fin" format="fb2.0"/>
+				<genre-alt value="biz_ref" format="fb2.0"/>
+				<genre-alt value="biz_small_biz" format="fb2.0"/>
+				<genre-alt value="professional_finance" format="fb2.0"/>
+				<genre-alt value="professional_management" format="fb2.0"/>
+				<genre-alt value="ref_edu" format="fb2.0"/>
+			</subgenre>
+			<subgenre value="sci_juris">
+				<genre-descr lang="en" title="Jurisprudence"/>
+				<genre-descr lang="ru" title="Юриспруденция"/>
+				<genre-alt value="nonfiction_law" format="fb2.0"/>
+				<genre-alt value="professional_law" format="fb2.0"/>
+			</subgenre>
+			<subgenre value="sci_linguistic">
+				<genre-descr lang="en" title="Linguistics"/>
+				<genre-descr lang="ru" title="Языкознание"/>
+			</subgenre>
+			<subgenre value="sci_medicine">
+				<genre-descr lang="en" title="Medicine"/>
+				<genre-descr lang="ru" title="Медицина"/>
+				<genre-alt value="health_aging" format="fb2.0"/>
+				<genre-alt value="health_alt_medicine" format="fb2.0"/>
+				<genre-alt value="health_cancer" format="fb2.0"/>
+				<genre-alt value="professional_medical" format="fb2.0"/>
+				<genre-alt value="science_medicine" format="fb2.0"/>
+			</subgenre>
+			<subgenre value="sci_phys">
+				<genre-descr lang="en" title="Physics"/>
+				<genre-descr lang="ru" title="Физика"/>
+				<genre-alt value="science_physics" format="fb2.0"/>
+			</subgenre>
+			<subgenre value="sci_math">
+				<genre-descr lang="en" title="Mathematics"/>
+				<genre-descr lang="ru" title="Математика"/>
+				<genre-alt value="science_math" format="fb2.0"/>
+			</subgenre>
+			<subgenre value="sci_chem">
+				<genre-descr lang="en" title="Chemistry"/>
+				<genre-descr lang="ru" title="Химия"/>
+				<genre-alt value="science_chemistry" format="fb2.0"/>
+			</subgenre>
+			<subgenre value="sci_biology">
+				<genre-descr lang="en" title="Biology"/>
+				<genre-descr lang="ru" title="Биология"/>
+				<genre-alt value="outdoors_birdwatching" format="fb2.0"/>
+				<genre-alt value="outdoors_ecology" format="fb2.0"/>
+				<genre-alt value="outdoors_ecosystems" format="fb2.0"/>
+				<genre-alt value="outdoors_env" format="fb2.0"/>
+				<genre-alt value="outdoors_fauna" format="fb2.0"/>
+				<genre-alt value="outdoors_flora" format="fb2.0"/>
+				<genre-alt value="outdoors_nature_writing" format="fb2.0"/>
+				<genre-alt value="outdoors_ref" format="fb2.0"/>
+				<genre-alt value="science_biolog" format="fb2.0"/>
+			</subgenre>
+			<subgenre value="sci_tech">
+				<genre-descr lang="en" title="Technical"/>
+				<genre-descr lang="ru" title="Технические"/>
+				<genre-alt value="professional_enginering" format="fb2.0"/>
+				<genre-alt value="professional_sci" format="fb2.0"/>
+				<genre-alt value="science_technology" format="fb2.0"/>
+			</subgenre>
+			<subgenre value="science">
+				<genre-descr lang="en" title="Other"/>
+				<genre-descr lang="ru" title="Прочее"/>
+				<genre-alt value="nonfiction_edu" format="fb2.0"/>
+				<genre-alt value="nonfiction_gov" format="fb2.0"/>
+				<genre-alt value="nonfiction_holidays" format="fb2.0"/>
+				<genre-alt value="nonfiction_social_sci" format="fb2.0"/>
+				<genre-alt value="nonfiction_ethnology" format="fb2.0"/>
+				<genre-alt value="nonfiction_gender" format="fb2.0"/>
+				<genre-alt value="nonfiction_gerontology" format="fb2.0"/>
+				<genre-alt value="nonfiction_hum_geogr" format="fb2.0"/>
+				<genre-alt value="nonfiction_methodology" format="fb2.0"/>
+				<genre-alt value="nonfiction_research" format="fb2.0"/>
+				<genre-alt value="nonfiction_social_work" format="fb2.0"/>
+				<genre-alt value="nonfiction_sociology" format="fb2.0"/>
+				<genre-alt value="nonfiction_spec_group" format="fb2.0"/>
+				<genre-alt value="nonfiction_stat" format="fb2.0"/>
+				<genre-alt value="outdoors_resources" format="fb2.0"/>
+				<genre-alt value="professional_edu" format="fb2.0"/>
+				<genre-alt value="science_agri" format="fb2.0"/>
+				<genre-alt value="science_astronomy" format="fb2.0"/>
+				<genre-alt value="science_earth" format="fb2.0"/>
+				<genre-alt value="science_edu" format="fb2.0"/>
+				<genre-alt value="science_evolution" format="fb2.0"/>
+				<genre-alt value="science_measurement" format="fb2.0"/>
+				<genre-alt value="science_eco" format="fb2.0"/>
+				<genre-alt value="science_ref" format="fb2.0"/>
+				<genre-alt value="teens_tech" format="fb2.0"/>
+			</subgenre>
+		</subgenres>
+	</genre>
+	<genre value="computers">
+		<root-descr lang="en" genre-title="Computers" detailed="Internet, Programming, Hardware"/>
+		<root-descr lang="ru" genre-title="Компьютеры" detailed="Интернет, программирование, железо"/>
+		<subgenres>
+			<subgenre value="comp_www">
+				<genre-descr lang="en" title="Internet"/>
+				<genre-descr lang="ru" title="Интернет"/>
+			</subgenre>
+			<subgenre value="comp_programming">
+				<genre-descr lang="en" title="Programming"/>
+				<genre-descr lang="ru" title="Программирование"/>
+			</subgenre>
+			<subgenre value="comp_hard">
+				<genre-descr lang="en" title="Hardware"/>
+				<genre-descr lang="ru" title="Компьютерное Железо"/>
+				<genre-alt value="comp_hardware" format="fb2.0"/>
+			</subgenre>
+			<subgenre value="comp_soft">
+				<genre-descr lang="en" title="Software"/>
+				<genre-descr lang="ru" title="Программы"/>
+				<genre-alt value="comp_software" format="fb2.0"/>
+			</subgenre>
+			<subgenre value="comp_db">
+				<genre-descr lang="en" title="Databases"/>
+				<genre-descr lang="ru" title="Базы Данных"/>
+			</subgenre>
+			<subgenre value="comp_osnet">
+				<genre-descr lang="en" title="OS &amp; Networking"/>
+				<genre-descr lang="ru" title="ОС и Сети"/>
+				<genre-alt value="comp_microsoft" format="fb2.0"/>
+				<genre-alt value="comp_networking" format="fb2.0"/>
+				<genre-alt value="comp_os" format="fb2.0"/>
+			</subgenre>
+			<subgenre value="computers">
+				<genre-descr lang="en" title="Other"/>
+				<genre-descr lang="ru" title="Прочее"/>
+				<genre-alt value="child_computers" format="fb2.0"/>
+				<genre-alt value="compusers" format="fb2.0"/>
+				<genre-alt value="comp_office" format="fb2.0"/>
+				<genre-alt value="comp_cert" format="fb2.0"/>
+				<genre-alt value="comp_games" format="fb2.0"/>
+				<genre-alt value="comp_sci" format="fb2.0"/>
+				<genre-alt value="comp_biz" format="fb2.0"/>
+				<genre-alt value="comp_graph" format="fb2.0"/>
+			</subgenre>
+		</subgenres>
+	</genre>
+	<genre value="reference">
+		<root-descr lang="en" genre-title="Reference" detailed="Reference, Encyclopedias, Dictionaries"/>
+		<root-descr lang="ru" genre-title="Справочники" detailed="Справочники, энциклопедии, словари"/>
+		<subgenres>
+			<subgenre value="ref_encyc">
+				<genre-descr lang="en" title="Encyclopedias"/>
+				<genre-descr lang="ru" title="Энциклопедии"/>
+				<genre-alt value="ref_encyclopedia" format="fb2.0"/>
+			</subgenre>
+			<subgenre value="ref_dict">
+				<genre-descr lang="en" title="Dictionaries"/>
+				<genre-descr lang="ru" title="Словари"/>
+				<genre-alt value="ref_dict" format="fb2.0"/>
+			</subgenre>
+			<subgenre value="ref_ref">
+				<genre-descr lang="en" title="Reference"/>
+				<genre-descr lang="ru" title="Справочники"/>
+				<genre-alt value="ref_almanacs" format="fb2.0"/>
+				<genre-alt value="ref_careers" format="fb2.0"/>
+				<genre-alt value="ref_catalogs" format="fb2.0"/>
+				<genre-alt value="ref_cons_guides" format="fb2.0"/>
+				<genre-alt value="ref_study_guides" format="fb2.0"/>
+			</subgenre>
+			<subgenre value="ref_guide">
+				<genre-descr lang="en" title="Guidebooks"/>
+				<genre-descr lang="ru" title="Руководства"/>
+				<genre-alt value="outdoors_field_guides" format="fb2.0"/>
+			</subgenre>
+			<subgenre value="reference">
+				<genre-descr lang="en" title="Other"/>
+				<genre-descr lang="ru" title="Прочее"/>
+				<genre-alt value="nonfiction_ref" format="fb2.0"/>
+				<genre-alt value="family_ref" format="fb2.0"/>
+				<genre-alt value="references" format="fb2.0"/>
+				<genre-alt value="ref_etiquette" format="fb2.0"/>
+				<genre-alt value="ref_langs" format="fb2.0"/>
+				<genre-alt value="ref_fun" format="fb2.0"/>
+				<genre-alt value="ref_books" format="fb2.0"/>
+				<genre-alt value="ref_quotations" format="fb2.0"/>
+				<genre-alt value="ref_words" format="fb2.0"/>
+				<genre-alt value="teens_ref" format="fb2.0"/>
+			</subgenre>
+		</subgenres>
+	</genre>
+	<genre value="nonfiction">
+		<root-descr lang="en" genre-title="Nonfiction" detailed="Biography, Memoirs, Publicism"/>
+		<root-descr lang="ru" genre-title="Документальное" detailed="Биографии, мемуары, публицистика"/>
+		<subgenres>
+			<subgenre value="nonf_biography">
+				<genre-descr lang="en" title="Biography &amp; Memoirs"/>
+				<genre-descr lang="ru" title="Биографии и Мемуары"/>
+				<genre-alt value="people" format="fb2.0"/>
+				<genre-alt value="biography" format="fb2.0"/>
+				<genre-alt value="biogr_arts" format="fb2.0"/>
+				<genre-alt value="biogr_ethnic" format="fb2.0"/>
+				<genre-alt value="biogr_family" format="fb2.0"/>
+				<genre-alt value="biogr_historical" format="fb2.0"/>
+				<genre-alt value="biogr_leaders" format="fb2.0"/>
+				<genre-alt value="biogr_professionals" format="fb2.0"/>
+				<genre-alt value="biogr_sports" format="fb2.0"/>
+				<genre-alt value="biogr_travel" format="fb2.0"/>
+				<genre-alt value="biz_beogr" format="fb2.0"/>
+				<genre-alt value="gay_biogr" format="fb2.0"/>
+				<genre-alt value="history_gay" format="fb2.0"/>
+				<genre-alt value="literature_letters" format="fb2.0"/>
+				<genre-alt value="teens_beogr" format="fb2.0"/>
+			</subgenre>
+			<subgenre value="nonf_publicism">
+				<genre-descr lang="en" title="Publicism"/>
+				<genre-descr lang="ru" title="Публицистика"/>
+			</subgenre>
+			<subgenre value="nonf_criticism">
+				<genre-descr lang="en" title="Criticism"/>
+				<genre-descr lang="ru" title="Критика"/>
+			</subgenre>
+			<subgenre value="nonfiction">
+				<genre-descr lang="en" title="Other"/>
+				<genre-descr lang="ru" title="Прочее"/>
+				<genre-alt value="gay_nonfiction" format="fb2.0"/>
+				<genre-alt value="nonfiction_avto" format="fb2.0"/>
+				<genre-alt value="nonfiction_crime" format="fb2.0"/>
+				<genre-alt value="nonfiction_events" format="fb2.0"/>
+				<genre-alt value="nonfiction_politics" format="fb2.0"/>
+				<genre-alt value="nonfiction_traditions" format="fb2.0"/>
+				<genre-alt value="nonfiction_demography" format="fb2.0"/>
+				<genre-alt value="nonfiction_racism" format="fb2.0"/>
+				<genre-alt value="nonfiction_emigration" format="fb2.0"/>
+				<genre-alt value="nonfiction_philantropy" format="fb2.0"/>
+				<genre-alt value="nonfiction_transportation" format="fb2.0"/>
+				<genre-alt value="nonfiction_true_accounts" format="fb2.0"/>
+				<genre-alt value="nonfiction_urban" format="fb2.0"/>
+				<genre-alt value="nonfiction_women" format="fb2.0"/>
+				<genre-alt value="outdoors_conservation" format="fb2.0"/>
+			</subgenre>
+			<subgenre value="design">
+				<genre-descr lang="en" title="Art, Design"/>
+				<genre-descr lang="ru" title="Искусство, Дизайн"/>
+				<genre-alt value="architecture" format="fb2.0"/>
+				<genre-alt value="art" format="fb2.0"/>
+				<genre-alt value="art_instr" format="fb2.0"/>
+				<genre-alt value="artists" format="fb2.0"/>
+				<genre-alt value="fashion" format="fb2.0"/>
+				<genre-alt value="graph_design" format="fb2.0"/>
+				<genre-alt value="photography" format="fb2.0"/>
+			</subgenre>
+		</subgenres>
+	</genre>
+	<genre value="religion">
+		<root-descr lang="en" genre-title="Religion" detailed="Religion, Esoterics"/>
+		<root-descr lang="ru" genre-title="Религия" detailed="Религия, эзотерика"/>
+		<subgenres>
+			<subgenre value="religion_rel">
+				<genre-descr lang="en" title="Religion"/>
+				<genre-descr lang="ru" title="Религия"/>
+				<genre-alt value="child_religion" format="fb2.0"/>
+				<genre-alt value="chris_bibles" format="fb2.0"/>
+				<genre-alt value="chris_pravoslavie" format="fb2.0"/>
+				<genre-alt value="chris_catholicism" format="fb2.0"/>
+				<genre-alt value="chris_living" format="fb2.0"/>
+				<genre-alt value="chris_history" format="fb2.0"/>
+				<genre-alt value="chris_clergy" format="fb2.0"/>
+				<genre-alt value="chris_edu" format="fb2.0"/>
+				<genre-alt value="chris_evangelism" format="fb2.0"/>
+				<genre-alt value="chris_fiction" format="fb2.0"/>
+				<genre-alt value="chris_holidays" format="fb2.0"/>
+				<genre-alt value="chris_jesus" format="fb2.0"/>
+				<genre-alt value="chris_mormonism" format="fb2.0"/>
+				<genre-alt value="chris_orthodoxy" format="fb2.0"/>
+				<genre-alt value="outdoors_conservation" format="fb2.0"/>
+				<genre-alt value="chris_protestantism" format="fb2.0"/>
+				<genre-alt value="chris_ref" format="fb2.0"/>
+				<genre-alt value="chris_theology" format="fb2.0"/>
+				<genre-alt value="chris_devotion" format="fb2.0"/>
+				<genre-alt value="literature_religion" format="fb2.0"/>
+				<genre-alt value="religion" format="fb2.0"/>
+				<genre-alt value="religion_bibles" format="fb2.0"/>
+				<genre-alt value="Christianity" format="fb2.0"/>
+				<genre-alt value="religion_fiction" format="fb2.0"/>
+				<genre-alt value="religion_new_age" format="fb2.0"/>
+				<genre-alt value="religion_religious_studies" format="fb2.0"/>
+				<genre-alt value="romance_religion" format="fb2.0"/>
+				<genre-alt value="teens_religion" format="fb2.0"/>
+			</subgenre>
+			<subgenre value="religion_esoterics">
+				<genre-descr lang="en" title="Esoterics"/>
+				<genre-descr lang="ru" title="Эзотерика"/>
+				<genre-alt value="religion_occult" format="fb2.0"/>
+				<genre-alt value="religion_spirituality" format="fb2.0"/>
+			</subgenre>
+			<subgenre value="religion_self">
+				<genre-descr lang="en" title="Self-perfection"/>
+				<genre-descr lang="ru" title="Самосовершенствование"/>
+			</subgenre>
+			<subgenre value="religion">
+				<genre-descr lang="en" title="Other"/>
+				<genre-descr lang="ru" title="Прочее"/>
+				<genre-alt value="religion_east" format="fb2.0"/>
+				<genre-alt value="religion_buddhism" format="fb2.0"/>
+				<genre-alt value="religion_earth" format="fb2.0"/>
+				<genre-alt value="religion_hinduism" format="fb2.0"/>
+				<genre-alt value="religion_islam" format="fb2.0"/>
+				<genre-alt value="religion_judaism" format="fb2.0"/>
+				<genre-alt value="religion_other" format="fb2.0"/>
+			</subgenre>
+			<subgenre value="sci_religion">
+				<genre-descr lang="en" title="Religious Studies"/>
+				<genre-descr lang="ru" title="Религиоведение"/>
+			</subgenre>
+		</subgenres>
+	</genre>
+	<genre value="humor">
+		<root-descr lang="en" genre-title="Humor" detailed="Prose, Verses, Anecdote"/>
+		<root-descr lang="ru" genre-title="Юмор" detailed="Проза, стихи, анекдоты"/>
+		<subgenres>
+			<subgenre value="humor_anecdote">
+				<genre-descr lang="en" title="Anecdote"/>
+				<genre-descr lang="ru" title="Анекдоты"/>
+			</subgenre>
+			<subgenre value="humor_prose">
+				<genre-descr lang="en" title="Humor Prose"/>
+				<genre-descr lang="ru" title="Юмористическая Проза"/>
+			</subgenre>
+			<subgenre value="humor_verse">
+				<genre-descr lang="en" title="Humor Verses"/>
+				<genre-descr lang="ru" title="Юмористические Стихи"/>
+			</subgenre>
+			<subgenre value="humor">
+				<genre-descr lang="en" title="Other"/>
+				<genre-descr lang="ru" title="Прочее"/>
+				<genre-alt value="family_humor" format="fb2.0"/>
+			</subgenre>
+		</subgenres>
+	</genre>
+	<genre value="home">
+		<root-descr lang="en" genre-title="Home, Family" detailed="Cooking, Pets, Hobby"/>
+		<root-descr lang="ru" genre-title="Дом, Семья" detailed="Кулинария, домашние животные, хобби"/>
+		<subgenres>
+			<subgenre value="home_cooking">
+				<genre-descr lang="en" title="Cooking"/>
+				<genre-descr lang="ru" title="Кулинария"/>
+				<genre-alt value="cooking" format="fb2.0"/>
+				<genre-alt value="cook_baking" format="fb2.0"/>
+				<genre-alt value="cook_can" format="fb2.0"/>
+				<genre-alt value="cook_art" format="fb2.0"/>
+				<genre-alt value="cook_drink" format="fb2.0"/>
+				<genre-alt value="cook_gastronomy" format="fb2.0"/>
+				<genre-alt value="cook_meals" format="fb2.0"/>
+				<genre-alt value="cook_natura" format="fb2.0"/>
+				<genre-alt value="cook_outdoor" format="fb2.0"/>
+				<genre-alt value="cook_pro" format="fb2.0"/>
+				<genre-alt value="cook_quick" format="fb2.0"/>
+				<genre-alt value="cook_ref" format="fb2.0"/>
+				<genre-alt value="cook_regional" format="fb2.0"/>
+				<genre-alt value="cook_appliances" format="fb2.0"/>
+				<genre-alt value="cook_diet" format="fb2.0"/>
+				<genre-alt value="cook_spec" format="fb2.0"/>
+				<genre-alt value="cook_veget" format="fb2.0"/>
+				<genre-alt value="health_diets" format="fb2.0"/>
+			</subgenre>
+			<subgenre value="home_pets">
+				<genre-descr lang="en" title="Pets"/>
+				<genre-descr lang="ru" title="Домашние Животные"/>
+			</subgenre>
+			<subgenre value="home_crafts">
+				<genre-descr lang="en" title="Hobbies &amp; Crafts"/>
+				<genre-descr lang="ru" title="Хобби, Ремесла"/>
+				<genre-alt value="home_collect" format="fb2.0"/>
+				<genre-alt value="outdoors_hiking" format="fb2.0"/>
+				<genre-alt value="outdoors_hunt_fish" format="fb2.0"/>
+			</subgenre>
+			<subgenre value="home_entertain">
+				<genre-descr lang="en" title="Entertaining"/>
+				<genre-descr lang="ru" title="Развлечения"/>
+				<genre-alt value="entertainment" format="fb2.0"/>
+				<genre-alt value="entert_comics" format="fb2.0"/>
+				<genre-alt value="entert_games" format="fb2.0"/>
+				<genre-alt value="entert_humor" format="fb2.0"/>
+				<genre-alt value="entert_movies" format="fb2.0"/>
+				<genre-alt value="entert_music" format="fb2.0"/>
+				<genre-alt value="nonfiction_pop_culture" format="fb2.0"/>
+				<genre-alt value="entert_radio" format="fb2.0"/>
+				<genre-alt value="entert_tv" format="fb2.0"/>
+			</subgenre>
+			<subgenre value="home_health">
+				<genre-descr lang="en" title="Health"/>
+				<genre-descr lang="ru" title="Здоровье"/>
+				<genre-alt value="health" format="fb2.0"/>
+				<genre-alt value="health_beauty" format="fb2.0"/>
+				<genre-alt value="family_health" format="fb2.0"/>
+				<genre-alt value="family_fertility" format="fb2.0"/>
+				<genre-alt value="family_parenting" format="fb2.0"/>
+				<genre-alt value="family_pregnancy" format="fb2.0"/>
+				<genre-alt value="family_special_needs" format="fb2.0"/>
+				<genre-alt value="health_death" format="fb2.0"/>
+				<genre-alt value="health_dideases" format="fb2.0"/>
+				<genre-alt value="health_fitness" format="fb2.0"/>
+				<genre-alt value="health_men" format="fb2.0"/>
+				<genre-alt value="health_nutrition" format="fb2.0"/>
+				<genre-alt value="health_personal" format="fb2.0"/>
+				<genre-alt value="health_recovery" format="fb2.0"/>
+				<genre-alt value="health_ref" format="fb2.0"/>
+				<genre-alt value="health_first_aid" format="fb2.0"/>
+				<genre-alt value="health_self_help" format="fb2.0"/>
+				<genre-alt value="health_women" format="fb2.0"/>
+			</subgenre>
+			<subgenre value="home_garden">
+				<genre-descr lang="en" title="Garden"/>
+				<genre-descr lang="ru" title="Сад и Огород"/>
+			</subgenre>
+			<subgenre value="home_diy">
+				<genre-descr lang="en" title="Do it yourself"/>
+				<genre-descr lang="ru" title="Сделай Сам"/>
+				<genre-alt value="home_expert" format="fb2.0"/>
+				<genre-alt value="home_design" format="fb2.0"/>
+				<genre-alt value="home_howto" format="fb2.0"/>
+				<genre-alt value="home_interior_design" format="fb2.0"/>
+			</subgenre>
+			<subgenre value="home_sport">
+				<genre-descr lang="en" title="Sports"/>
+				<genre-descr lang="ru" title="Спорт"/>
+				<genre-alt value="literature_sports" format="fb2.0"/>
+				<genre-alt value="outdoors_outdoor_recreation" format="fb2.0"/>
+				<genre-alt value="outdoors_survive" format="fb2.0"/>
+				<genre-alt value="sport" format="fb2.0"/>
+				<genre-alt value="teens_health" format="fb2.0"/>
+				<genre-alt value="teens_school_sports" format="fb2.0"/>
+			</subgenre>
+			<subgenre value="home_sex">
+				<genre-descr lang="en" title="Erotica, Sex"/>
+				<genre-descr lang="ru" title="Эротика, Секс"/>
+				<genre-alt value="health_sex" format="fb2.0"/>
+				<genre-alt value="nonfiction_pornography" format="fb2.0"/>
+			</subgenre>
+			<subgenre value="home">
+				<genre-descr lang="en" title="Other"/>
+				<genre-descr lang="ru" title="Прочее"/>
+				<genre-alt value="gay_parenting" format="fb2.0"/>
+				<genre-alt value="home_cottage" format="fb2.0"/>
+				<genre-alt value="home_weddings" format="fb2.0"/>
+				<genre-alt value="family" format="fb2.0"/>
+				<genre-alt value="family_adoption" format="fb2.0"/>
+				<genre-alt value="family_aging_parents" format="fb2.0"/>
+				<genre-alt value="family_edu" format="fb2.0"/>
+				<genre-alt value="family_activities" format="fb2.0"/>
+				<genre-alt value="family_relations" format="fb2.0"/>
+				<genre-alt value="family_lit_guide" format="fb2.0"/>
+				<genre-alt value="women_divorce" format="fb2.0"/>
+				<genre-alt value="women_domestic" format="fb2.0"/>
+				<genre-alt value="women_child" format="fb2.0"/>
+				<genre-alt value="women_single" format="fb2.0"/>
+			</subgenre>
+		</subgenres>
+	</genre>
+</fbgenrestransfer>
diff --git a/android/res/values-ru/strings.xml b/android/res/values-ru/strings.xml
index 78c48857f2..7e324eba87 100644
--- a/android/res/values-ru/strings.xml
+++ b/android/res/values-ru/strings.xml
@@ -20,6 +20,21 @@
     <string name="context_menu_title_recent_book">Запись</string>
     <string name="context_menu_title_folder">Папка</string>
     <string name="mi_book_open">Открыть</string>
+    <string name="mi_book_info">О книге</string>
+    <string name="mi_book_edit">Редактировать информацию</string>
+    <string name="mi_book_delete">Удалить файл книги</string>
+    <string name="mi_book_shortcut">Создать ярлык книги</string>
+    <string name="mi_book_to_gd">Сохранить на диск Google One</string>
+    <string name="mi_book_no_mark">Убрать пометку</string>
+    <string name="mi_book_to_read">Установить пометку \'к прочтению\'</string>
+    <string name="mi_book_reading">Установить пометку \'читаю\'</string>
+    <string name="mi_book_finished">Установить пометку \'прочитана\'</string>
+    <string name="mi_book_rate_5">Оценить на 5 звезд</string>
+    <string name="mi_book_rate_4">Оценить на 4 звезд</string>
+    <string name="mi_book_rate_3">Оценить на 3 звезд</string>
+    <string name="mi_book_rate_2">Оценить на 2 звезд</string>
+    <string name="mi_book_rate_1">Оценить на 1 звезд</string>
+    <string name="mi_book_rate_0">Убрать оценку</string>
     <string name="mi_book_recent_books">Последние</string>
     <string name="mi_book_file_remove">Удалить файл</string>
     <string name="mi_book_recent_remove">Удалить из списка</string>
@@ -47,8 +62,8 @@
     <string name="mi_folder_right">Сдвинуть вправо</string>
     <string name="mi_folder_remove">Убрать</string>
     <string name="dir_recent_books">Последние книги</string>
-    <string name="dir_sd_card">SD карта</string>
-    <string name="dir_internal_sd_card">Внутр. SD карта</string>
+    <string name="dir_sd_card">SD-карта</string>
+    <string name="dir_internal_sd_card">Внутр. SD-карта</string>
     <string name="dir_internal_memory">Внутр. память</string>
     <string name="win_title_bookmarks">Закладки</string>
     <string name="win_title_dicts">Словари</string>
@@ -93,7 +108,7 @@
     <string name="options_page_margin_right">Правый отступ</string>
     <string name="options_page_margin_top">Верхний отступ</string>
     <string name="options_page_margin_bottom">Нижний отступ</string>
-    <string name="options_rounded_corners_margin">Отступы в заголовке (для скругленных краев)</string>
+    <string name="options_rounded_corners_margin">Отступ (для устройств со скругленными углами)</string>
     <string name="options_view_mode">Режим просмотра</string>
     <string name="options_view_mode_pages">Страницы</string>
     <string name="options_view_mode_scroll">Свиток</string>
@@ -170,7 +185,7 @@
     <string name="options_color_b">Синий</string>
     <string name="options_page_show_titlebar_percent">Процент прочитанного</string>
     <string name="options_page_show_titlebar_page_count">Всего страниц</string>
-    <string name="options_show_titlebar_page_number">Новер страницы</string>
+    <string name="options_show_titlebar_page_number">Номер страницы</string>
     <string name="options_controls_flick_brightness">Управление яркостью скольжением по экрану</string>
     <string name="options_controls_flick_brightness_right">Правый край</string>
     <string name="options_controls_flick_brightness_left">Левый край</string>
diff --git a/android/res/values-v4/styles.xml b/android/res/values-v4/styles.xml
index 9cb8e41e9c..932455c819 100644
--- a/android/res/values-v4/styles.xml
+++ b/android/res/values-v4/styles.xml
@@ -340,7 +340,9 @@
         <item name="folder_big_bookmark_drawable">@drawable/wdrk_icons8_favorite_folder_2</item>
         <item name="media_flash_microsd_drawable">@drawable/wdrk_icons8_micro_sd_2</item>
     </style>
+
     <style name="Theme.Dark" parent="@android:style/Theme">
+
         <item name="colorThemeBlue">@color/blueLight</item>
         <item name="colorThemeGray">@color/grayLight</item>
         <item name="colorThemeGreen">@color/greenLight</item>
@@ -608,7 +610,19 @@
         <item name="folder_big_drawable">@drawable/wlgt_icons8_folder</item>
         <item name="folder_big_bookmark_drawable">@drawable/wlgt_icons8_favorite_folder_2</item>
         <item name="media_flash_microsd_drawable">@drawable/wlgt_icons8_micro_sd_2</item>
+
+        <!--
+        <item name="android:popupMenuStyle">@style/PopupMenuDark</item>
+        -->
+
     </style>
+
+    <!--
+    <style name="PopupMenuDark" parent="@android:style/Theme">
+        <item name="android:popupBackground">@color/wlgt_iconColor</item>
+    </style>
+    -->
+
     <style name="Theme.White" parent="@android:style/Theme.Light">
         <item name="colorThemeBlue">@color/blueDark</item>
         <item name="colorThemeGray">@color/grayDark</item>
diff --git a/android/res/values/colors.xml b/android/res/values/colors.xml
new file mode 100644
index 0000000000..0770ff482a
--- /dev/null
+++ b/android/res/values/colors.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="cr3_logo_background">#cfd8dc</color>
+</resources>
diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml
index 63c8f5b6f2..ea2eb716a9 100644
--- a/android/res/values/strings.xml
+++ b/android/res/values/strings.xml
@@ -25,6 +25,21 @@
     <string name="context_menu_title_recent_book">Recent book</string>
     <string name="context_menu_title_folder">Folder</string>
     <string name="mi_book_open">Open book</string>
+    <string name="mi_book_info">Book info</string>
+    <string name="mi_book_edit">Edit book info</string>
+    <string name="mi_book_delete">Delete book file</string>
+    <string name="mi_book_shortcut">Create book shortcut</string>
+    <string name="mi_book_to_gd">Save book to Google One</string>
+    <string name="mi_book_no_mark">Set no mark</string>
+    <string name="mi_book_to_read">Set \'to read\' mark</string>
+    <string name="mi_book_reading">Set \'reading\' mark</string>
+    <string name="mi_book_finished">Set \'finished\' mark</string>
+    <string name="mi_book_rate_5">Rate 5 stars</string>
+    <string name="mi_book_rate_4">Rate 4 stars</string>
+    <string name="mi_book_rate_3">Rate 3 stars</string>
+    <string name="mi_book_rate_2">Rate 2 stars</string>
+    <string name="mi_book_rate_1">Rate 1 stars</string>
+    <string name="mi_book_rate_0">Rate no stars</string>
     <string name="mi_book_recent_books">Recent books</string>
     <string name="mi_book_file_remove">Delete book file</string>
     <string name="mi_book_recent_remove">Remove from list</string>
@@ -51,6 +66,9 @@
     <string name="mi_folder_left">Move left</string>
     <string name="mi_folder_right">Move right</string>
     <string name="mi_folder_remove">Remove</string>
+
+
+
     <string name="dir_recent_books">Recent Books</string>
     <string name="dir_sd_card">SD Card</string>
     <string name="dir_internal_sd_card">Internal SD Card</string>
@@ -99,7 +117,7 @@
     <string name="options_page_margin_right">Right margin</string>
     <string name="options_page_margin_top">Top margin</string>
     <string name="options_page_margin_bottom">Bottom margin</string>
-    <string name="options_rounded_corners_margin">Header margins (for rounded corners)</string>
+    <string name="options_rounded_corners_margin">Margin (for devices with rounded corners)</string>
     <string name="options_view_mode">View mode</string>
     <string name="options_view_mode_pages">Pages</string>
     <string name="options_view_mode_scroll">Scroll</string>
@@ -538,7 +556,7 @@
     <string name="tb_button_find_next">Find next</string>
     <string name="options_selection_action_mail">Share</string>
     <string name="tts_play">Play / Pause</string>
-    <string name="tts_back">Revind</string>
+    <string name="tts_back">Rewind</string>
     <string name="tts_forward">Forward</string>
     <string name="tts_stop">Stop</string>
     <string name="tts_volume">Volume</string>
diff --git a/android/src/org/coolreader/CoolReader.java b/android/src/org/coolreader/CoolReader.java
index 327cdaca34..ca0831f181 100644
--- a/android/src/org/coolreader/CoolReader.java
+++ b/android/src/org/coolreader/CoolReader.java
@@ -30,7 +30,9 @@
 import org.coolreader.crengine.ErrorDialog;
 import org.coolreader.crengine.FileBrowser;
 import org.coolreader.crengine.FileInfo;
+import org.coolreader.crengine.GenreSAXElem;
 import org.coolreader.crengine.GoogleDriveTools;
+import org.coolreader.crengine.History;
 import org.coolreader.crengine.History.BookInfoLoadedCallack;
 import org.coolreader.crengine.InterfaceTheme;
 import org.coolreader.crengine.L;
@@ -1410,19 +1412,28 @@ public void updateCurrentPositionStatus(FileInfo book, Bookmark position, Positi
 			askConfirmation(R.string.mark_book_as_read, new Runnable() {
 				@Override
 				public void run() {
-					book1.setReadingState(FileInfo.STATE_FINISHED);
-					BookInfo bookInfo = new BookInfo(book1);
-					CoolReader.this.getDB().saveBookInfo(bookInfo);
-					CoolReader.this.getDB().flush();
-					BookInfo bi = Services.getHistory().getBookInfo(book1);
-					if (bi != null)
-						bi.getFileInfo().setFileProperties(book1);
+					Services.getHistory().getOrCreateBookInfo(getDB(), book1, new History.BookInfoLoadedCallack() {
+						@Override
+						public void onBookInfoLoaded(BookInfo bookInfo) {
+							book1.setReadingState(FileInfo.STATE_FINISHED);
+							BookInfo bi = new BookInfo(book1);
+							getDB().saveBookInfo(bi);
+							getDB().flush();
+							if (bookInfo.getFileInfo()!=null) {
+								bookInfo.getFileInfo().setReadingState(FileInfo.STATE_FINISHED);
+								if (bookInfo.getFileInfo().parent!=null)
+									directoryUpdated(bookInfo.getFileInfo().parent, bookInfo.getFileInfo());
+							}
+							BookInfo bi2 = Services.getHistory().getBookInfo(book1);
+							if (bi2 != null)
+								bi2.getFileInfo().setFileProperties(book1);
+						}
+					});
 				}
 			});
 		}
 	}
 
-
 	@Override
     protected void setDimmingAlpha(int dimmingAlpha) {
 		if (mReaderView != null)
@@ -1501,6 +1512,45 @@ public void run() {
 			}
 		});
 	}
+
+	public void DeleteRecursive(File dir, FileInfo fi)
+	{
+		if (dir.isDirectory())
+		{
+			String[] children = dir.list();
+			for (int i = 0; i < children.length; i++)
+			{
+				File temp = new File(dir, children[i]);
+				if (temp.isDirectory())
+				{
+					DeleteRecursive(temp, null);
+				}
+				else
+				{
+					FileInfo item = new FileInfo(temp);
+					closeBookIfOpened(item);
+					FileInfo file = Services.getScanner().findFileInTree(item);
+					if (file == null)
+						file = item;
+					if (file.deleteFile()) {
+						Services.getHistory().removeBookInfo(getDB(), file, true, true);
+					}
+//					boolean b = temp.delete();
+//					if (b == false)
+//					{
+//						Log.d("DeleteRecursive", "DELETE FAIL");
+//					}
+				}
+			}
+
+		}
+		dir.delete();
+		if (fi!=null) {
+			if (fi.parent != null)
+				directoryUpdated(fi.parent);
+			else directoryUpdated(fi);
+		}
+	}
 	
 	public void askDeleteRecent(final FileInfo item)
 	{
@@ -1651,7 +1701,34 @@ public void done() {
 					itemsBook.add("book.language=" + fi.language);
 				}
 				if (!StrUtils.isEmptyStr(fi.genre)) {
-					itemsBook.add("book.genre=" + fi.genre);
+					// lets try to get out genre name
+					GenreSAXElem ge = null;
+					String genreDescr = "";
+					if (!StrUtils.isEmptyStr(fi.genre)) {
+
+						String lang = CoolReader.this.getCurrentLanguage();
+						if (lang.length()>2) lang = lang.substring(0,2);
+
+						GenreSAXElem.mActivity=CoolReader.this;
+						try {
+							if (GenreSAXElem.elemList.size()==0) GenreSAXElem.initGenreList();
+						} catch (Exception e) {
+							log.e("exception while ini genre list", e);
+						}
+						ge = GenreSAXElem.getGenreDescr(lang,fi.genre);
+						if (ge != null)
+							if (ge.hshAttrs!=null) {
+								genreDescr=ge.hshAttrs.get("detailed");
+								if (StrUtils.isEmptyStr(genreDescr))
+									genreDescr=ge.hshAttrs.get("genre-title");
+								if (StrUtils.isEmptyStr(genreDescr))
+									genreDescr=ge.hshAttrs.get("title");
+						}
+					}
+					if ((!StrUtils.isEmptyStr(fi.genre)) && (!StrUtils.isEmptyStr(genreDescr)))
+							itemsBook.add("book.genre=" + genreDescr+" ("+fi.genre+")");
+					if ((!StrUtils.isEmptyStr(fi.genre)) && (StrUtils.isEmptyStr(genreDescr)))
+						itemsBook.add("book.genre=" + fi.genre);
 				}
 				String annot = "";
 				if (!StrUtils.isEmptyStr(fi.annotation)) {
diff --git a/android/src/org/coolreader/crengine/BaseActivity.java b/android/src/org/coolreader/crengine/BaseActivity.java
index 5f6932905e..cacb3bfd18 100644
--- a/android/src/org/coolreader/crengine/BaseActivity.java
+++ b/android/src/org/coolreader/crengine/BaseActivity.java
@@ -32,25 +32,34 @@
 import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.content.res.TypedArray;
+import android.graphics.Color;
 import android.os.Build;
 import android.os.Bundle;
+import android.os.Handler;
 import android.os.PowerManager;
 import android.support.annotation.RequiresPermission;
 import android.text.ClipboardManager;
+import android.util.AttributeSet;
 import android.util.DisplayMetrics;
 import android.view.ContextMenu;
 import android.view.ContextMenu.ContextMenuInfo;
 import android.view.Display;
 import android.view.Gravity;
+import android.view.InflateException;
 import android.view.KeyEvent;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.MenuItem.OnMenuItemClickListener;
 import android.view.View;
 import android.view.View.OnCreateContextMenuListener;
 import android.view.ViewConfiguration;
+import android.view.ViewGroup;
 import android.view.Window;
 import android.view.WindowManager;
 import android.view.WindowManager.LayoutParams;
+import android.widget.TextView;
 import android.widget.Toast;
 //import com.github.johnpersano.supertoasts.library.Style;
 //import com.github.johnpersano.supertoasts.library.SuperActivityToast;
@@ -59,6 +68,36 @@
 @SuppressLint("Registered")
 public class BaseActivity extends Activity implements Settings {
 
+//	@Override
+//	public boolean onCreateOptionsMenu(Menu menu) {
+//		MenuInflater inflater = getMenuInflater();
+//		inflater.inflate(R.menu.cr3_browser_menu, menu);
+//		getLayoutInflater().setFactory(new LayoutInflater.Factory() {
+//			@Override
+//			public View onCreateView(String name, Context context, AttributeSet attrs) {
+//				if (name.equalsIgnoreCase("com.android.internal.view.menu.IconMenuItemView")) {
+//					try{
+//						LayoutInflater f = getLayoutInflater();
+//						final View view = f.createView(name, null, attrs);
+//						new Handler().post(new Runnable() {
+//							public void run() {
+//								// set the background drawable
+//								view .setBackgroundResource(R.drawable.background_tiled_dark_v3);
+//
+//								// set the text color
+//								((TextView) view).setTextColor(Color.WHITE);
+//							}
+//						});
+//						return view;
+//					} catch (InflateException e) {
+//					} catch (ClassNotFoundException e) {}
+//				}
+//				return null;
+//			}
+//		});
+//		return super.onCreateOptionsMenu(menu);
+//	}
+
 	private static final Logger log = L.create("ba");
 	private View mDecorView;
 
@@ -1514,13 +1553,21 @@ public void onSettingsChanged(Properties props, Properties oldProps) {
 		// override for specific actions
 		
 	}
-	
+
+	public void showActionsToolbarMenu(final ReaderAction[] actions, final CRToolBar.OnActionHandler onActionHandler) {
+		CRToolBar toolbarView = new CRToolBar(this, ReaderAction.createList(actions), false,
+				false, true, false);
+		toolbarView.setFocusable(false);
+		toolbarView.showPopupMenu(actions, onActionHandler);
+	}
+
 	public void showActionsPopupMenu(final ReaderAction[] actions, final CRToolBar.OnActionHandler onActionHandler) {
 		ArrayList<ReaderAction> list = new ArrayList<ReaderAction>(actions.length);
 		for (ReaderAction a : actions)
 			list.add(a);
 		showActionsPopupMenu(list, onActionHandler);
 	}
+
 	public void showActionsPopupMenu(final ArrayList<ReaderAction> actions, final CRToolBar.OnActionHandler onActionHandler) {
 		registerForContextMenu(contentView);
 		contentView.setOnCreateContextMenuListener(new OnCreateContextMenuListener() {
@@ -1538,6 +1585,7 @@ public boolean onMenuItemClick(MenuItem item) {
                                 return onActionHandler.onActionSelected(action);
                             }
                         });
+						//item.setIcon(action.getIconId());
                     }
                 }
 			}
@@ -1974,7 +2022,6 @@ public Properties loadSettings(BaseActivity activity, File file) {
 			props.applyDefault(ReaderView.PROP_PAGE_MARGIN_RIGHT, hmargin);
 			props.applyDefault(ReaderView.PROP_PAGE_MARGIN_TOP, vmargin);
 			props.applyDefault(ReaderView.PROP_PAGE_MARGIN_BOTTOM, vmargin);
-
 			props.applyDefault(ReaderView.PROP_ROUNDED_CORNERS_MARGIN, "0");
 			
 	        props.applyDefault(ReaderView.PROP_APP_SCREEN_UPDATE_MODE, "0");
diff --git a/android/src/org/coolreader/crengine/BookInfoEditDialog.java b/android/src/org/coolreader/crengine/BookInfoEditDialog.java
index 492ff54b4f..4e4b4f77bc 100644
--- a/android/src/org/coolreader/crengine/BookInfoEditDialog.java
+++ b/android/src/org/coolreader/crengine/BookInfoEditDialog.java
@@ -252,7 +252,14 @@ public void onClick(View v) {
 				onNegativeButtonClick();
 			}
 		});
-        ImageButton btnOpenBook = (ImageButton)view.findViewById(R.id.btn_open_book);
+		ImageButton btnOk = (ImageButton)view.findViewById(R.id.base_dlg_btn_positive);
+		btnOk.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				onOkButtonClick();
+			}
+		});
+		ImageButton btnOpenBook = (ImageButton)view.findViewById(R.id.btn_open_book);
         btnOpenBook.setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View v) {
@@ -406,7 +413,7 @@ private void save() {
         int rate =(int)(rbBookRating.getRating() + 0.5f);
         if (rate >=0 && rate <= 5)
             modified = file.setRate(rate) || modified;
-        int state = FileInfo.STATE_NEW;
+		int state = FileInfo.STATE_NEW;
 		int currentStateId = rgState.getCheckedRadioButtonId();
 		if (currentStateId == R.id.book_state_new)
 			state = FileInfo.STATE_NEW;
@@ -443,9 +450,13 @@ public void run() {
 
 	@Override
 	protected void onNegativeButtonClick() {
-		save();
 		super.onNegativeButtonClick();
 	}
+
+	protected void onOkButtonClick() {
+		save();
+		super.onPositiveButtonClick();
+	}
 	
 	
 }
diff --git a/android/src/org/coolreader/crengine/CRRootView.java b/android/src/org/coolreader/crengine/CRRootView.java
index a28f9c3476..70f0be8e03 100644
--- a/android/src/org/coolreader/crengine/CRRootView.java
+++ b/android/src/org/coolreader/crengine/CRRootView.java
@@ -790,7 +790,7 @@ public void showMenu() {
 			//ReaderAction.OPEN_BOOK_FROM_GD,
 			ReaderAction.EXIT,	
 		};
-		mActivity.showActionsPopupMenu(actions, new OnActionHandler() {
+		mActivity.showActionsToolbarMenu(actions, new OnActionHandler() {
 			@Override
 			public boolean onActionSelected(ReaderAction item) {
 				if (item == ReaderAction.EXIT) {
@@ -821,6 +821,4 @@ public boolean onActionSelected(ReaderAction item) {
 		});
 	}
 
-	
-	
 }
diff --git a/android/src/org/coolreader/crengine/CRToolBar.java b/android/src/org/coolreader/crengine/CRToolBar.java
index 2499fe8175..9135381d1f 100644
--- a/android/src/org/coolreader/crengine/CRToolBar.java
+++ b/android/src/org/coolreader/crengine/CRToolBar.java
@@ -104,6 +104,14 @@ private LinearLayout inflateItem(ReaderAction action) {
 		final LinearLayout view = (LinearLayout)inflater.inflate(R.layout.popup_toolbar_item, null);
 		ImageView icon = (ImageView)view.findViewById(R.id.action_icon);
 		TextView label = (TextView)view.findViewById(R.id.action_label);
+		int colorIcon;
+		if (activity instanceof CoolReader) {
+			TypedArray a = ((CoolReader) activity).getTheme().obtainStyledAttributes(new int[]
+					{R.attr.colorIcon});
+			colorIcon = a.getColor(0, Color.GRAY);
+			a.recycle();
+			label.setTextColor(colorIcon);
+		}
 		icon.setImageResource(action != null ? action.getIconIdWithDef(activity) : Utils.resolveResourceIdByAttr(activity, R.attr.cr3_button_more_drawable, R.drawable.cr3_button_more));
 		//icon.setMinimumHeight(buttonHeight);
 		icon.setMinimumWidth(buttonWidth);
@@ -362,28 +370,49 @@ public void showOverflowMenu() {
 //			showContextMenuForChild(overflowButton);
 		}
 	}
-	
+
+	public void showPopupMenu(final ReaderAction[] actions, final OnActionHandler onActionHandler) {
+		if (popup != null)
+			popup.dismiss();
+		ArrayList<ReaderAction> act = new ArrayList<ReaderAction>();
+		for (ReaderAction ra: actions) act.add(ra);
+		showPopup(activity, activity.getContentView(), act,
+				onActionHandler, onOverflowHandler, act.size(), isMultiline ? popupLocation : Settings.VIEWER_TOOLBAR_BOTTOM);
+	}
 //	private void onMoreButtonClick() {
 //		showOverflowMenu();
 //	}
 	
 	private void onButtonClick(ReaderAction item) {
-		if (onActionHandler != null)
-			onActionHandler.onActionSelected(item);
+		if (item!=null)
+			if (onActionHandler != null)
+				onActionHandler.onActionSelected(item);
 	}
 
 	private Bitmap InverseBitmap(Bitmap src){
 		Bitmap dest = Bitmap.createBitmap(
 				src.getWidth(), src.getHeight(), src.getConfig());
 
+//		for(int i = 0; i < src.getWidth(); i++){
+//			for(int j = 0; j < src.getHeight(); j++){
+//
+//				dest.setPixel(i, j, Color.argb(
+//						Color.alpha(src.getPixel(i, j)),
+//						255 - Color.red(src.getPixel(i, j)),
+//						255 - Color.green(src.getPixel(i, j)),
+//						255 - Color.blue(src.getPixel(i, j))));
+//			}
+//		}
+
 		for(int i = 0; i < src.getWidth(); i++){
 			for(int j = 0; j < src.getHeight(); j++){
 
 				dest.setPixel(i, j, Color.argb(
 						Color.alpha(src.getPixel(i, j)),
-						255 - Color.red(src.getPixel(i, j)),
-						255 - Color.green(src.getPixel(i, j)),
-						255 - Color.blue(src.getPixel(i, j))));
+						(Color.red(src.getPixel(i, j))>160)?Color.red(src.getPixel(i, j))-160:0,
+						(Color.green(src.getPixel(i, j))>160)?Color.green(src.getPixel(i, j))-160:0,
+						(Color.blue(src.getPixel(i, j))>160)?Color.blue(src.getPixel(i, j))-160:0
+				));
 			}
 		}
 
@@ -611,33 +640,37 @@ protected void onLayout(boolean changed, int left, int top, int right,
         			layoutItemRect.set(layoutLineRect);
         			layoutItemRect.left += i * itemWidth + spacing;
         			layoutItemRect.right = layoutItemRect.left + itemWidth - spacing;
-        			final ReaderAction action = (visibleNonButtonCount > 0 && i + startBtn == iconActions.size()) || (lineCount > maxLines && currentLine == maxLines - 1 && i == currentLineButtons - 1) ? null : iconActions.get(startBtn + i);
-        			if (action != null)
+        			final ReaderAction action = (visibleNonButtonCount > 0 && i + startBtn == iconActions.size()) ||
+							(lineCount > maxLines && currentLine == maxLines - 1 && i == currentLineButtons - 1) ? null :
+							iconActions.get(startBtn + i);
+					//log.v("action = "+action);
+					if (action != null)
         				lastButtonIndex = startBtn + i;
-        			log.v("item=" + layoutItemRect);
-        			LinearLayout item = inflateItem(action);
+        			//log.v("item=" + layoutItemRect);
+        			final LinearLayout item = inflateItem(action);
         			//item.setLayoutParams(new LinearLayout.LayoutParams(itemRect.width(), itemRect.height()));
         			item.measure(MeasureSpec.makeMeasureSpec(layoutItemRect.width(), MeasureSpec.EXACTLY), MeasureSpec.makeMeasureSpec(layoutItemRect.height(), MeasureSpec.EXACTLY));
         			item.layout(layoutItemRect.left, layoutItemRect.top, layoutItemRect.right, layoutItemRect.bottom);
         			//item.forceLayout();
         			addView(item);
+        			// this is overflow panel
         			item.setOnClickListener(new OnClickListener() {
 						@Override
 						public void onClick(View v) {
-							if (action != null)
-								onButtonClick(action);
-							else
-								showOverflowMenu();
+						if (action != null)
+							onButtonClick(action);
+						else
+							showOverflowMenu();
+						}
+					});
+        			item.setOnLongClickListener(new OnLongClickListener() {
+						@Override
+						public boolean onLongClick(View v) {
+							ReaderAction ram = action.getMirrorAction();
+							if (ram != null) onButtonClick(ram);
+							return true;
 						}
 					});
-        			// doesnt work...
-					//item.setOnLongClickListener(new OnLongClickListener() {
-					//	@Override
-					//	public boolean onLongClick(View v) {
-					//		if (action == null) activity.showToast("asdf");
-					//		return true;
-					//	}
-					//});
         		}
 //        		addView(scroll);
         	}
@@ -827,7 +860,9 @@ public boolean onTouch(View v, MotionEvent event) {
 			@Override
 			public boolean onActionSelected(ReaderAction item) {
 				popup.dismiss();
+				if (onActionHandler==null) log.v("EMPTY!!!"); else
 				return onActionHandler.onActionSelected(item);
+				return false;
 			}
 		});
 		if (onOverflowHandler != null)
diff --git a/android/src/org/coolreader/crengine/EinkScreen.java b/android/src/org/coolreader/crengine/EinkScreen.java
index 23f63453de..0a3519260e 100644
--- a/android/src/org/coolreader/crengine/EinkScreen.java
+++ b/android/src/org/coolreader/crengine/EinkScreen.java
@@ -92,6 +92,11 @@ public static void PrepareController(View view, boolean isPartially) {
 			}
 			*/
 		} else if (DeviceInfo.EINK_ONYX) {
+			if (mRefreshNumber == -1) {
+				mRefreshNumber = 0;
+				EpdController.setViewDefaultUpdateMode(view, UpdateMode.GC);
+				return;
+			}
 			if (mUpdateInterval > 0) {
 				mRefreshNumber++;
 				if (mRefreshNumber >= mUpdateInterval) {
@@ -140,8 +145,7 @@ public static void ResetController(int mode, View view) {
 				default:
 					mRefreshNumber = -1;
 			}
-		}
-		if (DeviceInfo.EINK_ONYX) {
+		} else if (DeviceInfo.EINK_ONYX) {
 			mIsSupportRegal = EpdController.supportRegal();
 			mRefreshNumber = 0;
 			if (mUpdateInterval == 0)
diff --git a/android/src/org/coolreader/crengine/Engine.java b/android/src/org/coolreader/crengine/Engine.java
index b2b293d370..81361e0452 100644
--- a/android/src/org/coolreader/crengine/Engine.java
+++ b/android/src/org/coolreader/crengine/Engine.java
@@ -376,10 +376,7 @@ public void run() {
 								if (progressIcon != null)
 									mProgress.setIcon(progressIcon);
 								else
-									mProgress.setIcon(
-											Utils.resolveResourceIdByAttr(mActivity, R.attr.attr_cr3_logo, R.drawable.cr3_logo_nerd_hc)
-									//		R.drawable.cr3_logo_nerd_hc
-									);
+									mProgress.setIcon(R.mipmap.cr3_logo);
 								mProgress.setMax(10000);
 								mProgress.setCancelable(false);
 								mProgress.setProgress(mainProgress);
diff --git a/android/src/org/coolreader/crengine/FileBrowser.java b/android/src/org/coolreader/crengine/FileBrowser.java
index 22f56e0a8b..2ee7c8dbbc 100644
--- a/android/src/org/coolreader/crengine/FileBrowser.java
+++ b/android/src/org/coolreader/crengine/FileBrowser.java
@@ -42,6 +42,18 @@ public class FileBrowser extends LinearLayout implements FileInfoChangeListener
 	ListView mListView;
 
 	public static final int MAX_SUBDIR_LEN = 32;
+
+	public void showItemPopupMenu() {
+		mActivity.registerForContextMenu(mActivity.contentView);
+		mActivity.contentView.setOnCreateContextMenuListener(new OnCreateContextMenuListener() {
+			@Override
+			public void onCreateContextMenu(ContextMenu menu, View v,
+											ContextMenu.ContextMenuInfo menuInfo) {
+				mListView.createContextMenu(menu);
+			}
+		});
+		mActivity.contentView.showContextMenu();
+	}
 	
 	private class FileBrowserListView extends BaseListView {
 
@@ -62,6 +74,7 @@ public boolean onItemLongClick(AdapterView<?> arg0, View arg1,
 					log.d("onItemLongClick("+position+")");
 					//return super.performItemClick(view, position, id);
 					FileInfo item = (FileInfo) getAdapter().getItem(position);
+					//mActivity.showToast(item.filename);
 					if ( item==null )
 						return false;
 					//openContextMenu(_this);
@@ -101,13 +114,18 @@ public void createContextMenu(ContextMenu menu) {
             } else if (selectedItem!=null && selectedItem.isDirectory && !selectedItem.isOPDSDir()) {
                 inflater.inflate(R.menu.cr3_file_browser_file_folder_context_menu, menu);
                 menu.setHeaderTitle(mActivity.getString(R.string.context_menu_title_folder));
-		    } else if (selectedItem!=null && selectedItem.isDirectory) {
+		    } else if (selectedItem!=null && !selectedItem.isDirectory && !selectedItem.isOPDSDir() &&
+					!selectedItem.isOPDSBook()) {
+				inflater.inflate(R.menu.cr3_file_browser_file_context_menu, menu);
+				menu.setHeaderTitle(mActivity.getString(R.string.context_menu_title_book));
+			} else if (selectedItem!=null && selectedItem.isDirectory) {
 			    inflater.inflate(R.menu.cr3_file_browser_folder_context_menu, menu);
 			    menu.setHeaderTitle(mActivity.getString(R.string.context_menu_title_book));
 		    } else {
-			    inflater.inflate(R.menu.cr3_file_browser_context_menu, menu);
-			    menu.setHeaderTitle(mActivity.getString(R.string.context_menu_title_book));
-		    }
+				inflater.inflate(R.menu.cr3_file_browser_context_menu, menu);
+				menu.setHeaderTitle(mActivity.getString(R.string.context_menu_title_book));
+			}
+
 		    for ( int i=0; i<menu.size(); i++ ) {
 		    	menu.getItem(i).setOnMenuItemClickListener(new OnMenuItemClickListener() {
 					public boolean onMenuItemClick(MenuItem item) {
@@ -303,6 +321,22 @@ public void onThemeChanged() {
 	}
 	
 	FileInfo selectedItem = null;
+
+	void saveBookInfo() {
+		Services.getHistory().getOrCreateBookInfo(mActivity.getDB(), selectedItem, new History.BookInfoLoadedCallack() {
+			@Override
+			public void onBookInfoLoaded(BookInfo bookInfo) {
+				BookInfo bi = new BookInfo(selectedItem);
+				mActivity.getDB().saveBookInfo(bi);
+				mActivity.getDB().flush();
+				BookInfo bi2 = Services.getHistory().getBookInfo(selectedItem);
+				if (bi2 != null)
+					bi2.getFileInfo().setFileProperties(selectedItem);
+				if ((selectedItem.parent) != null)
+					mActivity.directoryUpdated(selectedItem.parent, selectedItem);
+			}
+		});
+	}
 	
 	public boolean onContextItemSelected(MenuItem item) {
 		
@@ -367,11 +401,157 @@ public boolean onContextItemSelected(MenuItem item) {
             log.d("folder_open menu item selected");
             showDirectory(selectedItem, null);
             return true;
-        case R.id.folder_to_favorites:
+		case R.id.folder_delete:
+			log.d("folder_delete menu item selected");
+			//mActivity.showToast(selectedItem.pathname);
+			final File f = new File(selectedItem.pathname);
+			String[] children = f.list();
+			if (children.length>0)
+				mActivity.askConfirmation( mActivity.getString(R.string.delete_dir_confirm)+" "+children.length, new Runnable() {
+					@Override
+					public void run() {
+						mActivity.DeleteRecursive(f,selectedItem);
+					}
+				}); else mActivity.DeleteRecursive(f,selectedItem);
+			return true;
+		case R.id.folder_to_favorites:
             log.d("folder_to_favorites menu item selected");
             addToFavorites(selectedItem);
             return true;
+		case R.id.book_info:
+			log.d("book_info menu item selected");
+			if (!selectedItem.isDirectory && !selectedItem.isOPDSBook() && !selectedItem.isOnlineCatalogPluginDir()) {
+				Services.getHistory().getOrCreateBookInfo(mActivity.getDB(), selectedItem, new History.BookInfoLoadedCallack() {
+					@Override
+					public void onBookInfoLoaded(BookInfo bookInfo) {
+						BookInfo bi = new BookInfo(selectedItem);
+						mActivity.showBookInfo(bi);
+					}
+				});
+			}
+			return true;
+		case R.id.book_edit:
+			log.d("book_edit menu item selected");
+			if (!selectedItem.isDirectory && !selectedItem.isOPDSBook() && !selectedItem.isOnlineCatalogPluginDir()) {
+				mActivity.editBookInfo(currDirectory, selectedItem);
+			}
+			return true;
+		case R.id.book_shortcut:
+			log.d("book_shortcut menu item selected");
+			if (!selectedItem.isDirectory && !selectedItem.isOPDSBook() && !selectedItem.isOnlineCatalogPluginDir()) {
+				mActivity.createBookShortcut(selectedItem);
+			}
+			return true;
+		case R.id.book_to_gd:
+			log.d("book_to_gd menu item selected");
+			if (!selectedItem.isDirectory && !selectedItem.isOPDSBook() && !selectedItem.isOnlineCatalogPluginDir()) {
+				mActivity.mGoogleDriveTools.signInAndDoAnAction(
+						mActivity.mGoogleDriveTools.REQUEST_CODE_SAVE_CURRENT_BOOK_TO_GD, FileBrowser.this);
+			}
+			return true;
+		case R.id.book_no_mark:
+			log.d("book_no_mark menu item selected");
+			if (!selectedItem.isDirectory && !selectedItem.isOPDSBook() && !selectedItem.isOnlineCatalogPluginDir()) {
+				int state = selectedItem.getReadingState();
+				int newState = FileInfo.STATE_NEW;
+				boolean modified = state != newState;
+				selectedItem.setReadingState(FileInfo.STATE_NEW);
+				if (modified) saveBookInfo();
+			}
+			return true;
+		case R.id.book_to_read:
+			log.d("book_to_read menu item selected");
+			if (!selectedItem.isDirectory && !selectedItem.isOPDSBook() && !selectedItem.isOnlineCatalogPluginDir()) {
+				int state = selectedItem.getReadingState();
+				int newState = FileInfo.STATE_TO_READ;
+				boolean modified = state != newState;
+				selectedItem.setReadingState(FileInfo.STATE_TO_READ);
+				if (modified) saveBookInfo();
+			}
+			return true;
+		case R.id.book_reading:
+			log.d("book_reading menu item selected");
+			if (!selectedItem.isDirectory && !selectedItem.isOPDSBook() && !selectedItem.isOnlineCatalogPluginDir()) {
+				int state = selectedItem.getReadingState();
+				int newState = FileInfo.STATE_READING;
+				boolean modified = state != newState;
+				selectedItem.setReadingState(FileInfo.STATE_READING);
+				if (modified) saveBookInfo();
+			}
+			return true;
+		case R.id.book_finished:
+			log.d("book_finished menu item selected");
+			if (!selectedItem.isDirectory && !selectedItem.isOPDSBook() && !selectedItem.isOnlineCatalogPluginDir()) {
+				int state = selectedItem.getReadingState();
+				int newState = FileInfo.STATE_FINISHED;
+				boolean modified = state != newState;
+				selectedItem.setReadingState(FileInfo.STATE_FINISHED);
+				if (modified) saveBookInfo();
+			}
+			return true;
+		case R.id.book_rate_5:
+			log.d("book_rate_5 menu item selected");
+			if (!selectedItem.isDirectory && !selectedItem.isOPDSBook() && !selectedItem.isOnlineCatalogPluginDir()) {
+				int rate = selectedItem.getRate();
+				int newRate = 5;
+				boolean modified = rate != newRate;
+				selectedItem.setRate(newRate);
+				if (modified) saveBookInfo();
+			}
+			return true;
+		case R.id.book_rate_4:
+			log.d("book_rate_4 menu item selected");
+			if (!selectedItem.isDirectory && !selectedItem.isOPDSBook() && !selectedItem.isOnlineCatalogPluginDir()) {
+				int rate = selectedItem.getRate();
+				int newRate = 4;
+				boolean modified = rate != newRate;
+				selectedItem.setRate(newRate);
+				if (modified) saveBookInfo();
+			}
+			return true;
+		case R.id.book_rate_3:
+			log.d("book_rate_3 menu item selected");
+			if (!selectedItem.isDirectory && !selectedItem.isOPDSBook() && !selectedItem.isOnlineCatalogPluginDir()) {
+				int rate = selectedItem.getRate();
+				int newRate = 3;
+				boolean modified = rate != newRate;
+				selectedItem.setRate(newRate);
+				if (modified) saveBookInfo();
+			}
+			return true;
+		case R.id.book_rate_2:
+			log.d("book_rate_2 menu item selected");
+			if (!selectedItem.isDirectory && !selectedItem.isOPDSBook() && !selectedItem.isOnlineCatalogPluginDir()) {
+				int rate = selectedItem.getRate();
+				int newRate = 2;
+				boolean modified = rate != newRate;
+				selectedItem.setRate(newRate);
+				if (modified) saveBookInfo();
+			}
+			return true;
+		case R.id.book_rate_1:
+			log.d("book_rate_1 menu item selected");
+			if (!selectedItem.isDirectory && !selectedItem.isOPDSBook() && !selectedItem.isOnlineCatalogPluginDir()) {
+				int rate = selectedItem.getRate();
+				int newRate = 1;
+				boolean modified = rate != newRate;
+				selectedItem.setRate(newRate);
+				if (modified) saveBookInfo();
+			}
+			return true;
+		case R.id.book_rate_0:
+			log.d("book_rate_0 menu item selected");
+			if (!selectedItem.isDirectory && !selectedItem.isOPDSBook() && !selectedItem.isOnlineCatalogPluginDir()) {
+				int rate = selectedItem.getRate();
+				int newRate = 0;
+				boolean modified = rate != newRate;
+				selectedItem.setRate(newRate);
+				if (modified) saveBookInfo();
+			}
+			return true;
+
 		}
+
 		return false;
 	}
 
@@ -1119,7 +1299,8 @@ public void onClick(View v) {
 								public void onBookInfoLoaded(BookInfo bookInfo) {
 									//mActivity.showToast(item.annotation);
 									//log.v("BOOKNF annotation:"+item.annotation);
-									mActivity.showBookInfo(new BookInfo(item));
+                                    BookInfo bi = new BookInfo(item);
+									mActivity.showBookInfo(bi);
 								}
 							});
 						}
@@ -1131,12 +1312,17 @@ public void onBookInfoLoaded(BookInfo bookInfo) {
 
 						@Override
 						public void onClick(View v) {
-							Services.getHistory().getOrCreateBookInfo(mActivity.getDB(), item, new History.BookInfoLoadedCallack() {
-								@Override
-								public void onBookInfoLoaded(BookInfo bookInfo) {
-									mActivity.showToast("Did not implemented yet...");
-								}
-							});
+							if ( item!=null ) {
+								selectedItem = item;
+								showItemPopupMenu();
+							}
+//							Services.getHistory().getOrCreateBookInfo(mActivity.getDB(), item, new History.BookInfoLoadedCallack() {
+//								@Override
+//								public void onBookInfoLoaded(BookInfo bookInfo) {
+//									mActivity.showToast("Did not implemented yet...");
+//									showContextMenu();
+//								}
+//							});
 						}
 					});
 				}
diff --git a/android/src/org/coolreader/crengine/FileInfo.java b/android/src/org/coolreader/crengine/FileInfo.java
index c549a682ae..d12f2d7ce2 100644
--- a/android/src/org/coolreader/crengine/FileInfo.java
+++ b/android/src/org/coolreader/crengine/FileInfo.java
@@ -39,6 +39,7 @@ public class FileInfo {
 	public String series; // series name w/o number
 	public int seriesNumber; // number of book inside series
     public int saved_with_ver; // version of database book was saved with
+	public boolean need_to_update_ver; // file was saved in old format
 	public String genre;
 	public String annotation;
 	public String srclang;
@@ -292,16 +293,19 @@ private void fromFile( File f )
 	public FileInfo( File f )
 	{
 		fromFile(f);
+		need_to_update_ver = false;
 	}
 	
 	public FileInfo()
 	{
+		need_to_update_ver = false;
 	}
 
 	/// doesn't copy parent and children
 	public FileInfo(FileInfo v)
 	{
 		assign(v);
+		need_to_update_ver = false;
 	}
 
 	public void assign(FileInfo v)
@@ -328,6 +332,22 @@ public void assign(FileInfo v)
 		username = v.username;
 		password = v.password;
 		id = v.id;
+		saved_with_ver = v.saved_with_ver;
+		genre = v.genre;
+		annotation = v.annotation;
+		srclang = v.srclang;
+		translator = v.translator;
+		docauthor = v.docauthor;
+		docprogram = v.docprogram;
+		docdate = v.docdate;
+		docsrcurl = v.docsrcurl;
+		docsrcocr = v.docsrcocr;
+		docversion = v.docversion;
+		publname = v.publname;
+		publisher = v.publisher;
+		publcity = v.publcity;
+		publyear = v.publyear;
+		publisbn = v.publisbn;
 	}
 	
 	/**
@@ -1165,11 +1185,7 @@ public boolean equals(Object obj) {
 				return false;
 		} else if (!dirs.equals(other.dirs))
 			return false;
-		if (filename == null) {
-			if (other.filename != null)
-				return false;
-		} else if (!filename.equals(other.filename))
-			return false;
+		if (!StrUtils.euqalsIgnoreNulls(filename, other.filename, true)) return false;
 		if (files == null) {
 			if (other.files != null)
 				return false;
@@ -1187,21 +1203,9 @@ public boolean equals(Object obj) {
 			return false;
 		if (isScanned != other.isScanned)
 			return false;
-		if (language == null) {
-			if (other.language != null)
-				return false;
-		} else if (!language.equals(other.language))
-			return false;
-		if (lang_from == null) {
-			if (other.lang_from != null)
-				return false;
-		} else if (!lang_from.equals(other.lang_from))
-			return false;
-		if (lang_to == null) {
-			if (other.lang_to != null)
-				return false;
-		} else if (!lang_to.equals(other.lang_to))
-			return false;
+		if (!StrUtils.euqalsIgnoreNulls(language, other.language, true)) return false;
+		if (!StrUtils.euqalsIgnoreNulls(lang_from, other.lang_from, true)) return false;
+		if (!StrUtils.euqalsIgnoreNulls(lang_to, other.lang_to, true)) return false;
 		if (lastAccessTime != other.lastAccessTime)
 			return false;
 		if (parent == null) {
@@ -1209,30 +1213,29 @@ public boolean equals(Object obj) {
 				return false;
 		} else if (!parent.equals(other.parent))
 			return false;
-		if (path == null) {
-			if (other.path != null)
-				return false;
-		} else if (!path.equals(other.path))
-			return false;
-		if (pathname == null) {
-			if (other.pathname != null)
-				return false;
-		} else if (!pathname.equals(other.pathname))
-			return false;
-		if (series == null) {
-			if (other.series != null)
-				return false;
-		} else if (!series.equals(other.series))
-			return false;
+		if (!StrUtils.euqalsIgnoreNulls(path, other.path, true)) return false;
+		if (!StrUtils.euqalsIgnoreNulls(pathname, other.pathname, true)) return false;
+		if (!StrUtils.euqalsIgnoreNulls(series, other.series, true)) return false;
 		if (seriesNumber != other.seriesNumber)
 			return false;
 		if (size != other.size)
 			return false;
-		if (title == null) {
-			if (other.title != null)
-				return false;
-		} else if (!title.equals(other.title))
-			return false;
+		if (!StrUtils.euqalsIgnoreNulls(title, other.title, true)) return false;
+		if (!StrUtils.euqalsIgnoreNulls(genre, other.genre, true)) return false;
+		if (!StrUtils.euqalsIgnoreNulls(annotation, other.annotation, true)) return false;
+		if (!StrUtils.euqalsIgnoreNulls(srclang, other.srclang, true)) return false;
+		if (!StrUtils.euqalsIgnoreNulls(translator, other.translator, true)) return false;
+		if (!StrUtils.euqalsIgnoreNulls(docauthor, other.docauthor, true)) return false;
+		if (!StrUtils.euqalsIgnoreNulls(docprogram, other.docprogram, true)) return false;
+		if (!StrUtils.euqalsIgnoreNulls(docdate, other.docdate, true)) return false;
+		if (!StrUtils.euqalsIgnoreNulls(docsrcurl, other.docsrcurl, true)) return false;
+		if (!StrUtils.euqalsIgnoreNulls(docsrcocr, other.docsrcocr, true)) return false;
+		if (!StrUtils.euqalsIgnoreNulls(docversion, other.docversion, true)) return false;
+		if (!StrUtils.euqalsIgnoreNulls(publname, other.publname, true)) return false;
+		if (!StrUtils.euqalsIgnoreNulls(publisher, other.publisher, true)) return false;
+		if (!StrUtils.euqalsIgnoreNulls(publcity, other.publcity, true)) return false;
+		if (!StrUtils.euqalsIgnoreNulls(publyear, other.publyear, true)) return false;
+		if (!StrUtils.euqalsIgnoreNulls(publisbn, other.publisbn, true)) return false;
 		return true;
 	}
 
diff --git a/android/src/org/coolreader/crengine/GenreSAXElem.java b/android/src/org/coolreader/crengine/GenreSAXElem.java
new file mode 100644
index 0000000000..967aeff045
--- /dev/null
+++ b/android/src/org/coolreader/crengine/GenreSAXElem.java
@@ -0,0 +1,121 @@
+package org.coolreader.crengine;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.HashMap;
+
+import org.coolreader.CoolReader;
+import org.coolreader.R;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+import org.xml.sax.helpers.DefaultHandler;
+
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
+
+public class GenreSAXElem {
+
+    public static BaseActivity mActivity;
+    public static ArrayList<GenreSAXElem> elemList = new ArrayList<GenreSAXElem>();
+
+    public String qName;
+    public GenreSAXElem parentLink;
+    public HashMap<String,String> hshAttrs;
+
+    public GenreSAXElem(String qName, GenreSAXElem parentLink, HashMap<String,String> hshAttrs) {
+        this.qName = qName;
+        this.parentLink = parentLink;
+        this.hshAttrs = hshAttrs;
+        elemList.add(this);
+    }
+
+    public static GenreSAXElem getGenreDescr(String lang, String genre) {
+        GenreSAXElem found = null;
+        for (GenreSAXElem g: elemList) {
+            if (g.hshAttrs!=null) {
+                if (g.hshAttrs.get("value")!=null)
+                    if ((g.hshAttrs.get("value").equalsIgnoreCase(genre))&&
+                            (
+                                    (g.qName.equalsIgnoreCase("genre"))||
+                                            (g.qName.equalsIgnoreCase("subgenre"))||
+                                            (g.qName.equalsIgnoreCase("genre-alt"))
+                            )
+                            ) {
+                        found = g;
+                        break;
+                    }
+            }
+        }
+        GenreSAXElem foundDescr = null;
+        GenreSAXElem foundDescrEn = null;
+        if (found!=null) {
+            for (GenreSAXElem g: elemList) {
+                if (g.hshAttrs!=null) {
+                    if (
+                            (g.parentLink==found) &&
+                                    (
+                                            (g.qName.equalsIgnoreCase("root-descr"))||
+                                                    (g.qName.equalsIgnoreCase("genre-descr"))
+                                    )
+                            ) {
+                        if (g.hshAttrs.get("lang")!=null) {
+                            if (g.hshAttrs.get("lang").equalsIgnoreCase("en")) foundDescrEn = g;
+                            if (g.hshAttrs.get("lang").equalsIgnoreCase(lang)) foundDescr = g;
+                        }
+                    }
+                }
+            }
+            if ((foundDescrEn==null)&&(foundDescr==null)&&(found.parentLink!=null)) {
+                for (GenreSAXElem g: elemList) {
+                    if (g.hshAttrs!=null) {
+                        if (
+                                (g.parentLink==found.parentLink) &&
+                                        (
+                                                (g.qName.equalsIgnoreCase("root-descr"))||
+                                                (g.qName.equalsIgnoreCase("genre-descr"))
+                                        )
+                                ) {
+                            if (g.hshAttrs.get("lang")!=null) {
+                                if (g.hshAttrs.get("lang").equalsIgnoreCase("en")) foundDescrEn = g;
+                                if (g.hshAttrs.get("lang").equalsIgnoreCase(lang)) foundDescr = g;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        if (foundDescr!=null) return foundDescr;
+        return foundDescr;
+    }
+
+    public static void initGenreList() throws SAXException, ParserConfigurationException, IOException {
+        SAXParserFactory factory = SAXParserFactory.newInstance();
+        final SAXParser saxParser = factory.newSAXParser();
+        DefaultHandler handler = new DefaultHandler() {
+            GenreSAXElem curElem = new GenreSAXElem("root", null, null);
+
+            public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException {
+                GenreSAXElem oldElem = curElem;
+                HashMap<String, String> hshAttrs = new HashMap<String, String>();
+                for (int i = 0; i < attributes.getLength(); i++) {
+                    hshAttrs.put(attributes.getQName(i), attributes.getValue(i));
+                }
+                curElem = new GenreSAXElem(qName, oldElem, hshAttrs);
+            }//end of startElement method
+
+            public void endElement(String uri, String localName, String qName) throws SAXException {
+                if (curElem != null)
+                    curElem = curElem.parentLink;
+            }
+
+            public void characters(char ch[], int start, int length) throws SAXException {
+
+            }
+            ; //end of DefaultHandler object
+        };
+        InputStream targetStream = mActivity.getResources().openRawResource(R.raw.fb2genres_utf8_wo_bom);
+        saxParser.parse(targetStream,handler);
+    }
+}
diff --git a/android/src/org/coolreader/crengine/HelpFileGenerator.java b/android/src/org/coolreader/crengine/HelpFileGenerator.java
index 4c6adf408a..83ffea1a0b 100644
--- a/android/src/org/coolreader/crengine/HelpFileGenerator.java
+++ b/android/src/org/coolreader/crengine/HelpFileGenerator.java
@@ -213,7 +213,7 @@ private static class ImageRes {
 		}
 	}
 	private static final ImageRes[] images = {
-		new ImageRes("cr3_logo", R.drawable.cr3_logo_hc),
+		new ImageRes("cr3_logo", R.mipmap.cr3_logo),
 		new ImageRes("open_file", R.drawable.ic_menu_archive),
 		new ImageRes("goto", R.drawable.ic_menu_goto),
 		new ImageRes("bookmarks", R.drawable.ic_menu_mark),
diff --git a/android/src/org/coolreader/crengine/ReaderView.java b/android/src/org/coolreader/crengine/ReaderView.java
index 4b94e5d4b6..96a7c7e970 100644
--- a/android/src/org/coolreader/crengine/ReaderView.java
+++ b/android/src/org/coolreader/crengine/ReaderView.java
@@ -161,8 +161,10 @@ protected void onSizeChanged(final int w, final int h, int oldw, int oldh) {
 
 		@Override
 		public void onWindowVisibilityChanged(int visibility) {
-			if (visibility == VISIBLE)
+			if (visibility == VISIBLE) {
+				mActivity.einkRefresh();
 				startStats();
+			}
 			else
 				stopStats();
 			super.onWindowVisibilityChanged(visibility);
@@ -170,8 +172,10 @@ public void onWindowVisibilityChanged(int visibility) {
 
 		@Override
 		public void onWindowFocusChanged(boolean hasWindowFocus) {
-			if (hasWindowFocus)
+			if (hasWindowFocus) {
+				mActivity.einkRefresh();
 				startStats();
+			}
 			else
 				stopStats();
 			super.onWindowFocusChanged(hasWindowFocus);
@@ -1900,7 +1904,7 @@ public void run() {
 						colorIcon = a.getColor(2, Color.GRAY);
 						a.recycle();
 						ColorDrawable c = new ColorDrawable(colorGrayC);
-						c.setAlpha(130);
+						c.setAlpha(170);
 						dlg.getWindow().setBackgroundDrawable(c);
 						initTapZone(dlg, grid.findViewById(R.id.tap_zone_grid_cell1), 1);
 						initTapZone(dlg, grid.findViewById(R.id.tap_zone_grid_cell2), 2);
@@ -2681,7 +2685,7 @@ public void run() {
 						ReaderAction.SAVE_CURRENT_BOOK_TO_GD,
 						ReaderAction.OPEN_BOOK_FROM_GD
 				};
-				mActivity.showActionsPopupMenu(actions, new CRToolBar.OnActionHandler() {
+				mActivity.showActionsToolbarMenu(actions, new CRToolBar.OnActionHandler() {
 					@Override
 					public boolean onActionSelected(ReaderAction item) {
 						if (item == ReaderAction.SAVE_SETTINGS_TO_GD) {
@@ -2729,7 +2733,7 @@ public boolean onActionSelected(ReaderAction item) {
 						ReaderAction.ZOOM_IN,
 						ReaderAction.ZOOM_OUT
 				};
-				mActivity.showActionsPopupMenu(fonts_actions, new CRToolBar.OnActionHandler() {
+				mActivity.showActionsToolbarMenu(fonts_actions, new CRToolBar.OnActionHandler() {
 					@Override
 					public boolean onActionSelected(ReaderAction item) {
 						if (item == ReaderAction.FONT_PREVIOUS) {
diff --git a/android/src/org/coolreader/crengine/Scanner.java b/android/src/org/coolreader/crengine/Scanner.java
index 85330789a8..ba3b0a022b 100644
--- a/android/src/org/coolreader/crengine/Scanner.java
+++ b/android/src/org/coolreader/crengine/Scanner.java
@@ -250,19 +250,21 @@ public void onFileInfoListLoaded(ArrayList<FileInfo> list) {
 				Map<String, FileInfo> mapOfFilesFoundInDb = new HashMap<String, FileInfo>();
 				for (FileInfo f : list)
 					mapOfFilesFoundInDb.put(f.getPathName(), f);
-						
 				for (int i=0; i<baseDir.fileCount(); i++) {
 					FileInfo item = baseDir.getFile(i);
 					FileInfo fromDB = mapOfFilesFoundInDb.get(item.getPathName());
 					boolean isOldVer = true;
 					if (fromDB != null) {
 						if (fromDB.saved_with_ver == MainDB.DB_VERSION) isOldVer = false;
-						//mActivity.showToast(fromDB.filename+ " "+fromDB.saved_with_ver);
 					}
-					if (isOldVer) fromDB = null;
-					if ((fromDB != null) && (!isOldVer)) {
+					if (fromDB != null) {
 						// use DB value
 						baseDir.setFile(i, fromDB);
+						if (isOldVer) {
+							FileInfo fi = new FileInfo(fromDB);
+							fi.need_to_update_ver = true;
+							filesForParsing.add(fi);
+						}
 					} else {
 						// not found in DB
 						if (item.format.canParseProperties()) {
diff --git a/android/src/org/coolreader/crengine/SelectionToolbarDlg.java b/android/src/org/coolreader/crengine/SelectionToolbarDlg.java
index 40b5158192..34fd49f539 100644
--- a/android/src/org/coolreader/crengine/SelectionToolbarDlg.java
+++ b/android/src/org/coolreader/crengine/SelectionToolbarDlg.java
@@ -141,7 +141,7 @@ public SelectionToolbarDlg(CoolReader coolReader, ReaderView readerView, Selecti
 		mAnchor = readerView.getSurface();
 
 		View panel = (LayoutInflater.from(coolReader.getApplicationContext()).inflate(R.layout.selection_toolbar, null));
-		panel.measure(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+		panel.measure(ViewGroup.LayoutParams.FILL_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
 		
 		//mReaderView.getS
 		
@@ -160,16 +160,21 @@ public boolean onTouch(View v, MotionEvent event) {
 		});
 		//super(panel);
 		int colorGrayC;
+		int colorGray;
 		TypedArray a = mCoolReader.getTheme().obtainStyledAttributes(new int[]
-				{R.attr.colorThemeGray2Contrast});
+				{R.attr.colorThemeGray2Contrast, R.attr.colorThemeGray2});
 		colorGrayC = a.getColor(0, Color.GRAY);
+		colorGray = a.getColor(1, Color.GRAY);
 		a.recycle();
 
+
 		ColorDrawable c = new ColorDrawable(colorGrayC);
 		c.setAlpha(130);
 		//mWindow.setBackgroundDrawable(c);
 
 		mPanel = panel;
+		panel.setBackgroundColor(Color.argb(170, Color.red(colorGray),Color.green(colorGray),Color.blue(colorGray)));
+
 		//mPanel.findViewById(R.id.selection_copy).setBackgroundColor(colorGrayC);
 		mPanel.findViewById(R.id.selection_copy).setBackgroundDrawable(c);
 		mPanel.findViewById(R.id.selection_copy).setOnClickListener(new OnClickListener() {
@@ -337,7 +342,7 @@ public void onDismiss() {
 		
 		mWindow.setBackgroundDrawable(new BitmapDrawable());
 		//mWindow.setAnimationStyle(android.R.style.Animation_Toast);
-		mWindow.setWidth(WindowManager.LayoutParams.WRAP_CONTENT);
+		mWindow.setWidth(WindowManager.LayoutParams.FILL_PARENT);
 		mWindow.setHeight(WindowManager.LayoutParams.WRAP_CONTENT);
 //		setWidth(panel.getWidth());
 //		setHeight(panel.getHeight());
diff --git a/android/src/org/coolreader/crengine/Settings.java b/android/src/org/coolreader/crengine/Settings.java
index a42ad29b57..6ae3befd32 100644
--- a/android/src/org/coolreader/crengine/Settings.java
+++ b/android/src/org/coolreader/crengine/Settings.java
@@ -41,8 +41,7 @@ public interface Settings {
     public static final String PROP_PAGE_MARGIN_BOTTOM      ="crengine.page.margin.bottom";
     public static final String PROP_PAGE_MARGIN_LEFT        ="crengine.page.margin.left";
     public static final String PROP_PAGE_MARGIN_RIGHT       ="crengine.page.margin.right";
-    public static final String PROP_ROUNDED_CORNERS_MARGIN  = "crengine.rounded.corners.margin";
-
+    public static final String PROP_ROUNDED_CORNERS_MARGIN  ="crengine.rounded.corners.margin";
     public static final String PROP_PAGE_VIEW_MODE          ="crengine.page.view.mode"; // pages/scroll
     public static final String PROP_PAGE_ANIMATION          ="crengine.page.animation";
     public static final String PROP_INTERLINE_SPACE         ="crengine.interline.space";
diff --git a/android/src/org/coolreader/crengine/StrUtils.java b/android/src/org/coolreader/crengine/StrUtils.java
index 8cc59fffcf..070e36c384 100644
--- a/android/src/org/coolreader/crengine/StrUtils.java
+++ b/android/src/org/coolreader/crengine/StrUtils.java
@@ -11,6 +11,10 @@ public static boolean isEmptyStr(String s) {
         return s == null || s.trim().length() == 0;
     }
 
+    public static boolean euqalsIgnoreNulls(String s1, String s2, boolean doTrim) {
+        return getNonEmptyStr(s1,doTrim).equals(getNonEmptyStr(s2,doTrim));
+    }
+
     public static String getNonEmptyStr(String s, boolean doTrim) {
         String res = s;
         if (isEmptyStr(res)) res=""; else
diff --git a/android/src/org/coolreader/db/MainDB.java b/android/src/org/coolreader/db/MainDB.java
index e16529399b..085e369669 100644
--- a/android/src/org/coolreader/db/MainDB.java
+++ b/android/src/org/coolreader/db/MainDB.java
@@ -15,10 +15,11 @@ public class MainDB extends BaseDB {
 	public static final Logger vlog = L.create("mdb", Log.VERBOSE);
 	
 	private boolean pathCorrectionRequired = false;
-	public static final int DB_VERSION = 25;
+	public static final int DB_VERSION = 26;
 	@Override
 	protected boolean upgradeSchema() {
 		log.i("DB_VERSION "+DB_VERSION);
+		//execSQL("update book set saved_with_ver = 0 ");
 		if (mDB.needUpgrade(DB_VERSION)) {
 			log.i("DB_VERSION NEED UPGRADE");
 			execSQL("CREATE TABLE IF NOT EXISTS author (" +
@@ -1540,7 +1541,9 @@ QueryHelper add(String fieldName, Long value, Long oldValue )
 		}
 		QueryHelper add(String fieldName, String value, String oldValue)
 		{
-			if ( value!=null && (oldValue==null || !oldValue.equals(value))) {
+			String val = StrUtils.isEmptyStr(value)?"":value;
+			String oldVal = StrUtils.isEmptyStr(oldValue)?"":oldValue;
+			if ( val!=null && (oldVal==null || !oldVal.equals(val))) {
 				fields.add(fieldName);
 				values.add(value);
 			}
@@ -1625,6 +1628,9 @@ boolean update( Long id )
 			}
 			buf.append(" WHERE id=" + id );
 			vlog.v("executing " + buf);
+			for (Object o: values) {
+				vlog.v("value:"+o.toString());
+			}
 			mDB.execSQL(buf.toString(), values.toArray());
 			return true;
 		}
@@ -1637,23 +1643,26 @@ Long fromFormat( DocumentFormat f )
 		QueryHelper( FileInfo newValue, FileInfo oldValue )
 		{
 			this("book");
-			add("pathname", newValue.getPathName(), oldValue.getPathName());
-			add("folder_fk", getFolderId(newValue.path), getFolderId(oldValue.path));
-			add("filename", newValue.filename, oldValue.filename);
-			add("arcname", newValue.arcname, oldValue.arcname);
-			add("title", newValue.title, oldValue.title);
-			add("series_fk", getSeriesId(newValue.series), getSeriesId(oldValue.series));
-			add("series_number", (long)newValue.seriesNumber, (long)oldValue.seriesNumber);
-			add("format", fromFormat(newValue.format), fromFormat(oldValue.format));
-			add("filesize", (long)newValue.size, (long)oldValue.size);
-			add("arcsize", (long)newValue.arcsize, (long)oldValue.arcsize);
-			add("last_access_time", (long)newValue.lastAccessTime, (long)oldValue.lastAccessTime);
-			add("create_time", (long)newValue.createTime, (long)oldValue.createTime);
-			add("flags", (long)newValue.flags, (long)oldValue.flags);
-			add("language", newValue.language, oldValue.language);
+			if (!newValue.need_to_update_ver) {
+				add("pathname", newValue.getPathName(), oldValue.getPathName());
+				add("folder_fk", getFolderId(newValue.path), getFolderId(oldValue.path));
+				add("filename", newValue.filename, oldValue.filename);
+				add("arcname", newValue.arcname, oldValue.arcname);
+				add("title", newValue.title, oldValue.title);
+				add("series_fk", getSeriesId(newValue.series), getSeriesId(oldValue.series));
+				add("series_number", (long) newValue.seriesNumber, (long) oldValue.seriesNumber);
+				add("format", fromFormat(newValue.format), fromFormat(oldValue.format));
+				add("filesize", (long) newValue.size, (long) oldValue.size);
+				add("arcsize", (long) newValue.arcsize, (long) oldValue.arcsize);
+				add("last_access_time", (long) newValue.lastAccessTime, (long) oldValue.lastAccessTime);
+				add("create_time", (long) newValue.createTime, (long) oldValue.createTime);
+				add("flags", (long) newValue.flags, (long) oldValue.flags);
+				add("language", newValue.language, oldValue.language);
+			}
 			add("lang_from", newValue.lang_from, oldValue.lang_from);
 			add("lang_to", newValue.lang_to, oldValue.lang_to);
 			add("saved_with_ver", (long)MainDB.DB_VERSION, (long)oldValue.saved_with_ver);
+			//vlog.v("QueryHelper: saved_with_ver "+(long)MainDB.DB_VERSION+"<"+(long)oldValue.saved_with_ver);
 			add("genre", newValue.genre, oldValue.genre);
 			add("annotation", newValue.annotation, oldValue.annotation);
 			add("srclang", newValue.srclang, oldValue.srclang);
diff --git a/crengine/src/lvdocview.cpp b/crengine/src/lvdocview.cpp
index 0004a2ebec..d16c86e84c 100644
--- a/crengine/src/lvdocview.cpp
+++ b/crengine/src/lvdocview.cpp
@@ -1249,10 +1249,11 @@ void LVDocView::getPageHeaderRectangle(int pageIndex, lvRect & headerRc) {
 		headerRc.bottom = 0;
 	} else {
 		int h = getPageHeaderHeight();
+		int propHeaderMargin = m_props->getIntDef(PROP_ROUNDED_CORNERS_MARGIN, 0);
 		headerRc.bottom = headerRc.top + h;
 		headerRc.top += HEADER_MARGIN;
-		headerRc.left += HEADER_MARGIN;
-		headerRc.right -= HEADER_MARGIN;
+		headerRc.left += HEADER_MARGIN + propHeaderMargin;
+		headerRc.right -= HEADER_MARGIN + propHeaderMargin;
 	}
 }
 
diff --git a/icons_src/logo/convert_all.pl b/icons_src/logo/convert_all.pl
index 6d4ad1329f..981960783d 100755
--- a/icons_src/logo/convert_all.pl
+++ b/icons_src/logo/convert_all.pl
@@ -6,21 +6,26 @@
 
 #                      dpi: 120       160       240         320         480           640
 #    factor:             0.75         1.0       1.5         2.0         3.0           4.0
+my %ic_actions_sizes  = (ldpi=>24, mdpi=>32,  hdpi=>48,  xhdpi=>64,  xxhdpi=>96,  xxxhdpi=>128);
 my %ic_legacy_sizes   = (ldpi=>36, mdpi=>48,  hdpi=>72,  xhdpi=>96,  xxhdpi=>144, xxxhdpi=>192);
 my %ic_ad_full_sizes  = (ldpi=>81, mdpi=>108, hdpi=>162, xhdpi=>216, xxhdpi=>324, xxxhdpi=>432);
 #my %ic_ad_inner_sizes = (ldpi=>54, mdpi=>72,  hdpi=>108, xhdpi=>144, xxhdpi=>216, xxxhdpi=>288);
-my %ic_ad_inner_sizes = (ldpi=>50,  mdpi=>66, hdpi=>99,  xhdpi=>132, xxhdpi=>198, xxxhdpi=>264);
+my %ic_ad_inner_sizes = (ldpi=>42, mdpi=>56,  hdpi=>84,  xhdpi=>112, xxhdpi=>168, xxxhdpi=>224);
 
 my %ic_legacy_list=(
-	'cr3_logo-180x180-store.png' => 'cr3_logo.png'
+	'cr3_logo-base-300x300-unsharp.png' => 'cr3_logo.png'
 );
 
 my %ic_ad_foreground_list=(
-	'cr3_logo-inner-348x348-unsharp.png' => 'cr3_logo_foreground.png'
+	'cr3_logo-inner-290x290.png' => 'cr3_logo_foreground.png'
 );
 
 my %ic_ad_foreground_background_list=(
-	'cr3_logo-inner-348x348-unsharp.png' => 'cr3_logo_background-432x432.png'
+	'cr3_logo-inner-290x290.png' => 'cr3_logo_background2-432x432.png'
+);
+
+my %ic_logo_button_list=(
+	'cr3_logo-base-300x300-unsharp.png' => 'cr3_logo_button.png'
 );
 
 my ($srcfile, $dstfile);
@@ -104,6 +109,8 @@
 			}
 			#}
 			
+			if (0)
+			{
 			# background
 			$bk_srcfile = $ic_ad_foreground_background_list{$srcfile};
 			$bk_dstfile = $dstfile;
@@ -117,6 +124,24 @@
 				print "Failed!\n";
 				last;
 			}
+			}
+		}
+	}
+}
+
+# Logo button icons
+while (($srcfile, $dstfile) = each(%ic_logo_button_list))
+{
+	while (($dpi, $size) = each(%ic_actions_sizes))
+	{
+		$folder = "${TARGET_DIR}/drawable-${dpi}/";
+		if (-d $folder)
+		{
+			$resfile = "${folder}/${dstfile}";
+			$cmd = "magick ${srcfile} -resize ${size}x${size} ${resfile}";
+			print "$cmd\n";
+			$ret = system($cmd);
+			print "Failed!\n" if $ret != 0;
 		}
 	}
 }
diff --git a/icons_src/logo/cr3_logo-base-300x300-unsharp.png b/icons_src/logo/cr3_logo-base-300x300-unsharp.png
new file mode 100644
index 0000000000..43a47dccbc
Binary files /dev/null and b/icons_src/logo/cr3_logo-base-300x300-unsharp.png differ
diff --git a/icons_src/logo/cr3_logo-base-300x300.png b/icons_src/logo/cr3_logo-base-300x300.png
new file mode 100644
index 0000000000..36bdd4d0f4
Binary files /dev/null and b/icons_src/logo/cr3_logo-base-300x300.png differ
diff --git a/icons_src/logo/cr3_logo-inner-174x174-store.png b/icons_src/logo/cr3_logo-inner-174x174-store.png
deleted file mode 100644
index 33e3266efe..0000000000
Binary files a/icons_src/logo/cr3_logo-inner-174x174-store.png and /dev/null differ
diff --git a/icons_src/logo/cr3_logo-inner-290x290.png b/icons_src/logo/cr3_logo-inner-290x290.png
new file mode 100644
index 0000000000..0055daf55e
Binary files /dev/null and b/icons_src/logo/cr3_logo-inner-290x290.png differ
diff --git a/icons_src/logo/cr3_logo-inner-348x348-unsharp.png b/icons_src/logo/cr3_logo-inner-348x348-unsharp.png
deleted file mode 100644
index 69d541f599..0000000000
Binary files a/icons_src/logo/cr3_logo-inner-348x348-unsharp.png and /dev/null differ
diff --git a/icons_src/logo/readme.txt b/icons_src/logo/readme.txt
index 6ae64bebc6..6c5d09b2b2 100644
--- a/icons_src/logo/readme.txt
+++ b/icons_src/logo/readme.txt
@@ -4,25 +4,28 @@
 устройствах выглядит неаккуратно, размыто. Доступно максимум для экранов xhdpi
 (dpi=320) размером 96x96 и выглядит так будто её отмасштабировали с меньшего
 размера.
-По словам Вадима Лопатина исходный рисунок с логотипом утерян.
-Была предпринята попытка воссоздать лого на основе логотипа приложения в
-магазине Google Play Store. Там логотип имеет разрешение 180x180.
-Полученный файл называется "cr3_logo-180x180-store.png".
+Была найдена иконка с разрешением 300x300 (cr3icon.png), но по словам автора
+проекта она отмасштабирована с иконки меньшего размера и вручную почищена.
+Также в магазине приложений Google Play Store есть иконка с разрешением 180x180
+(cr3_logo-180x180-store.png), похоже, что создана похожим путем. Обе иконки
+находятся в подкаталоге source данного каталога.
+Была предпринята попытка воссоздать иконки приложений на основе иконки файла
+cr3icon.png. Данный файл еще немного подретуширован и сохранен под именем
+cr3_logo-base-300x300.png.
+С помощью ImageMagick немного программно повышена резкость:
+
+  magick convert cr3_logo-base-300x300.png -unsharp 3.0x1.0x0.2, cr3_logo-base-300x300-unsharp.png
+
+Таким образом получен файл cr3_logo-base-300x300-unsharp.png.
 
 Для устройств Android 7.1 и ниже данная иконка просто отмасштабирована до
 соответсвующего разрешения.
+
 Для устройств Android 8.0 и выше создана адаптивная иконка
 (https://developer.android.com/guide/practices/ui_guidelines/icon_design_adaptive).
-Для этого из исходной иконки с Google Play Store размером 180x180 вырезана
-центральная (значащая) часть, её размер получился 174x174.
-Полученный файл называется "cr3_logo-inner-174x174-store.png".
-Так как центральная часть адаптивной иконки максимально поддерживаемого
-разрешения (xxxhdpi или 640 dpi) должна иметь больший размер (288x288 или 264x264 -
-зависит от контура иконки) её пришлось увеличить в 2 раза и немного поднять резкость
-изображения.
-
-magick cr3_logo-inner-174x174-store.png -resize 348x348 cr3_logo-inner-348x348-scaled.png
-magick convert cr3_logo-inner-348x348-scaled.png -unsharp 0x5.0 cr3_logo-inner-348x348-unsharp.png
-
-От этого получившегося файла путем масштабирования и наложения получены адаптивные
-иконки всех требуемых разрешений с помощью скрипта "convert_all.pl" и программы ImageMagick.
+Для этого из файла cr3_logo-base-300x300-unsharp.png вырезана центральная
+(значащая) часть, её размер получился 290x290.
+Полученный файл называется "cr3_logo-inner-290x290.png".
+От этого получившегося файла путем масштабирования и наложения получены
+адаптивные иконки всех требуемых разрешений с помощью скрипта "convert_all.pl"
+и программы ImageMagick.
diff --git a/icons_src/logo/cr3_logo-180x180-store.png b/icons_src/logo/source/cr3_logo-180x180-store.png
similarity index 100%
rename from icons_src/logo/cr3_logo-180x180-store.png
rename to icons_src/logo/source/cr3_logo-180x180-store.png
diff --git a/icons_src/logo/source/cr3icon.png b/icons_src/logo/source/cr3icon.png
new file mode 100644
index 0000000000..084139187b
Binary files /dev/null and b/icons_src/logo/source/cr3icon.png differ