diff --git a/app/javascript/flavours/glitch/styles/homogay/diff.scss b/app/javascript/flavours/glitch/styles/homogay/diff.scss
index 99f5fe232e..b628f70e4e 100644
--- a/app/javascript/flavours/glitch/styles/homogay/diff.scss
+++ b/app/javascript/flavours/glitch/styles/homogay/diff.scss
@@ -17,6 +17,14 @@ body {
   background: $ui-base-color;
   color: $primary-text-color;
 }
+.compose-form .autosuggest-textarea label .autosuggest-textarea__textarea {
+  border-top-left-radius: $border-radius;
+  border-top-right-radius: $border-radius;
+}
+.compose-form__buttons-wrapper {
+  border-bottom-left-radius: $border-radius;
+  border-bottom-right-radius: $border-radius;
+}
 .compose-panel .compose-form__autosuggest-wrapper {
   background-color: #fff0; // transparent background so it doesn't mess with border-radius
 }
@@ -28,6 +36,8 @@ body {
 .emoji-mart-bar:first-child {
   background: lighten($ui-base-color, 7%);
   border-bottom-color: #fff0;
+  border-top-left-radius: $border-radius;
+  border-top-right-radius: $border-radius;
 }
 .emoji-mart-anchor:not(.emoji-mart-anchor-selected) {
   color: $ui-base-lighter-color;
@@ -71,3 +81,42 @@ body {
 .glitch.local-settings__navigation__item {
   border-bottom-color: $ui-base-lighter-color;
 }
+
+// border radius
+.button,
+.dropdown-menu,
+.account__avatar,
+.search__input,
+.spoiler-input input,
+.language-dropdown__dropdown,
+.privacy-dropdown__dropdown,
+.poll__option input[type="text"],
+.compose-form__poll-wrapper select,
+.account__header__tabs__buttons .icon-button,
+.emoji-picker-dropdown__menu,
+.emoji-mart-search input,
+.boost-modal,
+.report-modal,
+.block-modal,
+.confirmation-modal,
+.actions-modal,
+.mute-modal,
+.compare-history-modal {
+  border-radius: $border-radius;
+}
+.dropdown-menu {
+  padding-top: $border-radius;
+  padding-bottom: $border-radius;
+}
+.emoji-mart-scroll {
+  margin-bottom: $border-radius;
+  padding-bottom: 0;
+}
+.column-header {
+  border-top-left-radius: $border-radius;
+  border-top-right-radius: $border-radius;
+}
+.column > .scrollable {
+  border-bottom-left-radius: $border-radius;
+  border-bottom-right-radius: $border-radius;
+}
diff --git a/app/javascript/flavours/glitch/styles/homogay/variables.scss b/app/javascript/flavours/glitch/styles/homogay/variables.scss
index 335a22349f..e1304a526a 100644
--- a/app/javascript/flavours/glitch/styles/homogay/variables.scss
+++ b/app/javascript/flavours/glitch/styles/homogay/variables.scss
@@ -49,3 +49,5 @@ $media-modal-media-max-width: 100%;
 
 // put margins on top and bottom of image to avoid the screen covered by image.
 $media-modal-media-max-height: 80%;
+
+$border-radius: 8px;