I'm having the same issue with my SP4 i7 16gb 512gb. I only get 2 to 3.5hrs. It's a huge downside of this. I was hoping at least 5 to 6 hrs. I am thinking of returning the i7 back and getting an SP4 i5 16gb 512gb. Anyone else have better battery on the i5 while using Photoshop and graphic work?