diff --git a/MVMCoreUI/Atomic/Atoms/TextFields/BaseDropdownEntryField.swift b/MVMCoreUI/Atomic/Atoms/TextFields/BaseDropdownEntryField.swift
index f7083df5..ee697a3e 100644
--- a/MVMCoreUI/Atomic/Atoms/TextFields/BaseDropdownEntryField.swift
+++ b/MVMCoreUI/Atomic/Atoms/TextFields/BaseDropdownEntryField.swift
@@ -69,7 +69,7 @@ import UIKit
         textFieldTrailingConstraint = dropDownCaretView.leadingAnchor.constraint(equalTo: textField.trailingAnchor, constant: 6)
         textFieldTrailingConstraint?.isActive = true
         
-        container.trailingAnchor.constraint(equalTo: dropDownCaretView.trailingAnchor, constant: 16).isActive = true
+        container.trailingAnchor.constraint(equalTo: dropDownCaretView.trailingAnchor, constant: Padding.Four).isActive = true
         dropDownCaretView.centerYAnchor.constraint(equalTo: container.centerYAnchor).isActive = true
     }
     
diff --git a/MVMCoreUI/Atomic/Atoms/TextFields/MdnEntryField.swift b/MVMCoreUI/Atomic/Atoms/TextFields/MdnEntryField.swift
index dfca1b76..c973071d 100644
--- a/MVMCoreUI/Atomic/Atoms/TextFields/MdnEntryField.swift
+++ b/MVMCoreUI/Atomic/Atoms/TextFields/MdnEntryField.swift
@@ -22,6 +22,8 @@ import MVMCore
     public var isNationalMDN = true
     public var shouldValidateMDN = false
     
+    public var accessoryViewTrailingConstraint: NSLayoutConstraint?
+    
     //--------------------------------------------------
     // MARK: - Delegate
     //--------------------------------------------------
@@ -38,6 +40,15 @@ import MVMCore
         }
     }
     
+    public lazy var errorImage: UIImageView = {
+        let image = MVMCoreUIUtility.imageNamed("alert_standard")
+        let imageView = UIImageView(image: image)
+        imageView.translatesAutoresizingMaskIntoConstraints = false
+        imageView.heightAnchor.constraint(equalToConstant: 20).isActive = true
+        imageView.widthAnchor.constraint(equalToConstant: 20).isActive = true
+        return imageView
+    }()
+    
     //--------------------------------------------------
     // MARK: - Computed Properties
     //--------------------------------------------------
@@ -84,21 +95,26 @@ import MVMCore
         let dismissButton = UIBarButtonItem(barButtonSystemItem: .done, target: self, action: #selector(dismissFieldInput(_:)))
         toolbar.items = [contacts, space, dismissButton]
         textField.inputAccessoryView = toolbar
+        
+//        textFieldTrailingConstraint?.isActive = false
+//        textFieldTrailingConstraint = errorImage.leadingAnchor.constraint(equalTo: textField.trailingAnchor, constant: Padding.Two)
+//        textFieldTrailingConstraint?.isActive = true
+//
+//        container.trailingAnchor.constraint(equalTo: errorImage.trailingAnchor, constant: Padding.Four).isActive = true
+//        errorImage.centerYAnchor.constraint(equalTo: container.centerYAnchor).isActive = true
     }
     
     public func constrainAccessoryView() {
         
-        guard let accessoryView = accessoryView else { return }
-        
-        entryFieldContainer.addSubview(accessoryView)
+        entryFieldContainer.addSubview(errorImage)
         
         textFieldTrailingConstraint?.isActive = false
-        textFieldTrailingConstraint = accessoryView.leadingAnchor.constraint(equalTo: textField.trailingAnchor, constant: Padding.Two)
+        textFieldTrailingConstraint = errorImage.leadingAnchor.constraint(equalTo: textField.trailingAnchor, constant: Padding.Two)
         textFieldTrailingConstraint?.isActive = true
         
-        accessoryViewTrailingConstraint = entryFieldContainer.trailingAnchor.constraint(equalTo: accessoryView.trailingAnchor, constant: Padding.Four)
+        accessoryViewTrailingConstraint = entryFieldContainer.trailingAnchor.constraint(equalTo: errorImage.trailingAnchor, constant: Padding.Four)
         accessoryViewTrailingConstraint?.isActive = true
-        accessoryView.centerYAnchor.constraint(equalTo: entryFieldContainer.centerYAnchor).isActive = true
+        errorImage.centerYAnchor.constraint(equalTo: entryFieldContainer.centerYAnchor).isActive = true
     }
     
     public func unconstrainAccessoryView() {
@@ -107,7 +123,6 @@ import MVMCore
         textFieldTrailingConstraint?.isActive = true
     }
     
-    
     //--------------------------------------------------
     // MARK: - Methods
     //--------------------------------------------------
diff --git a/MVMCoreUI/Atomic/Atoms/TextFields/TextEntryField.swift b/MVMCoreUI/Atomic/Atoms/TextFields/TextEntryField.swift
index c013a246..1c5563aa 100644
--- a/MVMCoreUI/Atomic/Atoms/TextFields/TextEntryField.swift
+++ b/MVMCoreUI/Atomic/Atoms/TextFields/TextEntryField.swift
@@ -137,7 +137,6 @@ import UIKit
     //--------------------------------------------------
     
     public var textFieldTrailingConstraint: NSLayoutConstraint?
-    public var accessoryViewTrailingConstraint: NSLayoutConstraint?
     
     //--------------------------------------------------
     // MARK: - Initializers