diff --git a/packages/ketcher-core/src/application/render/raphaelRender.js b/packages/ketcher-core/src/application/render/raphaelRender.js
index 4bff83e97e..2ed35bdda1 100644
--- a/packages/ketcher-core/src/application/render/raphaelRender.js
+++ b/packages/ketcher-core/src/application/render/raphaelRender.js
@@ -204,7 +204,12 @@ Render.prototype.update = function (force = false, viewSz = null) {
       .transform(Scale.obj2scaled, this.options)
       .translate(this.options.offset || new Vec2())
 
-    if (!this.options.autoScale) {
+    if (this.options.downScale) {
+      this.ctab.molecule.rescale()
+    }
+
+    const isAutoScale = this.options.autoScale || this.options.downScale
+    if (!isAutoScale) {
       const ext = Vec2.UNIT.scaled(sf)
       const eb = bb.sz().length() > 0 ? bb.extend(ext, ext) : bb
       const vb = new Box2Abs(
@@ -237,7 +242,12 @@ Render.prototype.update = function (force = false, viewSz = null) {
       let rescale =
         this.options.rescaleAmount ||
         Math.max(sz1.x / (csz.x - 2 * marg), sz1.y / (csz.y - 2 * marg))
-      if (this.options.maxBondLength / rescale > 1.0) rescale = 1.0
+
+      const isForceDownscale = this.options.downScale && rescale < 1
+      const isBondsLengthFit = this.options.maxBondLength / rescale > 1
+      if (isBondsLengthFit || isForceDownscale) {
+        rescale = 1
+      }
       const sz2 = sz1.add(mv.scaled(2 * rescale))
       /* eslint-disable no-mixed-operators */
       this.paper.setViewBox(
diff --git a/packages/ketcher-react/src/script/ui/dialog/template/TemplateDialog.tsx b/packages/ketcher-react/src/script/ui/dialog/template/TemplateDialog.tsx
index 1d62e6b5a5..cae69514c9 100644
--- a/packages/ketcher-react/src/script/ui/dialog/template/TemplateDialog.tsx
+++ b/packages/ketcher-react/src/script/ui/dialog/template/TemplateDialog.tsx
@@ -78,6 +78,7 @@ interface TemplateLibProps {
   mode: string
   tab: number
   saltsAndSolvents: Template[]
+  renderOptions?: any
 }
 
 interface TemplateLibCallProps {
@@ -283,6 +284,7 @@ const TemplateDialog: FC<Props> = (props) => {
                         selected={props.selected}
                         onDelete={props.onDelete}
                         onAttach={props.onAttach}
+                        renderOptions={props.renderOptions}
                       />
                     </AccordionDetails>
                   </Accordion>
@@ -303,6 +305,7 @@ const TemplateDialog: FC<Props> = (props) => {
                 templates={filteredFG}
                 onSelect={(templ) => select(templ)}
                 selected={props.selected}
+                renderOptions={props.renderOptions}
               />
             </div>
           ) : (
@@ -319,6 +322,7 @@ const TemplateDialog: FC<Props> = (props) => {
                 templates={filteredSaltsAndSolvents}
                 onSelect={(templ) => select(templ)}
                 selected={props.selected}
+                renderOptions={props.renderOptions}
               />
             </div>
           ) : (
@@ -350,6 +354,7 @@ export default connect(
   (store) => ({
     ...omit(['attach'], (store as any).templates),
     initialTab: (store as any).modal?.prop?.tab || TemplateTabs.TemplateLibrary,
+    renderOptions: (store as any).editor?.render?.options,
     functionalGroups: functionalGroupsSelector(store),
     saltsAndSolvents: saltsAndSolventsSelector(store)
   }),
diff --git a/packages/ketcher-react/src/script/ui/dialog/template/TemplateTable.tsx b/packages/ketcher-react/src/script/ui/dialog/template/TemplateTable.tsx
index 3b3bbc30cc..24ff3eb0ba 100644
--- a/packages/ketcher-react/src/script/ui/dialog/template/TemplateTable.tsx
+++ b/packages/ketcher-react/src/script/ui/dialog/template/TemplateTable.tsx
@@ -19,7 +19,6 @@ import { Struct } from 'ketcher-core'
 import StructRender from '../../component/structrender'
 import classes from './TemplateTable.module.less'
 import { greekify } from '../../utils'
-import { useSelector } from 'react-redux'
 import Icon from 'src/script/ui/component/view/icon'
 
 export interface Template {
@@ -41,9 +40,9 @@ interface TemplateTableProps {
   onDelete?: (tmpl: Template) => void
   onAttach?: (tmpl: Template) => void
   titleRows?: 1 | 2
+  renderOptions?: any
 }
 
-const getSettingsSelector = (state) => state.options.settings
 const isSaltOrSolventTemplate = (template) =>
   template.props.group === 'Salts and Solvents'
 const isFunctionalGroupTemplate = (template) =>
@@ -71,8 +70,13 @@ const RenderTmpl: FC<{
   return (
     <StructRender
       struct={tmpl.struct}
-      options={{ ...options, autoScaleMargin: 15 }}
       {...props}
+      options={{
+        ...options,
+        autoScaleMargin: 10,
+        cachePrefix: 'templates',
+        downScale: true
+      }}
     />
   )
 }
@@ -84,9 +88,9 @@ const TemplateTable: FC<TemplateTableProps> = (props) => {
     onSelect,
     onDelete,
     onAttach,
-    titleRows = 2
+    titleRows = 2,
+    renderOptions
   } = props
-  const options = useSelector((state) => getSettingsSelector(state))
 
   return (
     <div
@@ -112,7 +116,7 @@ const TemplateTable: FC<TemplateTableProps> = (props) => {
           >
             <RenderTmpl
               tmpl={tmpl}
-              options={options}
+              options={renderOptions}
               className={classes.struct}
             />
             <div
diff --git a/packages/ketcher-react/src/script/ui/state/saltsAndSolvents/index.ts b/packages/ketcher-react/src/script/ui/state/saltsAndSolvents/index.ts
index 25e02fc336..e31aead0b5 100644
--- a/packages/ketcher-react/src/script/ui/state/saltsAndSolvents/index.ts
+++ b/packages/ketcher-react/src/script/ui/state/saltsAndSolvents/index.ts
@@ -63,7 +63,12 @@ const prerenderPartOfStructures = (saltsAndSolvents: Struct[], settings) => {
     div.style.height = '100px'
     div.style.display = 'none'
     document.body.appendChild(div)
-    RenderStruct.render(div, struct, { ...settings, autoScaleMargin: 15 })
+    RenderStruct.render(div, struct, {
+      ...settings,
+      autoScaleMargin: 10,
+      cachePrefix: 'saltsAndSolvents',
+      downScale: true
+    })
     div.remove()
   })
 }