diff --git a/admin/tool/oauth2/classes/output/renderer.php b/admin/tool/oauth2/classes/output/renderer.php
index 43633c1dab8..b0a32f22009 100644
--- a/admin/tool/oauth2/classes/output/renderer.php
+++ b/admin/tool/oauth2/classes/output/renderer.php
@@ -55,8 +55,8 @@ class renderer extends plugin_renderer_base {
             get_string('name'),
             get_string('configuredstatus', 'tool_oauth2'),
             get_string('loginissuer', 'tool_oauth2'),
-            get_string('discoverystatus', 'tool_oauth2'),
-            get_string('systemauthstatus', 'tool_oauth2'),
+            get_string('discoverystatus', 'tool_oauth2') . ' ' . $OUTPUT->help_icon('discovered', 'tool_oauth2'),
+            get_string('systemauthstatus', 'tool_oauth2') . ' ' . $OUTPUT->help_icon('systemaccountconnected', 'tool_oauth2'),
             get_string('edit'),
         ];
         $table->attributes['class'] = 'admintable generaltable';
@@ -110,7 +110,6 @@ class renderer extends plugin_renderer_base {
                     $discovered = '-';
                 }
             }
-            $discovered .= ' ' . $OUTPUT->help_icon('discovered', 'tool_oauth2');
 
             $discoverystatuscell = new html_table_cell($discovered);
 
@@ -130,7 +129,6 @@ class renderer extends plugin_renderer_base {
                 $authlink = html_writer::link($authurl, $icon);
                 $systemauth .= ' ' . $authlink;
             }
-            $systemauth .= ' ' . $OUTPUT->help_icon('systemaccountconnected', 'tool_oauth2');
 
             $systemauthstatuscell = new html_table_cell($systemauth);