diff --git a/administrator/components/com_content/config.xml b/administrator/components/com_content/config.xml
index 8b21fceaf25d6..876d2a6e9062a 100644
--- a/administrator/components/com_content/config.xml
+++ b/administrator/components/com_content/config.xml
@@ -139,14 +139,17 @@
 
 		<field
 			name="flags"
-			type="radio"
-			label="JGLOBAL_SHOW_FLAG_LABEL"
-			layout="joomla.form.field.radio.switcher"
+			type="list"
+			label="JGLOBAL_ASSOCIATIONS_DISPLAY_LABEL"
+			description="JGLOBAL_ASSOCIATIONS_DISPLAY_DESC"
 			default="1"
 			showon="show_associations:1"
+			validate="options"
 			>
-			<option value="0">JNO</option>
-			<option value="1">JYES</option>
+			<option value="1">JGLOBAL_ASSOCIATIONS_DISPLAY_FLAGS</option>
+			<option value="0">JGLOBAL_ASSOCIATIONS_DISPLAY_LANGUAGE_CODE</option>
+			<option value="2">JGLOBAL_ASSOCIATIONS_DISPLAY_NATIVE_LANGUAGE_TITLE</option>
+			<option value="3">JGLOBAL_ASSOCIATIONS_DISPLAY_LANGUAGE_TITLE</option>
 		</field>
 
 		<field
diff --git a/administrator/components/com_content/forms/article.xml b/administrator/components/com_content/forms/article.xml
index 45384ae78f0cb..80b9182d28ee3 100644
--- a/administrator/components/com_content/forms/article.xml
+++ b/administrator/components/com_content/forms/article.xml
@@ -414,13 +414,16 @@
 				<field
 					name="flags"
 					type="list"
-					label="JGLOBAL_SHOW_FLAG_LABEL"
+					label="JGLOBAL_ASSOCIATIONS_DISPLAY_LABEL"
+					description="JGLOBAL_ASSOCIATIONS_DISPLAY_DESC"
 					useglobal="true"
 					showon="show_associations:1"
 					validate="options"
 					>
-					<option value="0">JNO</option>
-					<option value="1">JYES</option>
+					<option value="1">JGLOBAL_ASSOCIATIONS_DISPLAY_FLAGS</option>
+					<option value="0">JGLOBAL_ASSOCIATIONS_DISPLAY_LANGUAGE_CODE</option>
+					<option value="2">JGLOBAL_ASSOCIATIONS_DISPLAY_NATIVE_LANGUAGE_TITLE</option>
+					<option value="3">JGLOBAL_ASSOCIATIONS_DISPLAY_LANGUAGE_TITLE</option>
 				</field>
 			</fieldset>
 
diff --git a/administrator/language/en-GB/joomla.ini b/administrator/language/en-GB/joomla.ini
index 7ccabcf0c069a..f4b1e832a4dda 100644
--- a/administrator/language/en-GB/joomla.ini
+++ b/administrator/language/en-GB/joomla.ini
@@ -334,6 +334,12 @@ JGLOBAL_ARTICLE_ORDER_LABEL="Article Order"
 JGLOBAL_ARTICLES="Articles"
 JGLOBAL_ASSOC_NOT_POSSIBLE="To define associations, please make sure the item language is not set to 'All'."
 JGLOBAL_ASSOCIATIONS_CONTENTLANGUAGE_WARNING="Some associated items are assigned to the <strong>%s</strong> Content Language but that Content Language is trashed or deleted."
+JGLOBAL_ASSOCIATIONS_DISPLAY_DESC="Select how the language of associated articles is displayed."
+JGLOBAL_ASSOCIATIONS_DISPLAY_FLAGS="Flags"
+JGLOBAL_ASSOCIATIONS_DISPLAY_LABEL="Association Language Display"
+JGLOBAL_ASSOCIATIONS_DISPLAY_LANGUAGE_CODE="Language Code"
+JGLOBAL_ASSOCIATIONS_DISPLAY_LANGUAGE_TITLE="Language Title"
+JGLOBAL_ASSOCIATIONS_DISPLAY_NATIVE_LANGUAGE_TITLE="Native Language Title"
 JGLOBAL_ASSOCIATIONS_NEW_ITEM_WARNING="To create associations, first save the item."
 JGLOBAL_ASSOCIATIONS_PROPAGATE_BUTTON="Propagate"
 JGLOBAL_ASSOCIATIONS_PROPAGATE_FAILED="Failed propagating associations. You may have to select or create them manually."
