diff --git a/CHANGES.md b/CHANGES.md
index 8f766c4505d6d46fa574b97421ac357a35ea0911..778afb2f4a528040e09cb65430e294a2e28ac03a 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -6,6 +6,7 @@ Changes
### Unreleased
+* 2021-08-16 - Bugfix: Remove overwritten template full_header.mustache. If the setting showsettingsincourse is enabled, this will place the cog icon _over_ instead of _near_ the edit button. This will fix a presentation issue with the in-course settings menu on smaller screens.
* 2021-08-16 - Improvement: Re-add the margin below the breadcrumb as this does not need to differ between theme_boost and theme_boost_campus anymore
### v3.10-r6
diff --git a/classes/output/core_renderer.php b/classes/output/core_renderer.php
index 0e5654ff9a85b5b4fb8d022e50f0fad274295a0b..6e842a150d66b5146137f457ab24c5ecc2dd9f2d 100644
--- a/classes/output/core_renderer.php
+++ b/classes/output/core_renderer.php
@@ -193,12 +193,7 @@ class core_renderer extends \core_renderer {
$header->headeractions = $this->page->get_header_actions();
// MODIFICATION START:
// Change this to add the result in the html variable to be able to add further features below the header.
- // Render from the own header template if we are not on the content bank view page (contentbank/view.php).
- if ($this->page->bodyid == 'page-contentbank') {
- $html = $this->render_from_template('core/full_header', $header);
- } else {
- $html = $this->render_from_template('theme_boost_campus/full_header', $header);
- }
+ $html = $this->render_from_template('core/full_header', $header);
// MODIFICATION END.
// @codingStandardsIgnoreStart
/* ORIGINAL START
diff --git a/templates/full_header.mustache b/templates/full_header.mustache
deleted file mode 100644
index 55cd98637ae88c90516ab854e162eb9efd4098a9..0000000000000000000000000000000000000000
--- a/templates/full_header.mustache
+++ /dev/null
@@ -1,67 +0,0 @@
-{{!
- This file is part of Moodle - http://moodle.org/
-
- Moodle is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- Moodle is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with Moodle. If not, see <http://www.gnu.org/licenses/>.
-}}
-{{!
- @template theme_boost_campus/full_header
-
- This template renders the header.
-
- Example context (json):
- {
- "contextheader": "context_header_html",
- "settingsmenu": "settings_html",
- "hasnavbar": false,
- "navbar": "navbar_if_available",
- "courseheader": "course_header_html"
- }
-}}
-{{! MODIFICATION:
- * Changed the order of the settingsmenu item.
-}}
-
-<header id="page-header" class="row">
- <div class="col-12 pt-3 pb-3">
- <div class="card {{^contextheader}}border-0 bg-transparent{{/contextheader}}">
- <div class="card-body {{^contextheader}}p-2{{/contextheader}}">
- <div class="d-flex">
- {{#contextheader}}
- <div class="mr-auto">
- {{{contextheader}}}
- </div>
- {{/contextheader}}
- </div>
- <div class="d-flex flex-wrap">
- {{#hasnavbar}}
- <div id="page-navbar">
- {{{navbar}}}
- </div>
- {{/hasnavbar}}
- <div class="ml-auto d-flex">
- {{{pageheadingbutton}}}
- </div>
- {{#settingsmenu}}
- <div class="context-header-settings-menu ml-4">
- {{{settingsmenu}}}
- </div>
- {{/settingsmenu}}
- <div id="course-header">
- {{{courseheader}}}
- </div>
- </div>
- </div>
- </div>
- </div>
-</header>
diff --git a/templates/full_header.mustache.original b/templates/full_header.mustache.original
deleted file mode 100644
index 6e0b55398dc83787854bc8591f2702b345c4fbf1..0000000000000000000000000000000000000000
--- a/templates/full_header.mustache.original
+++ /dev/null
@@ -1,66 +0,0 @@
-{{!
- This file is part of Moodle - http://moodle.org/
-
- Moodle is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- Moodle is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with Moodle. If not, see <http://www.gnu.org/licenses/>.
-}}
-{{!
- @template boost/header
-
- This template renders the header.
-
- Example context (json):
- {
- "contextheader": "context_header_html",
- "settingsmenu": "settings_html",
- "hasnavbar": false,
- "navbar": "navbar_if_available",
- "courseheader": "course_header_html"
- }
-
- Page header.
-}}
-<header id="page-header" class="row">
- <div class="col-12 pt-3 pb-3">
- <div class="card {{^contextheader}}border-0 bg-transparent{{/contextheader}}">
- <div class="card-body {{^contextheader}}p-2{{/contextheader}}">
- <div class="d-flex">
- {{#contextheader}}
- <div class="mr-auto">
- {{{contextheader}}}
- </div>
- {{/contextheader}}
-
- {{#settingsmenu}}
- <div class="context-header-settings-menu">
- {{{settingsmenu}}}
- </div>
- {{/settingsmenu}}
- </div>
- <div class="d-flex flex-wrap">
- {{#hasnavbar}}
- <div id="page-navbar">
- {{{navbar}}}
- </div>
- {{/hasnavbar}}
- <div class="ml-auto d-flex">
- {{{pageheadingbutton}}}
- </div>
- <div id="course-header">
- {{{courseheader}}}
- </div>
- </div>
- </div>
- </div>
- </div>
-</header>