diff --git a/helpdesk/templates/helpdesk/faq/faq_category_create.html b/helpdesk/templates/helpdesk/faq/faq_category_create.html
index a91d9744f..4194a78e6 100644
--- a/helpdesk/templates/helpdesk/faq/faq_category_create.html
+++ b/helpdesk/templates/helpdesk/faq/faq_category_create.html
@@ -22,7 +22,7 @@
 			hx-encoding="multipart/form-data"
 		>
 			{{form.as_p}}
-			<div class="oh-modal__dialog-footer">
+			<div class="d-flex flex-row-reverse">
 				<input
 					type="submit"
 					value='{% trans "Save" %}'
diff --git a/helpdesk/templates/helpdesk/faq/faq_category_list.html b/helpdesk/templates/helpdesk/faq/faq_category_list.html
index 76263d5fc..8ccb95108 100644
--- a/helpdesk/templates/helpdesk/faq/faq_category_list.html
+++ b/helpdesk/templates/helpdesk/faq/faq_category_list.html
@@ -27,9 +27,10 @@
                         <li class="oh-dropdown__item">
                             <a
                                 hx-get="{% url 'faq-category-update' category.id %}"
-                                hx-target="#faqCategoryCreate"
+                                hx-target="#objectCreateModalTarget"
                                 data-toggle="oh-modal-toggle"
-                                data-target="#faqCategoryCreate"
+                                data-target="#objectCreateModal"
+                                role="button"
                                 class="oh-dropdown__link"
                                 >{% trans "Edit" %}</a
                             >
diff --git a/helpdesk/templates/helpdesk/faq/faq_category_nav.html b/helpdesk/templates/helpdesk/faq/faq_category_nav.html
index fbbd7644d..cf45ab97d 100644
--- a/helpdesk/templates/helpdesk/faq/faq_category_nav.html
+++ b/helpdesk/templates/helpdesk/faq/faq_category_nav.html
@@ -74,9 +74,9 @@
                     <button
                         class="oh-btn oh-btn--secondary oh-btn--shadow"
                         data-toggle="oh-modal-toggle"
-                        data-target="#faqCategoryCreate"
+                        data-target="#objectCreateModal"
                         hx-get="{% url 'faq-category-create' %}"
-                        hx-target="#faqCategoryCreate"
+                        hx-target="#objectCreateModalTarget"
                     >
                         <ion-icon name="add-outline" class="me-1"></ion-icon>
                         {% trans "Create" %}
diff --git a/helpdesk/templates/helpdesk/faq/faq_create.html b/helpdesk/templates/helpdesk/faq/faq_create.html
index f842b75c0..d7a6466c7 100644
--- a/helpdesk/templates/helpdesk/faq/faq_create.html
+++ b/helpdesk/templates/helpdesk/faq/faq_create.html
@@ -22,7 +22,7 @@
 			hx-encoding="multipart/form-data"
 		>
 			{{form.as_p}}
-			<div class="oh-modal__dialog-footer">
+			<div class="d-flex flex-row-reverse">
 				<input
 					type="submit"
 					value='{% trans "Save" %}'
diff --git a/helpdesk/templates/helpdesk/faq/faq_list.html b/helpdesk/templates/helpdesk/faq/faq_list.html
index 31c7160f0..d8b2c9ddb 100644
--- a/helpdesk/templates/helpdesk/faq/faq_list.html
+++ b/helpdesk/templates/helpdesk/faq/faq_list.html
@@ -5,9 +5,9 @@
 		<ul class="oh-faq__items">
 			{% for faq in faqs %}
 			<li class="oh-faq__item">
-				<div class="oh-faq__item-header">
-					<div class="oh-faq__item-header__left">
-						<span class="oh-faq__item-title"> {{faq.question}} </span>
+				<div class="oh-faq__item-header icon-inner" onclick="show_answer(this)">
+					<div class="oh-faq__item-header__left icon-inner">
+						<span class="oh-faq__item-title icon-inner"> {{faq.question}} </span>
 						<ul class="oh-faq__tags">
 							{% for tag in faq.tags.all %}
 							<li class="oh-faq__tag text-light" style="background:{{tag.color}};">{{tag|capfirst}}</li>
