diff --git a/client/galaxy/style/scss/trackster.scss b/client/galaxy/style/scss/trackster.scss
index b8ddcfb9838..ac15bd0b53c 100644
--- a/client/galaxy/style/scss/trackster.scss
+++ b/client/galaxy/style/scss/trackster.scss
@@ -348,15 +348,6 @@ $separator-color: #888;
 
 // Styles for tools and filters.
 input {
-    font: 10px verdana;
-
-    // Override Galaxy defaults to make a smaller button.
-    &[type="submit"] {
-        padding: 0px;
-        margin-right: 20px;
-        font-size: inherit;
-    }
-
     &.color-input {
         float: left;
     }
diff --git a/templates/user/login.mako b/templates/user/login.mako
index 1090acff960..1941d6a1bc7 100644
--- a/templates/user/login.mako
+++ b/templates/user/login.mako
@@ -82,8 +82,8 @@ def inherit(context):
     %if header:
         ${header}
     %endif
-    <div class="toolForm">
-        <div class="toolFormTitle">Login</div>
+    <div class="card">
+        <div class="card-header">Login</div>
         <form name="login" id="login" action="${form_action}" method="post" >
             <input type="hidden" name="session_csrf_token" value="${trans.session_csrf_token}" />
             <div class="form-row">
@@ -116,8 +116,8 @@ def inherit(context):
     %if header:
         ${header}
     %endif
-    <div class="toolForm">
-        <div class="toolFormTitle">OR</div>
+    <div class="card">
+        <div class="card-header">OR</div>
         <form name="oidc" id="oidc" action="${form_action}" method="post" >
             <div class="form-row">
                 <input type="submit" value="Login with Google"/>
@@ -128,8 +128,8 @@ def inherit(context):
 </%def>
 
 <%def name="render_openid_form( redirect, auto_associate, openid_providers )">
-    <div class="toolForm">
-        <div class="toolFormTitle">OpenID Login</div>
+    <div class="card">
+        <div class="card-header">OpenID Login</div>
         <form name="openid" id="openid" action="${h.url_for( controller='user', action='openid_auth' )}" method="post" target="_parent" >
             <div class="form-row">
                 <label>OpenID URL:</label>
diff --git a/templates/user/register.mako b/templates/user/register.mako
index fd6d6d0ef2e..18712d5734a 100644
--- a/templates/user/register.mako
+++ b/templates/user/register.mako
@@ -127,12 +127,12 @@ def inherit(context):
         });
     </script>
 
-    <div id="registrationForm" class="toolForm">
+    <div id="registrationForm" class="card">
         ## only display the prepopulate form to admins
         %if show_user_prepopulate_form:
             <form name="registration" id="prepopulateform" action="${form_action}" method="post" >
                 <input type="hidden" name="session_csrf_token" value="${trans.session_csrf_token}" />
-                <div class="toolFormTitle">Pre-populate an account through LDAP</div>
+                <div class="card-header">Pre-populate an account through LDAP</div>
                 <div class="form-row">
                     <label>Email address:</label>
                     <input id="email_input" type="text" name="email" value="${email | h}" size="40"/>
@@ -154,7 +154,7 @@ def inherit(context):
         %endif
         <form name="registration" id="registration" action="${form_action}" method="post" >
             <input type="hidden" name="session_csrf_token" value="${trans.session_csrf_token}" />
-            <div class="toolFormTitle">Create account</div>
+            <div class="card-header">Create account</div>
             <div class="form-row">
                 <label>Email address:</label>
                 <input id="email_input" type="text" name="email" value="${email | h}" size="40"/>
diff --git a/templates/user/reset_password.mako b/templates/user/reset_password.mako
index 806d4c824b2..7fb33370eba 100644
--- a/templates/user/reset_password.mako
+++ b/templates/user/reset_password.mako
@@ -5,8 +5,8 @@
     ${render_msg( message, status )}
 %endif
 
-<div class="toolForm">
-    <div class="toolFormTitle">Reset Password</div>
+<div class="card">
+    <div class="card-header">Reset Password</div>
     <form name="reset_password" id="reset_password" action="${h.url_for( controller='user', action='reset_password' )}" method="post" >
         <div class="form-row">
             <label>Email:</label>