diff --git a/webapp/src/components/input.jsx b/webapp/src/components/input.jsx
index 6678c401c..8829ac72b 100644
--- a/webapp/src/components/input.jsx
+++ b/webapp/src/components/input.jsx
@@ -20,6 +20,7 @@ export default class Input extends PureComponent {
         onChange: PropTypes.func,
         disabled: PropTypes.bool,
         required: PropTypes.bool,
+        readOnly: PropTypes.bool,
         type: PropTypes.oneOf([
             'number',
             'input',
@@ -31,6 +32,7 @@ export default class Input extends PureComponent {
         type: 'input',
         maxLength: null,
         required: false,
+        readOnly: false,
     };
 
     handleChange = (e) => {
@@ -55,6 +57,7 @@ export default class Input extends PureComponent {
                     onChange={this.handleChange}
                     disabled={this.props.disabled}
                     required={this.props.required}
+                    readOnly={this.props.readOnly}
                 />
             );
         } else if (this.props.type === 'number') {
@@ -69,6 +72,7 @@ export default class Input extends PureComponent {
                     onChange={this.handleChange}
                     disabled={this.props.disabled}
                     required={this.props.required}
+                    readOnly={this.props.readOnly}
                 />
             );
         } else if (this.props.type === 'textarea') {
@@ -83,6 +87,7 @@ export default class Input extends PureComponent {
                     onChange={this.handleChange}
                     disabled={this.props.disabled}
                     required={this.props.required}
+                    readOnly={this.props.readOnly}
                 />
             );
         }
diff --git a/webapp/src/components/modals/attach_comment_to_issue/attach_comment_to_issue.jsx b/webapp/src/components/modals/attach_comment_to_issue/attach_comment_to_issue.jsx
index 6f99e27c8..2ff9401e0 100644
--- a/webapp/src/components/modals/attach_comment_to_issue/attach_comment_to_issue.jsx
+++ b/webapp/src/components/modals/attach_comment_to_issue/attach_comment_to_issue.jsx
@@ -131,6 +131,7 @@ export default class AttachIssueModal extends PureComponent {
                         isDisabled={true}
                         value={this.props.post.message}
                         disabled={false}
+                        readOnly={true}
                     />
                     <br/>
                 </div>
@@ -160,7 +161,7 @@ export default class AttachIssueModal extends PureComponent {
                     <Modal.Footer>
                         <FormButton
                             type='button'
-                            btnClass='btn-default'
+                            btnClass='btn-link'
                             defaultMessage='Cancel'
                             onClick={this.handleClose}
                         />
diff --git a/webapp/src/components/modals/create_issue/create_issue.jsx b/webapp/src/components/modals/create_issue/create_issue.jsx
index 2e6b175dd..bef909dbb 100644
--- a/webapp/src/components/modals/create_issue/create_issue.jsx
+++ b/webapp/src/components/modals/create_issue/create_issue.jsx
@@ -205,7 +205,7 @@ export default class CreateIssueModal extends PureComponent {
                     <Modal.Footer>
                         <FormButton
                             type='button'
-                            btnClass='btn-default'
+                            btnClass='btn-link'
                             defaultMessage='Cancel'
                             onClick={this.handleClose}
                         />
diff --git a/webapp/src/components/setting.jsx b/webapp/src/components/setting.jsx
index 52905f213..f833a7117 100644
--- a/webapp/src/components/setting.jsx
+++ b/webapp/src/components/setting.jsx
@@ -31,7 +31,12 @@ export default class Setting extends React.PureComponent {
                     {label}
                 </label>
                 {required &&
-                <span style={{color: '#ff0000'}}>{'*'}</span>
+                <span
+                    className='error-text'
+                    style={{marginLeft: '3px'}}
+                >
+                    {'*'}
+                </span>
                 }
                 <div>
                     {children}