diff --git a/packages/mediacenter/kodi-theme-Estuary/package.mk b/packages/mediacenter/kodi-theme-Estuary/package.mk
index c47f90e3b6..c218bbd885 100644
--- a/packages/mediacenter/kodi-theme-Estuary/package.mk
+++ b/packages/mediacenter/kodi-theme-Estuary/package.mk
@@ -59,5 +59,5 @@ makeinstall_target() {
     done
 
 # Rebrand
-  sed -e "s,@DISTRONAME@,$DISTRONAME,g" -i $INSTALL/usr/share/kodi/addons/skin.estuary/1080i/Home.xml
+  sed -e "s,@DISTRONAME@,$DISTRONAME,g" -i $INSTALL/usr/share/kodi/addons/skin.estuary/1080i/Settings.xml
 }
diff --git a/packages/mediacenter/kodi-theme-Estuary/patches/kodi-theme-Estuary-0001-add_le_settings_to_settingscreen.patch b/packages/mediacenter/kodi-theme-Estuary/patches/kodi-theme-Estuary-0001-add_le_settings_to_settingscreen.patch
new file mode 100644
index 0000000000..7d094a5436
--- /dev/null
+++ b/packages/mediacenter/kodi-theme-Estuary/patches/kodi-theme-Estuary-0001-add_le_settings_to_settingscreen.patch
@@ -0,0 +1,15 @@
+diff --git a/1080i/Settings.xml b/1080i/Settings.xml
+--- a/1080i/Settings.xml
++++ b/1080i/Settings.xml
+@@ -134,6 +134,11 @@
+ 					<icon>icons/settings/system.png</icon>
+ 				</item>
+ 				<item>
++					<label>@DISTRONAME@</label>
++					<onclick>RunAddon(service.libreelec.settings)</onclick>
++					<icon>icons/settings/libreelec.png</icon>
++				</item>
++				<item>
+ 					<label>$LOCALIZE[138]</label>
+ 					<onclick>ActivateWindow(systeminfo)</onclick>
+ 					<icon>icons/settings/sysinfo.png</icon>
diff --git a/packages/mediacenter/kodi-theme-Estuary/patches/kodi-theme-Estuary-0001-add_oe_settings_to_homescreen.patch b/packages/mediacenter/kodi-theme-Estuary/patches/kodi-theme-Estuary-0001-add_oe_settings_to_homescreen.patch
deleted file mode 100644
index c2806c96d5..0000000000
--- a/packages/mediacenter/kodi-theme-Estuary/patches/kodi-theme-Estuary-0001-add_oe_settings_to_homescreen.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -Naur a/1080i/Home.xml b/1080i/Home.xml
---- a/1080i/Home.xml	2016-03-29 23:29:42.616607010 +0100
-+++ b/1080i/Home.xml	2016-03-29 23:30:49.205150336 +0100
-@@ -1090,6 +1090,12 @@
- 								<property name="id">weather</property>
- 								<visible>!Skin.HasSetting(HomeMenuNoWeatherButton)</visible>
- 							</item>
-+							<item>
-+								<label>@DISTRONAME@</label>
-+								<onclick>RunAddon(service.libreelec.settings)</onclick>
-+								<thumb>icons/home/libreelec.png</thumb>
-+								<property name="id">libreelec</property>
-+							</item>
- 						</content>
- 					</control>
- 				</control>
diff --git a/packages/mediacenter/kodi-theme-Estuary/sources/media/icons/home/libreelec.png b/packages/mediacenter/kodi-theme-Estuary/sources/media/icons/home/libreelec.png
deleted file mode 100644
index 458b87fefd..0000000000
Binary files a/packages/mediacenter/kodi-theme-Estuary/sources/media/icons/home/libreelec.png and /dev/null differ
diff --git a/packages/mediacenter/kodi-theme-Estuary/sources/media/icons/settings/libreelec.png b/packages/mediacenter/kodi-theme-Estuary/sources/media/icons/settings/libreelec.png
new file mode 100644
index 0000000000..7dfd90398b
Binary files /dev/null and b/packages/mediacenter/kodi-theme-Estuary/sources/media/icons/settings/libreelec.png differ