@@ -20,9 +20,9 @@
 							class="oh-btn oh-btn--sq oh-btn--transparent"
 							title="{% trans 'Edit' %}"
 							data-toggle="oh-modal-toggle"
-							data-target="#faqCreate"
+							data-target="#objectCreateModal"
 							hx-get="{% url 'faq-update' faq.id %}"
-							hx-target="#faqCreate"
+							hx-target="#objectCreateModalTarget"
 							onclick='event.stopPropagation()'
 						>
 							<ion-icon name="create-outline"></ion-icon>
diff --git a/helpdesk/templates/helpdesk/faq/faq_list_view.html b/helpdesk/templates/helpdesk/faq/faq_list_view.html
index 7faab355b..f3bb4e43d 100644
--- a/helpdesk/templates/helpdesk/faq/faq_list_view.html
+++ b/helpdesk/templates/helpdesk/faq/faq_list_view.html
@@ -120,12 +120,20 @@
           	return $(this).val();
         }).get();
 
-        // Check if 'create_new_tag' exists in the list
         if (selectedValues.includes('create_new_tag')) {
 			$("#addTagModal").addClass("oh-modal--show");
         }
     }
 
+	function show_answer(element){
+		if ($(element).parent(".oh-faq__item--show").length !=0){
+			$(".oh-faq__item--show").removeClass("oh-faq__item--show");
+		} else {
+			$(".oh-faq__item--show").removeClass("oh-faq__item--show");
+			$(element).parent('.oh-faq__item').addClass("oh-faq__item--show");
+		}
+	}
+
 	$("#addTagForm").on('submit', function(){
 		event.preventDefault();
 		$.ajax({
diff --git a/helpdesk/templates/helpdesk/faq/faq_nav.html b/helpdesk/templates/helpdesk/faq/faq_nav.html
index 43250ba97..92725bb0d 100644
--- a/helpdesk/templates/helpdesk/faq/faq_nav.html
+++ b/helpdesk/templates/helpdesk/faq/faq_nav.html
@@ -89,9 +89,9 @@
 					<button
 						class="oh-btn oh-btn--secondary oh-btn--shadow"
 						data-toggle="oh-modal-toggle"
-						data-target="#faqCreate"
+						data-target="#objectCreateModal"
 						hx-get="{% url 'faq-create' cat_id %}"
-						hx-target="#faqCreate"
+						hx-target="#objectCreateModalTarget"
 					>
 						<ion-icon name="add-outline" class="me-1"></ion-icon>
 						{% trans "Create" %}
diff --git a/helpdesk/templates/helpdesk/faq/faq_view.html b/helpdesk/templates/helpdesk/faq/faq_view.html
index 1beb9389c..aef40fc69 100644
--- a/helpdesk/templates/helpdesk/faq/faq_view.html
+++ b/helpdesk/templates/helpdesk/faq/faq_view.html
@@ -91,6 +91,15 @@
 		$("#suggestion_box").hide();
 	}
 
+	function show_answer(element){
+		if ($(element).parent(".oh-faq__item--show").length !=0){
+			$(".oh-faq__item--show").removeClass("oh-faq__item--show");
+		} else {
+			$(".oh-faq__item--show").removeClass("oh-faq__item--show");
+			$(element).parent('.oh-faq__item').addClass("oh-faq__item--show");
+		}
+	}
+
 	$(document).ready(function () {
 
     	var autocompleteSuggestions = $('.oh-autocomplete-suggestions');
@@ -128,14 +137,7 @@
 	});
 
 	$(document).ready(function(){
-		$(".oh-faq__item-header").on("click", function(){
-			if ($(this).parent(".oh-faq__item--show").length !=0){
-				$(".oh-faq__item--show").removeClass("oh-faq__item--show");
-			} else {
-				$(".oh-faq__item--show").removeClass("oh-faq__item--show");
-				$(this).parent('.oh-faq__item').addClass("oh-faq__item--show");
-			}
-		})
+
 	});
 </script>
 {% endblock %}