diff --git a/720p/Home.xml b/720p/Home.xml
index 1228732..d4f7c18 100644
--- a/720p/Home.xml
+++ b/720p/Home.xml
@@ -499,7 +499,8 @@
 			<onleft>9000</onleft>
 			<onright>9000</onright>
 			<onup>20</onup>
-			<ondown>608</ondown>
+			<ondown condition="Control.IsVisible(600)">600</ondown>
+			<ondown condition="!Control.IsVisible(600)">9000</ondown>
 			<visible>false</visible>
 		</control>
 		<control type="group">
@@ -519,43 +520,12 @@
 			<visible>String.IsEmpty(Window(Videos).Property(PlayingBackgroundMedia))</visible>
 			<control type="image">
 				<description>Background End image</description>
-				<left>0</left>
+				<left>145</left>
 				<top>0</top>
 				<width>35</width>
 				<height>35</height>
 				<colordiffuse>CCFFFFFF</colordiffuse>
 				<texture flipy="true" border="0,5,0,0" flipx="true">HomeSubEnd.png</texture>
-				<animation effect="slide" start="0,0" end="145,0" time="0" condition="!System.AddonIsEnabled(script.globalsearch)">Conditional</animation>
-			</control>
-			<control type="radiobutton" id="608">
-				<colordiffuse>CCFFFFFF</colordiffuse>
-				<description>Global Search</description>
-				<left>35</left>
-				<top>0</top>
-				<height>35</height>
-				<width>145</width>
-				<textwidth>150</textwidth>
-				<textoffsetx>10</textoffsetx>
-				<align>left</align>
-				<aligny>center</aligny>
-				<font>font12</font>
-				<textcolor>grey2</textcolor>
-				<focusedcolor>white</focusedcolor>
-				<texturefocus flipy="true" border="5">HomeSubFO.png</texturefocus>
-				<texturenofocus flipy="true" border="5">HomeSubNF.png</texturenofocus>
-				<pulseonselect>false</pulseonselect>
-				<label>137</label>
-				<onclick condition="System.AddonIsEnabled(script.globalsearch)">RunScript(script.globalsearch)</onclick>
-				<onclick condition="!System.AddonIsEnabled(script.globalsearch) + System.HasAddon(script.globalsearch)">EnableAddon(script.globalsearch)</onclick>
-				<onclick condition="!System.HasAddon(script.globalsearch)">InstallAddon(script.globalsearch)</onclick>
-				<textureradioonfocus>icon_search_home.png</textureradioonfocus>
-				<textureradioonnofocus>icon_search_home.png</textureradioonnofocus>
-				<textureradioofffocus>icon_search_home.png</textureradioofffocus>
-				<textureradiooffnofocus>icon_search_home.png</textureradiooffnofocus>
-				<onleft>607</onleft>
-				<onright>601</onright>
-				<onup>9003</onup>
-				<ondown>9000</ondown>
 			</control>
 			<control type="group" id="600">
 				<left>180</left>
@@ -582,7 +552,7 @@
 						<label/>
 						<texturefocus>OSDPrevTrackFO.png</texturefocus>
 						<texturenofocus>OSDPrevTrackNF.png</texturenofocus>
-						<onleft>608</onleft>
+						<onleft>607</onleft>
 						<onright>602</onright>
 						<onup>9003</onup>
 						<ondown>9000</ondown>
@@ -673,7 +643,7 @@
 						<label/>
 						<texturefocus>OSDChannelUPFO.png</texturefocus>
 						<texturenofocus>OSDChannelUPNF.png</texturenofocus>
-						<onleft>608</onleft>
+						<onleft>607</onleft>
 						<onright>602</onright>
 						<onup>9003</onup>
 						<ondown>9000</ondown>
@@ -783,7 +753,7 @@
 				<textureradioofffocus>GoFullscreen.png</textureradioofffocus>
 				<textureradiooffnofocus>GoFullscreen.png</textureradiooffnofocus>
 				<onleft>606</onleft>
