diff --git a/.gitattributes b/.gitattributes
index 5b7d4f48bab46597a375148fd2b72b52839dae04..31a0c994dec29d7fc7c75a56ce8980aeae03d474 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -8,7 +8,6 @@
/rector.yml export-ignore
/typo3/sysext/*/Resources/Private/TypeScript/ export-ignore
/typo3/sysext/*/Tests/ export-ignore
-/typo3conf/ext/styleguide export-ignore
/components/testing_framework/ export-ignore
# Enforce checkout with linux lf consistent over all platforms
diff --git a/.gitignore b/.gitignore
index 220d01aee820ab59bc3581525b4122a213ef2866..9ab2325e8fdc5fe2b86992f8445e0317c0b71d54 100644
--- a/.gitignore
+++ b/.gitignore
@@ -65,7 +65,6 @@ nbproject
/typo3conf/*
!/typo3conf/ext
/typo3conf/ext/*
-!/typo3conf/ext/styleguide
/fileadmin/*
/uploads/*
/FIRST_INSTALL
diff --git a/typo3/sysext/styleguide/Configuration/TypoScript/setup.typoscript b/typo3/sysext/styleguide/Configuration/TypoScript/setup.typoscript
index a0b0855d453a118743f2e4c35eb350da9eecdcf3..bcfd2792a87895f410e034301c7afe40d9ec9c2f 100644
--- a/typo3/sysext/styleguide/Configuration/TypoScript/setup.typoscript
+++ b/typo3/sysext/styleguide/Configuration/TypoScript/setup.typoscript
@@ -11,11 +11,6 @@
// Configure admin panel
config.admPanel = 1
-page.headerData.1568907945 = TEXT
-page.headerData.1568907945.value (
- <link rel="shortcut icon" href="typo3conf/ext/styleguide/Resources/Public/Icons/Extension.svg" />
-)
-
// Define template paths for fluid_styled_content
lib.contentElement {
templateName = Default
@@ -61,6 +56,7 @@ lib.dynamicContent {
page = PAGE
page {
typeNum = 0
+ shortcutIcon = EXT:styleguide/Resources/Public/Icons/Extension.svg
10 = FLUIDTEMPLATE
10 {
templateName = StyleguideFrontend
diff --git a/typo3/sysext/t3editor/Documentation/CodeSnippets/Automatic/T3editor1.rst.txt b/typo3/sysext/t3editor/Documentation/CodeSnippets/Automatic/T3editor1.rst.txt
index ceac6d2287bc33d46e64aade7621cc8e85b4c08c..a0c871ee47ef335ca137c23228c1f7560eba59fb 100644
--- a/typo3/sysext/t3editor/Documentation/CodeSnippets/Automatic/T3editor1.rst.txt
+++ b/typo3/sysext/t3editor/Documentation/CodeSnippets/Automatic/T3editor1.rst.txt
@@ -2,7 +2,7 @@
.. Automatically generated code snippet
.. ====================================
..
-.. Extracted from typo3conf/ext/styleguide/Configuration/TCA/tx_styleguide_elements_t3editor.php
+.. Extracted from typo3/sysext/styleguide/Configuration/TCA/tx_styleguide_elements_t3editor.php
.. code-block:: php
diff --git a/typo3/sysext/t3editor/Documentation/screenshots.json b/typo3/sysext/t3editor/Documentation/screenshots.json
index b7b507fe9185881891b2404fec9518334fe15859..6c2b5126032466b3f98930a1907fb490c8db5413 100644
--- a/typo3/sysext/t3editor/Documentation/screenshots.json
+++ b/typo3/sysext/t3editor/Documentation/screenshots.json
@@ -18,7 +18,7 @@
},
{
"action": "setCodeSnippetsSourcePath",
- "path": "typo3conf/ext/styleguide"
+ "path": "typo3/sysext/styleguide"
},
{
"action": "makeScreenshotOfField",