                 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)

    static let inspector = Self(Self.prefix + "inspector")
    
    static let textSize = Self(Self.prefix + "textSize")
    static let writingDirection = Self(Self.prefix + "writingDirection")
    static let textOrientation = Self(Self.prefix + "textOrientation")
    
    static let indent = Self(Self.prefix + "indent")
    static let comment = Self(Self.prefix + "comment")
    
    static let tabStyle = Self(Self.prefix + "tabStyle")

                return item
                
            case .writingDirection:
                let ltrItem = NSToolbarItem(itemIdentifier: .leftToRight)
                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(itemIdentifier: .rightToLeft)
                rtlItem.label = "Right to Left".localized
                rtlItem.toolTip = "Right to Left".localized
                rtlItem.image = NSImage(systemSymbolName: "text.alignright", accessibilityDescription: rtlItem.label)
