diff --git a/administrator/components/com_content/forms/article.xml b/administrator/components/com_content/forms/article.xml
index 227adb4a491dc..ffcc7ccd0bf14 100644
--- a/administrator/components/com_content/forms/article.xml
+++ b/administrator/components/com_content/forms/article.xml
@@ -500,7 +500,7 @@
 
 				<field
 					name="show_vote"
-					type="list"
+					type="votelist"
 					label="JGLOBAL_SHOW_VOTE_LABEL"
 					useglobal="true"
 					validate="options"
diff --git a/components/com_content/tmpl/article/default.xml b/components/com_content/tmpl/article/default.xml
index 53ddb9c23b1fb..4ec3d0131d7db 100644
--- a/components/com_content/tmpl/article/default.xml
+++ b/components/com_content/tmpl/article/default.xml
@@ -229,7 +229,7 @@
 
 			<field
 				name="show_vote"
-				type="list"
+				type="votelist"
 				label="JGLOBAL_SHOW_VOTE_LABEL"
 				useglobal="true"
 				class="form-select-color-state"
diff --git a/components/com_content/tmpl/categories/default.xml b/components/com_content/tmpl/categories/default.xml
index 7ca5914521be7..45d0220568650 100644
--- a/components/com_content/tmpl/categories/default.xml
+++ b/components/com_content/tmpl/categories/default.xml
@@ -25,8 +25,8 @@
 	</fields>
 
 	<!-- Add fields to the parameters object for the layout. -->
-<fields name="params">
-	<fieldset name="basic" label="JGLOBAL_CATEGORIES_OPTIONS">
+	<fields name="params">
+		<fieldset name="basic" label="JGLOBAL_CATEGORIES_OPTIONS">
 
 			<field
 				name="show_base_description"
@@ -448,7 +448,9 @@
 			</field>
 		</fieldset>
 
-	<fieldset name="article" label="COM_CONTENT_ATTRIBS_FIELDSET_LABEL">
+		<fieldset name="article" label="COM_CONTENT_ATTRIBS_FIELDSET_LABEL"
+			addfieldprefix="Joomla\Component\Content\Administrator\Field"
+		>
 
 			<field
 				name="article_layout"
@@ -619,7 +621,7 @@
 
 			<field
 				name="show_vote"
-				type="list"
+				type="votelist"
 				label="JGLOBAL_SHOW_VOTE_LABEL"
 				useglobal="true"
 				class="form-select-color-state"
@@ -677,9 +679,9 @@
 				>
 				<option value="0">JNO</option>
 				<option value="1">JYES</option>
-		</field>
-	</fieldset>
-	<fieldset name="integration">
+			</field>
+		</fieldset>
+		<fieldset name="integration">
 
 			<field
 				name="show_feed_link"
@@ -704,5 +706,5 @@
 				<option value="1">JGLOBAL_FULL_TEXT</option>
 			</field>
 		</fieldset>
-</fields>
+	</fields>
 </metadata>
diff --git a/components/com_content/tmpl/category/blog.xml b/components/com_content/tmpl/category/blog.xml
index abe1ede1b599b..d9a3974332c31 100644
--- a/components/com_content/tmpl/category/blog.xml
+++ b/components/com_content/tmpl/category/blog.xml
@@ -576,7 +576,7 @@
 
 			<field
 				name="show_vote"
-				type="list"
+				type="votelist"
 				label="JGLOBAL_SHOW_VOTE_LABEL"
 				useglobal="true"
 				class="form-select-color-state"
diff --git a/components/com_content/tmpl/category/default.xml b/components/com_content/tmpl/category/default.xml
index a6b95a7ee0970..3e427050bbc0c 100644
--- a/components/com_content/tmpl/category/default.xml
+++ b/components/com_content/tmpl/category/default.xml
@@ -582,7 +582,7 @@
 
 			<field
 				name="show_vote"
-				type="list"
+				type="votelist"
 				label="JGLOBAL_SHOW_VOTE_LABEL"
 				useglobal="true"
 				class="form-select-color-state"
diff --git a/components/com_content/tmpl/featured/default.xml b/components/com_content/tmpl/featured/default.xml
index 1a653ce831b74..87fe43eac04d2 100644
--- a/components/com_content/tmpl/featured/default.xml
+++ b/components/com_content/tmpl/featured/default.xml
@@ -182,12 +182,12 @@
 				size="20"
 			/>
 
-	</fieldset>
+		</fieldset>
 
-	<fieldset name="article"
-		label="COM_CONTENT_ATTRIBS_FIELDSET_LABEL"
-		addfieldprefix="Joomla\Component\Content\Administrator\Field"
-	>
+		<fieldset name="article"
+			label="COM_CONTENT_ATTRIBS_FIELDSET_LABEL"
+			addfieldprefix="Joomla\Component\Content\Administrator\Field"
+		>
 			<field
 				name="show_title"
 				type="list"
@@ -398,7 +398,7 @@
 
 			<field
 				name="show_vote"
-				type="list"
+				type="votelist"
 				label="JGLOBAL_SHOW_VOTE_LABEL"
 				useglobal="true"
 				class="form-select-color-state"