diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart
index ca30816c..78a4fa8b 100644
--- a/lib/config/localized_values.dart
+++ b/lib/config/localized_values.dart
@@ -365,7 +365,7 @@ const Map localizedValues = {
   'painScale': {'en': 'Pain Scale', 'ar': 'مقياس الألم'},
   'weight': {'en': 'Weight', 'ar': 'الوزن'},
   'height': {'en': 'Height', 'ar': 'الطول'},
-  'heart': {'en': 'Heart', 'ar': 'قلب'},
+  'heart': {'en': 'Heart Rate', 'ar': 'معدل النبض'},
   "heightUnit": {"en": "height unit", "ar": "وحدة الطول"},
   "weightUnit": {"en": "Weight Unit", "ar": "وحدة الوزن"},
   "request": {"en": "Request", "ar": "طلبات الاضافة"},
diff --git a/lib/pages/settings/general_setting.dart b/lib/pages/settings/general_setting.dart
index 14f24181..8c3177dc 100644
--- a/lib/pages/settings/general_setting.dart
+++ b/lib/pages/settings/general_setting.dart
@@ -40,7 +40,7 @@ class _GeneralSettings extends State<GeneralSettings>
     return Container(
         child: ListView(scrollDirection: Axis.vertical, children: <Widget>[
       Container(
-        color: Theme.of(context).primaryColor,
+        color: Theme.of(context).scaffoldBackgroundColor,
         padding: EdgeInsets.all(10),
         child: AppText(
           TranslationBase.of(context).modes,
@@ -48,7 +48,7 @@ class _GeneralSettings extends State<GeneralSettings>
         ),
       ),
       Container(
-          color: Theme.of(context).primaryColor,
+          color: Theme.of(context).scaffoldBackgroundColor,
           padding: EdgeInsets.all(10),
           child: Row(
             mainAxisAlignment: MainAxisAlignment.spaceBetween,
@@ -68,7 +68,7 @@ class _GeneralSettings extends State<GeneralSettings>
             ],
           )),
       Container(
-          color: Theme.of(context).primaryColor,
+          color: Theme.of(context).scaffoldBackgroundColor,
           padding: EdgeInsets.all(10),
           child: Row(
             mainAxisAlignment: MainAxisAlignment.spaceBetween,
@@ -88,7 +88,7 @@ class _GeneralSettings extends State<GeneralSettings>
             ],
           )),
       Container(
-        color: Theme.of(context).primaryColor,
+        color: Theme.of(context).scaffoldBackgroundColor,
         padding: EdgeInsets.all(10),
         child: AppText(
           TranslationBase.of(context).blindMode,
@@ -96,7 +96,7 @@ class _GeneralSettings extends State<GeneralSettings>
         ),
       ),
       new Container(
-          color: Theme.of(context).primaryColor,
+          color: Theme.of(context).scaffoldBackgroundColor,
           padding: EdgeInsets.all(8.0),
           child: new Column(
               mainAxisAlignment: MainAxisAlignment.center,
@@ -179,7 +179,7 @@ class _GeneralSettings extends State<GeneralSettings>
                 )
               ])),
       Container(
-        color: Theme.of(context).primaryColor,
+        color: Theme.of(context).scaffoldBackgroundColor,
         padding: EdgeInsets.all(10),
         child: AppText(
           TranslationBase.of(context).permissions,
@@ -187,7 +187,7 @@ class _GeneralSettings extends State<GeneralSettings>
         ),
       ),
       Container(
-          color: Theme.of(context).primaryColor,
+          color: Theme.of(context).scaffoldBackgroundColor,
           padding: EdgeInsets.all(10),
           child: Row(
             mainAxisAlignment: MainAxisAlignment.spaceBetween,
@@ -206,7 +206,7 @@ class _GeneralSettings extends State<GeneralSettings>
             ],
           )),
       Container(
-          color: Theme.of(context).primaryColor,
+          color: Theme.of(context).scaffoldBackgroundColor,
           padding: EdgeInsets.all(10),
           child: Row(
             mainAxisAlignment: MainAxisAlignment.spaceBetween,
diff --git a/lib/theme/theme_value.dart b/lib/theme/theme_value.dart
index 129174ee..e209081d 100644
--- a/lib/theme/theme_value.dart
+++ b/lib/theme/theme_value.dart
@@ -35,7 +35,7 @@ defaultTheme({fontName}) {
     backgroundColor: Color.fromRGBO(255, 255, 255, 1),
     highlightColor: Colors.grey[100].withOpacity(0.4),
     splashColor: Colors.transparent,
-    primaryColor: Color(0xffffffff),
+    primaryColor: Color(0xff515A5D),
     buttonColor: Colors.black,
     toggleableActiveColor: secondaryColor,
     indicatorColor: secondaryColor,