diff --git a/src/core_modules/capture-core/components/DataEntries/SingleEventRegistrationEntry/DataEntryWrapper/RecentlyAddedEventsList/RecentlyAddedEventsList.component.js b/src/core_modules/capture-core/components/DataEntries/SingleEventRegistrationEntry/DataEntryWrapper/RecentlyAddedEventsList/RecentlyAddedEventsList.component.js
index 907d7c6548..c0a8f2a6a2 100644
--- a/src/core_modules/capture-core/components/DataEntries/SingleEventRegistrationEntry/DataEntryWrapper/RecentlyAddedEventsList/RecentlyAddedEventsList.component.js
+++ b/src/core_modules/capture-core/components/DataEntries/SingleEventRegistrationEntry/DataEntryWrapper/RecentlyAddedEventsList/RecentlyAddedEventsList.component.js
@@ -1,7 +1,7 @@
 // @flow
 import * as React from 'react';
 import { withStyles } from '@material-ui/core/styles';
-import Paper from '@material-ui/core/Paper';
+import { Card } from '@dhis2/ui';
 import i18n from '@dhis2/d2-i18n';
 import { OfflineEventsList } from '../../../../EventsList/OfflineEventsList/OfflineEventsList.component';
 import { listId } from './RecentlyAddedEventsList.const';
@@ -30,7 +30,7 @@ const NewEventsListPlain = (props: Props) => {
         return null;
     }
     return (
-        <Paper className={classes.container}>
+        <Card className={classes.container}>
             <div
                 className={classes.header}
             >
@@ -43,7 +43,7 @@ const NewEventsListPlain = (props: Props) => {
                 emptyListText={i18n.t('No events added')}
                 {...passOnProps}
             />
-        </Paper>
+        </Card>
     );
 };
 
diff --git a/src/core_modules/capture-core/components/DataEntries/SingleEventRegistrationEntry/NewRelationshipWrapper/NewEventNewRelationshipWrapper.component.js b/src/core_modules/capture-core/components/DataEntries/SingleEventRegistrationEntry/NewRelationshipWrapper/NewEventNewRelationshipWrapper.component.js
index d5d7ad6b4a..88cf67efe7 100644
--- a/src/core_modules/capture-core/components/DataEntries/SingleEventRegistrationEntry/NewRelationshipWrapper/NewEventNewRelationshipWrapper.component.js
+++ b/src/core_modules/capture-core/components/DataEntries/SingleEventRegistrationEntry/NewRelationshipWrapper/NewEventNewRelationshipWrapper.component.js
@@ -1,7 +1,7 @@
 // @flow
 import * as React from 'react';
 import i18n from '@dhis2/d2-i18n';
-import Paper from '@material-ui/core/Paper';
+import { Card } from '@dhis2/ui';
 import withStyles from '@material-ui/core/styles/withStyles';
 import { NewRelationship } from '../../../Pages/NewRelationship/NewRelationship.container';
 import { DiscardDialog } from '../../../Dialogs/DiscardDialog.component';
