Move some buttons to toolbar actions