-				<onright>608</onright>
+				<onright>601</onright>
 				<onup>9003</onup>
 				<ondown>9000</ondown>
 				<enable>Player.HasMedia</enable>
@@ -908,7 +878,7 @@
 				<height>60</height>
 				<onleft>9000</onleft>
 				<onright>9000</onright>
-				<onup>608</onup>
+				<onup>601</onup>
 				<ondown>9001</ondown>
 				<pagecontrol/>
 				<scrolltime>300</scrolltime>
@@ -1188,55 +1158,91 @@
 			<left>20</left>
 			<top>55r</top>
 			<include>Window_OpenClose_Animation</include>
-			<control type="button" id="20">
-				<description>Favourites push button</description>
-				<left>55</left>
-				<top>0</top>
-				<width>45</width>
-				<height>45</height>
-				<label>31003</label>
-				<font/>
-				<onclick>ActivateWindow(Favourites)</onclick>
-				<texturefocus border="5">floor_buttonFO.png</texturefocus>
-				<texturenofocus border="5">floor_button.png</texturenofocus>
-				<onleft>21</onleft>
-				<onright>noop</onright>
-				<onup>9002</onup>
-				<ondown>9003</ondown>
+			<control type="group">
+				<visible>!Skin.HasSetting(HomepageHideFavourite)</visible>
+				<control type="button" id="20">
+					<description>Favourites push button</description>
+					<left>55</left>
+					<top>0</top>
+					<width>45</width>
+					<height>45</height>
+					<label>31003</label>
+					<font/>
+					<onclick>ActivateWindow(Favourites)</onclick>
+					<texturefocus border="5">floor_buttonFO.png</texturefocus>
+					<texturenofocus border="5">floor_button.png</texturenofocus>
+					<onleft>21</onleft>
+					<onright>22</onright>
+					<onup>9002</onup>
+					<ondown>9003</ondown>
+				</control>
+				<control type="image">
+					<description>Favourites Icon</description>
+					<left>60</left>
+					<top>5</top>
+					<width>35</width>
+					<height>35</height>
+					<aspectratio>keep</aspectratio>
+					<texture>icon_favourites.png</texture>
+				</control>
 			</control>
-			<control type="image">
-				<description>Favourites Icon</description>
-				<left>60</left>
-				<top>5</top>
-				<width>35</width>
-				<height>35</height>
-				<aspectratio>keep</aspectratio>
-				<texture>icon_favourites.png</texture>
+			<control type="group">
+				<control type="button" id="21">
+					<description>Power push button</description>
+					<left>0</left>
+					<top>0</top>
+					<width>45</width>
+					<height>45</height>
+					<label>1036</label>
+					<font/>
+					<onclick>ActivateWindow(ShutdownMenu)</onclick>
+					<texturefocus border="5">floor_buttonFO.png</texturefocus>
+					<texturenofocus border="5">floor_button.png</texturenofocus>
+					<onleft>22</onleft>
+					<onright>20</onright>
+					<onup>9002</onup>
+					<ondown>9003</ondown>
+				</control>
+				<control type="image">
+					<description>Power Icon</description>
+					<left>5</left>
+					<top>5</top>
+					<width>35</width>
+					<height>35</height>
+					<aspectratio>keep</aspectratio>
+					<texture>icon_power.png</texture>
+				</control>
 			</control>
