diff --git a/calculatorpp/res/values-ru/text_strings.xml b/calculatorpp/res/values-ru/text_strings.xml
index 22bc4c9a..d6db9be1 100644
--- a/calculatorpp/res/values-ru/text_strings.xml
+++ b/calculatorpp/res/values-ru/text_strings.xml
@@ -226,4 +226,11 @@
     <string name="prefs_graph_real_color_summary">Устанавливает цвет вещественной части графика</string>
     <string name="prefs_graph_imag_color_title">Цвет мнимой части графика</string>
     <string name="prefs_graph_imag_color_summary">Устанавливает цвет мнимой части графика</string>
+
+    <string name="p_white_line_color">Белый</string>
+    <string name="p_grey_line_color">Серый</string>
+    <string name="p_red_line_color">Красный</string>
+    <string name="p_blue_line_color">Синий</string>
+    <string name="p_green_line_color">Зелёный</string>
+
 </resources>
\ No newline at end of file
diff --git a/calculatorpp/res/values/arrays.xml b/calculatorpp/res/values/arrays.xml
index b1f687af..d808cac0 100644
--- a/calculatorpp/res/values/arrays.xml
+++ b/calculatorpp/res/values/arrays.xml
@@ -1,103 +1,103 @@
-<!--
-  ~ Copyright (c) 2009-2011. Created by serso aka se.solovyev.
-  ~ For more information, please, contact se.solovyev@gmail.com
-  ~ or visit http://se.solovyev.org
-  -->
-
-<resources>
-	<string-array name="p_theme_names">
-		<item>@string/p_default_theme</item>
-		<item>@string/p_violet_theme</item>
-		<item>@string/p_light_blue_theme</item>
-		<item>@string/p_metro_blue_theme</item>
-		<item>@string/p_metro_green_theme</item>
-		<item>@string/p_metro_purple_theme</item>
-	</string-array>
-	<string-array name="p_theme_values">
-		<item>default_theme</item>
-		<item>violet_theme</item>
-		<item>light_blue_theme</item>
-		<item>metro_blue_theme</item>
-		<item>metro_green_theme</item>
-		<item>metro_purple_theme</item>
-	</string-array>
-
-	<string-array name="p_grouping_separator_names">
-		<item>@string/p_grouping_separator_no</item>
-		<item>@string/p_grouping_separator_apostrophe</item>
-		<item>@string/p_grouping_separator_space</item>
-	</string-array>
-	<string-array name="p_grouping_separator_values">
-		<item>""</item>
-		<item>\'</item>
-		<item>" "</item>
-	</string-array>
-
-	<string-array name="p_multiplication_sign_values">
-		<item>"*"</item>
-		<item>"×"</item>
-		<item>"∙"</item>
-	</string-array>
-
-	<string-array name="p_layout_names">
-		<item>@string/p_layout_calculator</item>
-		<item>@string/p_layout_simple</item>
-	</string-array>
-	<string-array name="p_layout_values">
-		<item>main_calculator</item>
-		<item>simple</item>
-	</string-array>
-
-	<string-array name="p_calc_haptic_feedback_duration_names">
-		<item>@string/p_calc_haptic_feedback_strength_short</item>
-		<item>@string/p_calc_haptic_feedback_strength_middle</item>
-		<item>@string/p_calc_haptic_feedback_strength_long</item>
-	</string-array>
-	<string-array name="p_calc_haptic_feedback_duration_values">
-		<item>30</item>
-		<item>60</item>
-		<item>100</item>
-	</string-array>
-
-	<string-array name="p_angle_units_names">
-		<item>@string/p_deg</item>
-		<item>@string/p_rad</item>
-		<item>@string/p_grad</item>
-		<item>@string/p_turns</item>
-	</string-array>
-	<string-array name="p_angle_units">
-		<item>deg</item>
-		<item>rad</item>
-		<item>grad</item>
-		<item>turns</item>
-	</string-array>
-
-	<string-array name="p_numeral_bases_names">
-		<item>@string/p_dec</item>
-		<item>@string/p_hex</item>
-		<item>@string/p_oct</item>
-		<item>@string/p_bin</item>
-	</string-array>
-	<string-array name="p_numeral_bases">
-		<item>dec</item>
-		<item>hex</item>
-		<item>oct</item>
-		<item>bin</item>
-	</string-array>
-
-    <string-array name="graph_line_color_names">
-        <item>White</item>
-        <item>Grey</item>
-        <item>Red</item>
-        <item>Blue</item>
-        <item>Green</item>
-    </string-array>
-    <string-array name="graph_line_color_values">
-        <item>white</item>
-        <item>grey</item>
-        <item>red</item>
-        <item>blue</item>
-        <item>green</item>
-    </string-array>
-
+<!--
+  ~ Copyright (c) 2009-2011. Created by serso aka se.solovyev.
+  ~ For more information, please, contact se.solovyev@gmail.com
+  ~ or visit http://se.solovyev.org
+  -->
+
+<resources>
+	<string-array name="p_theme_names">
+		<item>@string/p_default_theme</item>
+		<item>@string/p_violet_theme</item>
+		<item>@string/p_light_blue_theme</item>
+		<item>@string/p_metro_blue_theme</item>
+		<item>@string/p_metro_green_theme</item>
+		<item>@string/p_metro_purple_theme</item>
+	</string-array>
+	<string-array name="p_theme_values">
+		<item>default_theme</item>
+		<item>violet_theme</item>
+		<item>light_blue_theme</item>
+		<item>metro_blue_theme</item>
+		<item>metro_green_theme</item>
+		<item>metro_purple_theme</item>
+	</string-array>
+
+	<string-array name="p_grouping_separator_names">
+		<item>@string/p_grouping_separator_no</item>
+		<item>@string/p_grouping_separator_apostrophe</item>
+		<item>@string/p_grouping_separator_space</item>
+	</string-array>
+	<string-array name="p_grouping_separator_values">
+		<item>""</item>
+		<item>\'</item>
+		<item>" "</item>
+	</string-array>
+
+	<string-array name="p_multiplication_sign_values">
+		<item>"*"</item>
+		<item>"×"</item>
+		<item>"∙"</item>
+	</string-array>
+
+	<string-array name="p_layout_names">
+		<item>@string/p_layout_calculator</item>
+		<item>@string/p_layout_simple</item>
+	</string-array>
+	<string-array name="p_layout_values">
+		<item>main_calculator</item>
+		<item>simple</item>
+	</string-array>
+
+	<string-array name="p_calc_haptic_feedback_duration_names">
+		<item>@string/p_calc_haptic_feedback_strength_short</item>
+		<item>@string/p_calc_haptic_feedback_strength_middle</item>
+		<item>@string/p_calc_haptic_feedback_strength_long</item>
+	</string-array>
+	<string-array name="p_calc_haptic_feedback_duration_values">
+		<item>30</item>
+		<item>60</item>
+		<item>100</item>
+	</string-array>
+
+	<string-array name="p_angle_units_names">
+		<item>@string/p_deg</item>
+		<item>@string/p_rad</item>
+		<item>@string/p_grad</item>
+		<item>@string/p_turns</item>
+	</string-array>
+	<string-array name="p_angle_units">
+		<item>deg</item>
+		<item>rad</item>
+		<item>grad</item>
+		<item>turns</item>
+	</string-array>
+
+	<string-array name="p_numeral_bases_names">
+		<item>@string/p_dec</item>
+		<item>@string/p_hex</item>
+		<item>@string/p_oct</item>
+		<item>@string/p_bin</item>
+	</string-array>
+	<string-array name="p_numeral_bases">
+		<item>dec</item>
+		<item>hex</item>
+		<item>oct</item>
+		<item>bin</item>
+	</string-array>
+
+    <string-array name="graph_line_color_names">
+        <item>@string/p_white_line_color</item>
+        <item>@string/p_grey_line_color</item>
+        <item>@string/p_red_line_color</item>
+        <item>@string/p_blue_line_color</item>
+        <item>@string/p_green_line_color</item>
+    </string-array>
+    <string-array name="graph_line_color_values">
+        <item>white</item>
+        <item>grey</item>
+        <item>red</item>
+        <item>blue</item>
+        <item>green</item>
+    </string-array>
+
 </resources>
