diff --git a/android-app/src/main/AndroidManifest.xml b/android-app/src/main/AndroidManifest.xml
index 01d84c52..885df7d0 100644
--- a/android-app/src/main/AndroidManifest.xml
+++ b/android-app/src/main/AndroidManifest.xml
@@ -56,7 +56,6 @@
 		<activity android:label="@string/c_operators" android:name=".math.edit.CalculatorOperatorsActivity"/>
 
 		<activity android:label="@string/c_vars_and_constants" android:name=".math.edit.CalculatorVarsActivity"/>
-		<activity android:name=".CalculatorWikiActivity"/>
 		<activity android:launchMode="singleTop" android:name=".wizard.WizardActivity" android:theme="@style/Cpp.Theme.Wizard">
 			<intent-filter>
 				<action android:name="android.intent.action.MAIN"/>
diff --git a/android-app/src/main/java/org/solovyev/android/calculator/CalculatorActivityLauncher.java b/android-app/src/main/java/org/solovyev/android/calculator/CalculatorActivityLauncher.java
index e5b17ec8..c32a007b 100644
--- a/android-app/src/main/java/org/solovyev/android/calculator/CalculatorActivityLauncher.java
+++ b/android-app/src/main/java/org/solovyev/android/calculator/CalculatorActivityLauncher.java
@@ -262,16 +262,6 @@ public final class CalculatorActivityLauncher implements CalculatorEventListener
 					});
 				}
 				break;
-			case show_wiki_description:
-				App.getUiThreadExecutor().execute(new Runnable() {
-					@Override
-					public void run() {
-						final Intent intent = new Intent(context, CalculatorWikiActivity.class);
-						Android.addIntentFlags(intent, false, context);
-						context.startActivity(intent);
-					}
-				});
-				break;
 			case show_message_dialog:
 				final DialogData dialogData = (DialogData) data;
 				if (dialogData != null) {
diff --git a/android-app/src/main/java/org/solovyev/android/calculator/CalculatorWikiActivity.java b/android-app/src/main/java/org/solovyev/android/calculator/CalculatorWikiActivity.java
deleted file mode 100644
index 0d338ef2..00000000
--- a/android-app/src/main/java/org/solovyev/android/calculator/CalculatorWikiActivity.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright 2013 serso aka se.solovyev
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- * Contact details
- *
- * Email: se.solovyev@gmail.com
- * Site:  http://se.solovyev.org
- */
-
-package org.solovyev.android.calculator;
-
-import android.os.Bundle;
-import android.webkit.WebView;
-
-/**
- * User: serso
- * Date: 6/16/13
- * Time: 6:26 PM
- */
-public final class CalculatorWikiActivity extends EmptyActivity {
-
-	@Override
-	protected void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-
-		setContentView(R.layout.cpp_wiki_page);
-
-		final WebView webView = (WebView) findViewById(R.id.cpp_wiki_webview);
-		//webView.loadUrl("file:///android_asset/wiki/functions/sin/index.html");
-	}
-}
diff --git a/android-app/src/main/java/org/solovyev/android/calculator/math/edit/AbstractMathEntityListFragment.java b/android-app/src/main/java/org/solovyev/android/calculator/math/edit/AbstractMathEntityListFragment.java
index 33850bd0..1dec35f9 100644
--- a/android-app/src/main/java/org/solovyev/android/calculator/math/edit/AbstractMathEntityListFragment.java
+++ b/android-app/src/main/java/org/solovyev/android/calculator/math/edit/AbstractMathEntityListFragment.java
@@ -60,7 +60,6 @@ import org.solovyev.common.text.Strings;
 
 import android.support.v4.app.ListFragment;
 
