                 let leftItem = NSToolbarItem()
                 leftItem.label = "Shift Left".localized
                 leftItem.toolTip = "Shift lines to left".localized
-                leftItem.image = #imageLiteral(resourceName: "ShiftLeft")
+                if #available(macOS 10.16, *) {
+                    leftItem.image = NSImage(systemSymbolName: "increase.indent", accessibilityDescription: leftItem.label)
+                } else {
+                    leftItem.image = #imageLiteral(resourceName: "ShiftLeft")
+                }
                 leftItem.action = #selector(EditorTextView.shiftLeft)
                 
                 let rightItem = NSToolbarItem()
                 rightItem.label = "Shift Right".localized
                 rightItem.toolTip = "Shift lines to right".localized
-                rightItem.image = #imageLiteral(resourceName: "ShiftRight")
+                if #available(macOS 10.16, *) {
+                    rightItem.image = NSImage(systemSymbolName: "decrease.indent", accessibilityDescription: rightItem.label)
+                } else {
+                    rightItem.image = #imageLiteral(resourceName: "ShiftRight")
+                }
                 rightItem.action = #selector(EditorTextView.shiftRight)
                 
                 let item = NSToolbarItemGroup(itemIdentifier: itemIdentifier)

                let ltrItem = NSToolbarItem()
                ltrItem.label = "Left to Right".localized
                ltrItem.toolTip = "Left to Right".localized
                ltrItem.image = #imageLiteral(resourceName: "WritingDirectionLTRTemplate")
                ltrItem.action = #selector(DocumentViewController.makeWritingDirectionLeftToRight)
                
                let rtlItem = NSToolbarItem()
                rtlItem.label = "Right to Left".localized
                rtlItem.toolTip = "Right to Left".localized
                rtlItem.image = #imageLiteral(resourceName: "WritingDirectionRTLTemplate")
                rtlItem.action = #selector(DocumentViewController.makeWritingDirectionRightToLeft)
                
                let item = ToolbarItemGroup(itemIdentifier: itemIdentifier)

                item.isBordered = true
                item.label = "Color Code".localized
                item.toolTip = "Open Color Code Editor and set selection as color code".localized
                if #available(macOS 10.16, *) {
                    item.image = NSImage(systemSymbolName: "eyedropper.halffull", accessibilityDescription: item.label)
                } else {
                    item.image = #imageLiteral(resourceName: "ColorCode")
                }
                item.action = #selector(EditorTextView.editColorCode)
                return item
                
