Improved hover and icon position