diff --git a/apps/auth_web/lib/auth_web/templates/pow/registration/edit.html.eex b/apps/auth_web/lib/auth_web/templates/pow/registration/edit.html.eex
index 08debddb..81070cbd 100644
--- a/apps/auth_web/lib/auth_web/templates/pow/registration/edit.html.eex
+++ b/apps/auth_web/lib/auth_web/templates/pow/registration/edit.html.eex
@@ -2,11 +2,11 @@
   <%= floating_form "Update My Account", @changeset do %>
     <%= form_for @changeset, @action, [as: :user], fn f -> %>
       <div>
-        <%= styled_input f, :current_password, icon: "lock", type: "password", autocomplete: "current-password" %>
+        <%= styled_input f, :current_password, type: "password", autocomplete: "current-password" %>
 
-        <%= styled_input f, Pow.Ecto.Schema.user_id_field(@changeset), icon: "user" %>
+        <%= styled_input f, Pow.Ecto.Schema.user_id_field(@changeset) %>
 
-        <%= styled_input f, :password, [icon: "lock", label: "New Password", type: "password", autocomplete: "new-password"], nil do %>
+        <%= styled_input f, :password, [label: "New Password", type: "password", autocomplete: "new-password"], nil do %>
           <div class="password-revealer js-passwordRevealer flex items-center justify-center text-gray-500 bg-gray-200 hover:bg-gray-300 rounded-r">
             <span class="fa fa-eye inline"></span>
           </div>
diff --git a/apps/auth_web/lib/auth_web/templates/pow/registration/new.html.eex b/apps/auth_web/lib/auth_web/templates/pow/registration/new.html.eex
index 56bf9ef2..d41e7fdf 100644
--- a/apps/auth_web/lib/auth_web/templates/pow/registration/new.html.eex
+++ b/apps/auth_web/lib/auth_web/templates/pow/registration/new.html.eex
@@ -2,7 +2,11 @@
   <%= floating_form "Sign Up", @changeset do %>
     <%= form_for @changeset, @action, [as: :user], fn f -> %>
       <%= styled_input f, Pow.Ecto.Schema.user_id_field(@changeset), placeholder: "E-mail address" %>
-      <%= styled_input f, :password, placeholder: "Password", autocomplete: "new-password"  %>
+      <%= styled_input f, :password, [placeholder: "Password", autocomplete: "new-password"], nil do  %>
+        <div class="password-revealer js-passwordRevealer flex items-center justify-center text-gray-500 bg-gray-200 hover:bg-gray-300 rounded-r">
+          <span class="fa fa-eye inline"></span>
+        </div>
+      <% end %>
 
       <%= styled_button "Create My Account" %>
     <% end %>
diff --git a/apps/auth_web/lib/auth_web/templates/pow/session/new.html.eex b/apps/auth_web/lib/auth_web/templates/pow/session/new.html.eex
index ccc46fae..b9a4b62b 100644
--- a/apps/auth_web/lib/auth_web/templates/pow/session/new.html.eex
+++ b/apps/auth_web/lib/auth_web/templates/pow/session/new.html.eex
@@ -1,8 +1,8 @@
 <%= floating_page_wrapper do %>
   <%= floating_form "Log In", @changeset do %>
     <%= form_for @changeset, @action, [as: :user], fn f -> %>
-      <%= styled_input f, Pow.Ecto.Schema.user_id_field(@changeset), icon: "user", placeholder: "joe@example.org" %>
-      <%= styled_input f, :password, icon: "lock", type: "password", autocomplete: "current-password" %>
+      <%= styled_input f, Pow.Ecto.Schema.user_id_field(@changeset), placeholder: "joe@example.org" %>
+      <%= styled_input f, :password, type: "password", autocomplete: "current-password" %>
       <%= hidden_input f, :persistent_session, value: "true" %>
       <div class="text-center mt-6">
         <%= styled_button "Sign In" %>
diff --git a/apps/auth_web/lib/auth_web/templates/pow_reset_password/reset_password/edit.html.eex b/apps/auth_web/lib/auth_web/templates/pow_reset_password/reset_password/edit.html.eex
index ff74757a..38773342 100644
--- a/apps/auth_web/lib/auth_web/templates/pow_reset_password/reset_password/edit.html.eex
+++ b/apps/auth_web/lib/auth_web/templates/pow_reset_password/reset_password/edit.html.eex
@@ -1,7 +1,7 @@
 <%= floating_page_wrapper do %>
   <%= floating_form "Reset Password", @changeset do %>
     <%= form_for @changeset, @action, [as: :user], fn f -> %>
-      <%= styled_input f, :password, [icon: "lock", label: "New Password", type: "password", autocomplete: "new-password"], nil do %>
+      <%= styled_input f, :password, [label: "New Password", type: "password", autocomplete: "new-password"], nil do %>
         <div class="password-revealer js-passwordRevealer flex items-center justify-center text-gray-500 bg-gray-200 hover:bg-gray-300 rounded-r">
           <span class="fa fa-eye inline"></span>
         </div>
diff --git a/apps/auth_web/lib/auth_web/templates/pow_reset_password/reset_password/new.html.eex b/apps/auth_web/lib/auth_web/templates/pow_reset_password/reset_password/new.html.eex
index b08b53fa..56a000d0 100644
--- a/apps/auth_web/lib/auth_web/templates/pow_reset_password/reset_password/new.html.eex
+++ b/apps/auth_web/lib/auth_web/templates/pow_reset_password/reset_password/new.html.eex
@@ -1,7 +1,7 @@
 <%= floating_page_wrapper do %>
   <%= floating_form "Reset Password", @changeset do %>
     <%= form_for @changeset, @action, [as: :user], fn f -> %>
-      <%= styled_input f, :email, [placeholder: "joe@example.org", icon: "user"] %>
+      <%= styled_input f, :email, [placeholder: "joe@example.org"] %>
       <%= styled_button "Reset My Password" %>
     <% end %>
   <% end %>
diff --git a/apps/core/lib/core_web/views/helpers.ex b/apps/core/lib/core_web/views/helpers.ex
index daeba427..f08eb5ac 100644
--- a/apps/core/lib/core_web/views/helpers.ex
+++ b/apps/core/lib/core_web/views/helpers.ex
@@ -52,7 +52,7 @@ defmodule CoreWeb.Helpers do
     {icon, rest_opts} = Keyword.pop(rest_opts, :icon, "")
     {classes, rest_opts} = Keyword.pop(rest_opts, :class, default_classes_for_type(type))
     {label_text, rest_opts} = Keyword.pop(rest_opts, :label)
-    {input_helper, rest_opts} = Keyword.pop(rest_opts, :input_helper, :text_input)
+    {input_helper, rest_opts} = Keyword.pop(rest_opts, :input_helper, input_type(f, field))
 
     error_classes =
       if Keyword.get_values(f.errors, field) |> Enum.any?() do
@@ -69,7 +69,6 @@ defmodule CoreWeb.Helpers do
         <%= label f, field, class: "block uppercase text-gray-700 text-xs font-bold mb-2" %>
       <% end %>
 
-      <i class="<%= icon %> icon"></i>
       <%= do_styled_input_tag(type, input_helper, f, field, options, opts, classes, error_classes) %>
       <%= content %>