Correct wrong order icons

My silly mistake, I should put anchor element outside before the icon so the link will cover the icon image. From #1230, since it has been merge so I fix it in new Pull request and I add more fix of bugs that I have found accidentally.