diff --git a/src/assets/css/indicator.css b/src/assets/css/indicator.css
index a342e5c16..7db515690 100644
--- a/src/assets/css/indicator.css
+++ b/src/assets/css/indicator.css
@@ -1,11 +1,3 @@
-.document-save-indicator {
-    color: $brand-danger-color;
-}
-
-.document-save-indicator:hover{
-    background: none;
-}
-
 .indicators-wrapper {
     border: 1px solid $brand-border-color;
     border-radius: 3px;
diff --git a/src/components/app/Indicator.js b/src/components/app/Indicator.js
index 535c5e9aa..c5600acc1 100644
--- a/src/components/app/Indicator.js
+++ b/src/components/app/Indicator.js
@@ -18,11 +18,14 @@ class Indicator extends Component {
     }
 
     render() {
-        const {indicator} = this.props;
+        const {indicator, isDocumentNotSaved} = this.props;
 
         return (
             <div>
-                <div className={'indicator-bar indicator-' + indicator} />
+                <div className={
+                        'indicator-bar indicator-' + indicator +
+                        (isDocumentNotSaved ? ' indicator-error ' : ' ')
+                } />
             </div>
         )
     }
diff --git a/src/components/header/Header.js b/src/components/header/Header.js
index 5d048dce5..a24a7859a 100644
--- a/src/components/header/Header.js
+++ b/src/components/header/Header.js
@@ -292,20 +292,6 @@ class Header extends Component {
                                 <img src={logo} className="header-logo pointer" onClick={() => this.handleDashboardLink()} />
                             </div>
                             <div className="header-right-side">
-                                <ReactCSSTransitionGroup
-                                    transitionName="fade"
-                                    transitionEnterTimeout={300}
-                                    transitionLeaveTimeout={300}
-                                >
-                                    {isDocumentNotSaved &&
-                                        <div className="document-save-indicator header-item-container">
-                                            <div className="text-xs-center">
-                                                <i className="meta-icon-save" />
-                                            </div>
-                                            <small>Not saved</small>
-                                        </div>
-                                    }
-                                </ReactCSSTransitionGroup>
                                 {docStatus &&
                                     <div
                                         className="hidden-sm-down tooltip-parent"
@@ -386,7 +372,7 @@ class Header extends Component {
                             </div>
                         </div>
                     </div>
-                    {showIndicator && <Indicator />}
+                    {showIndicator && <Indicator {...{isDocumentNotSaved}}/>}
                 </nav>
 
                 {isSubheaderShow && <Subheader