diff --git a/templates/Authentication/form.html.twig b/templates/Authentication/form.html.twig
index e3d1f2f6a..e6c896ca5 100644
--- a/templates/Authentication/form.html.twig
+++ b/templates/Authentication/form.html.twig
@@ -21,9 +21,11 @@
             </div>
 
             {% if displayTrustedOption %}
-            <div class="input-field col s12">
-                <input id="_trusted" type="checkbox" name="{{ trustedParameterName }}" />
-                <label for="_trusted">{{ "trusted"|trans({}, 'SchebTwoFactorBundle') }}</label>
+            <div class="input-field col s12 with-checkbox">
+                <label for="_trusted">
+                    <input id="_trusted" type="checkbox" name="{{ trustedParameterName }}"/>
+                    <span>{{ "trusted"|trans({}, 'SchebTwoFactorBundle') }}</span>
+                </label>
             </div>
             {% endif %}
         </div>
diff --git a/templates/Entry/entries.html.twig b/templates/Entry/entries.html.twig
index 449187bff..7da4c2bdd 100644
--- a/templates/Entry/entries.html.twig
+++ b/templates/Entry/entries.html.twig
@@ -128,28 +128,38 @@
                 </div>
 
                 <div class="input-field col s6 with-checkbox">
-                    {{ form_widget(form.isArchived) }}
-                    {{ form_label(form.isArchived) }}
+                    <label for="{{ form.isArchived.vars.id }}">
+                        {{ form_widget(form.isArchived) }}
+                        <span>{{ form.isArchived.vars.label|trans }}</span>
+                    </label>
                 </div>
 
                 <div class="input-field col s6 with-checkbox">
-                    {{ form_widget(form.isStarred) }}
-                    {{ form_label(form.isStarred) }}
+                    <label for="{{ form.isStarred.vars.id }}">
+                        {{ form_widget(form.isStarred) }}
+                        <span>{{ form.isStarred.vars.label|trans }}</span>
+                    </label>
                 </div>
 
                 <div class="input-field col s12 with-checkbox">
-                    {{ form_widget(form.isUnread) }}
-                    {{ form_label(form.isUnread) }}
+                    <label for="{{ form.isUnread.vars.id }}">
+                        {{ form_widget(form.isUnread) }}
+                        <span>{{ form.isUnread.vars.label|trans }}</span>
+                    </label>
                 </div>
 
                 <div class="input-field col s12 with-checkbox">
-                    {{ form_widget(form.isAnnotated) }}
-                    {{ form_label(form.isAnnotated) }}
+                    <label for="{{ form.isAnnotated.vars.id }}">
+                        {{ form_widget(form.isAnnotated) }}
+                        <span>{{ form.isAnnotated.vars.label|trans }}</span>
+                    </label>
                 </div>
 
                 <div class="input-field col s12 with-checkbox">
-                    {{ form_widget(form.isNotParsed) }}
-                    {{ form_label(form.isNotParsed) }}
+                    <label for="{{ form.isNotParsed.vars.id }}">
+                        {{ form_widget(form.isNotParsed) }}
+                        <span>{{ form.isNotParsed.vars.label|trans }}</span>
+                    </label>
                 </div>
 
                 <div class="col s12">
@@ -157,8 +167,10 @@
                 </div>
 
                 <div class="input-field col s12 with-checkbox">
-                    {{ form_widget(form.previewPicture) }}
-                    {{ form_label(form.previewPicture) }}
+                    <label for="{{ form.previewPicture.vars.id }}">
+                        {{ form_widget(form.previewPicture) }}
+                        <span>{{ form.previewPicture.vars.label|trans }}</span>
+                    </label>
                 </div>
 
                 <div class="col s12">
@@ -166,8 +178,10 @@
                 </div>
 
                 <div class="input-field col s12 with-checkbox">
-                    {{ form_widget(form.isPublic) }}
-                    {{ form_label(form.isPublic) }}
+                    <label for="{{ form.isPublic.vars.id }}">
+                        {{ form_widget(form.isPublic) }}
+                        <span>{{ form.isPublic.vars.label|trans }}</span>
+                    </label>
                 </div>
 
                 <div class="col s12">
diff --git a/templates/Import/Chrome/index.html.twig b/templates/Import/Chrome/index.html.twig
index f97aff670..ecf37ec95 100644
--- a/templates/Import/Chrome/index.html.twig
+++ b/templates/Import/Chrome/index.html.twig
@@ -26,10 +26,12 @@
                                     <input class="file-path validate" type="text">
                                 </div>
                             </div>
