diff --git a/config.inc.php b/config.inc.php
index a330289c1c..fb52817e51 100644
--- a/config.inc.php
+++ b/config.inc.php
@@ -465,7 +465,6 @@
 // $tlCfg->OAuthServers[1]['oauth_name'] = 'google';
 
 // Get from /gui/themes/default/images
-// $tlCfg->OAuthServers[1]['oauth_icon'] = 'google.png'; 
 // $tlCfg->OAuthServers[1]['oauth_client_id'] = 'CLIENT_ID';
 // $tlCfg->OAuthServers[1]['oauth_client_secret'] = 'CLIENT_SECRET';
 // Can be authorization_code (by default), client_credentials or password
@@ -482,7 +481,6 @@
 // Github
 // $tlCfg->OAuthServers[2]['oauth_enabled'] = true;
 // $tlCfg->OAuthServers[2]['oauth_name'] = 'github';
-// $tlCfg->OAuthServers[2]['oauth_icon'] = 'github.png'; //Get from /gui/themes/default/images
 // $tlCfg->OAuthServers[2]['oauth_client_id'] = 'CLIENT_ID';
 // $tlCfg->OAuthServers[2]['oauth_client_secret'] = 'CLIENT_SECRET';
 
@@ -499,7 +497,6 @@
 //Microsoft
 //$tlCfg->OAuthServers[1]['oauth_enabled'] = true;
 //$tlCfg->OAuthServers[1]['oauth_name'] = 'microsoft';
-//$tlCfg->OAuthServers[1]['oauth_icon'] = 'mslogo.jpg';
 //$tlCfg->OAuthServers[1]['oauth_client_id'] = 'CLIENT_ID';
 //$tlCfg->OAuthServers[1]['oauth_client_secret'] = 'CLIENT_SECRET';
 
@@ -522,7 +519,6 @@
 
 // $tlCfg->OAuthServers[1]['oauth_enabled'] = true;
 // $tlCfg->OAuthServers[1]['oauth_name'] = 'azuread'; //do not change this
-// $tlCfg->OAuthServers[1]['oauth_icon'] = 'azuread.png'; 
 
 // $tlCfg->OAuthServers[1]['oauth_client_id'] = 'CLIENT_ID';
 // $tlCfg->OAuthServers[1]['oauth_client_secret'] = 'CLIENT_SECRET';
diff --git a/custom_config.inc.php.example b/custom_config.inc.php.example
index 411b10ae3b..89a012365c 100644
--- a/custom_config.inc.php.example
+++ b/custom_config.inc.php.example
@@ -94,7 +94,6 @@
 // $tlCfg->authentication['oauth'][1]['oauth_name'] = 'google';
 
 // Get from /gui/themes/default/images
-// $tlCfg->authentication['oauth'][1]['oauth_icon'] = 'google.png'; 
 // $tlCfg->authentication['oauth'][1]['oauth_client_id'] = 'CLIENT_ID';
 // $tlCfg->authentication['oauth'][1]['oauth_client_secret'] = 'CLIENT_SECRET';
 // Can be authorization_code (by default), client_credentials or password
@@ -111,7 +110,6 @@
 // Github
 // $tlCfg->authentication['oauth'][2]['oauth_enabled'] = true;
 // $tlCfg->authentication['oauth'][2]['oauth_name'] = 'github';
-// $tlCfg->authentication['oauth'][2]['oauth_icon'] = 'github.png'; //Get from /gui/themes/default/images
 // $tlCfg->authentication['oauth'][2]['oauth_client_id'] = 'CLIENT_ID';
 // $tlCfg->authentication['oauth'][2]['oauth_client_secret'] = 'CLIENT_SECRET';
 
diff --git a/custom_config.inc.php.example.github_oauth b/custom_config.inc.php.example.github_oauth
index a68fc346f3..d873796730 100644
--- a/custom_config.inc.php.example.github_oauth
+++ b/custom_config.inc.php.example.github_oauth
@@ -2,7 +2,6 @@
 # ngrok http -region eu -subdomain=testlink 80
 $tlCfg->OAuthServers[2]['oauth_enabled'] = true;
 $tlCfg->OAuthServers[2]['oauth_name'] = 'github';
