diff --git a/src/App.css b/src/App.css
index c1948aa..a4d12d5 100644
--- a/src/App.css
+++ b/src/App.css
@@ -104,17 +104,12 @@ a:hover{
     box-shadow: 0 0 0 0.5vh white;
 }
 
-.HashtagChooser .hashtag_button {
-    /* display: block; */
-    margin: 1vmin;
-}
-
 button,
 .labelButton{
     position: relative;
     outline: none;
     border: none;
-    margin: 1vh;
+    margin: 2vmin;
     padding: 1vh 2vh;
     font-size: calc(10px + 2vmin);
     font-weight: bold;
@@ -124,6 +119,9 @@ button,
     color: var(--volt-purple);
     transition: transform 0.2s ease;
 }
+button.isInRow{
+    margin: 1vmin;
+}
 button:hover,
 .labelButton:hover{
     transform-origin: center center;
diff --git a/src/App.js b/src/App.js
index b3ef13d..b888ea8 100644
--- a/src/App.js
+++ b/src/App.js
@@ -369,7 +369,7 @@ function AppWrapper() {
                     Object.entries(locales)
                     .map(([locale, name]) => {
                         return <button
-                            className={locale === currentLocale ? 'choosen' : ''}
+                            className={locale === currentLocale ? 'isInRow choosen' : 'isInRow'}
                             key={locale}
                             data-locale={locale}
                             onClick={handleLanguageChange}
diff --git a/src/HashtagChooser.js b/src/HashtagChooser.js
index 12d2f5b..6ab69f4 100644
--- a/src/HashtagChooser.js
+++ b/src/HashtagChooser.js
@@ -61,7 +61,7 @@ function HashtagChooser({ onChange, getString }) {
                 frames.map(frame => {
                     const frame_src_path = frame.src.default
                     const isChoosen = choosenFrame === frame_src_path
-                    return <button key={frame.name} data-src={frame_src_path} className={isChoosen ? 'hashtag_button choosen' : 'hashtag_button'} onClick={handleImageChoosing}>
+                    return <button key={frame.name} data-src={frame_src_path} className={isChoosen ? 'isInRow choosen' : 'isInRow'} onClick={handleImageChoosing}>
                         {frame.name === '' ? getString('button_no_hashtag') : '#'+frame.name}
                     </button>
                 })