-import static org.solovyev.android.calculator.CalculatorEventType.show_wiki_description;
 
 /**
  * User: serso
@@ -275,14 +274,6 @@ public abstract class AbstractMathEntityListFragment<T extends MathEntity> exten
 			} else {
 				description.setVisibility(View.GONE);
 			}
-
-			final View descriptionButton = result.findViewById(R.id.math_entity_description_imageview);
-			descriptionButton.setOnClickListener(new View.OnClickListener() {
-				@Override
-				public void onClick(View v) {
-					Locator.getInstance().getCalculator().fireCalculatorEvent(show_wiki_description, null);
-				}
-			});
 		}
 	}
 
diff --git a/android-app/src/main/res/drawable-hdpi/ab_clock.png b/android-app/src/main/res/drawable-hdpi/ab_clock.png
deleted file mode 100644
index 2ca96500..00000000
Binary files a/android-app/src/main/res/drawable-hdpi/ab_clock.png and /dev/null differ
diff --git a/android-app/src/main/res/drawable-hdpi/ab_plus.png b/android-app/src/main/res/drawable-hdpi/ab_plus.png
deleted file mode 100644
index 71f96c80..00000000
Binary files a/android-app/src/main/res/drawable-hdpi/ab_plus.png and /dev/null differ
diff --git a/android-app/src/main/res/drawable-hdpi/ab_remove.png b/android-app/src/main/res/drawable-hdpi/ab_remove.png
deleted file mode 100644
index eaf4672c..00000000
Binary files a/android-app/src/main/res/drawable-hdpi/ab_remove.png and /dev/null differ
diff --git a/android-app/src/main/res/drawable-hdpi/ic_delete_grey600_48dp.png b/android-app/src/main/res/drawable-hdpi/ic_delete_grey600_48dp.png
deleted file mode 100644
index 5171fbe5..00000000
Binary files a/android-app/src/main/res/drawable-hdpi/ic_delete_grey600_48dp.png and /dev/null differ
diff --git a/android-app/src/main/res/drawable-mdpi/ab_clock.png b/android-app/src/main/res/drawable-mdpi/ab_clock.png
deleted file mode 100644
index caf0584d..00000000
Binary files a/android-app/src/main/res/drawable-mdpi/ab_clock.png and /dev/null differ
diff --git a/android-app/src/main/res/drawable-mdpi/ab_plus.png b/android-app/src/main/res/drawable-mdpi/ab_plus.png
deleted file mode 100644
index 2df0a600..00000000
Binary files a/android-app/src/main/res/drawable-mdpi/ab_plus.png and /dev/null differ
diff --git a/android-app/src/main/res/drawable-mdpi/ab_remove.png b/android-app/src/main/res/drawable-mdpi/ab_remove.png
deleted file mode 100644
index c387183a..00000000
Binary files a/android-app/src/main/res/drawable-mdpi/ab_remove.png and /dev/null differ
diff --git a/android-app/src/main/res/drawable-mdpi/ic_delete_grey600_48dp.png b/android-app/src/main/res/drawable-mdpi/ic_delete_grey600_48dp.png
deleted file mode 100644
index a46013c2..00000000
Binary files a/android-app/src/main/res/drawable-mdpi/ic_delete_grey600_48dp.png and /dev/null differ
diff --git a/android-app/src/main/res/drawable-xhdpi/ab_clock.png b/android-app/src/main/res/drawable-xhdpi/ab_clock.png
deleted file mode 100644
index 4ffb529f..00000000
Binary files a/android-app/src/main/res/drawable-xhdpi/ab_clock.png and /dev/null differ
diff --git a/android-app/src/main/res/drawable-xhdpi/ab_plus.png b/android-app/src/main/res/drawable-xhdpi/ab_plus.png
deleted file mode 100644
index 050dc012..00000000
Binary files a/android-app/src/main/res/drawable-xhdpi/ab_plus.png and /dev/null differ
diff --git a/android-app/src/main/res/drawable-xhdpi/ab_remove.png b/android-app/src/main/res/drawable-xhdpi/ab_remove.png
deleted file mode 100644
index bc2f393e..00000000
Binary files a/android-app/src/main/res/drawable-xhdpi/ab_remove.png and /dev/null differ
diff --git a/android-app/src/main/res/drawable-xhdpi/ic_delete_grey600_48dp.png b/android-app/src/main/res/drawable-xhdpi/ic_delete_grey600_48dp.png
deleted file mode 100644
index 87d36023..00000000
Binary files a/android-app/src/main/res/drawable-xhdpi/ic_delete_grey600_48dp.png and /dev/null differ
diff --git a/android-app/src/main/res/drawable-xxhdpi/ic_delete_grey600_48dp.png b/android-app/src/main/res/drawable-xxhdpi/ic_delete_grey600_48dp.png
deleted file mode 100644
index 78a2141b..00000000
Binary files a/android-app/src/main/res/drawable-xxhdpi/ic_delete_grey600_48dp.png and /dev/null differ
diff --git a/android-app/src/main/res/drawable/metro_green_list_item.xml b/android-app/src/main/res/drawable/metro_green_list_item.xml
deleted file mode 100644
index 06ddd49f..00000000
--- a/android-app/src/main/res/drawable/metro_green_list_item.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-
-<!--
-  ~ Copyright 2013 serso aka se.solovyev
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~
-  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  ~ Contact details
-  ~
-  ~ Email: se.solovyev@gmail.com
-  ~ Site:  http://se.solovyev.org
-  -->
-
-<selector xmlns:a="http://schemas.android.com/apk/res/android">
-	<!-- Non focused states -->
-	<item a:state_focused="false" a:state_selected="false" a:state_pressed="false"
-		  a:drawable="@android:color/transparent"/>
-	<item a:state_focused="false" a:state_selected="true" a:state_pressed="false"
-		  a:drawable="@color/cpp_metro_green"/>
-
-	<!-- Focused states -->
-	<item a:state_focused="true" a:state_selected="false" a:state_pressed="false"
-		  a:drawable="@color/cpp_metro_green"/>
-	<item a:state_focused="true" a:state_selected="true" a:state_pressed="false"
-		  a:drawable="@color/cpp_metro_green"/>
-
-	<!-- Pressed -->
-	<!--    Non focused states -->
-	<item a:state_focused="false" a:state_selected="false" a:state_pressed="true"
-		  a:drawable="@color/cpp_metro_green"/>
-	<item a:state_focused="false" a:state_selected="true" a:state_pressed="true"
-		  a:drawable="@color/cpp_metro_green"/>
-
-	<!--    Focused states -->
-	<item a:state_focused="true" a:state_selected="false" a:state_pressed="true"
-		  a:drawable="@color/cpp_metro_green"/>
-	<item a:state_focused="true" a:state_selected="true" a:state_pressed="true"
-		  a:drawable="@color/cpp_metro_green"/>
-
-</selector>
diff --git a/android-app/src/main/res/drawable/metro_purple_list_item.xml b/android-app/src/main/res/drawable/metro_purple_list_item.xml
deleted file mode 100644
index 973b7a24..00000000
--- a/android-app/src/main/res/drawable/metro_purple_list_item.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-
-<!--
-  ~ Copyright 2013 serso aka se.solovyev
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~
-  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  ~ Contact details
-  ~
-  ~ Email: se.solovyev@gmail.com
-  ~ Site:  http://se.solovyev.org
-  -->
-
-<selector xmlns:a="http://schemas.android.com/apk/res/android">
-	<!-- Non focused states -->
-	<item a:state_focused="false" a:state_selected="false" a:state_pressed="false"
-		  a:drawable="@android:color/transparent"/>
-	<item a:state_focused="false" a:state_selected="true" a:state_pressed="false"
-		  a:drawable="@color/cpp_metro_purple"/>
-
-	<!-- Focused states -->
-	<item a:state_focused="true" a:state_selected="false" a:state_pressed="false"
-		  a:drawable="@color/cpp_metro_purple"/>
-	<item a:state_focused="true" a:state_selected="true" a:state_pressed="false"
-		  a:drawable="@color/cpp_metro_purple"/>
-
-	<!-- Pressed -->
-	<!--    Non focused states -->
-	<item a:state_focused="false" a:state_selected="false" a:state_pressed="true"
-		  a:drawable="@color/cpp_metro_purple"/>
-	<item a:state_focused="false" a:state_selected="true" a:state_pressed="true"
-		  a:drawable="@color/cpp_metro_purple"/>
-
-	<!--    Focused states -->
-	<item a:state_focused="true" a:state_selected="false" a:state_pressed="true"
-		  a:drawable="@color/cpp_metro_purple"/>
-	<item a:state_focused="true" a:state_selected="true" a:state_pressed="true"
-		  a:drawable="@color/cpp_metro_purple"/>
-</selector>
diff --git a/android-app/src/main/res/layout/calc_plot_view.xml b/android-app/src/main/res/layout/calc_plot_view.xml
deleted file mode 100644
index a425745d..00000000
--- a/android-app/src/main/res/layout/calc_plot_view.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-  ~ Copyright 2013 serso aka se.solovyev
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~
-  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  ~ Contact details
-  ~
-  ~ Email: se.solovyev@gmail.com
-  ~ Site:  http://se.solovyev.org
-  -->
-
-<LinearLayout a:id="@+id/plot_view_container"
-	xmlns:a="http://schemas.android.com/apk/res/android"
-	a:layout_width="fill_parent"
-	a:layout_height="fill_parent"
-	a:orientation="vertical">
-
-
-</LinearLayout>
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_simple_button_like.xml b/android-app/src/main/res/layout/cpp_simple_button_like.xml
deleted file mode 100644
index af2cb020..00000000
--- a/android-app/src/main/res/layout/cpp_simple_button_like.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-  ~ Copyright 2013 serso aka se.solovyev
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~
-  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  ~ Contact details
-  ~
-  ~ Email: se.solovyev@gmail.com
-  ~ Site:  http://se.solovyev.org
-  -->
-
-<ImageButton a:id="@id/cpp_button_like"
-	style="@style/cpp_simple_metro_control_image_button_style"
-	xmlns:a="http://schemas.android.com/apk/res/android"
-	a:contentDescription="Like"
-	a:src="@drawable/kb_share" />
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_unit_converter.xml b/android-app/src/main/res/layout/cpp_unit_converter.xml
index 8d00a958..ba04f6fa 100644
--- a/android-app/src/main/res/layout/cpp_unit_converter.xml
+++ b/android-app/src/main/res/layout/cpp_unit_converter.xml
@@ -78,15 +78,6 @@
 		a:orientation="horizontal"
 		a:paddingBottom="10dp">
 
-		<Button
-			a:id="@+id/unit_converter_ok_button"
-			a:layout_width="wrap_content"
-			a:layout_height="wrap_content"
-			a:paddingLeft="15dp"
-			a:paddingRight="15dp"
-			a:singleLine="true"
-			a:text="@android:string/ok" />
-
 		<Button
 			a:id="@+id/unit_converter_copy_button"
 			a:layout_width="wrap_content"
@@ -105,6 +96,15 @@
 			a:paddingRight="15dp"
 			a:singleLine="true" />
 
+		<Button
+			a:id="@+id/unit_converter_ok_button"
+			a:layout_width="wrap_content"
+			a:layout_height="wrap_content"
+			a:paddingLeft="15dp"
+			a:paddingRight="15dp"
+			a:singleLine="true"
+			a:text="@android:string/ok" />
+
 	</LinearLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_wiki_page.xml b/android-app/src/main/res/layout/cpp_wiki_page.xml
deleted file mode 100644
index 20a0d84b..00000000
--- a/android-app/src/main/res/layout/cpp_wiki_page.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-  ~ Copyright 2013 serso aka se.solovyev
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~
-  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  ~ Contact details
-  ~
-  ~ Email: se.solovyev@gmail.com
-  ~ Site:  http://se.solovyev.org
-  -->
-
-<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
-	a:layout_width="match_parent"
-	a:layout_height="match_parent"
-	a:orientation="vertical">
-
-	<WebView
-		a:id="@+id/cpp_wiki_webview"
-		a:layout_width="match_parent"
-		a:layout_height="match_parent" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_wizard.xml b/android-app/src/main/res/layout/cpp_wizard.xml
deleted file mode 100644
index f5cf1469..00000000
--- a/android-app/src/main/res/layout/cpp_wizard.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-  ~ Copyright 2013 serso aka se.solovyev
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~
-  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  ~ Contact details
-  ~
-  ~ Email: se.solovyev@gmail.com
-  ~ Site:  http://se.solovyev.org
-  -->
-
-<LinearLayout a:id="@+id/wizard_layout"
-	style="@style/CppDialog"
-	xmlns:a="http://schemas.android.com/apk/res/android"
-	a:orientation="vertical">
-
-	<FrameLayout
-		a:id="@id/acl_wizard_content"
-		a:layout_width="match_parent"
-		a:layout_height="0dp"
-		a:layout_weight="1"
-		a:gravity="center"
-		a:orientation="vertical"
-		a:padding="6dp" />
-
-	<LinearLayout
-		a:layout_width="match_parent"
-		a:layout_height="wrap_content"
-		a:orientation="horizontal">
-
-		<Button
-			a:id="@id/acl_wizard_prev_button"
-			a:layout_width="0dp"
-			a:layout_height="wrap_content"
-			a:layout_weight="1"
-			a:lines="1"
-			a:maxLines="1"
-			a:singleLine="true"
-			a:text="@string/cpp_wizard_back" />
-
-		<Button
-			a:id="@id/acl_wizard_next_button"
-			a:layout_width="0dp"
-			a:layout_height="wrap_content"
-			a:layout_weight="1"
-			a:lines="1"
-			a:maxLines="1"
-			a:singleLine="true"
-			a:text="@string/cpp_wizard_next" />
-
-	</LinearLayout>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/main_empty_multi_pane.xml b/android-app/src/main/res/layout/main_empty_multi_pane.xml
deleted file mode 100644
index 563f93de..00000000
--- a/android-app/src/main/res/layout/main_empty_multi_pane.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-  ~ Copyright 2013 serso aka se.solovyev
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~
-  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  ~ Contact details
-  ~
-  ~ Email: se.solovyev@gmail.com
-  ~ Site:  http://se.solovyev.org
-  -->
-
-<LinearLayout a:id="@+id/main_layout"
-	style="@style/CppMain.Multipane"
-	xmlns:a="http://schemas.android.com/apk/res/android"
-	a:orientation="vertical">
-
-</LinearLayout>
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/math_entity.xml b/android-app/src/main/res/layout/math_entity.xml
index 3c28bea3..ba01133a 100644
--- a/android-app/src/main/res/layout/math_entity.xml
+++ b/android-app/src/main/res/layout/math_entity.xml
@@ -22,36 +22,23 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<LinearLayout style="@style/CppListViewItem"
+<LinearLayout
+	style="@style/CppListViewItem"
 	xmlns:a="http://schemas.android.com/apk/res/android"
 	a:layout_width="match_parent"
 	a:layout_height="wrap_content"
-	a:orientation="horizontal">
+	a:orientation="vertical">
 
-	<LinearLayout
-		a:layout_width="0dp"
-		a:layout_height="wrap_content"
-		a:layout_weight="1"
-		a:orientation="vertical">
+	<TextView
+		a:id="@+id/math_entity_text"
+		style="@style/CppListViewItemTextPrimary"
+		a:layout_width="match_parent"
+		a:layout_height="wrap_content"/>
 
-		<TextView
-			a:id="@+id/math_entity_text"
-			style="@style/CppListViewItemTextPrimary"
-			a:layout_width="match_parent"
-			a:layout_height="wrap_content" />
-
-		<TextView
-			a:id="@+id/math_entity_short_description"
-			style="@style/CppListViewItemTextSecondary"
-			a:layout_width="match_parent"
-			a:layout_height="wrap_content" />
-	</LinearLayout>
-
-	<ImageView
-		a:id="@+id/math_entity_description_imageview"
-		a:layout_width="wrap_content"
-		a:layout_height="match_parent"
-		a:scaleType="centerInside"
-		a:visibility="gone" />
+	<TextView
+		a:id="@+id/math_entity_short_description"
+		style="@style/CppListViewItemTextSecondary"
+		a:layout_width="match_parent"
+		a:layout_height="wrap_content"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/matrix_edit_fragment_item.xml b/android-app/src/main/res/layout/matrix_edit_fragment_item.xml
deleted file mode 100644
index b73ab996..00000000
--- a/android-app/src/main/res/layout/matrix_edit_fragment_item.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-  ~ Copyright 2013 serso aka se.solovyev
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~
-  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  ~ Contact details
-  ~
-  ~ Email: se.solovyev@gmail.com
-  ~ Site:  http://se.solovyev.org
-  -->
-
-<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
-	a:layout_width="match_parent"
-	a:layout_height="match_parent">
-
-	<EditText
-		a:id="@+id/matrix_element_edittext"
-		a:layout_width="match_parent"
-		a:layout_height="match_parent"
-		a:text="test" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/widget_layout.xml b/android-app/src/main/res/layout/widget_layout.xml
index ad9e2064..ad42ba89 100644
--- a/android-app/src/main/res/layout/widget_layout.xml
+++ b/android-app/src/main/res/layout/widget_layout.xml
@@ -16,7 +16,8 @@
 	<LinearLayout
 		a:layout_width="match_parent"
 		a:layout_height="0dp"
-		a:layout_weight="1">
+		a:layout_weight="1"
+		a:baselineAligned="false">
 
 		<include
 			layout="@layout/cpp_simple_button_equals"
diff --git a/android-app/src/main/res/values/arrays.xml b/android-app/src/main/res/values/arrays.xml
index b0d385fd..c60a9525 100644
--- a/android-app/src/main/res/values/arrays.xml
+++ b/android-app/src/main/res/values/arrays.xml
@@ -126,13 +126,6 @@
 		<item>@string/p_green_line_color</item>
 		<item>@string/p_grey_line_color</item>
 	</string-array>
-	<string-array name="cpp_plot_line_color_values" translatable="false">
-		<item>white</item>
-		<item>blue</item>
-		<item>red</item>
-		<item>green</item>
-		<item>grey</item>
-	</string-array>
 
 	<string-array name="cpp_modes">
 		<item>@string/cpp_wizard_mode_simple</item>
diff --git a/android-app/src/main/res/values/colors.xml b/android-app/src/main/res/values/colors.xml
index 86cd2623..564d71e3 100644
--- a/android-app/src/main/res/values/colors.xml
+++ b/android-app/src/main/res/values/colors.xml
@@ -21,8 +21,6 @@
   -->
 
 <resources>
-	<color name="cpp_list_divider">#ff2e2e2e</color>
-
 	<color name="cpp_text">#ffe6e6e6</color>
 	<color name="cpp_text_error">@color/cpp_text_inverse</color>
 	<color name="cpp_text_inverse">#424242</color>
@@ -30,13 +28,9 @@
 
 	<color name="cpp_button_text">#ffffffff</color>
 	<color name="cpp_button_text_operator">#ffffff99</color>
-	<color name="cpp_button_text_ce">#ffffffff</color>
 	<color name="cpp_selected_angle_unit_text">#ffffff99</color>
 	<color name="cpp_main_bg">#101010</color>
 	<color name="cpp_main_bg_light">#fff6f1ef</color>
-	<color name="cpp_wizard_primary">#FAFAFA</color>
-	<color name="cpp_wizard_secondary">#9E9E9E</color>
-	<color name="cpp_wizard_overscroll">#FAFAFA</color>
 	<color name="cpp_wizard_button_normal">#424242</color>
 	<color name="cpp_wizard_button_disabled">#616161</color>
 	<color name="cpp_wizard_button_pressed">#757575</color>
@@ -49,18 +43,16 @@
 	<color name="cpp_material_light">#ff37b295</color>
 	<color name="cpp_material_light_darker">#ff309e84</color>
 	<color name="cpp_material_light_disabled">#c1d2ef</color>
-	<color name="cpp_metro_blue_dark">#ff092c39</color>
 	<color name="cpp_metro_green">#088e3a</color>
 	<color name="cpp_metro_purple">#651456</color>
 	<color name="cpp_widget_cursor">#ff707070</color>
-	<color name="cpp_text_primary">#ddffffff</color>
-	<color name="cpp_text_secondary">#89ffffff</color>
 	<color name="cpp_widget_ripple">#40ffffff</color>
 	<color name="cpp_status_bar">#ff131313</color>
 	<color name="cpp_status_bar_light">#262626</color>
 
 	<color name="cpp_wizard_disabled_text">#66ffffff</color>
 
+	<color name="cpp_material_accent">#FAFAFA</color>
 	<color name="cpp_material_grey">#212121</color>
 	<color name="cpp_material_grey_light">#393939</color>
 	<color name="cpp_material_actionbar">@color/cpp_material_grey</color>
diff --git a/android-app/src/main/res/values/dimens.xml b/android-app/src/main/res/values/dimens.xml
index ebe13b79..c16e2b83 100644
--- a/android-app/src/main/res/values/dimens.xml
+++ b/android-app/src/main/res/values/dimens.xml
@@ -14,7 +14,6 @@
 	<dimen name="cpp_fragment_title_text_size">20sp</dimen>
 
 	<dimen name="cpp_keyboard_button_text_size">30dp</dimen>
-	<dimen name="cpp_button_text_size">20dp</dimen>
 
 	<dimen name="cpp_display_text_size_mobile">25sp</dimen>
 	<dimen name="cpp_editor_text_size_mobile">25sp</dimen>
diff --git a/android-app/src/main/res/values/theme.xml b/android-app/src/main/res/values/theme.xml
index ceaa5b9d..1615eb30 100644
--- a/android-app/src/main/res/values/theme.xml
+++ b/android-app/src/main/res/values/theme.xml
@@ -27,9 +27,9 @@
 		<item name="android:colorPrimary">@color/cpp_metro_button</item>
 		<item name="colorPrimaryDark">@color/cpp_metro_button_dark</item>
 		<item name="android:colorPrimaryDark">@color/cpp_metro_button_dark</item>
-		<item name="colorAccent">@color/cpp_wizard_primary</item>
-		<item name="android:colorAccent">@color/cpp_wizard_primary</item>
-		<item name="android:colorEdgeEffect">@color/cpp_wizard_overscroll</item>
+		<item name="colorAccent">@color/cpp_material_accent</item>
+		<item name="android:colorAccent">@color/cpp_material_accent</item>
+		<item name="android:colorEdgeEffect">@color/cpp_material_accent</item>
 		<item name="android:statusBarColor">@color/cpp_status_bar</item>
 
 		<item name="android:windowBackground">@color/cpp_main_bg</item>
@@ -49,9 +49,9 @@
 		<item name="android:colorPrimary">@color/cpp_metro_button</item>
 		<item name="colorPrimaryDark">@color/cpp_metro_button_dark</item>
 		<item name="android:colorPrimaryDark">@color/cpp_metro_button_dark</item>
-		<item name="colorAccent">@color/cpp_wizard_primary</item>
-		<item name="android:colorAccent">@color/cpp_wizard_primary</item>
-		<item name="android:colorEdgeEffect">@color/cpp_wizard_overscroll</item>
+		<item name="colorAccent">@color/cpp_material_accent</item>
+		<item name="android:colorAccent">@color/cpp_material_accent</item>
+		<item name="android:colorEdgeEffect">@color/cpp_material_accent</item>
 		<item name="android:statusBarColor">@color/cpp_status_bar</item>
 
 		<item name="android:windowNoTitle">false</item>
diff --git a/android-app/src/main/res/xml/ga.xml b/android-app/src/main/res/xml/ga.xml
index 9f61b0ce..c7159f3e 100644
--- a/android-app/src/main/res/xml/ga.xml
+++ b/android-app/src/main/res/xml/ga.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools"
+		   tools:ignore="UnusedResources">
 	<string name="ga_trackingId">UA-28724009-2</string>
 	<bool name="ga_reportUncaughtExceptions">true</bool>
 	<bool name="ga_autoActivityTracking">true</bool>
diff --git a/core/src/main/java/org/solovyev/android/calculator/CalculatorEventType.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorEventType.java
index cb59d5fd..dd8cfbd6 100644
--- a/core/src/main/java/org/solovyev/android/calculator/CalculatorEventType.java
+++ b/core/src/main/java/org/solovyev/android/calculator/CalculatorEventType.java
@@ -186,8 +186,6 @@ public enum CalculatorEventType {
 	 */
 	show_message_dialog,
 
-	show_wiki_description,
-
 	plot_graph,
 
 	/**