Converted units to use 2D icon

Reverted Undo button test change