diff --git a/calculatorpp/AndroidManifest.xml b/calculatorpp/AndroidManifest.xml
index 18f58dd3..501dbe6f 100644
--- a/calculatorpp/AndroidManifest.xml
+++ b/calculatorpp/AndroidManifest.xml
@@ -65,6 +65,7 @@
         <!-- ONSCREEN CONFIG -->
 
 		<activity android:launchMode="singleInstance"
+                  android:icon="@drawable/icon_onscreen"
 				  android:label="@string/c_app_name_on_screen"
 				  android:name=".CalculatorOnscreenStartActivity">
 
diff --git a/calculatorpp/misc/res/icon-green.png b/calculatorpp/misc/res/icon-green.png
new file mode 100755
index 00000000..4fbae1d2
Binary files /dev/null and b/calculatorpp/misc/res/icon-green.png differ
diff --git a/calculatorpp/misc/res/icon-hi-res.png b/calculatorpp/misc/res/icon-hi-res.png
index 461f1af2..6d4efea7 100644
Binary files a/calculatorpp/misc/res/icon-hi-res.png and b/calculatorpp/misc/res/icon-hi-res.png differ
diff --git a/calculatorpp/misc/res/icon-promo.png b/calculatorpp/misc/res/icon-promo.png
index f600aa10..00f9268b 100644
Binary files a/calculatorpp/misc/res/icon-promo.png and b/calculatorpp/misc/res/icon-promo.png differ
diff --git a/calculatorpp/misc/res/icon.png b/calculatorpp/misc/res/icon.png
index 3701c0a5..d4f86a4e 100755
Binary files a/calculatorpp/misc/res/icon.png and b/calculatorpp/misc/res/icon.png differ
diff --git a/calculatorpp/misc/res/logo-scaled.png b/calculatorpp/misc/res/logo-scaled.png
index 1eb5dda1..b70927a7 100644
Binary files a/calculatorpp/misc/res/logo-scaled.png and b/calculatorpp/misc/res/logo-scaled.png differ
diff --git a/calculatorpp/res/drawable-hdpi/icon.png b/calculatorpp/res/drawable-hdpi/icon.png
index db6d454b..b4d8989a 100644
Binary files a/calculatorpp/res/drawable-hdpi/icon.png and b/calculatorpp/res/drawable-hdpi/icon.png differ
diff --git a/calculatorpp/res/drawable-hdpi/icon_onscreen.png b/calculatorpp/res/drawable-hdpi/icon_onscreen.png
new file mode 100644
index 00000000..119c24b2
Binary files /dev/null and b/calculatorpp/res/drawable-hdpi/icon_onscreen.png differ
diff --git a/calculatorpp/res/drawable-ldpi/icon.png b/calculatorpp/res/drawable-ldpi/icon.png
index 7075b457..663ecacc 100644
Binary files a/calculatorpp/res/drawable-ldpi/icon.png and b/calculatorpp/res/drawable-ldpi/icon.png differ
diff --git a/calculatorpp/res/drawable-ldpi/icon_onscreen.png b/calculatorpp/res/drawable-ldpi/icon_onscreen.png
new file mode 100644
index 00000000..c8cdd0a6
Binary files /dev/null and b/calculatorpp/res/drawable-ldpi/icon_onscreen.png differ
diff --git a/calculatorpp/res/drawable-mdpi/icon.png b/calculatorpp/res/drawable-mdpi/icon.png
index ba06a800..0067bf41 100644
Binary files a/calculatorpp/res/drawable-mdpi/icon.png and b/calculatorpp/res/drawable-mdpi/icon.png differ
diff --git a/calculatorpp/res/drawable-mdpi/icon_onscreen.png b/calculatorpp/res/drawable-mdpi/icon_onscreen.png
new file mode 100644
index 00000000..1b50c3fb
Binary files /dev/null and b/calculatorpp/res/drawable-mdpi/icon_onscreen.png differ
diff --git a/calculatorpp/res/drawable-xhdpi/icon.png b/calculatorpp/res/drawable-xhdpi/icon.png
index 745ff1a1..32617784 100644
Binary files a/calculatorpp/res/drawable-xhdpi/icon.png and b/calculatorpp/res/drawable-xhdpi/icon.png differ
diff --git a/calculatorpp/res/drawable-xhdpi/icon_onscreen.png b/calculatorpp/res/drawable-xhdpi/icon_onscreen.png
new file mode 100644
index 00000000..09ec7334
Binary files /dev/null and b/calculatorpp/res/drawable-xhdpi/icon_onscreen.png differ
diff --git a/calculatorpp/res/values-ru/text_strings.xml b/calculatorpp/res/values-ru/text_strings.xml
index d1a82300..d2621783 100644
--- a/calculatorpp/res/values-ru/text_strings.xml
+++ b/calculatorpp/res/values-ru/text_strings.xml
@@ -8,7 +8,8 @@
 
 <resources>
 	<string name="c_app_name">Калькулятор++</string>
