diff --git a/src/renderer/components/BaseIcon.vue b/src/renderer/components/BaseIcon.vue
index 53c83d4b..333473c3 100644
--- a/src/renderer/components/BaseIcon.vue
+++ b/src/renderer/components/BaseIcon.vue
@@ -39,11 +39,11 @@ const props = defineProps({
       default: () => 'mdi'
    },
    flip: {
-      type: String as PropType<'horizontal' | 'vertical' | 'both'>,
+      type: String as PropType<'horizontal' | 'vertical' | 'both' | null>,
       default: () => null
    },
    rotate: {
-      type: Number,
+      type: Number as PropType<number | null>,
       default: () => null
    }
 });
@@ -55,8 +55,7 @@ const iconPath = computed(() => {
       const base64 = getIconByUid(props.iconName)?.base64;
       const svgString = Buffer
          .from(base64, 'base64')
-         .toString('utf-8')
-         .replaceAll(/width="[^"]*"|height="[^"]*"/g, '');
+         .toString('utf-8');
 
       return svgString;
    }
diff --git a/src/renderer/components/ModalConnectionAppearance.vue b/src/renderer/components/ModalConnectionAppearance.vue
index 15a432c3..6e761179 100644
--- a/src/renderer/components/ModalConnectionAppearance.vue
+++ b/src/renderer/components/ModalConnectionAppearance.vue
@@ -131,8 +131,10 @@ import Application from '@/ipc-api/Application';
 import { camelize } from '@/libs/camelize';
 import { unproxify } from '@/libs/unproxify';
 import { SidebarElement, useConnectionsStore } from '@/stores/connections';
+import { useNotificationsStore } from '@/stores/notifications';
 
 const connectionsStore = useConnectionsStore();
+const { addNotification } = useNotificationsStore();
 
 const { addIcon, removeIcon, updateConnectionOrder, getConnectionName } = connectionsStore;
 const { customIcons } = storeToRefs(connectionsStore);
@@ -225,12 +227,56 @@ const removeIconHandler = () => {
    isContext.value = false;
 };
 
+const adjustSVGContent = (svgContent: string) => {
+   try {
+      const parser = new DOMParser();
+      const doc = parser.parseFromString(svgContent, 'image/svg+xml');
+
+      const parseError = doc.querySelector('parsererror');
+      if (parseError) {
+         addNotification({ status: 'error', message: parseError.textContent });
+         return null;
+      }
+
+      const svg = doc.documentElement;
+      if (svg.tagName.toLowerCase() !== 'svg') {
+         addNotification({ status: 'error', message: t('application.invalidFIle') });
+         return null;
+      }
+
+      if (!svg.hasAttribute('viewBox')) {
+         const width = svg.getAttribute('width') || '36';
+         const height = svg.getAttribute('height') || '36';
+         svg.setAttribute('viewBox', `0 0 ${width} ${height}`);
+      }
+
+      svg.removeAttribute('width');
+      svg.removeAttribute('height');
+
+      const serializer = new XMLSerializer();
+      return serializer.serializeToString(svg);
+   }
+   catch (error) {
+      addNotification({ status: 'error', message: error.stack });
+      return null;
+   }
+};
+
 const openFile = async () => {
-   const result = await Application.showOpenDialog({ properties: ['openFile'], filters: [{ name: '"SVG"', extensions: ['svg'] }] });
+   const result = await Application.showOpenDialog({
+      properties: ['openFile'],
+      filters: [{ name: '"SVG"', extensions: ['svg'] }]
+   });
+
    if (result && !result.canceled) {
       const file = result.filePaths[0];
-      const content = await Application.readFile({ filePath: file, encoding: 'base64url' });
-      addIcon(content);
+      let content = await Application.readFile({ filePath: file, encoding: 'utf-8' });
+
+      content = adjustSVGContent(content);
+
+      const base64Content = Buffer.from(content).toString('base64');
+
+      addIcon(base64Content);
    }
 };
 
diff --git a/src/renderer/i18n/en-US.ts b/src/renderer/i18n/en-US.ts
index 729cd7a6..5f317e7f 100644
--- a/src/renderer/i18n/en-US.ts
+++ b/src/renderer/i18n/en-US.ts
@@ -401,6 +401,7 @@ export const enUS = {
       ignoreDuplicates: 'Ignore duplicates',
       wrongImportPassword: 'Wrong import password',
       wrongFileFormat: 'Wrong file format',
+      invalidFile: 'Invalid file',
       dataImportSuccess: 'Data successfully imported',
       note: 'Note | Notes',
       thereAreNoNotesYet: 'There are no notes yet',