@@ -110,7 +110,7 @@ class NewEventNewRelationshipWrapper extends React.Component<Props, State> {
                         {i18n.t('Go back to event without saving relationship')}
                     </LinkButton>
                 </div>
-                <Paper className={classes.newRelationshipPaper}>
+                <Card className={classes.newRelationshipPaper}>
                     {/* $FlowFixMe[cannot-spread-inexact] automated comment */}
                     <NewRelationship
                         header={i18n.t('New event relationship')}
@@ -118,7 +118,7 @@ class NewEventNewRelationshipWrapper extends React.Component<Props, State> {
                         onCancel={onCancel}
                         {...passOnProps}
                     />
-                </Paper>
+                </Card>
                 <DiscardDialog
                     header={i18n.t('Discard unsaved changes?')}
                     text={i18n.t('Leaving this page will discard the selections you made for a new relationship')}
diff --git a/src/core_modules/capture-core/components/ListView/Filters/FilterRestMenu/FilterRestMenu.component.js b/src/core_modules/capture-core/components/ListView/Filters/FilterRestMenu/FilterRestMenu.component.js
index 0a2dea1776..3cd1e5535a 100644
--- a/src/core_modules/capture-core/components/ListView/Filters/FilterRestMenu/FilterRestMenu.component.js
+++ b/src/core_modules/capture-core/components/ListView/Filters/FilterRestMenu/FilterRestMenu.component.js
@@ -1,12 +1,11 @@
 // @flow
 import React from 'react';
 import { withStyles } from '@material-ui/core/styles';
-import { IconChevronDown16, IconChevronUp16, Button } from '@dhis2/ui';
+import { Card, IconChevronDown16, IconChevronUp16, Button } from '@dhis2/ui';
 
 import { Manager, Popper, Reference } from 'react-popper';
 import ClickAwayListener from '@material-ui/core/ClickAwayListener';
 import Grow from '@material-ui/core/Grow';
-import Paper from '@material-ui/core/Paper';
 import MenuList from '@material-ui/core/MenuList';
 import MenuItem from '@material-ui/core/MenuItem';
 import i18n from '@dhis2/d2-i18n';
@@ -185,11 +184,11 @@ class FilterRestMenuPlain extends React.Component<Props, State> {
                                         style={{ transformOrigin: '0 0 0' }}
                                         timeout={{ exit: 0, enter: 200 }}
                                     >
-                                        <Paper className={classes.menuPaper}>
+                                        <Card className={classes.menuPaper}>
                                             <MenuList role="menu">
                                                 {this.renderMenuItems()}
                                             </MenuList>
-                                        </Paper>
+                                        </Card>
                                     </Grow>
                                 </ClickAwayListener>
                             </div>
diff --git a/src/core_modules/capture-core/components/ListView/Menu/ListViewMenu.component.js b/src/core_modules/capture-core/components/ListView/Menu/ListViewMenu.component.js
index dd8d628a4d..07611adc28 100644
--- a/src/core_modules/capture-core/components/ListView/Menu/ListViewMenu.component.js
+++ b/src/core_modules/capture-core/components/ListView/Menu/ListViewMenu.component.js
@@ -2,8 +2,8 @@
 import React, { useCallback, memo, type ComponentType } from 'react';
 import { IconButton } from 'capture-ui';
 import { withStyles } from '@material-ui/core/styles';
-import { Divider, IconMore24 } from '@dhis2/ui';
-import { Paper, MenuList, MenuItem } from '@material-ui/core';
+import { Divider, IconMore24, Card } from '@dhis2/ui';
+import { MenuList, MenuItem } from '@material-ui/core';
 
 import { MenuPopper } from '../../Popper/Popper.component';
 import type { Props } from './listViewMenu.types';
@@ -86,11 +86,11 @@ const ListViewMenuPlain = ({ customMenuContents = [], classes }: Props) => {
             .flat(1), [customMenuContents, classes]);
 
     const renderPopperContent = useCallback((togglePopper: Function) => (
-        <Paper>
+        <Card>
             <MenuList role="menu">
                 {renderMenuItems(togglePopper)}
             </MenuList>
-        </Paper>
+        </Card>
     ), [renderMenuItems]);
 
     if (!customMenuContents.length) {
diff --git a/src/core_modules/capture-core/components/ListView/withEndColumnMenu/RowMenu.component.js b/src/core_modules/capture-core/components/ListView/withEndColumnMenu/RowMenu.component.js
index 49362c29af..9e51e50a36 100644
--- a/src/core_modules/capture-core/components/ListView/withEndColumnMenu/RowMenu.component.js
+++ b/src/core_modules/capture-core/components/ListView/withEndColumnMenu/RowMenu.component.js
@@ -2,9 +2,8 @@
 import * as React from 'react';
 import { Manager, Popper, Reference } from 'react-popper';
 import ClickAwayListener from '@material-ui/core/ClickAwayListener';
-import { spacers, IconMore24, colors } from '@dhis2/ui';
+import { Card, spacers, IconMore24, colors } from '@dhis2/ui';
 import Grow from '@material-ui/core/Grow';
-import Paper from '@material-ui/core/Paper';
 import MenuList from '@material-ui/core/MenuList';
 import MenuItem from '@material-ui/core/MenuItem';
 import withStyles from '@material-ui/core/styles/withStyles';
@@ -144,9 +143,9 @@ class Index extends React.Component<Props, State> {
                                         style={{ transformOrigin: '0 0 0' }}
                                         timeout={{ exit: 0, enter: 200 }}
                                     >
-                                        <Paper>
+                                        <Card>
                                             {this.renderMenuItems()}
-                                        </Paper>
+                                        </Card>
                                     </Grow>
                                 </ClickAwayListener>
                             </div>
diff --git a/src/core_modules/capture-core/components/Pages/ViewEvent/Relationship/ViewEventNewRelationshipWrapper.component.js b/src/core_modules/capture-core/components/Pages/ViewEvent/Relationship/ViewEventNewRelationshipWrapper.component.js
index d3cf907c06..a667eac5e1 100644
--- a/src/core_modules/capture-core/components/Pages/ViewEvent/Relationship/ViewEventNewRelationshipWrapper.component.js
+++ b/src/core_modules/capture-core/components/Pages/ViewEvent/Relationship/ViewEventNewRelationshipWrapper.component.js
@@ -1,7 +1,7 @@
 // @flow
 import * as React from 'react';
 import i18n from '@dhis2/d2-i18n';
-import Paper from '@material-ui/core/Paper';
+import { Card } from '@dhis2/ui';
 import withStyles from '@material-ui/core/styles/withStyles';
 import { NewRelationship } from '../../NewRelationship/NewRelationship.container';
 import { DiscardDialog } from '../../../Dialogs/DiscardDialog.component';
@@ -98,14 +98,14 @@ class ViewEventNewRelationshipWrapperPlain extends React.Component<Props, State>
                         {i18n.t('Go back to event without saving relationship')}
                     </LinkButton>
                 </div>
-                <Paper className={classes.newRelationshipPaper}>
+                <Card className={classes.newRelationshipPaper}>
                     {/* $FlowFixMe[cannot-spread-inexact] automated comment */}
                     <NewRelationship
                         header={i18n.t('New event relationship')}
                         onCancel={onCancel}
                         {...passOnProps}
                     />
-                </Paper>
+                </Card>
                 <DiscardDialog
                     header={i18n.t('Discard unsaved changes?')}
                     text={i18n.t('Leaving this page will discard any selections you made for a new relationship')}