diff --git a/indra/newview/llpanelprofile.cpp b/indra/newview/llpanelprofile.cpp
index 499e22edd1..fea1989e7e 100644
--- a/indra/newview/llpanelprofile.cpp
+++ b/indra/newview/llpanelprofile.cpp
@@ -927,7 +927,10 @@ BOOL LLPanelProfileSecondLife::postBuild()
     //mShowInSearchCombo      = getChild<LLComboBox>("show_in_search");
     mShowInSearchCheckbox   = getChild<LLCheckBoxCtrl>("show_in_search");
     // </FS:Ansariel>
-    mSecondLifePic          = getChild<LLIconCtrl>("2nd_life_pic");
+    // <FS:Zi> Allow proper texture swatch handling
+    // mSecondLifePic          = getChild<LLIconCtrl>("2nd_life_pic");
+    mSecondLifePic          = getChild<LLTextureCtrl>("2nd_life_pic");
+    // <FS:Zi>
     mSecondLifePicLayout    = getChild<LLPanel>("image_panel");
     mDescriptionEdit        = getChild<LLTextEditor>("sl_description_edit");
     // mAgentActionMenuButton  = getChild<LLMenuButton>("agent_actions_menu"); // <FS:Ansariel> Fix LL UI/UX design accident
@@ -981,7 +984,10 @@ BOOL LLPanelProfileSecondLife::postBuild()
     mCantSeeOnMapIcon->setMouseUpCallback([this](LLUICtrl*, S32 x, S32 y, MASK mask) { onShowAgentPermissionsDialog(); });
     mCanEditObjectsIcon->setMouseUpCallback([this](LLUICtrl*, S32 x, S32 y, MASK mask) { onShowAgentPermissionsDialog(); });
     mCantEditObjectsIcon->setMouseUpCallback([this](LLUICtrl*, S32 x, S32 y, MASK mask) { onShowAgentPermissionsDialog(); });
-    mSecondLifePic->setMouseUpCallback([this](LLUICtrl*, S32 x, S32 y, MASK mask) { onShowAgentProfileTexture(); });
+    // <FS:Zi> Allow proper texture swatch handling
+    // mSecondLifePic->setMouseUpCallback([this](LLUICtrl*, S32 x, S32 y, MASK mask) { onShowAgentProfileTexture(); });
+    mSecondLifePic->setCommitCallback(boost::bind(&LLPanelProfileSecondLife::onSecondLifePicChanged, this));
+    // </FS:Zi>
 
     // <FS:Ansariel> RLVa support
     mRlvBehaviorCallbackConnection = gRlvHandler.setBehaviourCallback(boost::bind(&LLPanelProfileSecondLife::updateRlvRestrictions, this, _1));
@@ -1074,6 +1080,9 @@ void LLPanelProfileSecondLife::onOpen(const LLSD& key)
     // <FS:Ansariel> Display agent ID
     getChild<LLUICtrl>("user_key")->setValue(avatar_id.asString());
 
+    // <FS:Zi> Allow proper texture swatch handling
+    mSecondLifePic->setEnabled(own_profile);
+
     mAvatarNameCacheConnection = LLAvatarNameCache::get(getAvatarId(), boost::bind(&LLPanelProfileSecondLife::onAvatarNameCache, this, _1, _2));
 }
 
@@ -2283,6 +2292,13 @@ void LLPanelProfileSecondLife::onShowTexturePicker()
     }
 }
 
+// <FS:Zi> Allow proper texture swatch handling
+void LLPanelProfileSecondLife::onSecondLifePicChanged()
+{
+    onCommitProfileImage(mSecondLifePic->getImageAssetID());
+}
+// </FS:Zi>
+
 void LLPanelProfileSecondLife::onCommitProfileImage(const LLUUID& id)
 {
     if (mImageId == id)
@@ -2511,7 +2527,10 @@ LLPanelProfileFirstLife::~LLPanelProfileFirstLife()
 BOOL LLPanelProfileFirstLife::postBuild()
 {
     mDescriptionEdit = getChild<LLTextEditor>("fl_description_edit");
-    mPicture = getChild<LLIconCtrl>("real_world_pic");
+    // <FS:Zi> Allow proper texture swatch handling
+    // mPicture = getChild<LLIconCtrl>("real_world_pic");
+    mPicture = getChild<LLTextureCtrl>("real_world_pic");
+    // </FS:Zi>
 
     mUploadPhoto = getChild<LLButton>("fl_upload_image");
     mChangePhoto = getChild<LLButton>("fl_change_image");
@@ -2525,7 +2544,7 @@ BOOL LLPanelProfileFirstLife::postBuild()
     mSaveChanges->setCommitCallback([this](LLUICtrl*, void*) { onSaveDescriptionChanges(); }, nullptr);
     mDiscardChanges->setCommitCallback([this](LLUICtrl*, void*) { onDiscardDescriptionChanges(); }, nullptr);
     mDescriptionEdit->setKeystrokeCallback([this](LLTextEditor* caller) { onSetDescriptionDirty(); });
-    mPicture->setMouseUpCallback([this](LLUICtrl*, S32 x, S32 y, MASK mask) { onShowPhoto(); }); // <FS:PP> Make "first life" picture clickable
+    mPicture->setCommitCallback(boost::bind(&LLPanelProfileFirstLife::onFirstLifePicChanged, this));    // <FS:Zi> Allow proper texture swatch handling
 
     return TRUE;
 }
@@ -2540,6 +2559,9 @@ void LLPanelProfileFirstLife::onOpen(const LLSD& key)
         mDescriptionEdit->setTabStop(FALSE);
     }
 
