Separate folder for icons.

src/components/elements/DropdownControl/DropdownControl.js

@@ -7,7 +7,7 @@ import InputControl from 'components/elements/InputControl/InputControl';
 
 import styles from './DropdownControl.sss';
 
-import ImageIconTriangularArrow from 'assets/images/icon-triangular-arrow.svg';
+import ImageArrowDownFull from 'assets/images/arrow-down-full.svg';
 import ImageArrows from 'assets/images/arrows.svg';
 
 
@@ -102,7 +102,7 @@ export default class DropdownControl extends Component {
       'arrow-rotated': this.state.listVis
     });
 
-    let icon = <InlineSVG styleName={arrowClasses} src={ImageIconTriangularArrow} />;
+    let icon = <InlineSVG styleName={arrowClasses} src={ImageArrowDownFull} />;
     if (type === 'big')
       icon = <InlineSVG styleName="arrows" src={ImageArrows} />;
 

src/components/elements/IconsComponent/IconsComponent.js

@@ -2,4 +2,4 @@ import React from 'react';
 import InlineSVG from 'svg-inline-react';
 
 export default props =>
-  <InlineSVG src={require(`assets/images/${props.icon}.svg`)} />;
+  <InlineSVG src={require(`assets/images/icons/${props.icon}.svg`)} />;

src/components/mainArea/content/ContentEdit/elements/ContentMedia.js

@@ -15,7 +15,7 @@ import InputControl from "components/elements/InputControl/InputControl";
 
 import styles from '../ContentEdit.sss';
 
-import ImageIconDelete from 'assets/images/icon-delete.svg';
+import ImageIconDelete from 'assets/images/icons/delete.svg';
 
 
 const AUTOSAVE_TIMEOUT = 2000;

src/components/mainArea/content/ContentEdit/elements/ContentString.js

@@ -19,7 +19,7 @@ import * as ftps from 'models/ModelData';
 
 import styles from '../ContentEdit.sss';
 
-import ImageLink from 'assets/images/link.svg';
+import ImageIconLink from 'assets/images/icons/link.svg';
 
 
 @CSSModules(styles, {allowMultiple: true})
@@ -204,7 +204,7 @@ export default class ContentString extends ContentBase {
           <div styleName="field-title">
             {this.field.name}
             <div styleName="link" onClick={this.onShowWysiwygModal}>
-              <InlineSVG styleName="link-icon" src={ImageLink}/>
+              <InlineSVG styleName="link-icon" src={ImageIconLink}/>
             </div>
           </div>
         );
@@ -214,7 +214,7 @@ export default class ContentString extends ContentBase {
           <div styleName="field-title">
             {this.field.name}
             <div styleName="link" onClick={this.onShowMarkdownModal}>
-              <InlineSVG styleName="link-icon" src={ImageLink}/>
+              <InlineSVG styleName="link-icon" src={ImageIconLink}/>
             </div>
           </div>
         );

src/components/mainArea/content/ContentList/ContentList.js

@@ -15,8 +15,8 @@ import styles from './ContentList.sss';
 
 import ImageEye from './eye.png';
 import ImageEyeGray from './eye-gray.png';
-import ImageIconEdit from 'assets/images/icon-edit.svg';
-import ImageIconDelete from 'assets/images/icon-delete.svg';
+import ImageIconEdit from 'assets/images/icons/edit.svg';
+import ImageIconDelete from 'assets/images/icons/delete.svg';
 
 
 const allStatuses = [STATUS_DRAFT, STATUS_PUBLISHED, STATUS_UPDATED, STATUS_ARCHIVED];

src/components/mainArea/models/Model/Model.js

@@ -16,7 +16,7 @@ import {ModelFieldData} from 'models/ModelData';
 
 import styles from './Model.sss';
 
-import ImageIconDelete from 'assets/images/icon-delete.svg';
+import ImageIconDelete from 'assets/images/icons/delete.svg';
 
 
 const DragHandle = SortableHandle(({color}) =>

src/components/mainArea/models/ModelsList/ModelsList.js

@@ -11,7 +11,7 @@ import {ALERT_TYPE_CONFIRM, ALERT_TYPE_ALERT} from 'components/modals/AlertModal
 
 import styles from './ModelsList.sss';
 
-import ImageIconDelete from 'assets/images/icon-delete.svg';
+import ImageIconDelete from 'assets/images/icons/delete.svg';
 
 
 @CSSModules(styles, {allowMultiple: true})

src/components/sidebar/Sites/Sites.js

@@ -9,7 +9,7 @@ import {ALERT_TYPE_CONFIRM, ALERT_TYPE_ALERT} from "components/modals/AlertModal
 import styles from './Sites.sss';
 
 import ImageHammer from 'assets/images/hammer.svg';
-import ImageLink from 'assets/images/link.svg';
+import ImageIconLink from 'assets/images/icons/link.svg';
 
 
 @CSSModules(styles, {allowMultiple: true})
@@ -96,11 +96,11 @@ export default class Sites extends Component {
                   <a href={site.domain}
                      target="_blank"
                      styleName="link">
-                    <InlineSVG src={ImageLink}/>
+                    <InlineSVG src={ImageIconLink}/>
                   </a>
                 :
                   <div styleName="link-disabled">
-                    <InlineSVG src={ImageLink}/>
+                    <InlineSVG src={ImageIconLink}/>
                   </div>
                 }
               </div>

src/containers/Header/Header.js

@@ -11,7 +11,7 @@ import {toggleSidebar} from 'ducks/nav';
 
 import styles from './Header.sss';
 
-import ImageSidebar from 'assets/images/sidebar.svg';
+import ImageIconSidebar from 'assets/images/icons/sidebar.svg';
 
 
 @CSSModules(styles, {allowMultiple: true})
@@ -27,7 +27,7 @@ export class Header extends Component  {
     return (
       <div styleName="header">
         <div styleName="sidebar-icon" onClick={toggleSidebar}>
-          <InlineSVG src={ImageSidebar} />
+          <InlineSVG src={ImageIconSidebar} />
         </div>
         <Menu siteNameId={nameId}
               isSidebarOpened={nav.isSidebarVisible}

src/index.pug

@@ -6,8 +6,8 @@ html(lang="en")
     title Chisel
     meta(name="description" content="Parse CMS")
     meta(name="viewport" content="width=device-width, initial-scale=1")
-    link(rel="apple-touch-icon" sizes="180x180" href="/assets/images/icons/apple-touch-icon.png")
-    link(rel="icon" type="image/png" sizes="512x512"  href="/assets/images/icons/logo512.png")
+    link(rel="apple-touch-icon" sizes="180x180" href="/assets/images/logo/apple-touch-icon.png")
+    link(rel="icon" type="image/png" sizes="512x512"  href="/assets/images/logo/logo512.png")
     link(rel="icon" type="image/x-icon" href="/favicon.ico")
     link(rel="manifest" href="/manifest.json")
     script(defer src="https://use.fontawesome.com/releases/v5.0.6/js/all.js")