             buttonOriginY = 0
         }
         
-        let autoCompleteButton = UIButton(type: .DetailDisclosure)
-        autoCompleteButton.frame = CGRectMake(0, buttonOriginY, defaultAutoCompleteButtonWidth, buttonFrameH)
+        let autoCompleteButton = UIButton(frame: CGRectMake(0, buttonOriginY, defaultAutoCompleteButtonWidth, buttonFrameH))
+        autoCompleteButton.setImage(buttonImage, forState: .Normal)
         autoCompleteButton.addTarget(self, action: "autoCompleteButtonDidTapped:", forControlEvents: .TouchUpInside)
         
         let containerFrame = CGRectMake(0, 0, defaultAutoCompleteButtonWidth, frame.height)

        
        let xOrigin = CGRectGetMaxX(textRect) + xOffsetCorrection
        let finalX = xOrigin + autocompleteTextRect.width
        
        if finalX >= textRectBounds.width {
            let autoCompleteRect = CGRectMake(textRectBounds.width, CGRectGetMinY(textRectBounds), 0, textRectBounds.height)
            
            return autoCompleteRect
            
        }else{
            let autoCompleteRect = CGRectMake(xOrigin, CGRectGetMinY(textRectBounds), autocompleteTextRect.width, textRectBounds.height)
            
            return autoCompleteRect
        }

        delimiter = NSCharacterSet(charactersInString: delimiterString)
    }
    
    /// Show completion button with custom image
    public func showAutoCompleteButton(buttonImage: UIImage? = UIImage(named: "check_icon"), autoCompleteButtonViewMode: AutoCompleteButtonViewMode) {
        
        var buttonFrameH: CGFloat = 0.0
        var buttonOriginY: CGFloat = 0.0
