diff --git a/src/components/CopyToClipboard.jsx b/src/components/CopyToClipboard.jsx
index f0bcdd6a..5ee6286f 100644
--- a/src/components/CopyToClipboard.jsx
+++ b/src/components/CopyToClipboard.jsx
@@ -64,13 +64,13 @@ export default class extends React.PureComponent {
     if (this.state.copied) {
       return (
                 <span>
-                    <Clippy class='copy-icon' {...Theme(theme, 'copy-icon')} />
+                    <Clippy className='copy-icon' {...Theme(theme, 'copy-icon')} />
                     <span {...Theme(theme, 'copy-icon-copied')}>✔</span>
                 </span>
       )
     }
 
-    return <Clippy class='copy-icon' {...Theme(theme, 'copy-icon')} />
+    return <Clippy className='copy-icon' {...Theme(theme, 'copy-icon')} />
   }
 
   clipboardValue = value => {
diff --git a/src/components/ObjectKeyModal/ObjectKeyModal.jsx b/src/components/ObjectKeyModal/ObjectKeyModal.jsx
index a6f887a8..9504dfb3 100644
--- a/src/components/ObjectKeyModal/ObjectKeyModal.jsx
+++ b/src/components/ObjectKeyModal/ObjectKeyModal.jsx
@@ -58,7 +58,7 @@ export default class extends React.PureComponent {
                           ? (
                             <CheckCircle
                                 {...Theme(theme, 'key-modal-submit')}
-                                class='key-modal-submit'
+                                className='key-modal-submit'
                                 onClick={e => this.submit()}
                             />
                             )
@@ -67,7 +67,7 @@ export default class extends React.PureComponent {
                     <span {...Theme(theme, 'key-modal-cancel')}>
                         <Cancel
                             {...Theme(theme, 'key-modal-cancel-icon')}
-                            class='key-modal-cancel'
+                            className='key-modal-cancel'
                             onClick={() => {
                               dispatcher.dispatch({
                                 rjvId,
diff --git a/src/components/ToggleIcons.jsx b/src/components/ToggleIcons.jsx
index c1ec7369..026b414e 100644
--- a/src/components/ToggleIcons.jsx
+++ b/src/components/ToggleIcons.jsx
@@ -17,21 +17,21 @@ export function ExpandedIcon (props) {
       return (
                 <ArrowDown
                     {...Theme(theme, 'expanded-icon')}
-                    class='expanded-icon'
+                    className='expanded-icon'
                 />
       )
     case 'square':
       return (
                 <SquareMinus
                     {...Theme(theme, 'expanded-icon')}
-                    class='expanded-icon'
+                    className='expanded-icon'
                 />
       )
     default:
       return (
                 <CircleMinus
                     {...Theme(theme, 'expanded-icon')}
-                    class='expanded-icon'
+                    className='expanded-icon'
                 />
       )
   }
@@ -44,21 +44,21 @@ export function CollapsedIcon (props) {
       return (
                 <ArrowRight
                     {...Theme(theme, 'collapsed-icon')}
-                    class='collapsed-icon'
+                    className='collapsed-icon'
                 />
       )
     case 'square':
       return (
                 <SquarePlus
                     {...Theme(theme, 'collapsed-icon')}
-                    class='collapsed-icon'
+                    className='collapsed-icon'
                 />
       )
     default:
       return (
                 <CirclePlus
                     {...Theme(theme, 'collapsed-icon')}
-                    class='collapsed-icon'
+                    className='collapsed-icon'
                 />
       )
   }
diff --git a/src/components/VariableEditor.jsx b/src/components/VariableEditor.jsx
index 829f5278..281fb95a 100644
--- a/src/components/VariableEditor.jsx
+++ b/src/components/VariableEditor.jsx
@@ -162,7 +162,7 @@ class VariableEditor extends React.PureComponent {
                 }}
             >
                 <Edit
-                    class='click-to-edit-icon'
+                    className='click-to-edit-icon'
                     {...Theme(theme, 'editVarIcon')}
                     onClick={() => {
                       this.prepopInput(variable)
@@ -199,7 +199,7 @@ class VariableEditor extends React.PureComponent {
                 }}
             >
                 <Remove
-                    class='click-to-remove-icon'
+                    className='click-to-remove-icon'
                     {...Theme(theme, 'removeVarIcon')}
                     onClick={() => {
                       dispatcher.dispatch({
@@ -264,7 +264,7 @@ class VariableEditor extends React.PureComponent {
                     type='text'
                     inputRef={input => input && input.focus()}
                     value={editValue}
-                    class='variable-editor'
+                    className='variable-editor'
                     onChange={event => {
                       const value = event.target.value
                       const detected = parseInput(value)
@@ -300,14 +300,14 @@ class VariableEditor extends React.PureComponent {
                 />
                 <div {...Theme(theme, 'edit-icon-container')}>
                     <Remove
-                        class='edit-cancel'
+                        className='edit-cancel'
                         {...Theme(theme, 'cancel-icon')}
                         onClick={() => {
                           this.setState({ editMode: false, editValue: '' })
                         }}
                     />
                     <CheckCircle
-                        class='edit-check string-value'
+                        className='edit-check string-value'
                         {...Theme(theme, 'check-icon')}
                         onClick={() => {
                           this.submitEdit()
@@ -352,7 +352,7 @@ class VariableEditor extends React.PureComponent {
                     <div {...Theme(theme, 'detected-row')}>
                         {detected}
                         <CheckCircle
-                            class='edit-check detected'
+                            className='edit-check detected'
                             style={{
                               verticalAlign: 'top',
                               paddingLeft: '3px',
diff --git a/src/components/VariableMeta.jsx b/src/components/VariableMeta.jsx
index 7d81d595..5b9c5909 100644
--- a/src/components/VariableMeta.jsx
+++ b/src/components/VariableMeta.jsx
@@ -32,7 +32,7 @@ export default class extends React.PureComponent {
                 }}
             >
                 <Add
-                    class='click-to-add-icon'
+                    className='click-to-add-icon'
                     {...Theme(theme, 'addVarIcon')}
                     onClick={() => {
                       const request = {
@@ -82,7 +82,7 @@ export default class extends React.PureComponent {
                 }}
             >
                 <Remove
-                    class='click-to-remove-icon'
+                    className='click-to-remove-icon'
                     {...Theme(theme, 'removeVarIcon')}
                     onClick={() => {
                       dispatcher.dispatch({