diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php
index f16cdeb..eecb855 100644
--- a/includes/skins/SkinMinerva.php
+++ b/includes/skins/SkinMinerva.php
@@ -845,9 +845,6 @@ class SkinMinerva extends SkinTemplate {
 		if ( $this->skinOptions->hasSkinOptions() ) {
 			$modules[] = 'skins.minerva.options';
 		}
-		if ( $this->skinOptions->get( SkinOptions::OPTION_SHARE_BUTTON ) ) {
-			$modules[] = 'skins.minerva.share';
-		}
 
 		return $modules;
 	}
@@ -930,7 +927,6 @@ class SkinMinerva extends SkinTemplate {
 			'mediawiki.ui.button',
 			'skins.minerva.icons.images',
 			'skins.minerva.mainMenu.icons',
-			'wikimedia.ui'
 		];
 		if ( $title->isMainPage() ) {
 			$styles[] = 'skins.minerva.mainPage.styles';
@@ -945,6 +941,7 @@ class SkinMinerva extends SkinTemplate {
 
 		if ( $this->skinOptions->get( SkinOptions::OPTION_AMC ) ) {
 			$styles[] = 'skins.minerva.amc.styles';
+			$styles[] = 'wikimedia.ui';
 		}
 
 		return $styles;
diff --git a/skin.json b/skin.json
index fb6c2a9..a0e91d5 100644
--- a/skin.json
+++ b/skin.json
@@ -198,9 +198,6 @@
 			"styles": [
 				"resources/skins.minerva.base.styles/reset.less",
 				"resources/skins.minerva.base.styles/ui.less",
-				"components/ToggleList/ToggleList.less",
-				"components/ToggleList/DropDownList.less",
-				"components/ToggleList/MenuListItem.less",
 				"resources/skins.minerva.base.styles/pageactions.less",
 				"resources/skins.minerva.base.styles/common.less",
 				"resources/skins.minerva.base.styles/images.less",
@@ -255,7 +252,10 @@
 				"desktop"
 			],
 			"styles": [
-				"resources/skins.minerva.amc.styles/index.less"
+				"resources/skins.minerva.amc.styles/index.less",
+				"components/ToggleList/ToggleList.less",
+				"components/ToggleList/DropDownList.less",
+				"components/ToggleList/MenuListItem.less"
 			]
 		},
 		"wikimedia.ui": {