The concentration dependence of self-diffusion of ions in solutions at large concentrations has remained an interesting yet unsolved problem. Here we develop a self-consistent microscopic approach based on the ideas of mode-coupling theory. It allows us to calculate both contributions which influence the friction of a moving ion: the ion atmosphere relaxation and hydrodynamic interactions. The resulting theory provides an excellent agreement with known experimental results over a wide concentration range. Interestingly, the mode-coupling self-consistent calculation of friction reveal a nonlinear coupling between the hydrodynamic interactions and the ion atmosphere relaxation which enhances ion diffusion by reducing friction, particularly at inten-nediate ion concentrations. This rather striking result has its origin in the similar time scales of the relaxation of the ion atmosphere relaxation and the hydrodynamic term, which are essentially given by the Debye relaxation time. The results are also in agreement with computer simulations, with and without hydrodynamic interactions.