Merge "(bug 40876) Icon for PSD (Adobe Photoshop) file types."