Merge "Fixing: Position of right button edge is different for VS"