diff --git a/packages/ui-default/components/form/checkbox.page.styl b/packages/ui-default/components/form/checkbox.page.styl
index 5c6b46146..80124bcdc 100644
--- a/packages/ui-default/components/form/checkbox.page.styl
+++ b/packages/ui-default/components/form/checkbox.page.styl
@@ -63,6 +63,7 @@ $checkbox-size = 16px
     margin-bottom: 0
     line-height: 1.2
     padding: ((rem($compact-control-height) - (@line-height * @font-size)) / 2) 0
+    margin: 0 !important
 
     input
       margin: ((@line-height * @font-size - rem($checkbox-size)) / 2) 0
diff --git a/packages/ui-default/templates/partials/discussion_edit_form.html b/packages/ui-default/templates/partials/discussion_edit_form.html
index c3c81732c..741f361af 100644
--- a/packages/ui-default/templates/partials/discussion_edit_form.html
+++ b/packages/ui-default/templates/partials/discussion_edit_form.html
@@ -11,10 +11,9 @@
   </div>
   <div class="medium-2 columns">
     <label>
-      {{ _('Highlight') }}
       <br>
       <label class="checkbox">
-        <input type="checkbox" name="highlight" value="on"
+        <input type="checkbox" name="highlight" value="on" class="checkbox"
           {%- if ddoc.highlight %} checked{% endif -%}
           {%- if not handler.user.hasPerm(perm.PERM_HIGHLIGHT_DISCUSSION) %} disabled{% endif -%}
         >{{ _('Highlight') }}
@@ -23,10 +22,9 @@
   </div>
   <div class="medium-2 columns">
     <label>
-      {{ _('Pin') }}
       <br>
       <label class="checkbox">
-        <input type="checkbox" name="pin" value="on"
+        <input type="checkbox" name="pin" value="on" class="checkbox"
           {%- if ddoc.pin %} checked{% endif -%}
           {%- if not handler.user.hasPerm(perm.PERM_PIN_DISCUSSION) %} disabled{% endif -%}
         >{{ _('Pin') }}
diff --git a/packages/ui-default/templates/problem_edit.html b/packages/ui-default/templates/problem_edit.html
index a1846e4bc..30bc24a6e 100644
--- a/packages/ui-default/templates/problem_edit.html
+++ b/packages/ui-default/templates/problem_edit.html
@@ -25,7 +25,7 @@
               <label>
                 <br>
                 <label class="checkbox">
-                  <input type="checkbox" name="hidden" value="on"{% if pdoc['hidden'] %} checked{% endif %}>{{ _('Hidden') }}
+                  <input type="checkbox" name="hidden" value="on"{% if pdoc['hidden'] %} checked{% endif %} class="checkbox">{{ _('Hidden') }}
                 </label>
               </label>
             </div>
diff --git a/packages/ui-default/templates/training_edit.html b/packages/ui-default/templates/training_edit.html
index cb91b2a5f..77ac742d8 100644
--- a/packages/ui-default/templates/training_edit.html
+++ b/packages/ui-default/templates/training_edit.html
@@ -6,7 +6,7 @@
       <div class="section__body">
         <form method="post">
           <div class="row">
-            <div class="medium-5 columns">
+            <div class="medium-10 columns">
               <label>
                 {{ _('Title') }}
                 <input name="title" placeholder="{{ _('title') }}" value="{{ tdoc.title|default('') }}" class="textbox" autofocus>
@@ -16,7 +16,7 @@
               <label>
                 <br>
                 <label class="checkbox">
-                  <input type="checkbox" name="pin" value="on"{% if tdoc['hidden'] %} checked{% endif %}>{{ _('Pin') }}
+                  <input type="checkbox" name="pin" value="on"{% if tdoc['hidden'] %} checked{% endif %} class="checkbox">{{ _('Pin') }}
                 </label>
               </label>
             </div>