diff --git a/src/Filtering/PostHiding.coffee b/src/Filtering/PostHiding.coffee
index 1772c13e1..6eb26c004 100755
--- a/src/Filtering/PostHiding.coffee
+++ b/src/Filtering/PostHiding.coffee
@@ -39,9 +39,9 @@ PostHiding =
         href: 'javascript:;'
       $.on apply, 'click', PostHiding.menu.hide
 
-      thisPost = UI.checkbox 'thisPost', ' This post',    true
-      replies  = UI.checkbox 'replies',  ' Hide replies', Conf['Recursive Hiding']
-      makeStub = UI.checkbox 'makeStub', ' Make stub',    Conf['Stubs']
+      thisPost = UI.checkbox 'thisPost', 'This post',    true
+      replies  = UI.checkbox 'replies',  'Hide replies', Conf['Recursive Hiding']
+      makeStub = UI.checkbox 'makeStub', 'Make stub',    Conf['Stubs']
 
       Menu.menu.addEntry
         el: div
@@ -71,8 +71,8 @@ PostHiding =
         href: 'javascript:;'
       $.on apply, 'click', PostHiding.menu.show
 
-      thisPost = UI.checkbox 'thisPost', ' This post',    false
-      replies  = UI.checkbox 'replies',  ' Show replies', false
+      thisPost = UI.checkbox 'thisPost', 'This post',    false
+      replies  = UI.checkbox 'replies',  'Show replies', false
       hideStubLink = $.el 'a',
         textContent: 'Hide stub'
         href: 'javascript:;'
diff --git a/src/Filtering/ThreadHiding.coffee b/src/Filtering/ThreadHiding.coffee
index 93c986a9e..06af56757 100755
--- a/src/Filtering/ThreadHiding.coffee
+++ b/src/Filtering/ThreadHiding.coffee
@@ -63,7 +63,7 @@ ThreadHiding =
         href: 'javascript:;'
       $.on apply, 'click', ThreadHiding.menu.hide
 
-      makeStub = UI.checkbox 'Stubs', ' Make stub'
+      makeStub = UI.checkbox 'Stubs', 'Make stub'
 
       Menu.menu.addEntry
         el: div
diff --git a/src/General/Header.coffee b/src/General/Header.coffee
index 38de6d1b1..200cd061c 100755
--- a/src/General/Header.coffee
+++ b/src/General/Header.coffee
@@ -6,14 +6,14 @@ Header =
       className: 'menu-button'
     $.extend menuButton, <%= html('<i></i>') %>
 
-    barFixedToggler     = UI.checkbox 'Fixed Header',               ' Fixed Header'
-    headerToggler       = UI.checkbox 'Header auto-hide',           ' Auto-hide header'
-    scrollHeaderToggler = UI.checkbox 'Header auto-hide on scroll', ' Auto-hide header on scroll'
-    barPositionToggler  = UI.checkbox 'Bottom Header',              ' Bottom header'
-    linkJustifyToggler  = UI.checkbox 'Centered links',             ' Centered links'
-    customNavToggler    = UI.checkbox 'Custom Board Navigation',    ' Custom board navigation'
-    footerToggler       = UI.checkbox 'Bottom Board List',          ' Hide bottom board list'
-    shortcutToggler     = UI.checkbox 'Shortcut Icons',             ' Shortcut Icons'
+    barFixedToggler     = UI.checkbox 'Fixed Header',               'Fixed Header'
+    headerToggler       = UI.checkbox 'Header auto-hide',           'Auto-hide header'
+    scrollHeaderToggler = UI.checkbox 'Header auto-hide on scroll', 'Auto-hide header on scroll'
+    barPositionToggler  = UI.checkbox 'Bottom Header',              'Bottom header'
+    linkJustifyToggler  = UI.checkbox 'Centered links',             'Centered links'
+    customNavToggler    = UI.checkbox 'Custom Board Navigation',    'Custom board navigation'
+    footerToggler       = UI.checkbox 'Bottom Board List',          'Hide bottom board list'
+    shortcutToggler     = UI.checkbox 'Shortcut Icons',             'Shortcut Icons'
     editCustomNav = $.el 'a',
       textContent: 'Edit custom board navigation'
       href: 'javascript:;'
diff --git a/src/General/Index.coffee b/src/General/Index.coffee
index b9b9877a5..a80f71658 100644
--- a/src/General/Index.coffee
+++ b/src/General/Index.coffee
@@ -26,10 +26,10 @@ Index =
     $.on @button, 'click', -> Index.update()
     Header.addShortcut @button, 1
 
-    repliesEntry = el: UI.checkbox 'Show Replies',          ' Show replies'
-    pinEntry     = el: UI.checkbox 'Pin Watched Threads',   ' Pin watched threads'
-    anchorEntry  = el: UI.checkbox 'Anchor Hidden Threads', ' Anchor hidden threads'
-    refNavEntry  = el: UI.checkbox 'Refreshed Navigation',  ' Refreshed navigation'
+    repliesEntry = el: UI.checkbox 'Show Replies',          'Show replies'
+    pinEntry     = el: UI.checkbox 'Pin Watched Threads',   'Pin watched threads'
+    anchorEntry  = el: UI.checkbox 'Anchor Hidden Threads', 'Anchor hidden threads'
+    refNavEntry  = el: UI.checkbox 'Refreshed Navigation',  'Refreshed navigation'
     pinEntry.el.title    = 'Move watched threads to the start of the index.'
     anchorEntry.el.title = 'Move hidden threads to the end of the index.'
     refNavEntry.el.title = 'Refresh index when navigating through pages.'
