Fix comments, icon paths