Fix button spacing, fix gender/country height (#2220)

* Fix button spacing, fix gender/country height, add tombstones

* Remove Tombstones

ui/v2.5/src/components/Performers/PerformerDetails/Performer.tsx

@@ -165,6 +165,7 @@ const PerformerPage: React.FC<IProps> = ({ performer }) => {
             isEditing={false}
             onSave={() => {}}
             onImageChange={() => {}}
+            classNames="mb-4"
           />
         </Row>
       </Col>
@@ -309,7 +310,7 @@ const PerformerPage: React.FC<IProps> = ({ performer }) => {
     }
   }
 
-  const renderIcons = () => (
+  const renderClickableIcons = () => (
     <span className="name-icons">
       <Button
         className={cx(
@@ -393,11 +394,11 @@ const PerformerPage: React.FC<IProps> = ({ performer }) => {
             <h2>
               <GenderIcon
                 gender={performer.gender}
-                className="gender-icon mr-2"
+                className="gender-icon mr-2 flag-icon"
               />
               <CountryFlag country={performer.country} className="mr-2" />
               {performer.name}
-              {renderIcons()}
+              {renderClickableIcons()}
             </h2>
             <RatingStars
               value={performer.rating ?? undefined}

ui/v2.5/src/components/Shared/DetailsEditNavbar.tsx

@@ -2,6 +2,7 @@ import { Button, Modal } from "react-bootstrap";
 import React, { useState } from "react";
 import { FormattedMessage, useIntl } from "react-intl";
 import { ImageInput } from "src/components/Shared";
+import cx from "classnames";
 
 interface IProps {
   objectName?: string;
@@ -20,6 +21,7 @@ interface IProps {
   onClearBackImage?: () => void;
   acceptSVG?: boolean;
   customButtons?: JSX.Element;
+  classNames?: string;
 }
 
 export const DetailsEditNavbar: React.FC<IProps> = (props: IProps) => {
@@ -127,7 +129,7 @@ export const DetailsEditNavbar: React.FC<IProps> = (props: IProps) => {
   }
 
   return (
-    <div className="details-edit">
+    <div className={cx("details-edit", props.classNames)}>
       {renderEditButton()}
       <ImageInput
         isEditing={props.isEditing}