diff --git a/Changelog.md b/Changelog.md
index b4f050ec9..3d5dfa0ac 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -14,6 +14,7 @@
 * Make the session cookies HttpOnly again [#7041](https://github.com/diaspora/diaspora/pull/7041)
 * Invalidate sessions with invalid CSRF tokens [#7050](https://github.com/diaspora/diaspora/pull/7050)
 * Liking a post will no longer update its interacted timestamp [#7030](https://github.com/diaspora/diaspora/pull/7030)
+* Improve W3C compliance [#7068](https://github.com/diaspora/diaspora/pull/7068)
 
 ## Bug fixes
 * Post comments no longer get collapsed when interacting with a post [#7040](https://github.com/diaspora/diaspora/pull/7040)
diff --git a/app/views/devise/passwords/new.haml b/app/views/devise/passwords/new.haml
index eccb259a2..627aa3a1d 100644
--- a/app/views/devise/passwords/new.haml
+++ b/app/views/devise/passwords/new.haml
@@ -20,11 +20,11 @@
         = f.text_field :email,
                        class:          "input-block-level form-control",
                        required:       true,
-                       autocapitalize: "off",
+                       autocapitalize: "none",
                        placeholder:    t("devise.passwords.new.email"),
                        autocorrect:    "off",
                        autofocus:      true,
-                       aria:           {labelledby: "passwordLabel"}
+                       aria:           {labelledby: "emailLabel"}
 
       = f.submit t("devise.passwords.new.send_password_instructions"), class: "btn btn-block btn-primary"
 
diff --git a/app/views/home/podmin.haml b/app/views/home/podmin.haml
index ecf1f2a03..fcee4e4b2 100644
--- a/app/views/home/podmin.haml
+++ b/app/views/home/podmin.haml
@@ -11,7 +11,7 @@
     .col-md-4
       .landing-info-card
         %h3.text-center
-          .entypo-tools
+          %span.entypo-tools
           = t(".configure_your_pod")
         != t(".configuration_info",
              database_path: content_tag(:code, "config/database.yml"),
@@ -20,7 +20,7 @@
     .col-md-4
       .landing-info-card
         %h3.text-center
-          .entypo-add-user
+          %span.entypo-add-user
           = t(".create_an_account")
         != t(".create_an_account_info",
              sign_up_link: link_to(t("devise.shared.links.sign_up"), new_user_registration_path))
@@ -28,7 +28,7 @@
     .col-md-4
       .landing-info-card
         %h3.text-center
-          .entypo-key
+          %span.entypo-key
           = t(".make_yourself_an_admin")
         != t(".make_yourself_an_admin_info",
              wiki: link_to("diaspora* wiki", "https://wiki.diasporafoundation.org/FAQ_for_pod_maintainers#What_are_roles_and_how_do_I_use_them.3F_.2F_Make_yourself_an_admin"),
@@ -38,7 +38,7 @@
     .col-md-4
       .landing-info-card
         %h3.text-center
-          .entypo-new
+          %span.entypo-new
           = t(".update_your_pod")
         != t(".update_your_pod_info",
              update_instructions: link_to(t(".update_instructions"), "https://wiki.diasporafoundation.org/Updating"))
@@ -46,7 +46,7 @@
     .col-md-4
       .landing-info-card
         %h3.text-center
-          .entypo-lifebuoy
+          %span.entypo-lifebuoy
           = t(".getting_help")
         != t(".getting_help_info",
              faq: link_to(t(".faq_for_podmins"), "https://wiki.diasporafoundation.org/FAQ_for_pod_maintainers"),
@@ -55,7 +55,7 @@
     .col-md-4
       .landing-info-card
         %h3.text-center
-          .entypo-code
+          %span.entypo-code
           = t(".contribute")
         != t(".contribute_info",
              report_bugs: link_to(t(".report_bugs"), "https://wiki.diasporafoundation.org/How_to_report_a_bug"))
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index a1ab3aa84..cb0248113 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -9,7 +9,6 @@
       = page_title yield(:page_title)
 
     %meta{charset:  'utf-8'}/
-    %meta{"http-equiv" => "Content-Type", :content=>"text/html; charset=utf-8"}/
     %meta{name:  "viewport", content:  "width=device-width, initial-scale=1"}/
     = content_for?(:meta_data) ? yield(:meta_data) : metas_tags