diff --git a/src/apps/draw/DrawGallery.tsx b/src/apps/draw/DrawGallery.tsx
index f3a8f3f28..9891a2244 100644
--- a/src/apps/draw/DrawGallery.tsx
+++ b/src/apps/draw/DrawGallery.tsx
@@ -1,8 +1,7 @@
 import * as React from 'react';
 import { Box, Table } from '@mui/joy';
 
-import { DBlobAssetType, DBlobImageAsset } from '~/common/stores/blob/dblobs-portability';
-import { useDBAssetsByScopeAndType } from '~/common/stores/blob/dblobs-portability';
+import { DBlobAssetType, DBlobImageAsset, useDBAssetsByScopeAndType } from '~/common/stores/blob/dblobs-portability';
 
 import { ZeroGallery } from './gallery/ZeroGallery';
 
diff --git a/src/common/attachment-drafts/attachment.dblobs.ts b/src/common/attachment-drafts/attachment.dblobs.ts
index 857eba72d..08a859439 100644
--- a/src/common/attachment-drafts/attachment.dblobs.ts
+++ b/src/common/attachment-drafts/attachment.dblobs.ts
@@ -1,6 +1,4 @@
-import type { DBlobDBContextId, DBlobDBScopeId } from '~/common/stores/blob/dblobs-portability';
-import { addDBImageAsset } from '~/common/stores/blob/dblobs-portability';
-import { deleteDBAsset, gcDBAssetsByScope, transferDBAssetContextScope } from '~/common/stores/blob/dblobs-portability';
+import { addDBImageAsset, DBlobDBContextId, DBlobDBScopeId, deleteDBAsset, gcDBAssetsByScope, transferDBAssetContextScope } from '~/common/stores/blob/dblobs-portability';
 
 import { CommonImageMimeTypes, imageBlobTransform, LLMImageResizeMode } from '~/common/util/imageUtils';
 import { convert_Base64WithMimeType_To_Blob } from '~/common/util/blobUtils';
diff --git a/src/common/stores/chat/chat.gc.ts b/src/common/stores/chat/chat.gc.ts
index 8451ebc40..047977df2 100644
--- a/src/common/stores/chat/chat.gc.ts
+++ b/src/common/stores/chat/chat.gc.ts
@@ -1,5 +1,4 @@
-import type { DBlobAssetId } from '~/common/stores/blob/dblobs-portability';
-import { gcDBImageAssets } from '~/common/stores/blob/dblobs-portability';
+import { DBlobAssetId, gcDBImageAssets } from '~/common/stores/blob/dblobs-portability';
 
 import type { DConversation } from './chat.conversation';
 import { isContentOrAttachmentFragment, isImageRefPart } from './chat.fragments';
diff --git a/src/modules/blocks/image/RenderImageRefDBlob.tsx b/src/modules/blocks/image/RenderImageRefDBlob.tsx
index fbb14f55a..a596cd159 100644
--- a/src/modules/blocks/image/RenderImageRefDBlob.tsx
+++ b/src/modules/blocks/image/RenderImageRefDBlob.tsx
@@ -5,9 +5,9 @@ import { useQuery } from '@tanstack/react-query';
 import type { SxProps } from '@mui/joy/styles/types';
 import { Box } from '@mui/joy';
 
-import type { DBlobAssetId, DBlobImageAsset } from '~/common/stores/blob/dblobs-portability';
 import { t2iGenerateImageContentFragments } from '~/modules/t2i/t2i.client';
-import { useDBAsset } from '~/common/stores/blob/dblobs-portability';
+
+import { DBlobAssetId, DBlobImageAsset, useDBAsset } from '~/common/stores/blob/dblobs-portability';
 
 import type { DMessageContentFragment } from '~/common/stores/chat/chat.fragments';
 import { humanReadableBytes } from '~/common/util/textUtils';
diff --git a/src/modules/t2i/t2i.client.ts b/src/modules/t2i/t2i.client.ts
index e571ae85d..64df7cb73 100644
--- a/src/modules/t2i/t2i.client.ts
+++ b/src/modules/t2i/t2i.client.ts
@@ -1,12 +1,12 @@
 import * as React from 'react';
 
 import type { AixParts_InlineImagePart } from '~/modules/aix/server/api/aix.wiretypes';
-import type { DBlobDBContextId, DBlobDBScopeId } from '~/common/stores/blob/dblobs-portability';
 import type { ModelVendorId } from '~/modules/llms/vendors/vendors.registry';
-import { addDBImageAsset } from '~/common/stores/blob/dblobs-portability';
 import { getBackendCapabilities } from '~/modules/backend/store-backend-capabilities';
 import { useDalleStore } from '~/modules/t2i/dalle/store-module-dalle';
 
+import { addDBImageAsset, DBlobDBScopeId } from '~/common/stores/blob/dblobs-portability';
+
 import type { CapabilityTextToImage, TextToImageProvider } from '~/common/components/useCapabilities';
 import type { DLLM } from '~/common/stores/llms/llms.types';
 import type { DModelsService, DModelsServiceId } from '~/common/stores/llms/llms.service.types';