diff --git a/app/views/general/error.phtml b/app/views/general/error.phtml
index 60afe86494..c6457ce98f 100644
--- a/app/views/general/error.phtml
+++ b/app/views/general/error.phtml
@@ -1,4 +1,6 @@
 <?php
+use Utopia\System\System;
+
 $development = $this->getParam('development', false);
 $type = $this->getParam('type', 'general_server_error');
 $code = $this->getParam('code', 500);
@@ -12,6 +14,15 @@ $label = '';
 $labelClass = '';
 $buttons = [];
 
+$protocol = System::getEnv('_APP_OPTIONS_FORCE_HTTPS') == 'disabled' ? 'http' : 'https';
+$hostname = System::getEnv('_APP_DOMAIN');
+// TODO: remove this later
+if (System::getEnv('_APP_ENV') === 'development') {
+    $hostname = 'localhost';
+}
+
+$url = $protocol . '://' . $hostname;
+
 if($exception !== null && method_exists($exception, 'getCTAs')) {
     foreach ($exception->getCTAs() as $index => $cta) {
         $class = ($index === 0) ? 'bordered-button' : 'button';
@@ -94,6 +105,8 @@ switch ($type) {
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <script src="https://cdn.jsdelivr.net/gh/alpinejs/alpine@v2.x.x/dist/alpine.min.js" defer></script>
+    <link rel="icon" type="image/svg+xml" href="<?php echo $url; ?>/images/logos/appwrite-icon.svg" />
+    <link rel="mask-icon" type="image/png" href="<?php echo $url; ?>/images/logos/appwrite-icon.png" />
     <link
         rel="preload"
         href="/fonts/inter/inter-v8-latin-600.woff2"
diff --git a/public/images/logos/appwrite-icon.png b/public/images/logos/appwrite-icon.png
new file mode 100644
index 0000000000..5d993a6b33
Binary files /dev/null and b/public/images/logos/appwrite-icon.png differ
diff --git a/public/images/logos/appwrite-icon.svg b/public/images/logos/appwrite-icon.svg
new file mode 100644
index 0000000000..afbc1124c2
--- /dev/null
+++ b/public/images/logos/appwrite-icon.svg
@@ -0,0 +1,11 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <g clip-path="url(#clip0_28_719)">
+    <path d="M24.4429 17.4322V22.9096H10.7519C6.76318 22.9096 3.28044 20.7067 1.4171 17.4322C1.14622 16.9561 0.909137 16.4567 0.710264 15.9383C0.319864 14.9225 0.0744552 13.8325 0 12.6952V11.2143C0.0161646 10.9609 0.0416361 10.7094 0.0749451 10.4609C0.143032 9.95105 0.245898 9.45211 0.381093 8.96711C1.66006 4.36909 5.81877 1 10.7519 1C15.6851 1 19.8433 4.36909 21.1223 8.96711H15.2682C14.3072 7.4683 12.6437 6.4774 10.7519 6.4774C8.86017 6.4774 7.19668 7.4683 6.23562 8.96711C5.9427 9.42274 5.71542 9.92516 5.56651 10.4609C5.43425 10.936 5.36371 11.4369 5.36371 11.9548C5.36371 13.5248 6.01324 14.94 7.05463 15.9383C8.01961 16.865 9.32061 17.4322 10.7519 17.4322H24.4429Z" fill="#FD366E" />
+    <path d="M24.4429 10.4609V15.9383H14.4492C15.4906 14.94 16.1401 13.5248 16.1401 11.9548C16.1401 11.4369 16.0696 10.936 15.9373 10.4609H24.4429Z" fill="#FD366E" />
+  </g>
+  <defs>
+    <clipPath id="clip0_28_719">
+      <rect width="24" height="24" fill="white" />
+    </clipPath>
+  </defs>
+</svg>
\ No newline at end of file