Application top buttons fix