-			<control type="button" id="21">
-				<description>Power push button</description>
-				<left>0</left>
-				<top>0</top>
-				<width>45</width>
-				<height>45</height>
-				<label>1036</label>
-				<font/>
-				<onclick>ActivateWindow(ShutdownMenu)</onclick>
-				<texturefocus border="5">floor_buttonFO.png</texturefocus>
-				<texturenofocus border="5">floor_button.png</texturenofocus>
-				<onleft>noop</onleft>
-				<onright>20</onright>
-				<onup>9002</onup>
-				<ondown>9003</ondown>
-			</control>
-			<control type="image">
-				<description>Power Icon</description>
-				<left>5</left>
-				<top>5</top>
-				<width>35</width>
-				<height>35</height>
-				<aspectratio>keep</aspectratio>
-				<texture>icon_power.png</texture>
+			<control type="group">
+				<visible>!Skin.HasSetting(HomepageHideSearch)</visible>
+				<animation effect="slide" start="0,0" end="-55,0" time="0" condition="Skin.HasSetting(HomepageHideFavourite)">conditional</animation>
+				<control type="button" id="22">
+					<description>Search push button</description>
+					<left>110</left>
+					<top>0</top>
+					<width>45</width>
+					<height>45</height>
+					<label>137</label>
+					<font/>
+					<onclick condition="System.AddonIsEnabled(script.globalsearch)">RunScript(script.globalsearch)</onclick>
+					<onclick condition="!System.AddonIsEnabled(script.globalsearch) + System.HasAddon(script.globalsearch)">EnableAddon(script.globalsearch)</onclick>
+					<onclick condition="!System.HasAddon(script.globalsearch)">InstallAddon(script.globalsearch)</onclick>
+					<texturefocus border="5">floor_buttonFO.png</texturefocus>
+					<texturenofocus border="5">floor_button.png</texturenofocus>
+					<onleft>20</onleft>
+					<onright>21</onright>
+					<onup>9002</onup>
+					<ondown>9003</ondown>
+				</control>
+				<control type="image">
+					<description>Search Icon</description>
+					<left>115</left>
+					<top>5</top>
+					<width>35</width>
+					<height>35</height>
+					<aspectratio>keep</aspectratio>
+					<texture>icon_search.png</texture>
+				</control>
 			</control>
 		</control>
 		<control type="group">
diff --git a/720p/IncludesHomeRecentlyAdded.xml b/720p/IncludesHomeRecentlyAdded.xml
index 7c93c78..2ee249c 100644
--- a/720p/IncludesHomeRecentlyAdded.xml
+++ b/720p/IncludesHomeRecentlyAdded.xml
@@ -4,7 +4,8 @@
 		<control type="group" id="9003">
 			<depth>DepthMenu</depth>
 			<onup>20</onup>
-			<ondown>608</ondown>
+			<ondown condition="Control.IsVisible(600)">600</ondown>
+			<ondown condition="!Control.IsVisible(600)">9000</ondown>
 			<visible>!Window.IsVisible(Favourites)</visible>
 			<include>VisibleFadeEffect</include>
 			<animation effect="fade" time="225" delay="750">WindowOpen</animation>
@@ -40,7 +41,8 @@
 					<onleft>8000</onleft>
 					<onright>8000</onright>
 					<onup>20</onup>
-					<ondown>608</ondown>
+					<ondown condition="Control.IsVisible(600)">600</ondown>
+					<ondown condition="!Control.IsVisible(600)">9000</ondown>
 					<viewtype label="535">list</viewtype>
 					<pagecontrol/>
 					<scrolltime>200</scrolltime>
@@ -194,7 +196,8 @@
 					<onleft>8001</onleft>
 					<onright>8001</onright>
 					<onup>20</onup>
-					<ondown>608</ondown>
+					<ondown condition="Control.IsVisible(600)">600</ondown>
+					<ondown condition="!Control.IsVisible(600)">9000</ondown>
 					<viewtype label="535">list</viewtype>
 					<pagecontrol/>
 					<scrolltime>200</scrolltime>
@@ -374,7 +377,8 @@
 					<onleft>8002</onleft>
 					<onright>8002</onright>
 					<onup>20</onup>
-					<ondown>608</ondown>
+					<ondown condition="Control.IsVisible(600)">600</ondown>
+					<ondown condition="!Control.IsVisible(600)">9000</ondown>
 					<viewtype label="535">list</viewtype>
 					<pagecontrol/>
 					<scrolltime>200</scrolltime>
