Merge "Fixing spacing between folder icon and folder itself" into udc-dev