diff --git a/frontend/src/uxbox/main/data/auth.cljs b/frontend/src/uxbox/main/data/auth.cljs
index 927f20deb..8131f7891 100644
--- a/frontend/src/uxbox/main/data/auth.cljs
+++ b/frontend/src/uxbox/main/data/auth.cljs
@@ -10,7 +10,7 @@
             [potok.core :as ptk]
             [uxbox.main.store :as st]
             [uxbox.main.repo :as rp]
-            [uxbox.main.state :refer [initial-state]]
+            [uxbox.main.store :refer [initial-state]]
             [uxbox.main.data.projects :as udp]
             [uxbox.main.data.users :as udu]
             [uxbox.util.messages :as uum]
diff --git a/frontend/src/uxbox/main/state.cljs b/frontend/src/uxbox/main/state.cljs
deleted file mode 100644
index 99501efab..000000000
--- a/frontend/src/uxbox/main/state.cljs
+++ /dev/null
@@ -1,31 +0,0 @@
-;; This Source Code Form is subject to the terms of the Mozilla Public
-;; License, v. 2.0. If a copy of the MPL was not distributed with this
-;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
-;;
-;; Copyright (c) 2015-2016 Andrey Antukh <niwi@niwi.nz>
-
-(ns uxbox.main.state
-  (:require [uxbox.builtins.colors :as colors]
-            [uxbox.builtins.library.icons :as icons]
-            [uxbox.util.storage :refer [storage]]))
-
-(defn initial-state
-  []
-  {:dashboard {:project-order :name
-               :project-filter ""
-               :images-order :name
-               :images-filter ""}
-   :route nil
-   :auth (:auth storage nil)
-   :clipboard #queue []
-   :undo {}
-   :profile nil
-   :workspace nil
-   :images-collections nil
-   :images nil
-   :icons-collections nil
-   :icons nil
-   :colors-collections colors/collections
-   :shapes nil
-   :projects nil
-   :pages nil})
diff --git a/frontend/src/uxbox/main/store.cljs b/frontend/src/uxbox/main/store.cljs
index 463f436ad..62d080c05 100644
--- a/frontend/src/uxbox/main/store.cljs
+++ b/frontend/src/uxbox/main/store.cljs
@@ -9,7 +9,6 @@
             [lentes.core :as l]
             [potok.core :as ptk]
             [uxbox.builtins.colors :as colors]
-            [uxbox.builtins.library.icons :as icons]
             [uxbox.util.storage :refer [storage]]))
 
 (enable-console-print!)
@@ -31,7 +30,7 @@
   ([event & events]
    (apply ptk/emit! store (cons event events))))
 
-(defn- initial-state
+(defn initial-state
   []
   {:dashboard {:project-order :name
                :project-filter ""
@@ -45,7 +44,7 @@
    :workspace nil
    :images-collections nil
    :images nil
-   :icons-collections icons/collections
+   :icons-collections nil
    :icons nil
    :colors-collections colors/collections
    :shapes nil