diff --git a/mod/data/classes/external.php b/mod/data/classes/external.php
index 4568cb7c76d..e4e22192ea7 100644
--- a/mod/data/classes/external.php
+++ b/mod/data/classes/external.php
@@ -527,7 +527,7 @@ class mod_data_external extends external_api {
 
         // Check correct record entry. Group check was done before.
         if (!data_can_view_record($database, $record, $record->groupid, $canmanageentries)) {
-            throw new moodle_exception('notapproved', 'data');
+            throw new moodle_exception('notapprovederror', 'data');
         }
 
         $related = array('context' => $context, 'database' => $database, 'user' => null);
diff --git a/mod/data/classes/template.php b/mod/data/classes/template.php
index 97199e2915c..fec7402f261 100644
--- a/mod/data/classes/template.php
+++ b/mod/data/classes/template.php
@@ -605,7 +605,7 @@ class template {
         if (!$this->instance->approval) {
             return '';
         }
-        return ($entry->approved) ? get_string('approved', 'data') : get_string('notapproved', 'data');
+        return ($entry->approved) ? '' : html_writer::div(get_string('notapproved', 'data'), 'mod-data-approval-status-badge');
     }
 
     /**
diff --git a/mod/data/lang/en/data.php b/mod/data/lang/en/data.php
index 07a7e80b807..9ceef0f8d69 100644
--- a/mod/data/lang/en/data.php
+++ b/mod/data/lang/en/data.php
@@ -300,7 +300,8 @@ $string['nomatch'] = 'No matching entries found!';
 $string['nomaximum'] = 'No maximum';
 $string['nopreviewavailable'] = 'No preview available for {$a}';
 $string['norecords'] = 'No entries yet';
-$string['notapproved'] = 'Entry is not approved yet.';
+$string['notapproved'] = 'Pending approval';
+$string['notapprovederror'] = 'Entry is not approved yet.';
 $string['notinjectivemap'] = 'Not an injective map';
 $string['notopenyet'] = 'Sorry, this activity is not available until {$a}';
 $string['number'] = 'Number';
diff --git a/mod/data/lib.php b/mod/data/lib.php
index 32348b77e30..9643740463f 100644
--- a/mod/data/lib.php
+++ b/mod/data/lib.php
@@ -3637,7 +3637,7 @@ function data_comment_validate($comment_param) {
 
     //check if approved
     if ($data->approval and !$record->approved and !data_isowner($record) and !has_capability('mod/data:approve', $context)) {
-        throw new comment_exception('notapproved', 'data');
+        throw new comment_exception('notapprovederror', 'data');
     }
 
     // group access
diff --git a/mod/data/preset/imagegallery/listtemplate.html b/mod/data/preset/imagegallery/listtemplate.html
index add132c7187..8dcf32e6907 100644
--- a/mod/data/preset/imagegallery/listtemplate.html
+++ b/mod/data/preset/imagegallery/listtemplate.html
@@ -9,7 +9,10 @@
                 <a href="##moreurl##" class="stretched-link"></a>
             </div>
             <div class="d-flex align-items-start">
-                <div class="card-footer border-0 bg-white ml-auto" style="position: relative;">##actionsmenu##</div>
+                <div class="card-footer border-0 bg-white ml-auto d-flex" style="position: relative;">
+                    <div class="ml-auto my-auto ##approvalstatusclass##">##approvalstatus##</div>
+                    <div>##actionsmenu##</div>
+                </div>
             </div>
         </div>
     </div>
diff --git a/mod/data/preset/imagegallery/singletemplate.html b/mod/data/preset/imagegallery/singletemplate.html
index f63601e5825..3d6589f3fcc 100644
--- a/mod/data/preset/imagegallery/singletemplate.html
+++ b/mod/data/preset/imagegallery/singletemplate.html
@@ -1,7 +1,8 @@
 <div class="imagegallery-single">
     <div class="d-flex">
         <h3 class="card-title">[[title]]</h3>
-        <div class="ml-auto">##actionsmenu##</div>
+        <div class="ml-auto my-auto ##approvalstatusclass##">##approvalstatus##</div>
+        <div class="my-auto">##actionsmenu##</div>
     </div>
     <div class="imagegallery-single-body">
         <div class="row">
diff --git a/mod/data/preset/journal/listtemplate.html b/mod/data/preset/journal/listtemplate.html
index 0d97a960cc9..2e58d0b7e2e 100644
--- a/mod/data/preset/journal/listtemplate.html
+++ b/mod/data/preset/journal/listtemplate.html
@@ -2,7 +2,8 @@
     <div class="card-body">
         <div class="d-flex">
             <h3 class="card-title">[[Title]]</h3>
-            <div class="ml-auto">##actionsmenu##</div>
+            <div class="ml-auto my-auto ##approvalstatusclass##">##approvalstatus##</div>
+            <div class="my-auto">##actionsmenu##</div>
         </div>
         <div class="card-text truncate-overflow mb-4">[[Content]]</div>
         <p class="card-text">##userpicture## ##user##</p>
diff --git a/mod/data/preset/journal/singletemplate.html b/mod/data/preset/journal/singletemplate.html
index fa7b4ea6aeb..8d9bc608850 100644
--- a/mod/data/preset/journal/singletemplate.html
+++ b/mod/data/preset/journal/singletemplate.html
@@ -1,7 +1,8 @@
 <div class="journal-single my-5">
     <div class="d-flex">
         <h3 class="card-title">[[Title]]</h3>
-        <div class="ml-auto">##actionsmenu##</div>
+        <div class="ml-auto my-auto ##approvalstatusclass##">##approvalstatus##</div>
+        <div class="my-auto">##actionsmenu##</div>
     </div>
     <div class="journal-single-body my-5">
         <div class="row">
diff --git a/mod/data/preset/proposals/listtemplate.html b/mod/data/preset/proposals/listtemplate.html
index 1e8a5cb25ee..cbb46ab90f6 100644
--- a/mod/data/preset/proposals/listtemplate.html
+++ b/mod/data/preset/proposals/listtemplate.html
@@ -2,14 +2,17 @@
     <div class="card-header" role="tab" id="entry-##id##">
         <div>
             <div class="row align-middle">
-                <div class="col-4 col-sm-7 my-auto">
+                <div class="col-4 my-auto">
                     <a data-toggle="collapse" data-parent="#proposals-list" href="#collapseentry-##id##" aria-expanded="true" aria-controls="collapseentry-##id##" class="d-block">
                         <i class="fa fa-chevron-down"></i> [[Title]]
                     </a>
                  </div>
-                <div class="col-3 col-sm-2 push my-auto">[[Status]]</div>
-                <div class="col-4 col-sm-2 my-auto">##userpicture## ##user##</div>
-                <div class="ml-auto">##actionsmenu##</div>
+                <div class="col-3 push my-auto">[[Status]]</div>
+                <div class="col-2 my-auto">##userpicture## ##user##</div>
+                <div class="col-3 d-flex justify-content-end">
+                    <div class="my-auto ##approvalstatusclass##">##approvalstatus##</div>
+                    <div class="ml-auto my-auto">##actionsmenu##</div>
+                </div>
             </div>
         </div>
     </div>
diff --git a/mod/data/preset/proposals/singletemplate.html b/mod/data/preset/proposals/singletemplate.html
index bd719ca70af..98a254995b5 100644
--- a/mod/data/preset/proposals/singletemplate.html
+++ b/mod/data/preset/proposals/singletemplate.html
@@ -1,7 +1,8 @@
 <div class="proposals-single my-5">
     <div class="d-flex">
         <h3 class="card-title">[[Title]]</h3>
-        <div class="ml-auto">##actionsmenu##</div>
+        <div class="ml-auto my-auto ##approvalstatusclass##">##approvalstatus##</div>
+        <div class="my-auto">##actionsmenu##</div>
     </div>
     <div class="proposals-single-body">
         <div class="row my-3">
diff --git a/mod/data/styles.css b/mod/data/styles.css
index d0dd50bccc9..6da5e6ca505 100644
--- a/mod/data/styles.css
+++ b/mod/data/styles.css
@@ -116,8 +116,12 @@
     text-align: right;
 }
 
-.mod-data-default-template.notapproved {
-    background-color: #fcc;
+#page-mod-data-view .notapproved {
+    background-color: #fff3cd;
+    color: #856404;
+    border-radius: 0.5em;
+    padding: 0.5em 1em;
+    gap: 1em;
 }
 
 #page-mod-data-templates td.save_template,
diff --git a/mod/data/templates/defaulttemplate_listtemplate.mustache b/mod/data/templates/defaulttemplate_listtemplate.mustache
index 112dc468d37..b778334fff4 100644
--- a/mod/data/templates/defaulttemplate_listtemplate.mustache
+++ b/mod/data/templates/defaulttemplate_listtemplate.mustache
@@ -35,7 +35,8 @@
 }}
 <div class="defaulttemplate-listentry my-5 p-5 card">
     <div class="d-flex">
-        <div class="ml-auto">##actionsmenu##</div>
+        <div class="ml-auto my-auto ##approvalstatusclass##">##approvalstatus##</div>
+        <div>##actionsmenu##</div>
     </div>
     <div class="defaulttemplate-list-body">
         {{#fields}}
diff --git a/mod/data/templates/defaulttemplate_singletemplate.mustache b/mod/data/templates/defaulttemplate_singletemplate.mustache
index e155596de0d..09b87474658 100644
--- a/mod/data/templates/defaulttemplate_singletemplate.mustache
+++ b/mod/data/templates/defaulttemplate_singletemplate.mustache
@@ -34,8 +34,9 @@
     }
 }}
 <div id="defaulttemplate-single" class="my-5">
-    <div class="d-flex">
-        <div class="ml-auto mt-n6">##actionsmenu##</div>
+    <div class="d-flex mt-n6">
+        <div class="ml-auto my-auto ##approvalstatusclass##">##approvalstatus##</div>
+        <div>##actionsmenu##</div>
     </div>
     <div class="defaulttemplate-single-body my-5">
         <div class="mt-4">
diff --git a/mod/data/tests/behat/entry_approval.feature b/mod/data/tests/behat/entry_approval.feature
new file mode 100644
index 00000000000..edccd753b54
--- /dev/null
+++ b/mod/data/tests/behat/entry_approval.feature
@@ -0,0 +1,50 @@
+@mod @mod_data
+Feature: User can see the entry approval status on the single view and list view
+  in the default template.
+
+  Background:
+    Given the following "users" exist:
+      | username | firstname | lastname | email                |
+      | teacher1 | Teacher   | 1        | teacher1@example.com |
+      | student1 | Student   | 1        | student1@example.com |
+    And the following "courses" exist:
+      | fullname | shortname | category |
+      | Course 1 | C1        | 0        |
+    And the following "course enrolments" exist:
+      | user     | course | role           |
+      | teacher1 | C1     | editingteacher |
+      | student1 | C1     | student        |
+    And the following "activities" exist:
+      | activity | name               | intro          | course | idnumber | approval |
+      | data     | Test database name | Database intro | C1     | data1    | 1        |
+    And the following "mod_data > fields" exist:
+      | database | type | name   | description              |
+      | data1    | text | field1 | Test field description   |
+      | data1    | text | field2 | Test field 2 description |
+    And the following "mod_data > templates" exist:
+      | database | name            |
+      | data1    | singletemplate  |
+      | data1    | listtemplate    |
+      | data1    | addtemplate     |
+      | data1    | asearchtemplate |
+      | data1    | rsstemplate     |
+    And the following "mod_data > entries" exist:
+      | database | user     | field1          | field2                 |
+      | data1    | student1 | Student entry 1 | Some student content 1 |
+      | data1    | teacher1 | Teacher entry 1 | Some teacher content 1 |
+
+  @javascript
+  Scenario Outline: The approval status is displayed in the single view and list view next to the action menu
+    # List view.
+    Given I am on the "Test database name" "data activity" page logged in as <user>
+    Then I should see "Pending approval" in the "region-main" "region"
+    # Single view.
+    And I select "Single view" from the "jump" singleselect
+    And I should see "Pending approval" in the "region-main" "region"
+    And I click on "2" "link" in the ".pagination" "css_element"
+    And I should not see "Pending approval" in the "region-main" "region"
+    And I should not see "Approved" in the "region-main" "region"
+    Examples:
+      | user     |
+      | student1 |
+      | teacher1 |
diff --git a/mod/data/tests/externallib_test.php b/mod/data/tests/externallib_test.php
index 6198b0c2afa..a4e0a2b40cb 100644
--- a/mod/data/tests/externallib_test.php
+++ b/mod/data/tests/externallib_test.php
@@ -555,7 +555,7 @@ class externallib_test extends externallib_advanced_testcase {
         $result = mod_data_external::get_entries($this->database->id);
         $result = \external_api::clean_returnvalue(mod_data_external::get_entries_returns(), $result);
         $this->assertCount(0, $result['warnings']);
-        $this->assertCount(4, $result['entries']);  // I can see my entry not approved yet.
+        $this->assertCount(4, $result['entries']);  // I can see my entry is pending approval.
         $this->assertEquals(4, $result['totalcount']);
 
         // Now try with the user in the second group that must see only two entries (his group entry and the one without group).
@@ -727,7 +727,7 @@ class externallib_test extends externallib_advanced_testcase {
         $result = \external_api::clean_returnvalue(mod_data_external::get_entry_returns(), $result);
         $this->assertEquals($entry21, $result['entry']['id']);
 
-        // Now, try to get an entry not approved yet.
+        // Now, try to get a pending approval.
         $this->setUser($this->student1);
         $this->expectException('moodle_exception');
         $result = mod_data_external::get_entry($entry13);
diff --git a/mod/data/tests/template_test.php b/mod/data/tests/template_test.php
index 787d3fe12e8..63797349d34 100644
--- a/mod/data/tests/template_test.php
+++ b/mod/data/tests/template_test.php
@@ -294,14 +294,14 @@ class template_test extends \advanced_testcase {
             ],
             'Teacher approvalstatus tag approved entry' => [
                 'templatecontent' => 'Some ##approvalstatus## tag',
-                'expected' => '|Some Approved tag|',
+                'expected' => '|Some  tag|', // We do not display the approval status anymore.
                 'rolename' => 'editingteacher',
                 'enableexport' => false,
                 'approved' => true,
             ],
             'Teacher approvalstatus tag disapproved entry' => [
                 'templatecontent' => 'Some ##approvalstatus## tag',
-                'expected' => '|Some .*not approved.* tag|',
+                'expected' => '|Some .*Pending approval.* tag|',
                 'rolename' => 'editingteacher',
                 'enableexport' => false,
                 'approved' => false,
@@ -590,14 +590,14 @@ class template_test extends \advanced_testcase {
             ],
             'Student approvalstatus tag approved entry' => [
                 'templatecontent' => 'Some ##approvalstatus## tag',
-                'expected' => '|Some Approved tag|',
+                'expected' => '|Some  tag|',
                 'rolename' => 'student',
                 'enableexport' => false,
                 'approved' => true,
             ],
             'Student approvalstatus tag disapproved entry' => [
                 'templatecontent' => 'Some ##approvalstatus## tag',
-                'expected' => '|Some .*not approved.* tag|',
+                'expected' => '|Some .*Pending approval.* tag|',
                 'rolename' => 'student',
                 'enableexport' => false,
                 'approved' => false,
diff --git a/mod/data/view.php b/mod/data/view.php
index 4a93fbc062c..88ef0fd6e90 100644
--- a/mod/data/view.php
+++ b/mod/data/view.php
@@ -250,7 +250,7 @@ if (!$manager->has_fields()) {
 
 // Detect entries not approved yet and show hint instead of not found error.
 if ($record and !data_can_view_record($data, $record, $currentgroup, $canmanageentries)) {
-    throw new \moodle_exception('notapproved', 'data');
+    throw new \moodle_exception('notapprovederror', 'data');
 }
 
 // Do we need to show a link to the RSS feed for the records?