diff --git a/src/components/right/EditTopic.tsx b/src/components/right/EditTopic.tsx
index 50b2d3a17..d21d9f7c6 100644
--- a/src/components/right/EditTopic.tsx
+++ b/src/components/right/EditTopic.tsx
@@ -125,8 +125,8 @@ const EditTopic: FC<OwnProps & StateProps> = ({
         {!topic && <Loading />}
         {topic && (
           <>
-            <div className={buildClassName(styles.section, styles.top)}>
-              <span className={styles.heading}>{lang('CreateTopicTitle')}</span>
+            <div className={buildClassName(styles.section, styles.top, isGeneral && styles.general)}>
+              <span className={styles.heading}>{lang(isGeneral ? 'CreateGeneralTopicTitle' : 'CreateTopicTitle')}</span>
               <Transition
                 name="zoomFade"
                 activeKey={Number(dummyTopic.iconEmojiId) || 0}
diff --git a/src/components/right/ManageTopic.module.scss b/src/components/right/ManageTopic.module.scss
index 2abdc857e..503317f4c 100644
--- a/src/components/right/ManageTopic.module.scss
+++ b/src/components/right/ManageTopic.module.scss
@@ -1,7 +1,7 @@
 .root {
   position: relative;
   height: 100%;
-  background-color: var(--color-background-secondary);
+  background-color: var(--color-background);
   --topic-icon-size: 5rem;
 }
 
@@ -9,6 +9,7 @@
   display: flex;
   flex-direction: column;
   height: 100%;
+  overflow: auto;
 }
 
 .section {
@@ -17,8 +18,13 @@
   flex-direction: column;
 
   background-color: var(--color-background);
+  border-bottom: 0.625rem solid var(--color-background-secondary);
   box-shadow: inset 0 -0.0625rem 0 0 var(--color-background-secondary-accent);
-  margin-bottom: 0.625rem;
+}
+
+.general {
+  box-shadow: none;
+  border-bottom: 0;
 }
 
 .top {
@@ -27,7 +33,7 @@
 
 .bottom {
   flex-grow: 1;
-  min-height: 0;
+  min-height: 30rem;
   margin-bottom: 0;
 }