diff --git a/backend/app/classes/SettingsManager.py b/backend/app/classes/SettingsManager.py
index ea025ea46..8660a661b 100644
--- a/backend/app/classes/SettingsManager.py
+++ b/backend/app/classes/SettingsManager.py
@@ -6,6 +6,7 @@ import subprocess
 from cscore._cscore import VideoMode
 from .Singleton import Singleton
 from .Exceptions import PipelineAlreadyExistsException, NoCameraConnectedException
+from ..handlers.IPHandler import ChangeIP
 
 
 class SettingsManager(metaclass=Singleton):
@@ -189,9 +190,12 @@ class SettingsManager(metaclass=Singleton):
         for key in dic['change_general_settings_values']:
             if self.default_general_settings[key]:
                 self.general_settings[key] = dic['change_general_settings_values'][key]
-        self.settings_manager.save_settings()
-        #after all values has been set change settings
-        self.change_general_settings()
+        self.save_settings()
+
+        # after all values has been set change settings
+        ChangeIP(hostname=self.general_settings['hostname'], ip=self.general_settings['ip'],
+                 netmask=self.general_settings['netmask'], gateway=self.general_settings['gateway'])
+
 
 
     # Creators
@@ -254,7 +258,5 @@ class SettingsManager(metaclass=Singleton):
         with open(os.path.join(self.settings_path, 'settings.json'), 'w+') as setting_file:
             json.dump(self.general_settings, setting_file)
 
-    def change_general_settings(self):
-        pass
 
 
diff --git a/backend/app/handlers/IPHandler.py b/backend/app/handlers/IPHandler.py
index d25ba0321..be1c26fc1 100644
--- a/backend/app/handlers/IPHandler.py
+++ b/backend/app/handlers/IPHandler.py
@@ -39,4 +39,4 @@ class ChangeIP:
 
     @staticmethod
     def change_hostname(hostname):
-        subprocess.call(['hostnamectl set-hostname', "Chameleon-Vision-{}".format(hostname)])
\ No newline at end of file
+        subprocess.call(['hostnamectl set-hostname', "Chameleon-Vision-{}".format(hostname)])
diff --git a/chameleon-client/public/favicon.ico b/chameleon-client/public/favicon.ico
old mode 100644
new mode 100755
index c7b9a43c8..bc877aaad
Binary files a/chameleon-client/public/favicon.ico and b/chameleon-client/public/favicon.ico differ
diff --git a/chameleon-client/src/assets/logo.png b/chameleon-client/src/assets/logo.png
old mode 100644
new mode 100755
index f3d2503fc..5520ffde3
Binary files a/chameleon-client/src/assets/logo.png and b/chameleon-client/src/assets/logo.png differ
diff --git a/chameleon-client/src/components/SystemTab.vue b/chameleon-client/src/components/SystemTab.vue
index 47a2334fc..7a3cf033d 100644
--- a/chameleon-client/src/components/SystemTab.vue
+++ b/chameleon-client/src/components/SystemTab.vue
@@ -47,7 +47,7 @@
                         </Col>
                         <Col span="10">
                             <Input v-model="hostname" size="small">
-                                <span slot="prepend">http://Chameleon-Vision</span>
+                                <span slot="prepend">http://Chameleon-Vision-</span>
                                 <span slot="append">.local</span>
                             </Input>
                         </Col>