+    // <FS:Zi> Allow proper texture swatch handling
+    mPicture->setEnabled(getSelfProfile());
+
     resetData();
 }
 
@@ -2566,22 +2588,6 @@ void LLPanelProfileFirstLife::setProfileImageUploaded(const LLUUID &image_asset_
     mPicture->setValue(image_asset_id);
     mImageId = image_asset_id;
 
-    // <FS:PP> Make "first life" picture clickable
-    LLFloater *floater = mFloaterProfileTextureHandle.get();
-    if (floater)
-    {
-        LLFloaterProfileTexture * texture_view = dynamic_cast<LLFloaterProfileTexture*>(floater);
-        if (mImageId.notNull())
-        {
-            texture_view->loadAsset(mImageId);
-        }
-        else
-        {
-            texture_view->resetAsset();
-        }
-    }
-    // </FS:PP> Make "first life" picture clickable
-
     setProfileImageUploading(false);
 }
 
@@ -2680,51 +2686,12 @@ void LLPanelProfileFirstLife::onRemovePhoto()
     }
 }
 
-// <FS:PP> Make "first life" picture clickable
-void LLPanelProfileFirstLife::onShowPhoto()
+// <FS:Zi> Allow proper texture swatch handling
+void LLPanelProfileFirstLife::onFirstLifePicChanged()
 {
-    if (!getIsLoaded())
-    {
-        return;
-    }
-
-    LLFloater *floater = mFloaterProfileTextureHandle.get();
-    if (!floater)
-    {
-        LLFloater* parent_floater = gFloaterView->getParentFloater(this);
-        if (parent_floater)
-        {
-            LLFloaterProfileTexture * texture_view = new LLFloaterProfileTexture(parent_floater);
-            mFloaterProfileTextureHandle = texture_view->getHandle();
-            if (mImageId.notNull())
-            {
-                texture_view->loadAsset(mImageId);
-            }
-            else
-            {
-                texture_view->resetAsset();
-            }
-            texture_view->openFloater();
-            texture_view->setVisibleAndFrontmost(TRUE);
-            parent_floater->addDependentFloater(mFloaterProfileTextureHandle);
-        }
-    }
-    else // already open
-    {
-        LLFloaterProfileTexture * texture_view = dynamic_cast<LLFloaterProfileTexture*>(floater);
-        texture_view->setMinimized(FALSE);
-        texture_view->setVisibleAndFrontmost(TRUE);
-        if (mImageId.notNull())
-        {
-            texture_view->loadAsset(mImageId);
-        }
-        else
-        {
-            texture_view->resetAsset();
-        }
-    }
+    onCommitPhoto(mPicture->getImageAssetID());
 }
-// </FS:PP> Make "first life" picture clickable
+// </FS:Zi>
 
 void LLPanelProfileFirstLife::onCommitPhoto(const LLUUID& id)
 {
@@ -2751,22 +2718,6 @@ void LLPanelProfileFirstLife::onCommitPhoto(const LLUUID& id)
             mPicture->setValue("Generic_Person_Large");
         }
 
-        // <FS:PP> Make "first life" picture clickable
-        LLFloater *floater = mFloaterProfileTextureHandle.get();
-        if (floater)
-        {
-            LLFloaterProfileTexture * texture_view = dynamic_cast<LLFloaterProfileTexture*>(floater);
-            if (mImageId == LLUUID::null)
-            {
-                texture_view->resetAsset();
-            }
-            else
-            {
-                texture_view->loadAsset(mImageId);
-            }
-        }
-        // </FS:PP> Make "first life" picture clickable
-
         mRemovePhoto->setEnabled(mImageId.notNull());
     }
     else