-                            <div class="input-field col s6 with-checkbox">
-                                <h6>{{ 'import.form.mark_as_read_title'|trans }}</h6>
-                                {{ form_widget(form.mark_as_read) }}
-                                {{ form_label(form.mark_as_read) }}
+                            <h6 class="col s12">{{ 'import.form.mark_as_read_title'|trans }}</h6>
+                            <div class="col s6 with-checkbox">
+                                <label for="{{ form.mark_as_read.vars.id }}">
+                                    {{ form_widget(form.mark_as_read) }}
+                                    <span>{{ form.mark_as_read.vars.label|trans }}</span>
+                                </label>
                             </div>
                         </div>
 
diff --git a/templates/Import/Delicious/index.html.twig b/templates/Import/Delicious/index.html.twig
index 445e1aa6e..e9356f6b9 100644
--- a/templates/Import/Delicious/index.html.twig
+++ b/templates/Import/Delicious/index.html.twig
@@ -26,10 +26,12 @@
                                     <input class="file-path validate" type="text">
                                 </div>
                             </div>
-                            <div class="input-field col s6 with-checkbox">
-                                <h6>{{ 'import.form.mark_as_read_title'|trans }}</h6>
-                                {{ form_widget(form.mark_as_read) }}
-                                {{ form_label(form.mark_as_read) }}
+                            <h6 class="col s12">{{ 'import.form.mark_as_read_title'|trans }}</h6>
+                            <div class="col s6 with-checkbox">
+                                <label for="{{ form.mark_as_read.vars.id }}">
+                                    {{ form_widget(form.mark_as_read) }}
+                                    <span>{{ form.mark_as_read.vars.label|trans }}</span>
+                                </label>
                             </div>
                         </div>
 
diff --git a/templates/Import/Elcurator/index.html.twig b/templates/Import/Elcurator/index.html.twig
index 7236f7be5..d0479a8d0 100644
--- a/templates/Import/Elcurator/index.html.twig
+++ b/templates/Import/Elcurator/index.html.twig
@@ -26,10 +26,12 @@
                                     <input class="file-path validate" type="text">
                                 </div>
                             </div>
-                            <div class="input-field col s6 with-checkbox">
-                                <h6>{{ 'import.form.mark_as_read_title'|trans }}</h6>
-                                {{ form_widget(form.mark_as_read) }}
-                                {{ form_label(form.mark_as_read) }}
+                            <h6 class="col s12">{{ 'import.form.mark_as_read_title'|trans }}</h6>
+                            <div class="col s6 with-checkbox">
+                                <label for="{{ form.mark_as_read.vars.id }}">
+                                    {{ form_widget(form.mark_as_read) }}
+                                    <span>{{ form.mark_as_read.vars.label|trans }}</span>
+                                </label>
                             </div>
                         </div>
 
diff --git a/templates/Import/Firefox/index.html.twig b/templates/Import/Firefox/index.html.twig
index f16604fe3..239b9a3ee 100644
--- a/templates/Import/Firefox/index.html.twig
+++ b/templates/Import/Firefox/index.html.twig
@@ -26,10 +26,12 @@
                                     <input class="file-path validate" type="text">
                                 </div>
                             </div>
-                            <div class="input-field col s6 with-checkbox">
-                                <h6>{{ 'import.form.mark_as_read_title'|trans }}</h6>
-                                {{ form_widget(form.mark_as_read) }}
-                                {{ form_label(form.mark_as_read) }}
+                            <h6 class="col s12">{{ 'import.form.mark_as_read_title'|trans }}</h6>
+                            <div class="col s6 with-checkbox">
+                                <label for="{{ form.mark_as_read.vars.id }}">
+                                    {{ form_widget(form.mark_as_read) }}
+                                    <span>{{ form.mark_as_read.vars.label|trans }}</span>
+                                </label>
                             </div>
                         </div>
 
diff --git a/templates/Import/Instapaper/index.html.twig b/templates/Import/Instapaper/index.html.twig
index 4fdc5ed96..ea9039c22 100644
--- a/templates/Import/Instapaper/index.html.twig
+++ b/templates/Import/Instapaper/index.html.twig
@@ -26,10 +26,12 @@
                                     <input class="file-path validate" type="text">
                                 </div>
                             </div>
