diff --git a/bin/assets/layouts/test.xml b/bin/assets/layouts/test.xml
index 80559f2a6..156a532d1 100644
--- a/bin/assets/layouts/test.xml
+++ b/bin/assets/layouts/test.xml
@@ -49,8 +49,8 @@
 					<ScrollBar id="scrollbar" orientation="horizontal" layout_width="200dp" layout_height="wrap_content" layout_to_bottom_of="slider" />
 
 					<SpinBox id="spinbox" layout_width="200dp" layout_height="wrap_content" layout_to_bottom_of="scrollbar" />
-					
-					<InputPassword id="spinbox" layout_width="200dp" layout_height="wrap_content" layout_to_bottom_of="spinbox" text="test" margin-top="8dp" />
+
+					<TextInput id="spinbox" layout_width="200dp" layout_height="wrap_content" layout_to_bottom_of="spinbox" text="test" margin-top="8dp" input-mode="password" />
 
 					<TextEdit layout_width="200dp" layout_height="50dp" layout_gravity="bottom|center_horizontal" />
 				</RelativeLayout>
diff --git a/bin/assets/layouts/test_widgets.xml b/bin/assets/layouts/test_widgets.xml
index e00ceb08d..eb1dfa9f1 100644
--- a/bin/assets/layouts/test_widgets.xml
+++ b/bin/assets/layouts/test_widgets.xml
@@ -31,7 +31,7 @@
 					<item>Test 4</item><item>Test 5</item><item>Test 6</item><item>Test 7</item><item>Test 8</item>
 				</ComboBox>
 				<TextInput layout_width="300dp" layout_height="wrap_content" margin-top="8dp" text="Testing TextInput" />
-				<TextInputPassword layout_width="300dp" layout_height="wrap_content" margin-top="8dp" hint="Password" />
+				<TextInput layout_width="300dp" layout_height="wrap_content" margin-top="8dp" hint="Password" input-mode="password" />
 				<TextEdit word-wrap="true" layout_width="300dp" layout_height="100dp" margin-top="8dp" text="Testing TextEdit Text Texted with text as text is the way to test the text.&#10;Multi line&#10;Texts" />
 				<SelectButton layout_width="wrap_content" layout_height="wrap_content" text="Testing SelectButton" margin-top="8dp" />
 				<SpinBox id="spinbox" layout_width="200dp" layout_height="wrap_content" margin-top="8dp" />
diff --git a/bin/assets/ui/breeze.css b/bin/assets/ui/breeze.css
index 3019bc970..117cc7e95 100644
--- a/bin/assets/ui/breeze.css
+++ b/bin/assets/ui/breeze.css
@@ -245,7 +245,6 @@ Tab,
 TextEdit,
 TextInput,
 TextArea,
-TextInputPassword,
 TextView,
 Anchor,
 Tooltip,
@@ -264,7 +263,6 @@ Anchor,
 TextEdit,
 TextArea,
 TextInput,
-TextInputPassword,
 ComboBox::DropDownList,
 SpinBox::input, {
 	selection-color: var(--font-selected-pressed);
@@ -477,8 +475,7 @@ ComboBox::DropDownList::ListBox::item:selected {
 	tint: var(--font-selected-pressed);
 }
 
-TextInput,
-TextInputPassword {
+TextInput {
 	padding-left: var(--base-horizontal-padding);
 	padding-right: var(--base-horizontal-padding);
 	padding-top: var(--base-vertical-padding);
@@ -506,8 +503,6 @@ ComboBox::DropDownList {
 	padding-bottom: var(--base-vertical-padding);
 }
 
-TextInputPassword:hover,
-TextInputPassword:focus,
 TextInput:hover,
 TextInput:focus,
 SpinBox:hover,
diff --git a/src/eepp/ui/doc/languages/css.cpp b/src/eepp/ui/doc/languages/css.cpp
index c98e26a4a..02b2f539d 100644
--- a/src/eepp/ui/doc/languages/css.cpp
+++ b/src/eepp/ui/doc/languages/css.cpp
@@ -188,7 +188,6 @@ void addCSS() {
 			  { "rosybrown", "literal" },
 			  { "viewpager", "keyword" },
 			  { "tab", "keyword" },
-			  { "inputpassword", "keyword" },
 			  { "window", "keyword" },
 			  { "tooltip", "keyword" },
 			  { "scrollview", "keyword" },
@@ -261,7 +260,6 @@ void addCSS() {
 			  { "true", "literal" },
 			  { "sizens", "literal" },
 			  { "magenta", "literal" },
-			  { "textinputpassword", "keyword" },
 			  { "important", "literal" },
 			  { "a", "keyword" },
 			  { "abbr", "keyword" },
@@ -399,7 +397,6 @@ void addCSS() {
 			  { "TabWidget", "keyword" },
 			  { "TextEdit", "keyword" },
 			  { "TextInput", "keyword" },
-			  { "TextInputPassword", "keyword" },
 			  { "Loader", "keyword" },
 			  { "SelectButton", "keyword" },
 			  { "Window", "keyword" },
diff --git a/src/eepp/ui/uiwidgetcreator.cpp b/src/eepp/ui/uiwidgetcreator.cpp
index c55e372c3..44e0876f3 100644
--- a/src/eepp/ui/uiwidgetcreator.cpp
+++ b/src/eepp/ui/uiwidgetcreator.cpp
@@ -85,7 +85,6 @@ void UIWidgetCreator::createBaseWidgetList() {
 		registeredWidget["tabwidget"] = UITabWidget::New;
 		registeredWidget["textedit"] = UITextEdit::New;
 		registeredWidget["textinput"] = UITextInput::New;
-		registeredWidget["textinputpassword"] = UITextInput::NewPassword;
 		registeredWidget["loader"] = UILoader::New;
 		registeredWidget["selectbutton"] = UISelectButton::New;
 		registeredWidget["window"] = UIWindow::New;
@@ -121,7 +120,6 @@ void UIWidgetCreator::createBaseWidgetList() {
 		// Aliases
 		registeredWidget["hbox"] = UILinearLayout::NewHorizontal;
 		registeredWidget["vbox"] = UILinearLayout::NewVertical;
-		registeredWidget["inputpassword"] = UITextInput::NewPassword;
 		registeredWidget["viewpagerhorizontal"] = UIViewPager::NewHorizontal;
 		registeredWidget["viewpagervertical"] = UIViewPager::NewHorizontal;
 		registeredWidget["vslider"] = UISlider::NewHorizontal;
diff --git a/src/tools/ecode/uibuildsettings.cpp b/src/tools/ecode/uibuildsettings.cpp
index a45fafbd0..2a9eef596 100644
--- a/src/tools/ecode/uibuildsettings.cpp
+++ b/src/tools/ecode/uibuildsettings.cpp
@@ -385,7 +385,7 @@ static const auto SETTINGS_PANEL_XML = R"xml(
 		</hbox>
 		<Widget class="separator" lw="mp" lh="1dp" />
 		<TextView class="subtitle" text="@string(build_name, Build Name)" focusable="false" />
-		<Input id="build_name" lw="mp" lh="wc" text="new_name" />
+		<TextInput id="build_name" lw="mp" lh="wc" text="new_name" />
 		<TextView class="subtitle" text="@string(supported_platforms, Supported Platforms)" focusable="false" />
 		<TextView lw="mp" lh="wc" word-wrap="true" text="@string(supported_platforms_desc, Selecting none means that the build settings will work and be available on any Operating System)" />
 		<StackLayout id="os_select" class="os_select" lw="wc" lh="wc">