\ No newline at end of file
diff --git a/calculatorpp/res/values/text_strings.xml b/calculatorpp/res/values/text_strings.xml
index d2e91965..5e1d87ed 100644
--- a/calculatorpp/res/values/text_strings.xml
+++ b/calculatorpp/res/values/text_strings.xml
@@ -226,4 +226,11 @@
     <string name="prefs_graph_real_color_summary">Sets color of real part functions graph</string>
     <string name="prefs_graph_imag_color_title">Color of imaginary part of functions graph</string>
     <string name="prefs_graph_imag_color_summary">Sets color of imaginary part functions graph</string>
+
+    <string name="p_white_line_color">White</string>
+    <string name="p_grey_line_color">Grey</string>
+    <string name="p_red_line_color">Red</string>
+    <string name="p_blue_line_color">Blue</string>
+    <string name="p_green_line_color">Green</string>
+
 </resources>
\ No newline at end of file
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorFragmentHelperImpl.java b/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorFragmentHelperImpl.java
index 476a9a2b..da696eea 100644
--- a/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorFragmentHelperImpl.java
+++ b/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorFragmentHelperImpl.java
@@ -91,10 +91,14 @@ public class CalculatorFragmentHelperImpl extends AbstractCalculatorHelper imple
         final ViewGroup adParentView = (ViewGroup) root.findViewById(R.id.ad_parent_view);
         final ViewGroup mainFragmentLayout = (ViewGroup) root.findViewById(R.id.main_fragment_layout);
 
-        if (adParentView != null) {
-            adView = AdsController.getInstance().inflateAd(fragment.getActivity(), adParentView, R.id.ad_parent_view);
-        } else if ( mainFragmentLayout != null ) {
-            adView = AdsController.getInstance().inflateAd(fragment.getActivity(), mainFragmentLayout, R.id.main_fragment_layout);
+        if (fragment instanceof CalculatorDisplayFragment || fragment instanceof CalculatorEditorFragment || fragment instanceof CalculatorKeyboardFragment) {
+            // no ads in those fragments
+        } else {
+            if (adParentView != null) {
+                adView = AdsController.getInstance().inflateAd(fragment.getActivity(), adParentView, R.id.ad_parent_view);
+            } else if ( mainFragmentLayout != null ) {
+                adView = AdsController.getInstance().inflateAd(fragment.getActivity(), mainFragmentLayout, R.id.main_fragment_layout);
+            }
         }
 
         processButtons(fragment.getActivity(), root);