diff --git a/includes/UniversalLanguageSelectorHooks.php b/includes/UniversalLanguageSelectorHooks.php
index f3fdf6de..f0d42451 100644
--- a/includes/UniversalLanguageSelectorHooks.php
+++ b/includes/UniversalLanguageSelectorHooks.php
@@ -226,7 +226,11 @@ class UniversalLanguageSelectorHooks {
 			'uls' => [
 				'text' => Language::fetchLanguageName( $langCode ),
 				'href' => '#',
-				'class' => 'uls-trigger',
+				// Skin meta data to allow skin (e.g. Vector) to add icons
+				'icon' => 'wikimedia-language',
+				// Skin meta data to allow skin (e.g. Vector) to convert to button.
+				'button' => true,
+				'link-class' => [ 'uls-trigger' ],
 				'active' => true
 			]
 		] + $personal_urls;
diff --git a/resources/css/ext.uls.pt.less b/resources/css/ext.uls.pt.less
index 51202e02..6ad6e133 100644
--- a/resources/css/ext.uls.pt.less
+++ b/resources/css/ext.uls.pt.less
@@ -24,6 +24,13 @@
 	// Let the SVG image fit without cropping or stretch
 	background-size: contain;
 	padding-left: 24px;
+
+	// Certain skins upgrade this to mw-ui-button. Background and padding should not apply.
+	// e.g. Modern Vector
+	&.mw-ui-button {
+		background: none;
+		padding-left: 12px;
+	}
 }
 
 #pt-uls {