Unruffle, as feathers (5)
I believe the answer is:
preen
(Other definitions for preen that I've seen before include "Tidy and clean (plumage)" , "Arrange feathers" , "to give himself a pat on the back" , "Groom with elaborate care" , "Perfect one's appearance" .)