Index: lams_tool_assessment/web/WEB-INF/tags/Dropdown.tag
===================================================================
diff -u -r967256b088ed091ec9bfd98b25bdb6028879827f -r6713e2b8cbe5e01402cf4909ae929b252bab3297
--- lams_tool_assessment/web/WEB-INF/tags/Dropdown.tag	(.../Dropdown.tag)	(revision 967256b088ed091ec9bfd98b25bdb6028879827f)
+++ lams_tool_assessment/web/WEB-INF/tags/Dropdown.tag	(.../Dropdown.tag)	(revision 6713e2b8cbe5e01402cf4909ae929b252bab3297)
@@ -16,13 +16,15 @@
 
 <%@ attribute name="id" required="false" rtexprvalue="true" %>
 <%@ attribute name="useSpringForm" required="false" rtexprvalue="true" %>
+<%@ attribute name="inputCellClass" required="false" rtexprvalue="true" %>
 <%@ attribute name="tooltipKey" required="false" rtexprvalue="true" %>
 <%@ attribute name="tooltipDescriptionKey" required="false" rtexprvalue="true" %>
 
 <c:set var="id" value="${empty id ? name : id}" />
 <c:set var="useSpringForm" value="${empty useSpringForm ? false : useSpringForm}" />
 
-<lams:Input id="${id}" labelKey="${labelKey}" tooltipKey="${tooltipKey}" tooltipDescriptionKey="${tooltipDescriptionKey}">
+<lams:Input id="${id}" labelKey="${labelKey}" inputCellClass="switch switch-sm ${inputCellClass}"
+			tooltipKey="${tooltipKey}" tooltipDescriptionKey="${tooltipDescriptionKey}">
 	<c:choose>
    		<c:when test="${useSpringForm}">
    			<form:select path="${name}" id="${id}" cssClass="form-control form-control-select" aria-label="<fmt:message key='${tooltipKey}' />">
Index: lams_tool_assessment/web/WEB-INF/tags/Switch.tag
===================================================================
diff -u -r967256b088ed091ec9bfd98b25bdb6028879827f -r6713e2b8cbe5e01402cf4909ae929b252bab3297
--- lams_tool_assessment/web/WEB-INF/tags/Switch.tag	(.../Switch.tag)	(revision 967256b088ed091ec9bfd98b25bdb6028879827f)
+++ lams_tool_assessment/web/WEB-INF/tags/Switch.tag	(.../Switch.tag)	(revision 6713e2b8cbe5e01402cf4909ae929b252bab3297)
@@ -17,14 +17,16 @@
 <%@ attribute name="checked" required="false" rtexprvalue="true" %>
 <%@ attribute name="id" required="false" rtexprvalue="true" %>
 <%@ attribute name="useSpringForm" required="false" rtexprvalue="true" %>
+<%@ attribute name="inputCellClass" required="false" rtexprvalue="true" %>
 <%@ attribute name="tooltipKey" required="false" rtexprvalue="true" %>
 <%@ attribute name="tooltipDescriptionKey" required="false" rtexprvalue="true" %>
 
 <c:set var="checked" value="${empty checked ? false : checked}" />
 <c:set var="id" value="${empty id ? name : id}" />
 <c:set var="useSpringForm" value="${empty useSpringForm ? false : useSpringForm}" />
 
-<lams:Input id="${id}" labelKey="${labelKey}" tooltipKey="${tooltipKey}" tooltipDescriptionKey="${tooltipDescriptionKey}" inputCellClass="switch switch-sm">
+<lams:Input id="${id}" labelKey="${labelKey}" inputCellClass="switch switch-sm ${inputCellClass}"
+		    tooltipKey="${tooltipKey}" tooltipDescriptionKey="${tooltipDescriptionKey}" >
     <c:choose>
    		<c:when test="${useSpringForm}">
    			<form:checkbox path="${name}" id="${id}" cssClass="switch" />