Fixed: Small code cleanup.
Fixed: Check icon size in device editor.