@@ -607,7 +613,7 @@ JGLOBAL_SELECTION_ALL="Select All"
 JGLOBAL_SELECTION_INVERT="Toggle Selection"
 JGLOBAL_SELECTION_INVERT_ALL="Toggle All Selections"
 JGLOBAL_SELECTION_NONE="Clear Selection"
-JGLOBAL_SHOW_ASSOCIATIONS_DESC="Multilingual only. If set to Show, the associated articles flags or URL Language Code will be displayed."
+JGLOBAL_SHOW_ASSOCIATIONS_DESC="Multilingual only. If set to Show, the associated articles will display the selected language information."
 JGLOBAL_SHOW_ASSOCIATIONS_LABEL="Associations"
 JGLOBAL_SHOW_AUTHOR_DESC="If set to Show, the Name of the article's Author will be displayed."
 JGLOBAL_SHOW_AUTHOR_LABEL="Author"
@@ -631,7 +637,9 @@ JGLOBAL_SHOW_FEATURED_ARTICLES_DESC="Select to show, hide or only display featur
 JGLOBAL_SHOW_FEATURED_ARTICLES_LABEL="Featured Articles"
 JGLOBAL_SHOW_FEED_LINK_DESC="Show or hide an RSS Feed Link. (A Feed Link will show up as a feed icon in the address bar of most modern browsers)."
 JGLOBAL_SHOW_FEED_LINK_LABEL="RSS Feed Link"
+; Deprecated will be removed in 7.0
 JGLOBAL_SHOW_FLAG_DESC="If set to 'Yes', will display language choice as image flags. Otherwise will use the content language URL Language Code."
+; Deprecated will be removed in 7.0
 JGLOBAL_SHOW_FLAG_LABEL="Use Image Flags"
 JGLOBAL_SHOW_FULL_DESCRIPTION="Show full description &hellip;"
 JGLOBAL_SHOW_HEADINGS_DESC="Show or hide the headings in list layouts."
diff --git a/api/language/en-GB/joomla.ini b/api/language/en-GB/joomla.ini
index 18fde5672d4c2..0f2725bf5296b 100644
--- a/api/language/en-GB/joomla.ini
+++ b/api/language/en-GB/joomla.ini
@@ -331,6 +331,12 @@ JGLOBAL_ARTICLE_ORDER_LABEL="Article Order"
 JGLOBAL_ARTICLES="Articles"
 JGLOBAL_ASSOC_NOT_POSSIBLE="To define associations, please make sure the item language is not set to 'All'."
 JGLOBAL_ASSOCIATIONS_CONTENTLANGUAGE_WARNING="Some associated items are assigned to the <strong>%s</strong> Content Language but that Content Language is trashed or deleted."
+JGLOBAL_ASSOCIATIONS_DISPLAY_DESC="Select how the language of associated articles is displayed."
+JGLOBAL_ASSOCIATIONS_DISPLAY_FLAGS="Flags"
+JGLOBAL_ASSOCIATIONS_DISPLAY_LABEL="Association Language Display"
+JGLOBAL_ASSOCIATIONS_DISPLAY_LANGUAGE_CODE="Language Code"
+JGLOBAL_ASSOCIATIONS_DISPLAY_LANGUAGE_TITLE="Language Title"
+JGLOBAL_ASSOCIATIONS_DISPLAY_NATIVE_LANGUAGE_TITLE="Native Language Title"
 JGLOBAL_ASSOCIATIONS_NEW_ITEM_WARNING="To create associations, first save the item."
 JGLOBAL_ASSOCIATIONS_PROPAGATE_BUTTON="Propagate"
 JGLOBAL_ASSOCIATIONS_PROPAGATE_FAILED="Failed propagating associations. You may have to select or create them manually."
