diff --git a/app/Resources/views/Default/default.html.php b/app/Resources/views/Default/default.html.php
index c32591f6..a2d98552 100644
--- a/app/Resources/views/Default/default.html.php
+++ b/app/Resources/views/Default/default.html.php
@@ -79,7 +79,7 @@
 
 <div id="site">
     <div id="logo">
-        <a href="http://www.pimcore.org/"><img src="/pimcore/static6/img/logo-claim-gray.svg" style="width: 400px;" /></a>
+        <a href="http://www.pimcore.org/"><img src="/bundles/pimcoreadmin/img/logo-claim-gray.svg" style="width: 400px;" /></a>
     </div>
 </div>
 
diff --git a/app/Resources/views/Web2print/default.html.php b/app/Resources/views/Web2print/default.html.php
index 597fb4b3..40054f4f 100644
--- a/app/Resources/views/Web2print/default.html.php
+++ b/app/Resources/views/Web2print/default.html.php
@@ -100,7 +100,7 @@
     </style>
 
     <?php if($this->printermarks) { ?>
-        <link rel="stylesheet" type="text/css" href="/pimcore/static6/css/print/print-printermarks.css" media="print" />
+        <link rel="stylesheet" type="text/css" href="/bundles/pimcoreadmin/css/print/print-printermarks.css" media="print" />
     <?php } ?>
 
 
@@ -115,7 +115,7 @@
 <div id="site">
     <div class="page">
         <div id="logo">
-            <a href="http://www.pimcore.org/"><img style="width: 200px" src="/pimcore/static6/img/logo.png" /></a>
+            <a href="http://www.pimcore.org/"><img style="width: 200px" src="/bundles/pimcoreadmin/img/logo.png" /></a>
             <hr />
             <div class="claim">
                 THE OPEN-SOURCE ENTERPRISE PLATFORM FOR PIM, CMS, DAM & COMMERCE based on Symfony
diff --git a/app/config/pimcore/customviews.example.php b/app/config/pimcore/customviews.example.php
index 3aff3168..6cf41f39 100644
--- a/app/config/pimcore/customviews.example.php
+++ b/app/config/pimcore/customviews.example.php
@@ -6,7 +6,7 @@
             'treetype' => 'object',                                             // element type is "object"
             'name' => 'Articles',                                               // display name
             'condition' => null,                                                // SQL condition
-            'icon' => '/pimcore/static6/img/flat-color-icons/reading.svg',      // tree icon
+            'icon' => '/bundles/pimcoreadmin/img/flat-color-icons/reading.svg',      // tree icon
             'id' => 1,                                                          // unique (!!!) custom view ID
             'rootfolder' => '/blog',                                            // root node
             'showroot' => false,                                                // show root node or just children?
@@ -50,7 +50,7 @@
         [
             'treetype' => 'document',                                           // document view
             'name' => 'Basic Examples',
-            'icon' => '/pimcore/static6/img/flat-color-icons/text.svg',
+            'icon' => '/bundles/pimcoreadmin/img/flat-color-icons/text.svg',
             'id' => 2,                                                          // again, unique ID
             'rootfolder' => '/en/basic-examples',
             'showroot' => true,
@@ -93,7 +93,7 @@
         [
             'treetype' => 'asset',                                              // asset view
             'name' => 'Panama',
-            'icon' => '/pimcore/static6/img/flat-color-icons/stack_of_photos.svg',
+            'icon' => '/bundles/pimcoreadmin/img/flat-color-icons/stack_of_photos.svg',
             'id' => 3,
             'rootfolder' => '/examples/panama',
             'showroot' => true,
diff --git a/app/config/pimcore/perspectives.example.php b/app/config/pimcore/perspectives.example.php
index 9dd6c521..3bf705e1 100644
--- a/app/config/pimcore/perspectives.example.php
+++ b/app/config/pimcore/perspectives.example.php
@@ -62,7 +62,7 @@
 
     ],
     'Alternative view' => [
-        'icon' => '/pimcore/static6/img/flat-color-icons/biohazard.svg',
+        'icon' => '/bundles/pimcoreadmin/img/flat-color-icons/biohazard.svg',
         'toolbar' => [
             'file' => 1,
             'extras' => [
@@ -158,7 +158,7 @@
         ]
     ],
     'Assets only' => [
-        'icon' => '/pimcore/static6/img/flat-color-icons/webcam.svg',
+        'icon' => '/bundles/pimcoreadmin/img/flat-color-icons/webcam.svg',
         'elementTree' => [
             [
                 'type' => 'assets',