diff --git a/modules/ve-mw/i18n/en.json b/modules/ve-mw/i18n/en.json
index c1c53a4d40..99f8ff3ed3 100644
--- a/modules/ve-mw/i18n/en.json
+++ b/modules/ve-mw/i18n/en.json
@@ -151,7 +151,7 @@
     "visualeditor-dialog-transclusion-title": "Transclusion",
     "visualeditor-dialogbutton-media-tooltip": "Media",
     "visualeditor-dialogbutton-meta-tooltip": "Page settings",
-    "visualeditor-dialogbutton-reference-tooltip": "Reference",
+    "visualeditor-dialogbutton-reference-tooltip": "Basic",
     "visualeditor-dialogbutton-referencelist-tooltip": "References list",
     "visualeditor-dialogbutton-template-tooltip": "Template",
     "visualeditor-dialogbutton-transclusion-tooltip": "Transclusion",
diff --git a/modules/ve-mw/init/ve.init.mw.Target.js b/modules/ve-mw/init/ve.init.mw.Target.js
index cb226a957e..2426199ece 100644
--- a/modules/ve-mw/init/ve.init.mw.Target.js
+++ b/modules/ve-mw/init/ve.init.mw.Target.js
@@ -194,9 +194,9 @@ ve.init.mw.Target.static.toolbarGroups = [
 		'icon': 'text-style',
 		'indicator': 'down',
 		'title': OO.ui.deferMsg( 'visualeditor-toolbar-style-tooltip' ),
-		'include': [ { 'group': 'textStyle' }, 'clear' ],
+		'include': [ { 'group': 'textStyle' }, 'language', 'clear' ],
 		'promote': [ 'bold', 'italic' ],
-		'demote': [ 'strikethrough', 'code', 'underline', 'clear' ]
+		'demote': [ 'strikethrough', 'code', 'underline', 'language', 'clear' ]
 	},
 	// Link
 	{ 'include': [ 'link' ] },
@@ -205,7 +205,8 @@ ve.init.mw.Target.static.toolbarGroups = [
 		'type': 'list',
 		'label': OO.ui.deferMsg( 'visualeditor-toolbar-cite-label' ),
 		'indicator': 'down',
-		'include': [ { 'group': 'cite' } ]
+		'include': [ { 'group': 'cite' }, 'reference' ],
+		'demote': [ 'reference' ]
 	},
 	// Structure
 	{
@@ -220,8 +221,8 @@ ve.init.mw.Target.static.toolbarGroups = [
 		'label': OO.ui.deferMsg( 'visualeditor-toolbar-insert' ),
 		'indicator': 'down',
 		'include': '*',
-		'promote': [ 'reference', 'mediaInsert' ],
-		'demote': [ 'language', 'specialcharacter' ]
+		'promote': [ 'mediaInsert', 'transclusion' ],
+		'demote': [ 'specialcharacter' ]
 	}
 ];
 
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaEditDialog.js b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaEditDialog.js
index 7370a57c3e..4566502410 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaEditDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaEditDialog.js
@@ -59,9 +59,9 @@ ve.ui.MWMediaEditDialog.static.toolbarGroups = [
 		'icon': 'text-style',
 		'indicator': 'down',
 		'title': OO.ui.deferMsg( 'visualeditor-toolbar-style-tooltip' ),
-		'include': [ { 'group': 'textStyle' }, 'clear' ],
+		'include': [ { 'group': 'textStyle' }, 'language', 'clear' ],
 		'promote': [ 'bold', 'italic' ],
-		'demote': [ 'strikethrough', 'code', 'underline', 'clear' ]
+		'demote': [ 'strikethrough', 'code', 'underline', 'language', 'clear' ]
 	},
 	// Link
 	{ 'include': [ 'link' ] },
@@ -70,7 +70,8 @@ ve.ui.MWMediaEditDialog.static.toolbarGroups = [
 		'type': 'list',
 		'label': OO.ui.deferMsg( 'visualeditor-toolbar-cite-label' ),
 		'indicator': 'down',
-		'include': [ { 'group': 'cite' } ]
+		'include': [ { 'group': 'cite' }, 'reference' ],
+		'demote': [ 'reference' ]
 	},
 	// No structure
 	/* {
@@ -91,8 +92,8 @@ ve.ui.MWMediaEditDialog.static.toolbarGroups = [
 			'referenceList',
 			'gallery'
 		],
-		'promote': [ 'reference', 'mediaInsert' ],
-		'demote': [ 'language', 'specialcharacter' ]
+		'promote': [ 'mediaInsert', 'transclusion' ],
+		'demote': [ 'specialcharacter' ]
 	}
 ];
 
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js b/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js
index 26180f073f..734aec9bc2 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js
@@ -58,18 +58,18 @@ ve.ui.MWReferenceDialog.static.toolbarGroups = [
 		'icon': 'text-style',
 		'indicator': 'down',
 		'title': OO.ui.deferMsg( 'visualeditor-toolbar-style-tooltip' ),
-		'include': [ { 'group': 'textStyle' }, 'clear' ],
+		'include': [ { 'group': 'textStyle' }, 'language', 'clear' ],
 		'promote': [ 'bold', 'italic' ],
-		'demote': [ 'strikethrough', 'code', 'underline', 'clear' ]
+		'demote': [ 'strikethrough', 'code', 'underline', 'language', 'clear' ]
 	},
 	// Link
 	{ 'include': [ 'link' ] },
-	// Cite
+	// Cite but not reference
 	{
 		'type': 'list',
 		'label': OO.ui.deferMsg( 'visualeditor-toolbar-cite-label' ),
 		'indicator': 'down',
-		'include': [ { 'group': 'cite-transclusion' } ]
+		'include': [ { 'group': 'cite-transclusion' }/*, 'reference' ], 'demote': [ 'reference' */]
 	},
 	// No structure
 	/* {
@@ -91,8 +91,8 @@ ve.ui.MWReferenceDialog.static.toolbarGroups = [
 			'referenceList',
 			'gallery'
 		],
-		'promote': [ 'mediaInsert' ],
-		'demote': [ 'language', 'specialcharacter' ]
+		'promote': [ 'mediaInsert', 'transclusion' ],
+		'demote': [ 'specialcharacter' ]
 	}
 ];