@@ -598,7 +604,7 @@ JGLOBAL_SELECTION_ALL="Select All"
 JGLOBAL_SELECTION_INVERT="Toggle Selection"
 JGLOBAL_SELECTION_INVERT_ALL="Toggle All Selections"
 JGLOBAL_SELECTION_NONE="Clear Selection"
-JGLOBAL_SHOW_ASSOCIATIONS_DESC="Multilingual only. If set to Show, the associated articles flags or URL Language Code will be displayed."
+JGLOBAL_SHOW_ASSOCIATIONS_DESC="Multilingual only. If set to Show, the associated articles will display the selected language information."
 JGLOBAL_SHOW_ASSOCIATIONS_LABEL="Associations"
 JGLOBAL_SHOW_AUTHOR_DESC="If set to Show, the Name of the article's Author will be displayed."
 JGLOBAL_SHOW_AUTHOR_LABEL="Author"
@@ -622,7 +628,9 @@ JGLOBAL_SHOW_FEATURED_ARTICLES_DESC="Select to show, hide or only display featur
 JGLOBAL_SHOW_FEATURED_ARTICLES_LABEL="Featured Articles"
 JGLOBAL_SHOW_FEED_LINK_DESC="Show or hide an RSS Feed Link. (A Feed Link will show up as a feed icon in the address bar of most modern browsers)."
 JGLOBAL_SHOW_FEED_LINK_LABEL="RSS Feed Link"
+; Deprecated will be removed in 7.0
 JGLOBAL_SHOW_FLAG_DESC="If set to 'Yes', will display language choice as image flags. Otherwise will use the content language URL Language Code."
+; Deprecated will be removed in 7.0
 JGLOBAL_SHOW_FLAG_LABEL="Use Image Flags"
 JGLOBAL_SHOW_FULL_DESCRIPTION="Show full description &hellip;"
 JGLOBAL_SHOW_HEADINGS_DESC="Show or hide the headings in list layouts."
diff --git a/components/com_content/tmpl/category/default_articles.php b/components/com_content/tmpl/category/default_articles.php
index 2088fc2e2c84c..123520c8d7ff0 100644
--- a/components/com_content/tmpl/category/default_articles.php
+++ b/components/com_content/tmpl/category/default_articles.php
@@ -93,11 +93,11 @@
                 <label class="filter-search-lbl visually-hidden" for="filter-search">
                     <?php echo Text::_('COM_CONTENT_' . $this->params->get('filter_field') . '_FILTER_LABEL'); ?>
                 </label>
-                <input type="text" 
-                    name="filter-search" 
-                    id="filter-search" 
-                    value="<?php echo $this->escape($this->state->get('list.filter')); ?>" 
-                    class="inputbox" 
+                <input type="text"
+                    name="filter-search"
+                    id="filter-search"
+                    value="<?php echo $this->escape($this->state->get('list.filter')); ?>"
+                    class="inputbox"
                     placeholder="<?php echo Text::_('COM_CONTENT_' . $this->params->get('filter_field') . '_FILTER_LABEL'); ?>"
                 >
             <?php endif; ?>
@@ -186,10 +186,15 @@ class="inputbox"
                         <?php if (Associations::isEnabled() && $this->params->get('show_associations')) : ?>
                             <div class="cat-list-association">
                             <?php $associations = AssociationHelper::displayAssociations($article->id); ?>
+                            <?php $display = (int) $this->params->get('flags', 1); ?>
                             <?php foreach ($associations as $association) : ?>
-                                <?php if ($this->params->get('flags', 1) && $association['language']->image) : ?>
+                                <?php if ($display === 1 && $association['language']->image) : ?>
                                     <?php $flag = HTMLHelper::_('image', 'mod_languages/' . $association['language']->image . '.gif', $association['language']->title_native, ['title' => $association['language']->title_native], true); ?>
                                     <a href="<?php echo Route::_($association['item']); ?>"><?php echo $flag; ?></a>
