diff --git a/skins/elastic/styles/colors.less b/skins/elastic/styles/colors.less
index e4f099532..bd82f5fbc 100644
--- a/skins/elastic/styles/colors.less
+++ b/skins/elastic/styles/colors.less
@@ -116,10 +116,10 @@
 
 
 // Forms
-@color-input-border:                rgba(0, 0, 0, 0.15); /* from Bootstrap's .form-control */
-@color-input-border-focus:          #80bdff; /* from Bootstrap's .form-control:focus */
+@color-input-border:                rgba(0, 0, 0, 0.15); // from Bootstrap's .form-control
+@color-input-border-focus:          #80bdff; // from Bootstrap's .form-control:focus
 @color-input-border-invalid:        @color-error;
-@color-input-addon-background:      #e9ecef; /* from Bootstrap's .input-group-addon */
+@color-input-addon-background:      #e9ecef; // from Bootstrap's .input-group-addon
 @color-recipient-input-border:      @color-input-border;
 @color-recipient-input-background:  #f4f4f4;
 
@@ -145,7 +145,7 @@
 
 @color-spellcheck-link:             #b91414;
 
-@color-table-border:                #e9ecef; /* from Bootstrap */
+@color-table-border:                #e9ecef; // from Bootstrap
 @color-table-selected:              @color-list-selected;
 @color-table-selected-background:   @color-list-selected-background;
 
diff --git a/skins/elastic/styles/embed.less b/skins/elastic/styles/embed.less
index b3d76a2a6..2c210e581 100644
--- a/skins/elastic/styles/embed.less
+++ b/skins/elastic/styles/embed.less
@@ -11,7 +11,7 @@
 
 /* Style for embedded inline warning */
 
