                 return item
                 
             case .indent:
-                let leftItem = NSToolbarItem()
+                let leftItem = NSToolbarItem(itemIdentifier: .shiftLeft)
                 leftItem.label = "Shift Left".localized
                 leftItem.toolTip = "Shift lines to left".localized
                 leftItem.image = NSImage(systemSymbolName: "increase.indent", accessibilityDescription: leftItem.label)
                 leftItem.action = #selector(EditorTextView.shiftLeft)
                 
-                let rightItem = NSToolbarItem()
+                let rightItem = NSToolbarItem(itemIdentifier: .shiftRight)
                 rightItem.label = "Shift Right".localized
                 rightItem.toolTip = "Shift lines to right".localized
                 rightItem.image = NSImage(systemSymbolName: "decrease.indent", accessibilityDescription: rightItem.label)

                return item
                
            case .writingDirection:
                let ltrItem = NSToolbarItem()
                ltrItem.label = "Left to Right".localized
                ltrItem.toolTip = "Left to Right".localized
                ltrItem.image = NSImage(systemSymbolName: "text.alignleft", accessibilityDescription: ltrItem.label)
                ltrItem.action = #selector(DocumentViewController.makeWritingDirectionLeftToRight)
                
                let rtlItem = NSToolbarItem()
                rtlItem.label = "Right to Left".localized
                rtlItem.toolTip = "Right to Left".localized
                rtlItem.image = NSImage(systemSymbolName: "text.alignright", accessibilityDescription: rtlItem.label)

                return item
                
            case .textSize:
                let smallerItem = NSToolbarItem(itemIdentifier: .smaller)
                smallerItem.label = "Smaller".localized
                smallerItem.toolTip = "Smaller".localized
                smallerItem.image = NSImage(systemSymbolName: "a", accessibilityDescription: smallerItem.label)!
                    .withSymbolConfiguration(.init(scale: .small))
                smallerItem.action = #selector(EditorTextView.smallerFont)
                
                let biggerItem = NSToolbarItem(itemIdentifier: .bigger)
                biggerItem.label = "Bigger".localized
                biggerItem.toolTip = "Bigger".localized
                biggerItem.image = NSImage(systemSymbolName: "a", accessibilityDescription: biggerItem.label)!
