diff --git a/packages/ketcher-react/src/script/ui/component/view/savebutton.jsx b/packages/ketcher-react/src/script/ui/component/view/savebutton.jsx
index 2bf820eb36..872c924861 100644
--- a/packages/ketcher-react/src/script/ui/component/view/savebutton.jsx
+++ b/packages/ketcher-react/src/script/ui/component/view/savebutton.jsx
@@ -23,6 +23,7 @@ const SaveButton = props => {
   const {
     server,
     filename = 'unnamed',
+    outputFormat,
     data,
     type,
     mode = 'saveFile',
@@ -59,7 +60,7 @@ const SaveButton = props => {
   const saveImage = () => {
     const ketcherInstance = getKetcherInstance()
     ketcherInstance
-      .generateImageAsync(data, { outputFormat: 'svg' })
+      .generateImageAsync(data, { outputFormat })
       .then(blob => {
         saveAs(blob, filename)
         onSave()
diff --git a/packages/ketcher-react/src/script/ui/views/modal/components/document/Save/Save.jsx b/packages/ketcher-react/src/script/ui/views/modal/components/document/Save/Save.jsx
index d30ee59f4c..b030fac3ce 100644
--- a/packages/ketcher-react/src/script/ui/views/modal/components/document/Save/Save.jsx
+++ b/packages/ketcher-react/src/script/ui/views/modal/components/document/Save/Save.jsx
@@ -21,6 +21,9 @@ import {
   getPropertiesByFormat,
   formatProperties
 } from 'ketcher-core'
+
+import { molfileManager } from '../../../../../../chem/molfile'
+import smilesManager from '../../../../../../chem/smiles'
 import graphManager from '../../../../../../format/chemGraph'
 import * as structFormat from '../../../../../data/convert/structConverter'
 import { saveUserTmpl } from '../../../../../state/templates'
@@ -29,6 +32,8 @@ import { check } from '../../../../../state/server'
 import { Dialog } from '../../../../components'
 import Form, { Field } from '../../../../../component/form/form'
 import SaveButton from '../../../../../component/view/savebutton'
+import Tabs from '../../../../../component/view/Tabs'
+import SaveImageTab from './SaveImageTab'
 
 import classes from './Save.module.less'
 
@@ -60,9 +65,10 @@ const saveSchema = {
 class SaveDialog extends Component {
   constructor(props) {
     super(props)
-    this.state = { disableControls: false }
+    this.state = { imageFormat: 'svg', tabIndex: 0 }
     this.isRxn = this.props.struct.hasRxnArrow()
     this.textAreaRef = createRef()
+    this.formContainerRef = createRef()
     const formats = [this.isRxn ? 'rxn' : 'mol', 'smiles', 'graph']
     if (this.props.server)
       formats.push(
@@ -91,6 +97,13 @@ class SaveDialog extends Component {
   componentDidMount() {
     const { checkOptions } = this.props.checkState
     this.props.onCheck(checkOptions)
+    if (this.formContainerRef.current) {
+      const {
+        width,
+        height
+      } = this.formContainerRef.current.getBoundingClientRect()
+      this.setState({ dimensions: { width, height } })
+    }
   }
 
   showStructWarningMessage = format => {
@@ -99,35 +112,33 @@ class SaveDialog extends Component {
   }
 
   changeType = type => {
-    this.setState({ disableControls: true })
-
     const { struct, server, options, formState } = this.props
 
-    const factory = new FormatterFactory(server, graphManager)
+    const factory = new FormatterFactory(
+      server,
+      graphManager,
+      molfileManager,
+      smilesManager
+    )
 
     const service = factory.create(type, options)
 
-    return service
-      .getStructureFromStructAsync(struct)
-      .then(
-        structStr => {
-          this.setState({ structStr })
-          setTimeout(() => {
-            if (this.textAreaRef.current) {
-              this.textAreaRef.current.select()
-            }
-          }, 10) // TODO: remove hack
-        },
-        e => {
-          //TODO: add error handler call
-          alert(e.message)
-          this.props.onResetForm(formState)
-          return e
-        }
-      )
-      .finally(() => {
-        this.setState({ disableControls: false })
-      })
+    return service.getStructureFromStructAsync(struct).then(
+      structStr => {
+        this.setState({ structStr })
+        setTimeout(() => {
+          if (this.textAreaRef.current) {
+            this.textAreaRef.current.select()
+          }
+        }, 10) // TODO: remove hack
+      },
+      e => {
+        //TODO: add error handler call
+        alert(e.message)
+        this.props.onResetForm(formState)
+        return e
+      }
+    )
   }
 
   getWarnings = format => {
@@ -157,74 +168,118 @@ class SaveDialog extends Component {
     return warnings
   }
 
-  render() {
-    const { structStr, disableControls } = this.state
+  changeTab = tabIndex => {
+    this.setState({ tabIndex })
+  }
+
+  changeImageFormat = imageFormat => {
+    this.setState({ imageFormat })
+  }
+
+  renderSaveFile = () => {
     const formState = Object.assign({}, this.props.formState)
     delete formState.moleculeErrors
     const { filename, format } = formState.result
     const warnings = this.getWarnings(format)
+    const { structStr } = this.state
+    return (
+      <div className={classes.form_container} ref={this.formContainerRef}>
+        <Form
+          schema={this.saveSchema}
+          init={{
+            filename,
+            format: this.isRxn ? 'rxn' : 'mol'
+          }}
+          {...formState}>
+          <Field name="filename" />
+          <Field name="format" onChange={this.changeType} />
+        </Form>
+        <textarea value={structStr} readOnly ref={this.textAreaRef} />
+        {warnings.map(warning => (
+          <div className={classes.warnings_container}>
+            <div className={classes.warning} />
+            <div className={classes.warnings_arr}>{warning}</div>
+          </div>
+        ))}
+      </div>
+    )
+  }
+
+  getButtons = () => {
+    const { imageFormat, structStr, tabIndex } = this.state
+    const formState = this.props.formState
+    const { filename, format } = formState.result
     const isCleanStruct = this.props.struct.isBlank()
+    const buttons = [
+      [
+        <SaveButton
+          className="save-button"
+          mode="saveFile"
+          data={structStr}
+          filename={filename + getPropertiesByFormat(format).extensions[0]}
+          key="save-file-button"
+          type={format.mime}
+          server={this.props.server}
+          onSave={this.props.onOk}
+          disabled={!formState.valid || isCleanStruct}>
+          Save To File…
+        </SaveButton>,
+        <button
+          className="save-button"
+          key="save-tmpl"
+          disabled={isCleanStruct}
+          onClick={() => this.props.onTmplSave(this.props.struct)}>
+          Save to Templates...
+        </button>,
+        'Close'
+      ],
+      [
+        <SaveButton
+          className="save-button"
+          mode="saveImage"
+          data={structStr}
+          filename={filename}
+          outputFormat={imageFormat}
+          key="save-image-button"
+          type="image/svg+xml"
+          onSave={this.props.onOk}
+          disabled={!formState.valid || isCleanStruct || !this.props.server}>
+          Save
+        </SaveButton>,
+        'Close'
+      ]
+    ]
+    return buttons[tabIndex]
+  }
 
+  render() {
+    const tabs = [
+      {
+        caption: 'Structure',
+        component: this.renderSaveFile
+      },
+      {
+        caption: 'Image',
+        component: SaveImageTab,
+        props: {
+          changeImageFormat: this.changeImageFormat,
+          dimensions: this.state.dimensions
+        }
+      }
+    ]
     return (
       <Dialog
         title="Save Structure"
         className={classes.save}
         params={this.props}
-        buttons={[
-          <SaveButton
-            mode="saveFile"
-            data={structStr}
-            filename={filename + getPropertiesByFormat(format).extensions[0]}
-            key="save-file-button"
-            type={format.mime}
-            server={this.props.server}
-            onSave={() => this.props.onOk()}
-            disabled={disableControls || !formState.valid || isCleanStruct}>
-            Save To File…
-          </SaveButton>,
-          <SaveButton
-            mode="saveImage"
-            data={structStr}
-            filename={filename}
-            key="save-image-button"
-            type="image/svg+xml"
-            server={this.props.server}
-            onSave={this.props.onOk}
-            disabled={
-              disableControls ||
-              !formState.valid ||
-              isCleanStruct ||
-              !this.props.server
-            }>
-            Save As Image...
-          </SaveButton>,
-          <button
-            key="save-tmpl"
-            disabled={disableControls || isCleanStruct}
-            onClick={() => this.props.onTmplSave(this.props.struct)}>
-            Save to Templates
-          </button>,
-          'Close'
-        ]}>
-        <div className={classes.form_container}>
-          <Form
-            schema={this.saveSchema}
-            init={{
-              filename,
-              format: this.isRxn ? 'rxn' : 'mol'
-            }}
-            {...formState}>
-            <Field name="filename" />
-            <Field name="format" onChange={this.changeType} />
-          </Form>
-          <textarea value={structStr} readOnly ref={this.textAreaRef} />
-          {warnings.map(warning => (
-            <div className={classes.warnings_container}>
-              <div className={classes.warning} />
-              <div className={classes.warnings_arr}>{warning}</div>
-            </div>
-          ))}
-        </div>
+        buttons={this.getButtons()}>
+        <Tabs
+          tabs={tabs}
+          changeTab={tab => {
+            this.changeTab(tab)
+          }}
+          captions={this.tabs}
+        />
       </Dialog>
     )
   }
diff --git a/packages/ketcher-react/src/script/ui/views/modal/components/document/Save/Save.module.less b/packages/ketcher-react/src/script/ui/views/modal/components/document/Save/Save.module.less
index ff9b5836f5..a16211c467 100644
--- a/packages/ketcher-react/src/script/ui/views/modal/components/document/Save/Save.module.less
+++ b/packages/ketcher-react/src/script/ui/views/modal/components/document/Save/Save.module.less
@@ -56,9 +56,4 @@
     cursor: text;
     resize: both;
   }
-
-  footer {
-    display: flex;
-    justify-content: space-around;
-  }
 }
diff --git a/packages/ketcher-react/src/script/ui/views/modal/components/document/Save/SaveImageTab.jsx b/packages/ketcher-react/src/script/ui/views/modal/components/document/Save/SaveImageTab.jsx
new file mode 100644
index 0000000000..a2e832ff75
--- /dev/null
+++ b/packages/ketcher-react/src/script/ui/views/modal/components/document/Save/SaveImageTab.jsx
@@ -0,0 +1,34 @@
+import React from 'react'
+
+const SaveImageTab = ({ dimensions, changeImageFormat }) => {
+  const formats = [
+    { extension: 'svg', text: 'SVG Document' },
+    { extension: 'png', text: 'PNG Image' }
+  ]
+
+  const renderOptions = formats => {
+    return formats.map(format => {
+      const { extension, text } = format
+      return (
+        <option key={extension} value={extension}>
+          {text}
+        </option>
+      )
+    })
+  }
+
+  const handleChange = ({ target }) => {
+    changeImageFormat(target.value)
+  }
+
+  return (
+    <div style={dimensions}>
+      <label>
+        Image Format: &nbsp;
+        <select onChange={handleChange}>{renderOptions(formats)}</select>
+      </label>
+    </div>
+  )
+}
+
+export default SaveImageTab