-                            <div class="input-field col s6 with-checkbox">
-                                <h6>{{ 'import.form.mark_as_read_title'|trans }}</h6>
-                                {{ form_widget(form.mark_as_read) }}
-                                {{ form_label(form.mark_as_read) }}
+                            <h6 class="col s12">{{ 'import.form.mark_as_read_title'|trans }}</h6>
+                            <div class="col s6 with-checkbox">
+                                <label for="{{ form.mark_as_read.vars.id }}">
+                                    {{ form_widget(form.mark_as_read) }}
+                                    <span>{{ form.mark_as_read.vars.label|trans }}</span>
+                                </label>
                             </div>
                         </div>
 
diff --git a/templates/Import/Omnivore/index.html.twig b/templates/Import/Omnivore/index.html.twig
index 045668321..3aa09e25c 100644
--- a/templates/Import/Omnivore/index.html.twig
+++ b/templates/Import/Omnivore/index.html.twig
@@ -26,10 +26,12 @@
                                     <input class="file-path validate" type="text">
                                 </div>
                             </div>
-                            <div class="input-field col s6 with-checkbox">
-                                <h6>{{ 'import.form.mark_as_read_title'|trans }}</h6>
-                                {{ form_widget(form.mark_as_read) }}
-                                {{ form_label(form.mark_as_read) }}
+                            <h6 class="col s12">{{ 'import.form.mark_as_read_title'|trans }}</h6>
+                            <div class="col s6 with-checkbox">
+                                <label for="{{ form.mark_as_read.vars.id }}">
+                                    {{ form_widget(form.mark_as_read) }}
+                                    <span>{{ form.mark_as_read.vars.label|trans }}</span>
+                                </label>
                             </div>
                         </div>
 
diff --git a/templates/Import/Pinboard/index.html.twig b/templates/Import/Pinboard/index.html.twig
index 458a089f4..58a956d77 100644
--- a/templates/Import/Pinboard/index.html.twig
+++ b/templates/Import/Pinboard/index.html.twig
@@ -26,10 +26,12 @@
                                     <input class="file-path validate" type="text">
                                 </div>
                             </div>
-                            <div class="input-field col s6 with-checkbox">
-                                <h6>{{ 'import.form.mark_as_read_title'|trans }}</h6>
-                                {{ form_widget(form.mark_as_read) }}
-                                {{ form_label(form.mark_as_read) }}
+                            <h6 class="col s12">{{ 'import.form.mark_as_read_title'|trans }}</h6>
+                            <div class="col s6 with-checkbox">
+                                <label for="{{ form.mark_as_read.vars.id }}">
+                                    {{ form_widget(form.mark_as_read) }}
+                                    <span>{{ form.mark_as_read.vars.label|trans }}</span>
+                                </label>
                             </div>
                         </div>
 
diff --git a/templates/Import/Pocket/index.html.twig b/templates/Import/Pocket/index.html.twig
index 11eda98a9..50995941f 100644
--- a/templates/Import/Pocket/index.html.twig
+++ b/templates/Import/Pocket/index.html.twig
@@ -21,10 +21,12 @@
 
             <form method="post" action="{{ path('import_pocket_auth') }}">
                 <div class="row">
-                    <div class="input-field col s6 with-checkbox">
-                        <h6>{{ 'import.form.mark_as_read_title'|trans }}</h6>
-                        {{ form_widget(form.mark_as_read) }}
-                        {{ form_label(form.mark_as_read) }}
+                    <h6 class="col s12">{{ 'import.form.mark_as_read_title'|trans }}</h6>
+                    <div class="col s6 with-checkbox">
+                        <label for="{{ form.mark_as_read.vars.id }}">
+                            {{ form_widget(form.mark_as_read) }}
+                            <span>{{ form.mark_as_read.vars.label|trans }}</span>
+                        </label>
                     </div>
                 </div>
                 <button class="btn waves-effect waves-light" type="submit" name="action" {% if not has_consumer_key %}disabled="disabled"{% endif %}>
diff --git a/templates/Import/PocketHtml/index.html.twig b/templates/Import/PocketHtml/index.html.twig
index bb80e0090..332816fb4 100644
--- a/templates/Import/PocketHtml/index.html.twig
+++ b/templates/Import/PocketHtml/index.html.twig
@@ -26,10 +26,12 @@
                                     <input class="file-path validate" type="text">
                                 </div>
                             </div>
