diff --git a/MacPass/MPIconHelper.h b/MacPass/MPIconHelper.h
index 9e88113c..29629c54 100644
--- a/MacPass/MPIconHelper.h
+++ b/MacPass/MPIconHelper.h
@@ -101,7 +101,7 @@ typedef NS_ENUM(NSUInteger, MPIconType) {
   MPIconPhone,
   /* Custom Icons not used in Database */
   MPCustomIconTypeBegin = 1000,
-  MPIconInfo,
+  MPIconSidebar,
   MPIconAddFolder,
   MPIconHardDisk,
   MPIconCreated,
diff --git a/MacPass/MPIconHelper.m b/MacPass/MPIconHelper.m
index cbe93d6f..d5af09ce 100644
--- a/MacPass/MPIconHelper.m
+++ b/MacPass/MPIconHelper.m
@@ -87,86 +87,86 @@
   static dispatch_once_t onceToken;
   dispatch_once(&onceToken, ^{
     imageNames = @{
-                   @(MPIconPassword): @"00_PasswordTemplate",
-                   @(MPIconPackageNetwork): @"01_PackageNetworkTemplate",
-                   @(MPIconWarning): @"02_MessageBoxWarningTemplate",
-                   @(MPIconServer): @"03_ServerTemplate",
-                   @(MPIconKlipper): @"04_KlipperTemplate",
-                   @(MPIconLanguages): @"05_LanguagesTemplate",
-                   @(MPIconBlockDevice): @"06_BlockDeviceTemplate",
-                   @(MPIconNotepad): @"07_NotepadTemplate",
-                   @(MPIconSocket): @"08_SocketTemplate",
-                   @(MPIconIdentity): @"09_IdentityTemplate",
-                   @(MPIconContact): @"10_ContactTemplate",
-                   @(MPIconCamera): @"11_CameraTemplate",
-                   @(MPIconRemote): @"12_RemoteTemplate",
-                   @(MPIconKeys): @"13_KeysTemplate",
-                   @(MPIconBattery): @"14_BatteryTemplate",
-                   @(MPIconScanner): @"15_ScannerTemplate",
-                   @(MPIconBrowser): @"16_BrowserTemplate",
-                   @(MPIconCDRom): @"17_CDRomTemplate",
-                   @(MPIconDisplay): @"18_DisplayTemplate",
-                   @(MPIconEmail): @"19_EmailTemplate",
-                   @(MPIconMisc): @"20_MiscTemplate",
-                   @(MPIconOrganizer): @"21_OrganizerTemplate",
-                   @(MPIconASCII): @"22_ASCIITemplate",
-                   @(MPIconIcons): @"23_IconsTemplate",
-                   @(MPIconEstablishedConnection): @"24_EstablishedConnectionTemplate",
-                   @(MPIconMailFolder): @"25_MailFolderTemplate",
-                   @(MPIconFileSave): @"26_FileSaveTemplate",
-                   @(MPIconNFSUnmount) :@"27_NFSUnmountTemplate",
-                   @(MPIconQuickTime) : @"28_QuickTimeTemplate",
-                   @(MPIconSecureTerminal) : @"29_SecureTerminalTemplate",
-                   @(MPIconTerminal) : @"30_TerminalTemplate",
-                   @(MPIconPrint) : @"31_PrintTemplate",
-                   @(MPIconFileSystemView) : @"32_FileSystemViewTemplate",
-                   @(MPIconRun) : @"33_RunTemplate",
-                   @(MPIconConfigure) : @"34_ConfigureTemplate",
-                   @(MPIconBrowserWindow) : @"35_BrowserWindowTemplate",
-                   @(MPIconArchive) : @"36_ArchiveTemplate",
-                   @(MPIconPercentage) : @"37_PercentageTemplate",
-                   @(MPIconSambaUnmount) : @"38_SambaUnmountTemplate",
-                   @(MPIconHistory) : @"39_HistoryTemplate",
-                   @(MPIconFindMail) : @"40_FindMailTemplate",
-                   @(MPIconVector) : @"41_VectorTemplate",
-                   @(MPIconMemory) : @"42_MemoryTemplate",
-                   @(MPIconTrash): @"43_TrashTemplate",
-                   @(MPIconNotes) : @"44_NotesTemplate",
-                   @(MPIconCancel) : @"45_CancelTemplate",
-                   @(MPIconHelp) : @"46_HelpTemplate",
-                   @(MPIconPackage) : @"47_PackageTemplate",
-                   @(MPIconFolder): @"48_FolderTemplate",
-                   @(MPIconFolderOpen) : @"49_FolderOpenTemplate",
-                   @(MPIconFolderTar) : @"50_FolderTarTemplate",
-                   @(MPIconDecrypted) : @"51_DecryptedTemplate",
-                   @(MPIconEncrypted) : @"52_EncryptedTemplate",
-                   @(MPIconApply) : @"53_ApplyTemplate",
-                   @(MPIconSignature) : @"54_SignatureTemplate",
-                   @(MPIconThumbnail) : @"55_ThumbnailTemplate",
-                   @(MPIconAddressBook) : @"56_AddressBookTemplate",
-                   @(MPIconTextView) : @"57_TextViewTemplate",
-                   @(MPIconSecureAccount) : @"58_SecureAccountTemplate",
-                   @(MPIconDevelopment) : @"59_DevelopmentTemplate",
-                   @(MPIconHome) : @"60_HomeTemplate",
-                   @(MPIconServices) : @"61_ServicesTemplate",
-                   @(MPIconTux) : @"62_TuxTemplate",
-                   @(MPIconFeather) : @"63_FeatherTemplate",
-                   @(MPIconApple) : @"64_AppleTemplate",
-                   @(MPIconWiki) : @"65_WikiTemplate",
-                   @(MPIconMoney) : @"66_MoneyTemplate",
-                   @(MPIconCertificat) : @"67_CertificatTemplate",
-                   @(MPIconPhone): @"68_PhoneTemplate",
+                   @(MPIconPassword)              : @"00_PasswordTemplate",
+                   @(MPIconPackageNetwork)        : @"01_PackageNetworkTemplate",
+                   @(MPIconWarning)               : @"02_MessageBoxWarningTemplate",
+                   @(MPIconServer)                : @"03_ServerTemplate",
+                   @(MPIconKlipper)               : @"04_KlipperTemplate",
+                   @(MPIconLanguages)             : @"05_LanguagesTemplate",
+                   @(MPIconBlockDevice)           : @"06_BlockDeviceTemplate",
+                   @(MPIconNotepad)               : @"07_NotepadTemplate",
+                   @(MPIconSocket)                : @"08_SocketTemplate",
+                   @(MPIconIdentity)              : @"09_IdentityTemplate",
+                   @(MPIconContact)               : @"10_ContactTemplate",
+                   @(MPIconCamera)                : @"11_CameraTemplate",
+                   @(MPIconRemote)                : @"12_RemoteTemplate",
+                   @(MPIconKeys)                  : @"13_KeysTemplate",
+                   @(MPIconBattery)               : @"14_BatteryTemplate",
+                   @(MPIconScanner)               : @"15_ScannerTemplate",
+                   @(MPIconBrowser)               : @"16_BrowserTemplate",
+                   @(MPIconCDRom)                 : @"17_CDRomTemplate",
+                   @(MPIconDisplay)               : @"18_DisplayTemplate",
+                   @(MPIconEmail)                 : @"19_EmailTemplate",
+                   @(MPIconMisc)                  : @"20_MiscTemplate",
+                   @(MPIconOrganizer)             : @"21_OrganizerTemplate",
+                   @(MPIconASCII)                 : @"22_ASCIITemplate",
+                   @(MPIconIcons)                 : @"23_IconsTemplate",
+                   @(MPIconEstablishedConnection) : @"24_EstablishedConnectionTemplate",
+                   @(MPIconMailFolder)            : @"25_MailFolderTemplate",
+                   @(MPIconFileSave)              : @"26_FileSaveTemplate",
+                   @(MPIconNFSUnmount)            : @"27_NFSUnmountTemplate",
+                   @(MPIconQuickTime)             : @"28_QuickTimeTemplate",
+                   @(MPIconSecureTerminal)        : @"29_SecureTerminalTemplate",
+                   @(MPIconTerminal)              : @"30_TerminalTemplate",
+                   @(MPIconPrint)                 : @"31_PrintTemplate",
+                   @(MPIconFileSystemView)        : @"32_FileSystemViewTemplate",
+                   @(MPIconRun)                   : @"33_RunTemplate",
+                   @(MPIconConfigure)             : @"34_ConfigureTemplate",
+                   @(MPIconBrowserWindow)         : @"35_BrowserWindowTemplate",
+                   @(MPIconArchive)               : @"36_ArchiveTemplate",
+                   @(MPIconPercentage)            : @"37_PercentageTemplate",
+                   @(MPIconSambaUnmount)          : @"38_SambaUnmountTemplate",
+                   @(MPIconHistory)               : @"39_HistoryTemplate",
+                   @(MPIconFindMail)              : @"40_FindMailTemplate",
+                   @(MPIconVector)                : @"41_VectorTemplate",
+                   @(MPIconMemory)                : @"42_MemoryTemplate",
+                   @(MPIconTrash)                 : @"43_TrashTemplate",
+                   @(MPIconNotes)                 : @"44_NotesTemplate",
+                   @(MPIconCancel)                : @"45_CancelTemplate",
+                   @(MPIconHelp)                  : @"46_HelpTemplate",
+                   @(MPIconPackage)               : @"47_PackageTemplate",
+                   @(MPIconFolder)                : @"48_FolderTemplate",
+                   @(MPIconFolderOpen)            : @"49_FolderOpenTemplate",
+                   @(MPIconFolderTar)             : @"50_FolderTarTemplate",
+                   @(MPIconDecrypted)             : @"51_DecryptedTemplate",
+                   @(MPIconEncrypted)             : @"52_EncryptedTemplate",
+                   @(MPIconApply)                 : @"53_ApplyTemplate",
+                   @(MPIconSignature)             : @"54_SignatureTemplate",
+                   @(MPIconThumbnail)             : @"55_ThumbnailTemplate",
+                   @(MPIconAddressBook)           : @"56_AddressBookTemplate",
+                   @(MPIconTextView)              : @"57_TextViewTemplate",
+                   @(MPIconSecureAccount)         : @"58_SecureAccountTemplate",
+                   @(MPIconDevelopment)           : @"59_DevelopmentTemplate",
+                   @(MPIconHome)                  : @"60_HomeTemplate",
+                   @(MPIconServices)              : @"61_ServicesTemplate",
+                   @(MPIconTux)                   : @"62_TuxTemplate",
+                   @(MPIconFeather)               : @"63_FeatherTemplate",
+                   @(MPIconApple)                 : @"64_AppleTemplate",
+                   @(MPIconWiki)                  : @"65_WikiTemplate",
+                   @(MPIconMoney)                 : @"66_MoneyTemplate",
+                   @(MPIconCertificat)            : @"67_CertificatTemplate",
+                   @(MPIconPhone)                 : @"68_PhoneTemplate",
                    /* Custom */
-                   @(MPIconInfo): @"infoTemplate",
-                   @(MPIconAddFolder): @"addFolderTemplate",
-                   @(MPIconHardDisk): @"harddiskTemplate",
-                   @(MPIconCreated): @"createdTemplate",
-                   @(MPIconAddEntry): @"addEntryTemplate",
-                   @(MPIconContextTriangle): @"contextTriangleTemplate",
-                   @(MPIconKeyboard): @"keyboardTemplate",
+                   @(MPIconSidebar)               : NSImageNameTouchBarGetInfoTemplate,
+                   @(MPIconAddFolder)             : @"addFolderTemplate",
+                   @(MPIconHardDisk)              : @"harddiskTemplate",
+                   @(MPIconCreated)               : @"createdTemplate",
+                   @(MPIconAddEntry)              : @"addEntryTemplate",
+                   @(MPIconContextTriangle)       : @"contextTriangleTemplate",
+                   @(MPIconKeyboard)              : @"keyboardTemplate",
 
-                   @(MPIconExpiredEntry): NSImageNameCaution,
-                   @(MPIconExpiredGroup): NSImageNameCaution
+                   @(MPIconExpiredEntry)          : NSImageNameCaution,
+                   @(MPIconExpiredGroup)          : NSImageNameCaution
                    };
   });
   return imageNames;
diff --git a/MacPass/MPToolbarDelegate.m b/MacPass/MPToolbarDelegate.m
index 30c332d7..d4b0bd7f 100644
--- a/MacPass/MPToolbarDelegate.m
+++ b/MacPass/MPToolbarDelegate.m
@@ -225,7 +225,7 @@ NSString *const MPToolbarItemIdentifierAutotype     = @"TOOLBAR_AUTOTYPE";
                                MPToolbarItemIdentifierCopyPassword : [MPIconHelper icon:MPIconPassword],
                                MPToolbarItemIdentifierDelete: [MPIconHelper icon:MPIconTrash],
                                MPToolbarItemIdentifierAction: [NSImage imageNamed:NSImageNameActionTemplate],
-                               MPToolbarItemIdentifierInspector: [MPIconHelper icon:MPIconInfo],
+                               MPToolbarItemIdentifierInspector: [MPIconHelper icon:MPIconSidebar],
                                MPToolbarItemIdentifierHistory: [MPIconHelper icon:MPIconHistory],
                                MPToolbarItemIdentifierAutotype : [MPIconHelper icon:MPIconKeyboard]
                                };