diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index aa4c23e214..a369cd4eb5 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -14247,6 +14247,17 @@ Change of this parameter will affect the layout of buttons in notification toast
 			<key>Value</key>
 			<integer>0</integer>
 		</map>
+		<key>PhoenixToolboxExpanded</key>
+		<map>
+			<key>Comment</key>
+			<string>Whether to show additional build tool controls</string>
+			<key>Persist</key>
+			<integer>1</integer>
+			<key>Type</key>
+			<string>Boolean</string>
+			<key>Value</key>
+			<integer>1</integer>
+		</map>
 		
 </map>
 </llsd>
diff --git a/indra/newview/llfloatertools.cpp b/indra/newview/llfloatertools.cpp
index d9b0c6cd66..5b6c5d2e26 100644
--- a/indra/newview/llfloatertools.cpp
+++ b/indra/newview/llfloatertools.cpp
@@ -102,7 +102,7 @@ const std::string PANEL_NAMES[LLFloaterTools::PANEL_COUNT] =
 
 // Local prototypes
 void commit_select_component(void *data);
-void click_show_more(void*);
+//void click_show_more(void*);
 void click_popup_info(void*);
 void click_popup_done(void*);
 void click_popup_minimize(void*);
@@ -117,7 +117,6 @@ void commit_radio_group_edit(LLUICtrl* ctrl);
 void commit_radio_group_land(LLUICtrl* ctrl);
 void commit_grid_mode(LLUICtrl *);
 void commit_slider_zoom(LLUICtrl *ctrl);
-void commit_show_highlight(LLUICtrl *, void*);
 
 
 //static
@@ -278,8 +277,8 @@ BOOL	LLFloaterTools::postBuild()
 	mTab = getChild<LLTabContainer>("Object Info Tabs");
 	if(mTab)
 	{
-		mTab->setFollows(FOLLOWS_TOP | FOLLOWS_LEFT);
-		mTab->setBorderVisible(FALSE);
+		//mTab->setFollows(FOLLOWS_TOP | FOLLOWS_LEFT);
+		//mTab->setBorderVisible(FALSE);
 		mTab->selectFirstTab();
 	}
 
@@ -294,6 +293,22 @@ BOOL	LLFloaterTools::postBuild()
 
 	sShowObjectCost = gSavedSettings.getBOOL("ShowObjectRenderingCost");
 	
+	//Phoenix:KC - added back more/less button
+	LLButton* btnExpand = getChild<LLButton>("btnExpand");
+	if (btnExpand)
+	{
+		mExpandedHeight = getRect().getHeight();
+		if (mTab) mCollapsedHeight = mExpandedHeight - mTab->getRect().getHeight() + btnExpand->getRect().getHeight();
+		if(!gSavedSettings.getBOOL("PhoenixToolboxExpanded"))
+		{
+			btnExpand->setImageOverlay("Arrow_Down", btnExpand->getImageOverlayHAlign());
+		}
+	}
+	else
+	{
+		gSavedSettings.setBOOL("PhoenixToolboxExpanded", TRUE);
+	}
+
 	return TRUE;
 }
 
@@ -320,8 +335,8 @@ LLFloaterTools::LLFloaterTools(const LLSD& key)
 	mComboGridMode(NULL),
 	mCheckStretchUniform(NULL),
 	mCheckStretchTexture(NULL),
-	mCheckShowHighlight(NULL),
-	mCheckActualRoot(NULL),
+	mCheckShowHighlight(NULL), //Phoenix:KC
+	mCheckActualRoot(NULL), //Phoenix:KC
 
 	mBtnRotateLeft(NULL),
 	mBtnRotateReset(NULL),
@@ -385,6 +400,7 @@ LLFloaterTools::LLFloaterTools(const LLSD& key)
 	mCommitCallbackRegistrar.add("BuildTool.UnlinkObjects",		boost::bind(&LLSelectMgr::unlinkObjects, LLSelectMgr::getInstance()));
 
 	mCommitCallbackRegistrar.add("BuildTool.CopyKeys",			boost::bind(&LLFloaterTools::onClickBtnCopyKeys,this));
+	mCommitCallbackRegistrar.add("BuildTool.Expand",			boost::bind(&LLFloaterTools::onClickExpand,this));
 }
 
 LLFloaterTools::~LLFloaterTools()
@@ -622,7 +638,8 @@ void LLFloaterTools::updatePopup(LLCoordGL center, MASK mask)
 
 	mBtnEdit	->setToggleState( edit_visible );
 	mRadioGroupEdit->setVisible( edit_visible );
-	bool linked_parts = gSavedSettings.getBOOL("EditLinkedParts");
+	//bool linked_parts = gSavedSettings.getBOOL("EditLinkedParts");
+	static LLCachedControl<bool> linked_parts(gSavedSettings,  "EditLinkedParts");
 	getChildView("RenderingCost")->setVisible( !linked_parts && (edit_visible || focus_visible || move_visible) && sShowObjectCost);
 
 	mBtnLink->setVisible(edit_visible);
