diff --git a/api/core/tools/entities/api_entities.py b/api/core/tools/entities/api_entities.py
index d5d3d1b1d9..410ec72baf 100644
--- a/api/core/tools/entities/api_entities.py
+++ b/api/core/tools/entities/api_entities.py
@@ -75,22 +75,27 @@ class ToolProviderApiEntity(BaseModel):
                         parameter.pop("input_schema", None)
         # -------------
         optional_fields = self.optional_field("server_url", self.server_url)
-        if self.type == ToolProviderType.MCP:
-            optional_fields.update(self.optional_field("updated_at", self.updated_at))
-            optional_fields.update(self.optional_field("server_identifier", self.server_identifier))
-            optional_fields.update(
-                self.optional_field(
-                    "configuration", self.configuration.model_dump() if self.configuration else MCPConfiguration()
+        match self.type:
+            case ToolProviderType.MCP:
+                optional_fields.update(self.optional_field("updated_at", self.updated_at))
+                optional_fields.update(self.optional_field("server_identifier", self.server_identifier))
+                optional_fields.update(
+                    self.optional_field(
+                        "configuration", self.configuration.model_dump() if self.configuration else MCPConfiguration()
+                    )
                 )
-            )
-            optional_fields.update(
-                self.optional_field("authentication", self.authentication.model_dump() if self.authentication else None)
-            )
-            optional_fields.update(self.optional_field("is_dynamic_registration", self.is_dynamic_registration))
-            optional_fields.update(self.optional_field("masked_headers", self.masked_headers))
-            optional_fields.update(self.optional_field("original_headers", self.original_headers))
-        elif self.type == ToolProviderType.WORKFLOW:
-            optional_fields.update(self.optional_field("workflow_app_id", self.workflow_app_id))
+                optional_fields.update(
+                    self.optional_field(
+                        "authentication", self.authentication.model_dump() if self.authentication else None
+                    )
+                )
+                optional_fields.update(self.optional_field("is_dynamic_registration", self.is_dynamic_registration))
+                optional_fields.update(self.optional_field("masked_headers", self.masked_headers))
+                optional_fields.update(self.optional_field("original_headers", self.original_headers))
+            case ToolProviderType.WORKFLOW:
+                optional_fields.update(self.optional_field("workflow_app_id", self.workflow_app_id))
+            case _:
+                pass
         return {
             "id": self.id,
             "author": self.author,
diff --git a/api/services/tools/tools_transform_service.py b/api/services/tools/tools_transform_service.py
index b24f001133..4fd2ea1628 100644
--- a/api/services/tools/tools_transform_service.py
+++ b/api/services/tools/tools_transform_service.py
@@ -48,21 +48,25 @@ class ToolTransformService:
             URL(dify_config.CONSOLE_API_URL or "/") / "console" / "api" / "workspaces" / "current" / "tool-provider"
         )
 
-        if provider_type == ToolProviderType.BUILT_IN:
-            return str(url_prefix / "builtin" / provider_name / "icon")
-        elif provider_type in {ToolProviderType.API, ToolProviderType.WORKFLOW}:
-            try:
-                if isinstance(icon, str):
-                    parsed = emoji_icon_adapter.validate_json(icon)
-                    return {"background": parsed["background"], "content": parsed["content"]}
-                return {"background": icon["background"], "content": icon["content"]}
-            except (ValueError, ValidationError, KeyError):
-                return {"background": "#252525", "content": "\ud83d\ude01"}
-        elif provider_type == ToolProviderType.MCP:
-            if isinstance(icon, Mapping):
-                return {"background": icon.get("background", ""), "content": icon.get("content", "")}
-            return icon
-        return ""
+        match provider_type:
+            case ToolProviderType.BUILT_IN:
+                return str(url_prefix / "builtin" / provider_name / "icon")
+            case ToolProviderType.API | ToolProviderType.WORKFLOW:
+                try:
+                    if isinstance(icon, str):
+                        parsed = emoji_icon_adapter.validate_json(icon)
+                        return {"background": parsed["background"], "content": parsed["content"]}
+                    return {"background": icon["background"], "content": icon["content"]}
+                except (ValueError, ValidationError, KeyError):
+                    return {"background": "#252525", "content": "\ud83d\ude01"}
+            case ToolProviderType.MCP:
+                if isinstance(icon, Mapping):
+                    return {"background": icon.get("background", ""), "content": icon.get("content", "")}
+                return icon
+            case ToolProviderType.PLUGIN | ToolProviderType.APP | ToolProviderType.DATASET_RETRIEVAL:
+                return ""
+            case _:
+                return ""
 
     @staticmethod
     def repack_provider(tenant_id: str, provider: Union[dict, ToolProviderApiEntity, PluginDatasourceProviderEntity]):