diff --git a/app/assets/javascripts/app/config.js.coffee b/app/assets/javascripts/app/config.js.coffee
index 78c111484..0932960d2 100644
--- a/app/assets/javascripts/app/config.js.coffee
+++ b/app/assets/javascripts/app/config.js.coffee
@@ -1,3 +1,3 @@
 # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
 App.Config.set('api_path', 'api/v1')
-App.Config.set('image_path', '/assets')
\ No newline at end of file
+App.Config.set('image_path', '/assets/images')
\ No newline at end of file
diff --git a/app/assets/stylesheets/zammad.css.scss b/app/assets/stylesheets/zammad.css.scss
index 8f7db1978..2f0d9ca26 100644
--- a/app/assets/stylesheets/zammad.css.scss
+++ b/app/assets/stylesheets/zammad.css.scss
@@ -1031,7 +1031,7 @@ ol.tabs li {
 .provider_icon {
   width: 29px;
   height: 22px;
-  background: image_url("provider.svg") no-repeat;
+  background: image_url("/assets/images/provider.svg") no-repeat;
 }
 
   .facebook.provider_icon {
@@ -1054,7 +1054,7 @@ ol.tabs li {
   display: inline-block;
   width: 20px;
   height: 20px;
-  background-image: image_url("sprite.svg");
+  background-image: image_url("/assets/images/sprite.svg");
   background-repeat: no-repeat;
   background-position: 20px 20px; /* make icon empty */
 }
@@ -2081,7 +2081,7 @@ footer {
     height: 30px;
     color: #ECECEC;
     line-height: 20px;
-    background: #31373b image-url("sprite.svg") no-repeat 10px -26px;
+    background: #31373b image-url("/assets/images/sprite.svg") no-repeat 10px -26px;
     outline: none;
     border: none;
     border-radius: 15px;
@@ -2100,7 +2100,7 @@ footer {
   .search .logo {
     width: 41px;
     height: 36px;
-    background: image_url("logo.svg");
+    background: image_url("/assets/images/logo.svg");
     transition: 240ms;
     position: relative;
     @extend .u-clickable;
@@ -2313,7 +2313,7 @@ footer {
   }
 
   .unique.avatar {
-    background-image: image_url("avatar-bg.png");
+    background-image: image_url("/assets/images/avatar-bg.png");
     background-size: auto;
     color: white;
     line-height: 42px;
@@ -4032,7 +4032,7 @@ footer {
 
 .userInfo-avatar:after {
   content: "";
-  background: image_url("sprite.svg");
+  background: image_url("/assets/images/sprite.svg");
   background-position: -236px 0;
   right: 0;
   top: 0;
diff --git a/lib/static_assets.rb b/lib/static_assets.rb
index 9b28764a2..7ca91dccd 100644
--- a/lib/static_assets.rb
+++ b/lib/static_assets.rb
@@ -76,7 +76,7 @@ module StaticAssets
     return if !file
 
     hash = Digest::MD5.hexdigest( file.content )
-    path = "#{Rails.root.to_s}/public/assets/#{hash}"
+    path = "#{Rails.root.to_s}/public/assets/images/#{hash}"
     File.open( path, 'wb' ) do |f|
       f.puts file.content
     end
diff --git a/app/assets/images/avatar-bg.png b/public/assets/images/avatar-bg.png
similarity index 100%
rename from app/assets/images/avatar-bg.png
rename to public/assets/images/avatar-bg.png
diff --git a/app/assets/images/company-logo.png b/public/assets/images/company-logo.png
similarity index 100%
rename from app/assets/images/company-logo.png
rename to public/assets/images/company-logo.png
diff --git a/app/assets/images/full logo on dark.svg b/public/assets/images/full logo on dark.svg
similarity index 100%
rename from app/assets/images/full logo on dark.svg
rename to public/assets/images/full logo on dark.svg
diff --git a/app/assets/images/logo.svg b/public/assets/images/logo.svg
similarity index 100%
rename from app/assets/images/logo.svg
rename to public/assets/images/logo.svg
diff --git a/app/assets/images/logo_bw.svg b/public/assets/images/logo_bw.svg
similarity index 100%
rename from app/assets/images/logo_bw.svg
rename to public/assets/images/logo_bw.svg
diff --git a/app/assets/images/logotype on dark.svg b/public/assets/images/logotype on dark.svg
similarity index 100%
rename from app/assets/images/logotype on dark.svg
rename to public/assets/images/logotype on dark.svg
diff --git a/app/assets/images/otrs-logo.png b/public/assets/images/otrs-logo.png
similarity index 100%
rename from app/assets/images/otrs-logo.png
rename to public/assets/images/otrs-logo.png
diff --git a/app/assets/images/provider.svg b/public/assets/images/provider.svg
similarity index 100%
rename from app/assets/images/provider.svg
rename to public/assets/images/provider.svg
diff --git a/app/assets/images/sprite.svg b/public/assets/images/sprite.svg
similarity index 100%
rename from app/assets/images/sprite.svg
rename to public/assets/images/sprite.svg