FIX: order shipping extension fix
code tidy and added CMS icon