+                                <?php elseif ($display === 2) : ?>
+                                    <a href="<?php echo Route::_($association['item']); ?>"><?php echo $association['language']->title_native; ?></a>
+                                <?php elseif ($display === 3) : ?>
+                                    <a href="<?php echo Route::_($association['item']); ?>"><?php echo $association['language']->title; ?></a>
                                 <?php else : ?>
                                     <?php $class = 'btn btn-secondary btn-sm btn-' . strtolower($association['language']->lang_code); ?>
                                     <a class="<?php echo $class; ?>" title="<?php echo $association['language']->title_native; ?>" href="<?php echo Route::_($association['item']); ?>"><?php echo $association['language']->lang_code; ?>
@@ -212,10 +217,15 @@ class="inputbox"
                         <?php if (Associations::isEnabled() && $this->params->get('show_associations')) : ?>
                             <div class="cat-list-association">
                             <?php $associations = AssociationHelper::displayAssociations($article->id); ?>
+                            <?php $display = (int) $this->params->get('flags', 1); ?>
                             <?php foreach ($associations as $association) : ?>
-                                <?php if ($this->params->get('flags', 1)) : ?>
+                                <?php if ($display === 1 && $association['language']->image) : ?>
                                     <?php $flag = HTMLHelper::_('image', 'mod_languages/' . $association['language']->image . '.gif', $association['language']->title_native, ['title' => $association['language']->title_native], true); ?>
                                     <a href="<?php echo Route::_($association['item']); ?>"><?php echo $flag; ?></a>
+                                <?php elseif ($display === 2) : ?>
+                                    <a href="<?php echo Route::_($association['item']); ?>"><?php echo $association['language']->title_native; ?></a>
+                                <?php elseif ($display === 3) : ?>
+                                    <a href="<?php echo Route::_($association['item']); ?>"><?php echo $association['language']->title; ?></a>
                                 <?php else : ?>
                                     <?php $class = 'btn btn-secondary btn-sm btn-' . strtolower($association['language']->lang_code); ?>
                                     <a class="<?php echo $class; ?>" title="<?php echo $association['language']->title_native; ?>" href="<?php echo Route::_($association['item']); ?>"><?php echo $association['language']->lang_code; ?>
diff --git a/layouts/joomla/content/info_block/associations.php b/layouts/joomla/content/info_block/associations.php
index 3363711b553e6..75c7b69da1581 100644
--- a/layouts/joomla/content/info_block/associations.php
+++ b/layouts/joomla/content/info_block/associations.php
@@ -22,14 +22,22 @@
 <dd class="association">
     <span class="icon-globe icon-fw" aria-hidden="true"></span>
     <?php echo Text::_('JASSOCIATIONS'); ?>
+    <?php $display = (int) $displayData['item']->params->get('flags', 1); ?>
     <?php foreach ($associations as $association) : ?>
-        <?php if ($displayData['item']->params->get('flags', 1) && $association['language']->image) : ?>
+        <?php if ($display === 1 && $association['language']->image) : ?>
             <?php $flag = HTMLHelper::_('image', 'mod_languages/' . $association['language']->image . '.gif', $association['language']->title_native, ['title' => $association['language']->title_native], true); ?>
             <a href="<?php echo Route::_($association['item']); ?>"><?php echo $flag; ?></a>
         <?php else : ?>
             <?php $class = 'btn btn-secondary btn-sm btn-' . strtolower($association['language']->lang_code); ?>
-            <a class="<?php echo $class; ?>" title="<?php echo $association['language']->title_native; ?>" href="<?php echo Route::_($association['item']); ?>"><?php echo $association['language']->lang_code; ?>
-                <span class="visually-hidden"><?php echo $association['language']->title_native; ?></span>
+            <?php if ($display === 2) : ?>
+                <?php $label = $association['language']->title_native; ?>
+            <?php elseif ($display === 3) : ?>
+                <?php $label = $association['language']->title; ?>
+            <?php else : ?>
+                <?php $label = $association['language']->lang_code; ?>
+            <?php endif; ?>
+            <a class="<?php echo $class; ?>" title="<?php echo $association['language']->title_native; ?>" href="<?php echo Route::_($association['item']); ?>">
+                <?php echo $label; ?>
             </a>
         <?php endif; ?>
     <?php endforeach; ?>