Weird that Photoshop adds a two pixel border. It's probably meant as a transition border but it shouldn't be added without a setting to do so. Maybe try GIMP instead of Photoshop.
Most important: it would be great if you could remove that border and solve the white line problem.