Index: lams_tool_scratchie/web/pages/learning/learning.jsp
===================================================================
diff -u -r97c904db50165d55330d46cf940debea735ea16e -r9bf743c41d9895e6d35f3500a8ff0d02dc8f5848
--- lams_tool_scratchie/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 97c904db50165d55330d46cf940debea735ea16e)
+++ lams_tool_scratchie/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 9bf743c41d9895e6d35f3500a8ff0d02dc8f5848)
@@ -46,6 +46,12 @@
 		.lead {
 			margin-top: 30px;
 		}
+		[data-toggle="collapse"].collapsed .if-not-collapsed {
+		  display: none;
+		}
+		[data-toggle="collapse"]:not(.collapsed) .if-collapsed {
+		  display: none;
+		}
 	</style>
 
 	<script type="text/javascript" src="${lams}includes/javascript/jquery-ui.js"></script>
Index: lams_tool_scratchie/web/pages/learning/questionlist.jsp
===================================================================
diff -u -r4e39db7121b2be70c34a77f7e53982cf9a5c4b04 -r9bf743c41d9895e6d35f3500a8ff0d02dc8f5848
--- lams_tool_scratchie/web/pages/learning/questionlist.jsp	(.../questionlist.jsp)	(revision 4e39db7121b2be70c34a77f7e53982cf9a5c4b04)
+++ lams_tool_scratchie/web/pages/learning/questionlist.jsp	(.../questionlist.jsp)	(revision 9bf743c41d9895e6d35f3500a8ff0d02dc8f5848)
@@ -99,8 +99,10 @@
 <%-- show general burning question --%>
 <c:if test="${isUserLeader && scratchie.burningQuestionsEnabled || (mode == 'teacher')}">
 	<div class="form-group burning-question-container">
-		<a data-toggle="collapse" data-target="#burning-question-general" href="#bqg">
-			<i class="fa fa-xs fa-plus-square-o roffset5" aria-hidden="true"></i>
+		<a data-toggle="collapse" data-target="#burning-question-general" href="#bqg"
+				<c:if test="${empty sessionMap.generalBurningQuestion}">class="collapsed"</c:if>>
+			<span class="if-collapsed"><i class="fa fa-xs fa-plus-square-o roffset5" aria-hidden="true"></i></span>
+  			<span class="if-not-collapsed"><i class="fa fa-xs fa-minus-square-o roffset5" aria-hidden="true"></i></span>
 			<fmt:message key="label.general.burning.question" />
 		</a>
 
Index: lams_tool_scratchie/web/pages/learning/scratchies.jsp
===================================================================
diff -u -ra62d79594f2520abdd5503a66234f3b69356fec2 -r9bf743c41d9895e6d35f3500a8ff0d02dc8f5848
--- lams_tool_scratchie/web/pages/learning/scratchies.jsp	(.../scratchies.jsp)	(revision a62d79594f2520abdd5503a66234f3b69356fec2)
+++ lams_tool_scratchie/web/pages/learning/scratchies.jsp	(.../scratchies.jsp)	(revision 9bf743c41d9895e6d35f3500a8ff0d02dc8f5848)
@@ -82,8 +82,10 @@
 	<c:if test="${!showResults && scratchie.burningQuestionsEnabled && (isUserLeader || (mode == 'teacher'))}">
 		<div class="form-group burning-question-container">
 			<!-- LDEV-4532: href is needed for the collapsing to work on an ipad but do not make it the same as the data-target here or the screen will jump around. -->
-			<a data-toggle="collapse" data-target="#burning-question-item${item.uid}" href="#bqi${item.uid}">
-				<i class="fa fa-xs fa-plus-square-o roffset5" aria-hidden="true"></i>
+			<a data-toggle="collapse" data-target="#burning-question-item${item.uid}" href="#bqi${item.uid}"
+					<c:if test="${empty item.burningQuestion}">class="collapsed"</c:if>>
+				<span class="if-collapsed"><i class="fa fa-xs fa-plus-square-o roffset5" aria-hidden="true"></i></span>
+  				<span class="if-not-collapsed"><i class="fa fa-xs fa-minus-square-o roffset5" aria-hidden="true"></i></span>
 				<fmt:message key="label.burning.question" />
 			</a>