Moves more sizes to dimens.xml