diff --git a/MacPass/MPIconHelper.h b/MacPass/MPIconHelper.h
index 52beeab1..ba8a4319 100644
--- a/MacPass/MPIconHelper.h
+++ b/MacPass/MPIconHelper.h
@@ -73,15 +73,15 @@ typedef NS_ENUM(NSUInteger, MPIconType) {
 + (NSDictionary *)availableIconNames;
 
 /**
- *	List of all availabel DatabaseIcons as Images. Sorted by IconIndex
+ *	List of all available DatabaseIcons as an array of Images. Sorted by IconIndex.
  *	@return	Array of Icons as NSImage objects
  */
 + (NSArray *)databaseIcons;
 
 /**
- *	List of all available DatabaseIcons as MPIconType. Sorted by IconIndex
- *	@return	Array of Names as NSNumber objects
+ *	List of all available DatabaseIcons as an array of MPIconType. Sorted by IconIndex.
+ *	@return	Array of MPIconType as NSNumber objects
  */
-+ (NSArray *)databaseIconType;
++ (NSArray *)databaseIconTypes;
 
 @end
diff --git a/MacPass/MPIconHelper.m b/MacPass/MPIconHelper.m
index 70ecbf17..6853e4f1 100644
--- a/MacPass/MPIconHelper.m
+++ b/MacPass/MPIconHelper.m
@@ -47,7 +47,7 @@
 }
 
 
-+ (NSArray *)databaseIconType {
++ (NSArray *)databaseIconTypes {
     static NSArray *iconTypes;
     static dispatch_once_t onceToken;
     dispatch_once(&onceToken, ^{
diff --git a/MacPass/MPIconSelectViewController.m b/MacPass/MPIconSelectViewController.m
index a613e587..0a281705 100644
--- a/MacPass/MPIconSelectViewController.m
+++ b/MacPass/MPIconSelectViewController.m
@@ -58,7 +58,7 @@ NSInteger const kMPDefaultIcon = -1;
   NSButton *button = sender;
   NSImage *image = [button image];
   NSUInteger buttonIndex = [[self.iconCollectionView content] indexOfObject:image];
-  self.selectedIcon = [[MPIconHelper databaseIconType] [buttonIndex] integerValue];
+  self.selectedIcon = [[MPIconHelper databaseIconTypes] [buttonIndex] integerValue];
   [self.popover performClose:self];
 }