diff --git a/audio/acdbdata/Bluetooth_cal.acdb b/audio/acdbdata/Bluetooth_cal.acdb
index d86744c3..537d17ae 100644
Binary files a/audio/acdbdata/Bluetooth_cal.acdb and b/audio/acdbdata/Bluetooth_cal.acdb differ
diff --git a/audio/acdbdata/Handset_cal.acdb b/audio/acdbdata/Handset_cal.acdb
index 528b7dbf..6b25c8e1 100644
Binary files a/audio/acdbdata/Handset_cal.acdb and b/audio/acdbdata/Handset_cal.acdb differ
diff --git a/audio/acdbdata/Headset_cal.acdb b/audio/acdbdata/Headset_cal.acdb
index d4765e20..3bd0942c 100644
Binary files a/audio/acdbdata/Headset_cal.acdb and b/audio/acdbdata/Headset_cal.acdb differ
diff --git a/audio/acdbdata/Speaker_cal.acdb b/audio/acdbdata/Speaker_cal.acdb
index fc230c52..e488ad8a 100644
Binary files a/audio/acdbdata/Speaker_cal.acdb and b/audio/acdbdata/Speaker_cal.acdb differ
diff --git a/audio_policy_volumes.xml b/audio_policy_volumes.xml
index 635f7214..6a702bc5 100644
--- a/audio_policy_volumes.xml
+++ b/audio_policy_volumes.xml
@@ -24,21 +24,17 @@ volume index from 0 to 100.
 
 <volumes>
     <volume stream="AUDIO_STREAM_VOICE_CALL" deviceCategory="DEVICE_CATEGORY_HEADSET">
-        <point>0,-4200</point>
-        <point>33,-2800</point>
-        <point>66,-1400</point>
+        <point>0,-3000</point>
         <point>100,0</point>
     </volume>
     <volume stream="AUDIO_STREAM_VOICE_CALL" deviceCategory="DEVICE_CATEGORY_SPEAKER">
         <point>0,-2400</point>
-        <point>33,-1600</point>
-        <point>66,-800</point>
+        <point>66,-950</point>
+        <point>83,-600</point>
         <point>100,0</point>
     </volume>
     <volume stream="AUDIO_STREAM_VOICE_CALL" deviceCategory="DEVICE_CATEGORY_EARPIECE">
-        <point>0,-2400</point>
-        <point>33,-1600</point>
-        <point>66,-800</point>
+        <point>0,-3000</point>
         <point>100,0</point>
     </volume>
     <volume stream="AUDIO_STREAM_VOICE_CALL" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"