-                            <div class="input-field col s6 with-checkbox">
-                                <h6>{{ 'import.form.mark_as_read_title'|trans }}</h6>
-                                {{ form_widget(form.mark_as_read) }}
-                                {{ form_label(form.mark_as_read) }}
+                            <h6 class="col s12">{{ 'import.form.mark_as_read_title'|trans }}</h6>
+                            <div class="col s6 with-checkbox">
+                                <label for="{{ form.mark_as_read.vars.id }}">
+                                    {{ form_widget(form.mark_as_read) }}
+                                    <span>{{ form.mark_as_read.vars.label|trans }}</span>
+                                </label>
                             </div>
                         </div>
 
diff --git a/templates/Import/Readability/index.html.twig b/templates/Import/Readability/index.html.twig
index 12831e1bf..f97cf77e8 100644
--- a/templates/Import/Readability/index.html.twig
+++ b/templates/Import/Readability/index.html.twig
@@ -26,10 +26,12 @@
                                     <input class="file-path validate" type="text">
                                 </div>
                             </div>
-                            <div class="input-field col s6 with-checkbox">
-                                <h6>{{ 'import.form.mark_as_read_title'|trans }}</h6>
-                                {{ form_widget(form.mark_as_read) }}
-                                {{ form_label(form.mark_as_read) }}
+                            <h6 class="col s12">{{ 'import.form.mark_as_read_title'|trans }}</h6>
+                            <div class="col s6 with-checkbox">
+                                <label for="{{ form.mark_as_read.vars.id }}">
+                                    {{ form_widget(form.mark_as_read) }}
+                                    <span>{{ form.mark_as_read.vars.label|trans }}</span>
+                                </label>
                             </div>
                         </div>
 
diff --git a/templates/Import/Shaarli/index.html.twig b/templates/Import/Shaarli/index.html.twig
index 2091d6838..6cbf5049f 100644
--- a/templates/Import/Shaarli/index.html.twig
+++ b/templates/Import/Shaarli/index.html.twig
@@ -26,10 +26,12 @@
                                     <input class="file-path validate" type="text">
                                 </div>
                             </div>
-                            <div class="input-field col s6 with-checkbox">
-                                <h6>{{ 'import.form.mark_as_read_title'|trans }}</h6>
-                                {{ form_widget(form.mark_as_read) }}
-                                {{ form_label(form.mark_as_read) }}
+                            <h6 class="col s12">{{ 'import.form.mark_as_read_title'|trans }}</h6>
+                            <div class="col s6 with-checkbox">
+                                <label for="{{ form.mark_as_read.vars.id }}">
+                                    {{ form_widget(form.mark_as_read) }}
+                                    <span>{{ form.mark_as_read.vars.label|trans }}</span>
+                                </label>
                             </div>
                         </div>
 
diff --git a/templates/Import/WallabagV1/index.html.twig b/templates/Import/WallabagV1/index.html.twig
index d9a87a73c..e48f797d5 100644
--- a/templates/Import/WallabagV1/index.html.twig
+++ b/templates/Import/WallabagV1/index.html.twig
@@ -26,10 +26,12 @@
                                     <input class="file-path validate" type="text">
                                 </div>
                             </div>
-                            <div class="input-field col s6 with-checkbox">
-                                <h6>{{ 'import.form.mark_as_read_title'|trans }}</h6>
-                                {{ form_widget(form.mark_as_read) }}
-                                {{ form_label(form.mark_as_read) }}
+                            <h6 class="col s12">{{ 'import.form.mark_as_read_title'|trans }}</h6>
+                            <div class="col s6 with-checkbox">
+                                <label for="{{ form.mark_as_read.vars.id }}">
+                                    {{ form_widget(form.mark_as_read) }}
+                                    <span>{{ form.mark_as_read.vars.label|trans }}</span>
+                                </label>
                             </div>
                         </div>
 
diff --git a/templates/bundles/FOSUserBundle/Security/login.html.twig b/templates/bundles/FOSUserBundle/Security/login.html.twig
index 291a0a428..870e4c829 100644
--- a/templates/bundles/FOSUserBundle/Security/login.html.twig
+++ b/templates/bundles/FOSUserBundle/Security/login.html.twig
@@ -24,9 +24,11 @@
                 <input type="password" id="password" name="_password" />
             </div>
 
-            <div class="input-field col s12">
-                <input type="checkbox" id="remember_me" name="_remember_me" checked />
-                <label for="remember_me">{{ 'security.login.keep_logged_in'|trans }}</label>
+            <div class="input-field col s12 with-checkbox">
+                <label for="remember_me">
+                    <input type="checkbox" id="remember_me" name="_remember_me" checked/>
+                    <span>{{ 'security.login.keep_logged_in'|trans }}</span>
+                </label>
             </div>
 
         </div>