Bug 787390 - Add Toolbar's components type

(cherry picked from commit 280df1b3862b627d7594fa1a2a2efdca5f5fd7b0)