diff --git a/indra/newview/llpanelprofile.h b/indra/newview/llpanelprofile.h
index 1ff9babe8c..691fcaae7a 100644
--- a/indra/newview/llpanelprofile.h
+++ b/indra/newview/llpanelprofile.h
@@ -201,6 +201,7 @@ private:
     void onShowAgentPermissionsDialog();
     void onShowAgentProfileTexture();
     void onShowTexturePicker();
+    void onSecondLifePicChanged();  // <FS:Zi> Allow proper texture swatch handling
     void onCommitProfileImage(const LLUUID& id);
 
     // <FS:Ansariel> Fix LL UI/UX design accident
@@ -217,7 +218,10 @@ private:
     //LLComboBox*			mShowInSearchCombo;
 	LLCheckBoxCtrl*		mShowInSearchCheckbox;
 	// </FS:Ansariel>
-	LLIconCtrl*			mSecondLifePic;
+    // <FS:Zi> Allow proper texture swatch handling
+	// LLIconCtrl*			mSecondLifePic;
+	LLTextureCtrl*		mSecondLifePic;
+    // </FS:Zi>
 	LLPanel*			mSecondLifePicLayout;
     LLTextEditor*		mDescriptionEdit;
     //LLMenuButton*		mAgentActionMenuButton; // <FS:Ansariel> Fix LL UI/UX design accident
@@ -341,6 +345,7 @@ protected:
     void onUploadPhoto();
     void onChangePhoto();
     void onRemovePhoto();
+    void onFirstLifePicChanged();   // <FS:Zi> Allow proper texture swatch handling
     void onCommitPhoto(const LLUUID& id);
     void setDescriptionText(const std::string &text);
     void onSetDescriptionDirty();
@@ -348,7 +353,10 @@ protected:
     void onDiscardDescriptionChanges();
 
 	LLTextEditor*	mDescriptionEdit;
-    LLIconCtrl*		mPicture;
+    // <FS:Zi> Allow proper texture swatch handling
+    // LLIconCtrl*		mPicture;
+    LLTextureCtrl* mPicture;
+    // </FS:Zi>
     LLButton* mUploadPhoto;
     LLButton* mChangePhoto;
     LLButton* mRemovePhoto;
@@ -360,13 +368,6 @@ protected:
     std::string		mCurrentDescription;
     LLUUID			mImageId;
     bool			mHasUnsavedChanges;
-
-// <FS:PP> Make "first life" picture clickable
-private:
-    LLHandle<LLFloater>	mFloaterProfileTextureHandle;
-    void onShowPhoto();
-// </FS:PP> Make "first life" picture clickable
-
 };
 
 /**
diff --git a/indra/newview/skins/default/xui/en/panel_profile_firstlife.xml b/indra/newview/skins/default/xui/en/panel_profile_firstlife.xml
index 0263e76698..f535eb10a7 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_firstlife.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_firstlife.xml
@@ -24,9 +24,8 @@
      layout="topleft"
      visible="false"
     />
-    <icon
+    <texture_picker
      name="real_world_pic"
-     interactable="true"
      image_name="Generic_Person_Large"
      follows="top|left"
      layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
index 8383b4495c..9643eb3d64 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
@@ -351,15 +351,14 @@
          height="158"
          auto_resize="false"
          user_resize="false">
-            <icon
+            <texture_picker
              name="2nd_life_pic"
              top="0"
              left="0"
              width="158"
              height="158"
              follows="all"
-             layout="topleft"
-             interactable="true"/>
+             layout="topleft" />
 
             <loading_indicator
              name="image_upload_indicator"
diff --git a/indra/newview/skins/vintage/xui/en/panel_profile_secondlife.xml b/indra/newview/skins/vintage/xui/en/panel_profile_secondlife.xml
index af06673954..8be1da2c85 100644
--- a/indra/newview/skins/vintage/xui/en/panel_profile_secondlife.xml
+++ b/indra/newview/skins/vintage/xui/en/panel_profile_secondlife.xml
@@ -231,15 +231,14 @@
       auto_resize="false"
       user_resize="false">
 
-      <icon
+      <texture_picker
         name="2nd_life_pic"
         top="0"
         left="0"
         width="158"
         height="158"
         follows="all"
-        layout="topleft"
-        interactable="true" />
+        layout="topleft" />
 
       <loading_indicator
         name="image_upload_indicator"