diff --git a/720p/SkinSettings.xml b/720p/SkinSettings.xml
index 4e57714..77ec832 100644
--- a/720p/SkinSettings.xml
+++ b/720p/SkinSettings.xml
@@ -310,6 +310,7 @@
 					<onright>60</onright>
 					<onup>9002</onup>
 					<ondown>9002</ondown>
+					<!-- Home screen options -->
 					<control type="label" id="200">
 						<width>750</width>
 						<height>45</height>
@@ -386,6 +387,44 @@
 						<texturefocus>MenuItemFO.png</texturefocus>
 						<texturenofocus>MenuItemNF.png</texturenofocus>
 					</control>
+					<!-- Home screen buttons -->				
+					<control type="label" id="210">
+						<width>750</width>
+						<height>45</height>
+						<font>font13_title</font>
+						<label>31146</label>
+						<textcolor>blue</textcolor>
+						<shadowcolor>black</shadowcolor>
+						<align>left</align>
+						<aligny>center</aligny>
+					</control>
+					<control type="radiobutton" id="211">
+						<description>Show Search button</description>
+						<width>750</width>
+						<height>40</height>
+						<font>font13</font>
+						<textcolor>grey2</textcolor>
+						<focusedcolor>white</focusedcolor>
+						<label>31147</label>
+						<onclick>Skin.ToggleSetting(HomepageHideFavourite)</onclick>
+						<selected>Skin.HasSetting(HomepageHideFavourite)</selected>
+						<texturefocus>MenuItemFO.png</texturefocus>
+						<texturenofocus>MenuItemNF.png</texturenofocus>
+					</control>
+					<control type="radiobutton" id="212">
+						<description>Show Search button</description>
+						<width>750</width>
+						<height>40</height>
+						<font>font13</font>
+						<textcolor>grey2</textcolor>
+						<focusedcolor>white</focusedcolor>
+						<label>31148</label>
+						<onclick>Skin.ToggleSetting(HomepageHideSearch)</onclick>
+						<selected>Skin.HasSetting(HomepageHideSearch)</selected>
+						<texturefocus>MenuItemFO.png</texturefocus>
+						<texturenofocus>MenuItemNF.png</texturenofocus>
+					</control>					
+					<!-- Main menu buttons -->				
 					<control type="label" id="220">
 						<width>750</width>
 						<height>45</height>
@@ -515,7 +554,6 @@
 						<texturefocus>MenuItemFO.png</texturefocus>
 						<texturenofocus>MenuItemNF.png</texturenofocus>
 					</control>
-
 					<!-- Playlist buttons -->
 					<control type="label" id="247">
 						<width>750</width>
@@ -607,7 +645,6 @@
 						<onclick>Skin.SetFile(HomeMenuMusicPlaylist,*.xsp,special://profile/playlists/)</onclick>
 						<enable>Skin.HasSetting(HomeMenuMusicUsePlaylist)</enable>
 					</control>
-
 					<!-- Master buttons -->
 					<control type="label" id="230">
 						<width>750</width>
diff --git a/language/resource.language.en_gb/strings.po b/language/resource.language.en_gb/strings.po
index 5df00bb..81ecde0 100644
--- a/language/resource.language.en_gb/strings.po
+++ b/language/resource.language.en_gb/strings.po
@@ -373,7 +373,19 @@ msgctxt "#31145"
 msgid "playlist path"
 msgstr ""
 
-#empty strings from id 31146 to 31199
+msgctxt "#31146"
+msgid "Hide home screen buttons"
+msgstr ""
+
+msgctxt "#31147"
+msgid "Hide - Favourites"
+msgstr ""\
+
+msgctxt "#31148"
+msgid "Hide - Search"
+msgstr ""
+
+#empty strings from id 31149 to 31199
 
 msgctxt "#31200"
 msgid "Shortcuts"