-	<string name="c_app_name_free">Калькулятор++ Free</string>
+    <string name="c_app_name_on_screen">Калькулятор++ (В отдельном окне)</string>
+    <string name="c_app_name_free">Калькулятор++ Free</string>
 	<string name="c_app_icon_name">Кальк++</string>
 	<string name="c_app_settings">Настройки</string>
 	<string name="c_syntax_error">Ошибка</string>
@@ -269,10 +270,10 @@
     <string name="c_app_widget_3x4_name">Калькулятор++ Виджет (3x4)</string>
     <string name="c_app_widget_4x4_name">Калькулятор++ Виджет (4x4)</string>
     <string name="c_app_widget_4x5_name">Калькулятор++ Виджет (4x5)</string>
-    <string name="open_onscreen_calculator">Нажмите чтобы открыть калькулятор поверх всех приложений</string>
+    <string name="open_onscreen_calculator">Нажмите чтобы открыть калькулятор в отдельном окне</string>
 
-    <string name="prefs_onscreen_title">Настройки плавающего калькулятора</string>
+    <string name="prefs_onscreen_title">Настройки калькулятора в отдельном окне</string>
     <string name="prefs_onscreen_start_on_boot_title">Запуск после загрузки устройства</string>
-    <string name="prefs_onscreen_start_on_boot_summary">Если включено кнопка плавающего калькулятора будет доступна в панели уведомлений полсе загрузки устройства</string>
+    <string name="prefs_onscreen_start_on_boot_summary">Если включено кнопка Калькулятора++ будет доступна в панели уведомлений полсе загрузки устройства</string>
 
 </resources>
\ No newline at end of file
diff --git a/calculatorpp/res/values/text_strings.xml b/calculatorpp/res/values/text_strings.xml
index 2ffa32d9..72c4e53d 100644
--- a/calculatorpp/res/values/text_strings.xml
+++ b/calculatorpp/res/values/text_strings.xml
@@ -8,7 +8,7 @@
 
 <resources>
 	<string name="c_app_name">Calculator++</string>
-	<string name="c_app_name_on_screen">Calculator++ (On Screen)</string>
+	<string name="c_app_name_on_screen">Calculator++ (Window mode)</string>
 	<string name="c_app_name_free">Calculator++ Free</string>
 	<string name="c_app_icon_name">Calc++</string>
     <string name="c_app_settings">Settings</string>
@@ -270,10 +270,10 @@
     <string name="c_app_widget_3x4_name">Calculator++ Widget (3x4)</string>
     <string name="c_app_widget_4x4_name">Calculator++ Widget (4x4)</string>
     <string name="c_app_widget_4x5_name">Calculator++ Widget (4x5)</string>
-    <string name="open_onscreen_calculator">Click to open on-screen calculator</string>
+    <string name="open_onscreen_calculator">Click to open calculator in window mode</string>
 
-    <string name="prefs_onscreen_title">On-screen calculator settings</string>
+    <string name="prefs_onscreen_title">Calculator (window mode) settings</string>
     <string name="prefs_onscreen_start_on_boot_title">Start on boot</string>
-    <string name="prefs_onscreen_start_on_boot_summary">If checked on-screen calculator will appear in notification bar after device boot</string>
+    <string name="prefs_onscreen_start_on_boot_summary">If checked Calculator++ will appear in notification bar after device boot</string>
 
 </resources>
\ No newline at end of file