@@ -743,7 +760,8 @@ void LLFloaterTools::updatePopup(LLCoordGL center, MASK mask)
 	}
 	else if ( tool == LLToolBrushLand::getInstance() )
 	{
-		S32 dozer_mode = gSavedSettings.getS32("RadioLandBrushAction");
+		//S32 dozer_mode = gSavedSettings.getS32("RadioLandBrushAction");
+		static LLCachedControl<S32> dozer_mode(gSavedSettings,  "RadioLandBrushAction");
 		switch(dozer_mode)
 		{
 		case 0:
@@ -788,8 +806,9 @@ void LLFloaterTools::updatePopup(LLCoordGL center, MASK mask)
 
 	getChildView("obj_count")->setVisible( !land_visible);
 	getChildView("prim_count")->setVisible( !land_visible);
-	mTab->setVisible(!land_visible);
-	mPanelLandInfo->setVisible(land_visible);
+	static LLCachedControl<bool> sPhoenixToolboxExpanded(gSavedSettings,  "PhoenixToolboxExpanded", TRUE);
+	mTab->setVisible(!land_visible && sPhoenixToolboxExpanded);
+	mPanelLandInfo->setVisible(land_visible && sPhoenixToolboxExpanded);
 }
 
 
@@ -1967,3 +1986,25 @@ void LLFloaterTools::onClickBtnCopyKeys()
 		LLView::getWindow()->copyTextToClipboard(utf8str_to_wstring(stringKeys));
 	}
 }
+
+void LLFloaterTools::onClickExpand()
+{
+	BOOL show_more = !gSavedSettings.getBOOL("PhoenixToolboxExpanded");
+	gSavedSettings.setBOOL("PhoenixToolboxExpanded", show_more);
+
+	LLButton* btnExpand = getChild<LLButton>("btnExpand");
+	if (show_more)
+	{
+		mTab->setVisible(TRUE);
+		reshape( getRect().getWidth(), mExpandedHeight);
+		translate( 0, mCollapsedHeight - mExpandedHeight );
+		btnExpand->setImageOverlay("Arrow_Up", btnExpand->getImageOverlayHAlign());
+	}
+	else
+	{
+		mTab->setVisible(FALSE);
+		reshape( getRect().getWidth(), mCollapsedHeight);
+		translate( 0, mExpandedHeight - mCollapsedHeight );
+		btnExpand->setImageOverlay("Arrow_Down", btnExpand->getImageOverlayHAlign());
+	}
+}
diff --git a/indra/newview/llfloatertools.h b/indra/newview/llfloatertools.h
index 84608f4776..c32288bd92 100644
--- a/indra/newview/llfloatertools.h
+++ b/indra/newview/llfloatertools.h
@@ -106,6 +106,7 @@ public:
 	bool selectedMediaEditable();
 
 	void onClickBtnCopyKeys();
+	void onClickExpand();
 
 private:
 	void refresh();
@@ -146,7 +147,7 @@ public:
 	LLCheckBoxCtrl*	mCheckStretchUniform;
 	LLCheckBoxCtrl*	mCheckStretchTexture;
 	LLCheckBoxCtrl*	mCheckShowHighlight; //Phoenix:KC
-	LLCheckBoxCtrl*	mCheckActualRoot;
+	LLCheckBoxCtrl*	mCheckActualRoot; //Phoenix:KC
 
 	// Ansariel: Reverted the hack because then when clicking the label it
 	//           doesn't check the checkbox anymore!
@@ -197,6 +198,9 @@ private:
 	BOOL					mOrginalShowHighlight; //Phoenix:KC
 	BOOL					mOpen; //Phoenix:KC
 
+	//Phoenix:KC
+	S32					mCollapsedHeight;
+	S32					mExpandedHeight;
 	std::map<std::string, std::string> mStatusText;
 
 protected:
diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index 3af2c0b2f2..049581098f 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -9,7 +9,7 @@
 <floater
  legacy_header_height="18"
  follows="left|top|right"
- height="580"
+ height="588"
  layout="topleft"
  name="toolbox floater"
  help_topic="toolbox_floater"
@@ -365,6 +365,7 @@
      image_selected="ForwardArrow_Press"
      image_unselected="ForwardArrow_Off"
      layout="topleft"
+     follows="left|top"
      name="Options..."
      tool_tip="See more grid options"
      top="80"
@@ -810,7 +811,7 @@
      tab_max_width="100"
      tab_min_width="40"
      tab_position="top"
-     tab_height="25"
+     tab_height="20"
      top="173"
      width="295">
 	<panel
@@ -3345,4 +3346,17 @@ even though the user gets a free copy.
          width="125" />
  </panel>
 <!-- end of tabs -->
+	<button
+	 bottom="-1"
+	 follows="left|bottom|right"
+	 halign="center"
+	 left="1"
+	 right="-1"
+	 height="12"
+	 image_overlay="Arrow_Up"
+	 name="btnExpand"
+	 scale_image="TRUE">
+		<button.commit_callback
+		function="BuildTool.Expand"/>
+	</button>
 </floater>