-$tlCfg->OAuthServers[2]['oauth_icon'] = 'github.png';
 
 $tlCfg->OAuthServers[2]['oauth_client_id'] = '98e37f6f3f91602e9538';
 $tlCfg->OAuthServers[2]['oauth_client_secret'] = 'b66f036df4210af08a5d7b7fbf564e731e0ff189';
diff --git a/custom_config.inc.php.github.testlinkOauthProvider b/custom_config.inc.php.github.testlinkOauthProvider
index 31d1261d73..e5b600502f 100644
--- a/custom_config.inc.php.github.testlinkOauthProvider
+++ b/custom_config.inc.php.github.testlinkOauthProvider
@@ -15,7 +15,6 @@ $tlCfg->OAuthServers[2]['oauth_client_secret'] =
 
 $tlCfg->OAuthServers[2]['oauth_enabled'] = true;
 $tlCfg->OAuthServers[2]['oauth_name'] = 'github';
-$tlCfg->OAuthServers[2]['oauth_icon'] = 'github.png';
 
 // Can be authorization_code (by default), client_credentials or password
 $tlCfg->OAuthServers[2]['oauth_grant_type'] = 'authorization_code';  
diff --git a/custom_config.inc.php.google_oauth b/custom_config.inc.php.google_oauth
index be79ae6331..4626391b48 100644
--- a/custom_config.inc.php.google_oauth
+++ b/custom_config.inc.php.google_oauth
@@ -19,7 +19,6 @@
 // $tlCfg->authentication['oauth'][1]['oauth_name'] = 'google';
 
 // Get from /gui/themes/default/images
-// $tlCfg->authentication['oauth'][1]['oauth_icon'] = 'google.png'; 
 // Can be authorization_code (by default), client_credentials or password
 // $tlCfg->authentication['oauth'][1]['oauth_grant_type'] = 'authorization_code';  
 // $tlCfg->authentication['oauth'][1]['oauth_url'] = 'https://accounts.google.com/o/oauth2/auth';
diff --git a/gui/themes/default/images/microsoft.png b/gui/themes/default/images/microsoft.png
new file mode 100644
index 0000000000..ae926d2cc8
Binary files /dev/null and b/gui/themes/default/images/microsoft.png differ
diff --git a/gui/themes/default/images/mslogo.jpg b/gui/themes/default/images/mslogo.jpg
deleted file mode 100644
index bda6c77f20..0000000000
Binary files a/gui/themes/default/images/mslogo.jpg and /dev/null differ
diff --git a/login.php b/login.php
index 279cb6b6d3..4bdf0ba914 100644
--- a/login.php
+++ b/login.php
@@ -226,7 +226,7 @@ function init_gui(&$db,$args) {
         $gui->oauth[$name] = new stdClass();
         $gui->oauth[$name]->name = ucfirst($name);
         $gui->oauth[$name]->link = oauth_link($oauth_prov);
-        $gui->oauth[$name]->icon = $oauth_prov['oauth_icon'];
+        $gui->oauth[$name]->icon = $name . '.png';
     }
   }
 
diff --git a/microsoftoauth.php b/microsoftoauth.php
index 181d822003..9ef85a506f 100644
--- a/microsoftoauth.php
+++ b/microsoftoauth.php
@@ -151,7 +151,7 @@ function init_gui(&$db,$args)
         $gui->oauth[$name] = new stdClass();
         $gui->oauth[$name]->name = ucfirst($name);
         $gui->oauth[$name]->link = oauth_link($oauth_prov);
-        $gui->oauth[$name]->icon = $oauth_prov['oauth_icon'];
+        $gui->oauth[$name]->icon = $name . '.png';
     }
   }
   $gui->external_password_mgmt = false;