diff --git a/MVMCoreUI/Atomic/Atoms/TextFields/MdnEntryField.swift b/MVMCoreUI/Atomic/Atoms/TextFields/MdnEntryField.swift
index 55a903d0..ce36a7cb 100644
--- a/MVMCoreUI/Atomic/Atoms/TextFields/MdnEntryField.swift
+++ b/MVMCoreUI/Atomic/Atoms/TextFields/MdnEntryField.swift
@@ -89,6 +89,9 @@ import MVMCore
         super.setupFieldContainerContent(container)
         
         textField.keyboardType = .numberPad
+    }
+    
+    open override func setupTextFieldToolbar() {
         
         let toolbar = UIToolbar.createEmptyToolbar()
         let space = UIBarButtonItem(barButtonSystemItem: .flexibleSpace, target: nil, action: nil)
diff --git a/MVMCoreUI/Atomic/Atoms/TextFields/TextEntryField.swift b/MVMCoreUI/Atomic/Atoms/TextFields/TextEntryField.swift
index 0f4960be..695694ac 100644
--- a/MVMCoreUI/Atomic/Atoms/TextFields/TextEntryField.swift
+++ b/MVMCoreUI/Atomic/Atoms/TextFields/TextEntryField.swift
@@ -182,11 +182,11 @@ import UIKit
         NSLayoutConstraint.activate([
             textField.heightAnchor.constraint(equalToConstant: Padding.Five),
             textField.topAnchor.constraint(equalTo: container.topAnchor, constant: Padding.Three),
-            textField.leadingAnchor.constraint(equalTo: container.leadingAnchor, constant: Padding.Four),
+            textField.leadingAnchor.constraint(equalTo: container.leadingAnchor, constant: Padding.Three),
             container.bottomAnchor.constraint(equalTo: textField.bottomAnchor, constant: Padding.Three)
         ])
         
-        textFieldTrailingConstraint = container.trailingAnchor.constraint(equalTo: textField.trailingAnchor, constant: Padding.Four)
+        textFieldTrailingConstraint = container.trailingAnchor.constraint(equalTo: textField.trailingAnchor, constant: Padding.Three)
         textFieldTrailingConstraint?.isActive = true
         
         textField.addTarget(self, action: #selector(startEditing), for: .editingDidBegin)
@@ -216,6 +216,12 @@ import UIKit
         uiTextFieldDelegate = delegate
     }
     
+    open func setupTextFieldToolbar() {
+        
+        textField.inputAccessoryView = UIToolbar.getToolbarWithDoneButton(delegate: observingTextFieldDelegate ?? self,
+                                                                          action: #selector(observingTextFieldDelegate?.dismissFieldInput))
+    }
+    
     //--------------------------------------------------
     // MARK: - Observing for Change (TextFieldDelegate)
     //--------------------------------------------------
@@ -336,8 +342,7 @@ import UIKit
         
         uiTextFieldDelegate = delegateObject?.uiTextFieldDelegate
         observingTextFieldDelegate = delegateObject?.observingTextFieldDelegate
-        textField.inputAccessoryView = UIToolbar.getToolbarWithDoneButton(delegate: observingTextFieldDelegate ?? self,
-                                                                          action: #selector(observingTextFieldDelegate?.dismissFieldInput))
+        setupTextFieldToolbar()
     }
 }