-/* TODO: review */
+// TODO: review
 
 .rcmail-inline-message {
     font-family: sans-serif;
diff --git a/skins/elastic/styles/layout.less b/skins/elastic/styles/layout.less
index dfd38a6e7..0ff7d8088 100644
--- a/skins/elastic/styles/layout.less
+++ b/skins/elastic/styles/layout.less
@@ -89,7 +89,7 @@ body > #layout {
             min-width: 50%;
             background-color: @color-layout-content-background;
 
-            & > .formcontent, /* e.g. Help plugin */
+            & > .formcontent, // e.g. Help plugin
             & > iframe,
             & > .content,
             & > .content > iframe {
@@ -137,7 +137,7 @@ body > #layout {
             min-height: @layout-header-height;
             padding: 0 .25em;
             margin: 0;
-            position: relative; /* for absolute positioning of searchbar */
+            position: relative; // for absolute positioning of searchbar
             overflow: hidden;
             white-space: nowrap;
             display: flex;
@@ -223,7 +223,7 @@ html.iframe body {
 @media screen and (max-width: @screen-width-xs) {
     body > #layout > div.menu {
         position: absolute;
-        z-index: 30001; /* because autocompletion popup uses z-index:30000 */
+        z-index: 30001; // because autocompletion popup uses z-index:30000
         top: 0;
         left: 0;
         right: 0;
diff --git a/skins/elastic/styles/mixins.less b/skins/elastic/styles/mixins.less
index a4a5a1c2d..bc27f2088 100644
--- a/skins/elastic/styles/mixins.less
+++ b/skins/elastic/styles/mixins.less
@@ -13,10 +13,8 @@
 
 .font-icon-class {
     font-size: 1.25em;
-    /*
-        display: inline-block;
-        FIXME: with inline-block we have some problems with icon alignment
-    */
+    // FIXME: with inline-block we have some problems with icon alignment
+    // display: inline-block;
     display: block;
     float: left;
     margin: 0 .25rem 0 0;
@@ -34,7 +32,7 @@
 }
 
 .animated-icon-class() {
-    /* fa-spin is defined in styles.less */
+    // fa-spin is defined in styles.less
     -webkit-animation: fa-spin 2s infinite linear;
     animation: fa-spin 2s infinite linear;
 }
diff --git a/skins/elastic/styles/styles.less b/skins/elastic/styles/styles.less
index 8432b3bbc..564a1cd89 100644
--- a/skins/elastic/styles/styles.less
+++ b/skins/elastic/styles/styles.less
@@ -31,8 +31,8 @@
   font-style: normal;
   font-weight: 400;
   src: local('Roboto'), local('Roboto-Regular'),
-       url('../fonts/roboto-v18-greek-ext_cyrillic-ext_cyrillic_greek_latin-ext_latin-regular.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-       url('../fonts/roboto-v18-greek-ext_cyrillic-ext_cyrillic_greek_latin-ext_latin-regular.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+       url('../fonts/roboto-v18-greek-ext_cyrillic-ext_cyrillic_greek_latin-ext_latin-regular.woff2') format('woff2'), // Chrome 26+, Opera 23+, Firefox 39+
+       url('../fonts/roboto-v18-greek-ext_cyrillic-ext_cyrillic_greek_latin-ext_latin-regular.woff') format('woff'); // Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+
 }
 
 @font-face {
@@ -40,8 +40,8 @@
   font-style: italic;
   font-weight: 400;
   src: local('Roboto Italic'), local('Roboto-Italic'),
-       url('../fonts/roboto-v18-greek-ext_cyrillic-ext_cyrillic_greek_latin-ext_latin-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-       url('../fonts/roboto-v18-greek-ext_cyrillic-ext_cyrillic_greek_latin-ext_latin-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+       url('../fonts/roboto-v18-greek-ext_cyrillic-ext_cyrillic_greek_latin-ext_latin-italic.woff2') format('woff2'), // Chrome 26+, Opera 23+, Firefox 39+
+       url('../fonts/roboto-v18-greek-ext_cyrillic-ext_cyrillic_greek_latin-ext_latin-italic.woff') format('woff'); // Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+
 }
 
 @font-face {
@@ -49,8 +49,8 @@
   font-style: normal;
   font-weight: 700;
   src: local('Roboto Bold'), local('Roboto-Bold'),
-       url('../fonts/roboto-v18-greek-ext_cyrillic-ext_cyrillic_greek_latin-ext_latin-700.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-       url('../fonts/roboto-v18-greek-ext_cyrillic-ext_cyrillic_greek_latin-ext_latin-700.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+       url('../fonts/roboto-v18-greek-ext_cyrillic-ext_cyrillic_greek_latin-ext_latin-700.woff2') format('woff2'), // Chrome 26+, Opera 23+, Firefox 39+
+       url('../fonts/roboto-v18-greek-ext_cyrillic-ext_cyrillic_greek_latin-ext_latin-700.woff') format('woff'); // Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+
 }
 
 @font-face {
@@ -58,8 +58,8 @@
   font-style: italic;
   font-weight: 700;
   src: local('Roboto Bold Italic'), local('Roboto-BoldItalic'),
-       url('../fonts/roboto-v18-greek-ext_cyrillic-ext_cyrillic_greek_latin-ext_latin-700italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-       url('../fonts/roboto-v18-greek-ext_cyrillic-ext_cyrillic_greek_latin-ext_latin-700italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+       url('../fonts/roboto-v18-greek-ext_cyrillic-ext_cyrillic_greek_latin-ext_latin-700italic.woff2') format('woff2'), // Chrome 26+, Opera 23+, Firefox 39+
+       url('../fonts/roboto-v18-greek-ext_cyrillic-ext_cyrillic_greek_latin-ext_latin-700italic.woff') format('woff'); // Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+
 }
 
 /* E.g. for animated 'loading' icon */
@@ -139,7 +139,7 @@ a:hover {
     width: 95%;
     max-width: 280px;
 
-    /* Fixes input width and position in IE11 */
+    // Fixes input width and position in IE11
     .row {
         max-width: 280px;
         margin-right: 0;
diff --git a/skins/elastic/styles/widgets/common.less b/skins/elastic/styles/widgets/common.less
index f23015dcc..609f9f528 100644
--- a/skins/elastic/styles/widgets/common.less
+++ b/skins/elastic/styles/widgets/common.less
@@ -171,8 +171,8 @@ font.bold {
         margin: 0;
     }
 
-    /* Options table is a table with first column for identifier/description
-       and other columns for a state flag. E.g. ACL table */
+    // Options table is a table with first column for identifier/description
+    // and other columns for a state flag. E.g. ACL table
     table.options-table {
         td,th {
             text-align: center;
diff --git a/skins/elastic/styles/widgets/dialogs.less b/skins/elastic/styles/widgets/dialogs.less
index 1f857196c..6bf351b7a 100644
--- a/skins/elastic/styles/widgets/dialogs.less
+++ b/skins/elastic/styles/widgets/dialogs.less
@@ -23,7 +23,7 @@
     &.propform {
         overflow: hidden;
         margin-top: 1rem;
-        padding: .25rem; /* so overflow do not truncate focus outline on inputs */
+        padding: .25rem; // so overflow do not truncate focus outline on inputs
     }
 
     &.simplelist {
@@ -50,7 +50,7 @@
     padding: 0;
 
     & > h3 {
-        /* On mobile don't display popup arrows and titles */
+        // On mobile don't display popup arrows and titles
         display: none;
     }
 }
@@ -137,7 +137,7 @@ html.touch .popover {
             padding: 0 .5em;
 
             &:before {
-                float: left; /* overwrite icon float to have unified element height */
+                float: left; // overwrite icon float to have unified element height
             }
         }
     }
diff --git a/skins/elastic/styles/widgets/forms.less b/skins/elastic/styles/widgets/forms.less
index 62adacdba..87d3175ff 100644
--- a/skins/elastic/styles/widgets/forms.less
+++ b/skins/elastic/styles/widgets/forms.less
@@ -25,12 +25,12 @@ input.smart-upload {
 
 
 .propform {
-    /* TODO: do we need this? */
+    // TODO: do we need this?
     &:not(.popupmenu) {
         width: 100%;
     }
 
-    /* This is the way we can have multiple checkboxes in a single form field */
+    // This is the way we can have multiple checkboxes in a single form field
     .form-check td:not(.title) > label {
         display: block;
         margin: 0;
@@ -130,7 +130,7 @@ input.smart-upload {
 
             label {
                 min-width: 7rem;
-                /* Overwrite Bootstrap .input-group-addon style to make the label transparent */
+                // Overwrite Bootstrap .input-group-addon style to make the label transparent
                 background-color: transparent;
                 border: 0;
                 border-radius: 0;
@@ -215,7 +215,7 @@ input.smart-upload {
         color: @color-form-hint;
     }
 
-    /* Some dialogs may use simple one-row forms like this */
+    // Some dialogs may use simple one-row forms like this
     &.row.form-group {
         margin-left: 0;
         margin-right: 0;
@@ -277,7 +277,7 @@ input.smart-upload {
 }
 
 
-/* Forms fixes for IE and Edge */
+// Forms fixes for IE and Edge
 html.ms .propform {
     .row:not(.form-check) > td {
         display: flex;
@@ -329,13 +329,13 @@ html.layout-phone {
     padding: 1rem;
 
     .row {
-        margin-right: 0; /* without these the form is too wide causing horizontal scrollbar appearence */
+        margin-right: 0; // without these the form is too wide causing horizontal scrollbar appearence
         margin-left: 0;
 
-        /* Note: We never use odd numbers here */
+        // Note: We never use odd numbers here
         .col, .col-2, .col-4, .col-6, .col-8, .col-10, .col-12,
         .col-sm, .col-sm-2, .col-sm-4, .col-sm-6, .col-sm-8, .col-sm-10, .col-sm-12 {
-            /* overwrite Bootstrap's redundant padding */
+            // overwrite Bootstrap's redundant padding
             padding: 0;
         }
 
@@ -346,16 +346,16 @@ html.layout-phone {
     }
 
     .row.form-check {
-        padding-right: 0; /* without these e.g. inputs in compose screen are not aligned properly */
-        display: flex; /* https://github.com/twbs/bootstrap/issues/22348 */
+        padding-right: 0; // without these e.g. inputs in compose screen are not aligned properly
+        display: flex; // https://github.com/twbs/bootstrap/issues/22348
         flex-wrap: nowrap;
 
-        /* fixed checkbox vertical alignment */
+        // fixed checkbox vertical alignment
         td:not(.col-form-label) {
             padding: 0;
         }
 
-        /* alignment fixes needed because we do not stick precissely to Bootstrap's form structure */
+        // alignment fixes needed because we do not stick precissely to Bootstrap's form structure
         @media screen and (max-width: 576px) {
             .col-6 {
                 max-width: 100%;
@@ -364,7 +364,7 @@ html.layout-phone {
 
             & > *:last-child {
                 width: 1%;
-                min-width: 2.2em; /* for icon-checkbox */
+                min-width: 2.2em; // for icon-checkbox
                 padding-right: 15px;
             }
 
@@ -374,7 +374,7 @@ html.layout-phone {
         }
 
         .form-check-input {
-            margin: 0; /* fixes checkbox alignment with other inputs in a form */
+            margin: 0; // fixes checkbox alignment with other inputs in a form
             margin-top: .5rem;
             margin-bottom: .5rem;
         }
@@ -588,7 +588,7 @@ html.touch .popupmenu.form {
             border: 1px solid @color-input-border-focus;
         }
 
-        /* TODO: style button focus */
+        // TODO: style button focus
     }
 
     .input-group {
@@ -605,7 +605,7 @@ html.touch .popupmenu.form {
 
     .input-group-addon,
     .form-control {
-        height: 2.25rem; /* to be the same height as select.form-control element */
+        height: 2.25rem; // to be the same height as select.form-control element
     }
 
     input.form-control {
@@ -643,7 +643,7 @@ html.touch .popupmenu.form {
 /*** Files upload widget with list of files, upload form and drop area ***/
 
 .file-upload {
-    /* TODO */
+    // TODO
 
     padding: 1em 1em 12em;
     margin: 1em;
@@ -844,7 +844,7 @@ input.icon-checkbox {
             height: 2rem;
         }
 
-        /* A link after checkbox in a form, used in e.g. newmail_notifier plugin */
+        // A link after checkbox in a form, used in e.g. newmail_notifier plugin
         & + a {
             display: inline-block;
             line-height: 2rem;
@@ -946,7 +946,7 @@ html.touch input.icon-checkbox + label {
 .googie_edit_layer {
     font-family: monospace;
 
-    /* from Bootstrap's textarea */
+    // from Bootstrap's textarea
     padding: .5rem .75rem;
     border: 1px solid @color-input-border;
     border-radius: .3rem;
diff --git a/skins/elastic/styles/widgets/jqueryui.less b/skins/elastic/styles/widgets/jqueryui.less
index bb9405722..f82346af2 100644
--- a/skins/elastic/styles/widgets/jqueryui.less
+++ b/skins/elastic/styles/widgets/jqueryui.less
@@ -74,7 +74,7 @@
     }
 
     .ui-dialog-content {
-        /* fixes resize issue e.g. in qr-code dialog */
+        // fixes resize issue e.g. in qr-code dialog
         box-sizing: initial;
 
         & > .popupmenu {
@@ -158,7 +158,7 @@
                     }
 
                     &.btn-primary {
-                        color: #007bff; /* TODO: var */
+                        color: #007bff; // TODO: var
                         background: transparent;
                     }
 
@@ -177,7 +177,7 @@
 .ui-datepicker {
     padding: 0;
     overflow: hidden;
-    z-index: 2 !important; /* above Bootstrap form controls that use z-index: 1 */
+    z-index: 2 !important; // above Bootstrap form controls that use z-index: 1
 
     .ui-datepicker-header,
     .ui-datepicker-title {
@@ -275,6 +275,6 @@ html.touch {
     }
 
     .ui-autocomplete {
-        /* TODO: e.g. time input autocompletion on mobile */
+        // TODO: e.g. time input autocompletion on mobile
     }
 }
diff --git a/skins/elastic/styles/widgets/lists.less b/skins/elastic/styles/widgets/lists.less
index 34caaea59..4657b59c7 100644
--- a/skins/elastic/styles/widgets/lists.less
+++ b/skins/elastic/styles/widgets/lists.less
@@ -65,7 +65,7 @@
     }
 
     td.action {
-        /* TODO */
+        // TODO
         padding: 0 .5em;
         width: 2em;
         text-align: center;
@@ -89,8 +89,9 @@
         color: @color-list-secondary;
     }
 
-    /* Focus indicator */
-    /* because of border-collapse, we make the left border twice what we want it to be - half will be hidden to the left */
+    // Focus indicator
+    // because of border-collapse, we make the left border twice what we want it to be
+    // - half will be hidden to the left
     @media screen and (min-width: @screen-width-large) {
         li > a,
         tbody tr > td:first-child {
@@ -107,11 +108,9 @@
 table.listing {
     width: 100%;
     table-layout: fixed;
-    /*
-      border-spacing/border-collapse here fix problem with our focus indicator
-      when the table cells use overflow: hidden. I.e. we use border-spacing:0
-      instead of Bootstrap's border-collapse:collapse. Is this cross-browser?
-    */
+    // border-spacing/border-collapse here fix problem with our focus indicator
+    // when the table cells use overflow: hidden. I.e. we use border-spacing:0
+    // instead of Bootstrap's border-collapse:collapse. Is this cross-browser?
     border-spacing: 0;
     border-collapse: unset;
 }
@@ -189,7 +188,7 @@ html.touch {
 .listing.iconized li {
     a:before {
         &:extend(.font-icon-class);
-        height: 2em; /* TODO: ? */
+        height: 2em; // TODO: ?
         margin-right: .5rem;
     }
     &.preferences > a:before {
@@ -232,7 +231,7 @@ html.touch {
         content: @fa-var-feed;
     }
     &.delegation > a:before {
-        content: @fa-var-user-secret; /* TODO: a better icon */
+        content: @fa-var-user-secret; // TODO: a better icon
     }
     &.twofactorauth > a:before {
         content: @fa-var-sign-in;
@@ -248,7 +247,7 @@ html.touch {
         content: @fa-var-shield;
     }
 
-    /* autocomplete popup */
+    // autocomplete popup
     & > i:before {
         &:extend(.font-icon-class);
         content: @fa-var-user;
@@ -362,11 +361,11 @@ ul.treelist li {
     }
 
     &.selected {
-        /* reset .listing selection style */
+        // reset .listing selection style
         color: inherit;
         background-color: transparent;
 
-        & > div > a, /* this is used e.g. by kolab_addressbook */
+        & > div > a, // this is used e.g. by kolab_addressbook
         & > a {
             color: @color-list-selected;
             background-color: @color-list-selected-background;
@@ -410,7 +409,7 @@ ul.treelist li {
     li {
         &.mailbox {
             &.unread {
-                /* TODO */
+                // TODO
                 & > a {
                     padding-right: 2.8em;
                 }
@@ -441,7 +440,7 @@ ul.treelist li {
             }
 
             &.selected .unreadcount {
-                /* todo */;
+                // todo
             }
 
             &.recent > .unreadcount {
@@ -451,7 +450,7 @@ ul.treelist li {
 
             &.root {
                 display: none !important;
-                /* FIXME: This element is confusing, I propose to not use it */
+                // FIXME: This element is confusing, I propose to not use it
             }
         }
 
@@ -509,7 +508,7 @@ ul.treelist li {
         }
     }
 
-    /* folder-selector fix for left padding */
+    // folder-selector fix for left padding
     &.toolbarmenu a:before {
         margin-left: .5em;
     }
@@ -612,7 +611,7 @@ table.fixedcopy {
         font-weight: bold;
     }
 
-    /* thread parent message with unread children */
+    // thread parent message with unread children
     tr.unroot td.subject a {
         text-decoration: underline;
     }
@@ -653,7 +652,7 @@ table.fixedcopy {
         width: 1em;
     }
     td.subject span.msgicon.status.replied.forwarded:before {
-        content: @fa-var-mail-forward; /* TODO */
+        content: @fa-var-mail-forward; // TODO
         font-size: 1.2em;
         width: 1em;
     }
@@ -677,7 +676,7 @@ table.fixedcopy {
             content: @fa-var-lock;
         }
         &.vcard:before {
-            content: @fa-var-user-o; /* vcard_attachments plugin */
+            content: @fa-var-user-o; // vcard_attachments plugin
         }
     }
 
@@ -718,9 +717,9 @@ html.touch {
     }
 
     td.action {
-        /* TODO */
+        // TODO
         a {
-            /* TODO */
+            // TODO
         }
     }
 
@@ -802,7 +801,7 @@ html.touch {
 
         &.ics:before,
         &.calendar:before {
-            /* TODO */
+            // TODO
         }
 
         &.vcard:before {
@@ -815,7 +814,7 @@ html.touch {
 
         &.eml:before,
         &.rfc822:before {
-            /* TODO */
+            // TODO
         }
 
         &.odp:before,
@@ -830,15 +829,15 @@ html.touch {
         &.sig:before,
         &.pgp-signature:before,
         &.pkcs7-signature:before {
-            /* TODO */
+            // TODO
         }
 
         &.application.asc:before {
-            /* TODO */
+            // TODO
         }
 
         &.application.pgp-keys:before {
-            /* TODO */
+            // TODO
         }
 
         .attachment-size {
diff --git a/skins/elastic/styles/widgets/mail.less b/skins/elastic/styles/widgets/mail.less
index f70239fdc..89f701892 100644
--- a/skins/elastic/styles/widgets/mail.less
+++ b/skins/elastic/styles/widgets/mail.less
@@ -87,7 +87,7 @@
 }
 
 #messagebody {
-    /* TODO */
+    // TODO
 
     &.mailvelope {
         margin: 0;
@@ -96,10 +96,10 @@
 
 div.message-part,
 div.message-htmlpart {
-    /* TODO */
+    // TODO
 
     div.rcmBody {
-        /* Remove margins that can be set by the mail message styles */
+        // Remove margins that can be set by the mail message styles
         margin: 0 !important;
     }
 
diff --git a/skins/elastic/styles/widgets/messages.less b/skins/elastic/styles/widgets/messages.less
index ef6bd37ce..aced55987 100644
--- a/skins/elastic/styles/widgets/messages.less
+++ b/skins/elastic/styles/widgets/messages.less
@@ -15,7 +15,7 @@
     position: absolute;
     bottom: .5em;
     right: .7em;
-    z-index: 102; /* needs to be above .ui-widget-overlay */
+    z-index: 102; // needs to be above .ui-widget-overlay
     width: 320px;
     height: auto;
     max-height: 85%;
@@ -44,10 +44,8 @@
     }
 }
 
-/*
-    .boxwarning/.boxerror/.boxinformation classes are supported
-    by conversion to .ui.alert in bootstrap_init()
-*/
+// .boxwarning/.boxerror/.boxinformation classes are supported
+// by conversion to .ui.alert in bootstrap_init()
 
 .ui.alert {
     margin: 0;
@@ -58,7 +56,7 @@
     padding: .75em;
     color: @color-message;
     border: 1px solid @color-message-border;
-/*    box-shadow: 1px 1px 2px @color-message-shadow; */
+//    box-shadow: 1px 1px 2px @color-message-shadow;
     background-color: @color-message-background;
     display: flex;
     align-items: center;
@@ -115,12 +113,11 @@
     }
 
     &.vcardattachment > i.icon:before {
-        content: @fa-var-vcard; /* vcard_attachments plugin */
+        content: @fa-var-vcard; // vcard_attachments plugin
     }
 
-    /* This works with following structure: <i> <span> [button].
-       <span> here is a one-line text, and button can be anything but <span>.
-     */
+    // This works with following structure: <i> <span> [button].
+    // <span> here is a one-line text, and button can be anything but <span>.
     &.aligned-buttons {
         display: flex;
 
diff --git a/skins/elastic/styles/widgets/toolbar.less b/skins/elastic/styles/widgets/toolbar.less
index fad64c40c..45f1d5949 100644
--- a/skins/elastic/styles/widgets/toolbar.less
+++ b/skins/elastic/styles/widgets/toolbar.less
@@ -18,7 +18,7 @@
     &.listing a,
     a {
         text-decoration: none;
-        cursor: pointer !important; /* TODO: re-consider .listing class use on toolbar */
+        cursor: pointer !important; // TODO: re-consider .listing class use on toolbar
         color: @color-toolbar-button;
     }
 
@@ -28,7 +28,7 @@
         height: @layout-header-height;
         min-width: 3.5rem;
         max-width: 6rem;
-        width: auto; /* reset width defined for links in .listing */
+        width: auto; // reset width defined for links in .listing
         padding: .45rem;
         text-align: center;
         text-overflow: ellipsis;
@@ -143,10 +143,10 @@
             content: @fa-var-paperclip;
         }
         &.spellcheck:before {
-            content: @fa-var-magic; /* TODO */
+            content: @fa-var-magic; // TODO
         }
         &.signature:before {
-            content: @fa-var-at; /* TODO */
+            content: @fa-var-at; // TODO
         }
         &.responses:before {
             content: @fa-var-comment;
@@ -200,7 +200,7 @@
     .dropbutton {
         a.button.dropdown {
             font-size: 75%;
-            overflow: hidden; /* for IE11 */
+            overflow: hidden; // for IE11
 
             span.inner {
                 display: none;
@@ -384,7 +384,7 @@
 
 .toolbarmenu li {
     &.separator {
-        /* TODO: all separator properties */
+        // TODO: all separator properties
         line-height: 1.5rem !important;
         font-size: .75rem;
         padding: 0 .5rem;
@@ -392,7 +392,7 @@
         background-color: @color-popover-separator-background;
 
         label {
-            margin: 0; /* Unsets Bootstrap label margin, bug? */
+            margin: 0; // Unsets Bootstrap label margin, bug?
         }
     }
 
@@ -457,10 +457,10 @@
         content: @fa-var-plus-square;
     }
     a.edit:before {
-        content: @fa-var-edit; /* TODO: edit.asnew */
+        content: @fa-var-edit; // TODO: edit.asnew
     }
     a.rename:before {
-        content: @fa-var-pencil; /* TODO: better icon?  */
+        content: @fa-var-pencil; // TODO: better icon?
     }
     a.read:before {
         content: @fa-var-star-o;