[#10] New toolbar