diff --git a/src/assets/icons/calendar.svg b/src/assets/icons/calendar.svg
new file mode 100644
index 0000000..7ec143f
--- /dev/null
+++ b/src/assets/icons/calendar.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg height="100px" version="1.1" viewBox="0 0 100 100" width="100px"
+     xmlns="http://www.w3.org/2000/svg">
+    <g fill="none" fill-rule="evenodd" id="calendar" stroke="none" stroke-width="1">
+        <path
+            d="M35,70 L35,80 L25,80 L25,70 L35,70 Z M55,70 L55,80 L45,80 L45,70 L55,70 Z M35,55 L35,65 L25,65 L25,55 L35,55 Z M55,55 L55,65 L45,65 L45,55 L55,55 Z M75,55 L75,65 L65,65 L65,55 L75,55 Z M55,40 L55,50 L45,50 L45,40 L55,40 Z M75,40 L75,50 L65,50 L65,40 L75,40 Z"
+            fill="currentColor" fill-rule="nonzero" id="Combined-Shape"></path>
+        <path
+            d="M90,0 L10,0 C4.5,0 0,4.5 0,10 L0,90 C0,95.5 4.5,100 10,100 L90,100 C95.5,100 100,95.5 100,90 L100,10 C100,4.5 95.5,0 90,0 Z M10,90 L10,10 L90,10 L90,90 L10,90 Z"
+            fill="currentColor" fill-rule="nonzero" id="Shape"></path>
+        <path
+            d="M90,20 L10,20 C4.5,20 0,24.5 0,30 L0,90 C0,95.5 4.5,100 10,100 L90,100 C95.5,100 100,95.5 100,90 L100,30 C100,24.5 95.5,20 90,20 Z M10,90 L10,30 L90,30 L90,90 L10,90 Z"
+            fill="currentColor" fill-rule="nonzero" id="Shape"></path>
+    </g>
+</svg>
diff --git a/src/lib/inputs/dynamic-input/dynamic-input.component.html b/src/lib/inputs/dynamic-input/dynamic-input.component.html
index 052da0a..c9c45b5 100644
--- a/src/lib/inputs/dynamic-input/dynamic-input.component.html
+++ b/src/lib/inputs/dynamic-input/dynamic-input.component.html
@@ -13,7 +13,7 @@
             iqserStopPropagation
         />
         <mat-datepicker-toggle [for]="picker" matSuffix>
-            <mat-icon matDatepickerToggleIcon svgIcon="red:calendar"></mat-icon>
+            <mat-icon matDatepickerToggleIcon svgIcon="iqser:calendar"></mat-icon>
         </mat-datepicker-toggle>
         <mat-datepicker #picker (closed)="onCloseDatepicker()" (opened)="onOpenDatepicker()"></mat-datepicker>
     </ng-container>
diff --git a/src/lib/tenants/tenant-select/tenant-select.component.html b/src/lib/tenants/tenant-select/tenant-select.component.html
index b7a6030..7637f3c 100644
--- a/src/lib/tenants/tenant-select/tenant-select.component.html
+++ b/src/lib/tenants/tenant-select/tenant-select.component.html
@@ -1,7 +1,7 @@
 <div class="tenant-section flex-column">
     <a class="logo">
         <div class="actions flex">
-            <iqser-logo [icon]="config.IS_DOCUMINE ? 'red:documine-logo' : 'red:logo'"></iqser-logo>
+            <iqser-logo icon="iqser:logo"></iqser-logo>
             <h1 class="app-name">{{ titleService.getTitle() }}</h1>
         </div>
     </a>
@@ -21,7 +21,7 @@
             *ngFor="let stored of storedTenants"
             class="d-flex pointer mat-elevation-z2 card stored-tenant-card mt-10"
         >
-            <iqser-logo [icon]="config.IS_DOCUMINE ? 'red:documine-logo' : 'red:logo'" class="card-icon" mat-card-image></iqser-logo>
+            <iqser-logo class="card-icon" icon="iqser:logo" mat-card-image></iqser-logo>
 
             <div class="card-content flex-column">
                 <span class="heading">{{ stored.tenantId }}</span>
diff --git a/src/lib/utils/constants.ts b/src/lib/utils/constants.ts
index 093ce9c..beb8264 100644
--- a/src/lib/utils/constants.ts
+++ b/src/lib/utils/constants.ts
@@ -2,6 +2,7 @@ export const ICONS = new Set([
     'arrow-down',
     'arrow-down-o',
     'arrow-right',
+    'calendar',
     'check',
     'close',
     'collapse',