diff --git a/src/General/Settings.coffee b/src/General/Settings.coffee
index 52c5eafb3..1fc2db46f 100755
--- a/src/General/Settings.coffee
+++ b/src/General/Settings.coffee
@@ -100,11 +100,8 @@ Settings =
       containers = [fs]
       for key, arr of obj
         description = arr[1]
-        div = $.el 'div'
-        $.add div, [
-          UI.checkbox key, key, false
-          $.el 'span', class: 'description', textContent: ": #{description}"
-        ]
+        div = $.el 'div',
+          <%= html('<label><input type="checkbox" name="${key}">${key}</label><span class="description">: ${description}</span>') %>
         input = $ 'input', div
         $.on input, 'change', $.cb.checked
         $.on input, 'change', -> @parentNode.parentNode.dataset.checked = @checked
diff --git a/src/General/UI.coffee b/src/General/UI.coffee
index b0cd0a41d..b58f27fbe 100755
--- a/src/General/UI.coffee
+++ b/src/General/UI.coffee
@@ -373,7 +373,7 @@ UI = do ->
     checked = Conf[name] unless checked?
     label = $.el 'label'
     input = $.el 'input', {type: 'checkbox', name, checked}
-    $.add label, [input, $.tn text]
+    $.add label, [input, $.tn " #{text}"]
     label
 
 
diff --git a/src/Images/FappeTyme.coffee b/src/Images/FappeTyme.coffee
index 7d98304d6..9c72b1e5e 100755
--- a/src/Images/FappeTyme.coffee
+++ b/src/Images/FappeTyme.coffee
@@ -9,7 +9,7 @@ FappeTyme =
 
     for type in ["Fappe", "Werk"] when Conf["#{type} Tyme"]
       lc = type.toLowerCase()
-      el = UI.checkbox lc, " #{type} Tyme", false
+      el = UI.checkbox lc, "#{type} Tyme", false
       el.title = "#{type} Tyme"
 
       @nodes[lc] = el.firstElementChild
diff --git a/src/Images/Gallery.coffee b/src/Images/Gallery.coffee
index 2547fac91..49ba7e47d 100644
--- a/src/Images/Gallery.coffee
+++ b/src/Images/Gallery.coffee
@@ -315,7 +315,7 @@ Gallery =
         subEntries: Gallery.menu.createSubEntries()
 
     createSubEntry: (name) ->
-      label = UI.checkbox name, " #{name}"
+      label = UI.checkbox name, name
       input = label.firstElementChild
       if name in ['Fit Width', 'Fit Height', 'Hide Thumbnails']
         $.on input, 'change', Gallery.cb.setFitness
diff --git a/src/Images/ImageExpand.coffee b/src/Images/ImageExpand.coffee
index 07a83715c..af06a5c90 100755
--- a/src/Images/ImageExpand.coffee
+++ b/src/Images/ImageExpand.coffee
@@ -295,7 +295,7 @@ ImageExpand =
         subEntries: subEntries
 
     createSubEntry: (name, desc) ->
-      label = UI.checkbox name, " #{name}"
+      label = UI.checkbox name, name
       label.title = desc
       input = label.firstElementChild
       if name in ['Fit width', 'Fit height']
diff --git a/src/Images/Volume.coffee b/src/Images/Volume.coffee
index fc82a973b..496fd8837 100644
--- a/src/Images/Volume.coffee
+++ b/src/Images/Volume.coffee
@@ -13,7 +13,7 @@ Volume =
 
     return unless g.BOARD.ID in ['gif', 'wsg']
 
-    unmuteEntry = UI.checkbox 'Allow Sound', ' Allow Sound'
+    unmuteEntry = UI.checkbox 'Allow Sound', 'Allow Sound'
     unmuteEntry.title = Config.main['Images and Videos']['Allow Sound'][1]
 
     volumeEntry = $.el 'label',
diff --git a/src/Miscellaneous/CatalogLinks.coffee b/src/Miscellaneous/CatalogLinks.coffee
index 8af62012e..31e45d53b 100755
--- a/src/Miscellaneous/CatalogLinks.coffee
+++ b/src/Miscellaneous/CatalogLinks.coffee
@@ -26,7 +26,7 @@ CatalogLinks =
         cb:   @node
 
     if Conf['Catalog Links']
-      CatalogLinks.el = el = UI.checkbox 'Header catalog links', ' Catalog Links'
+      CatalogLinks.el = el = UI.checkbox 'Header catalog links', 'Catalog Links'
       el.id = 'toggleCatalog'
       input = $ 'input', el
       $.on input, 'change', @toggle
diff --git a/src/Monitoring/ThreadUpdater.coffee b/src/Monitoring/ThreadUpdater.coffee
index cc6a9cebb..8ba2778b2 100755
--- a/src/Monitoring/ThreadUpdater.coffee
+++ b/src/Monitoring/ThreadUpdater.coffee
@@ -33,7 +33,7 @@ ThreadUpdater =
 
     subEntries = []
     for name, conf of Config.updater.checkbox
-      el = UI.checkbox name, " #{name}"
+      el = UI.checkbox name, name
       el.title = conf[1]
       input = el.firstElementChild
       $.on input, 'change', $.cb.checked
diff --git a/src/Monitoring/ThreadWatcher.coffee b/src/Monitoring/ThreadWatcher.coffee
index c385353c6..9ed37c7eb 100755
--- a/src/Monitoring/ThreadWatcher.coffee
+++ b/src/Monitoring/ThreadWatcher.coffee
@@ -435,7 +435,7 @@ ThreadWatcher =
     createSubEntry: (name, desc) ->
       entry =
         type: 'thread watcher'
-        el: UI.checkbox name, " #{name.replace ' Thread Watcher', ''}"
+        el: UI.checkbox name, name.replace(' Thread Watcher', '')
       entry.el.title = desc
       input = entry.el.firstElementChild
       $.on input, 'change', $.cb.checked