diff --git a/web/react/components/user_settings/custom_theme_chooser.jsx b/web/react/components/user_settings/custom_theme_chooser.jsx
index 986b0b2fd6..895d0c5008 100644
--- a/web/react/components/user_settings/custom_theme_chooser.jsx
+++ b/web/react/components/user_settings/custom_theme_chooser.jsx
@@ -76,7 +76,7 @@ export default class CustomThemeChooser extends React.Component {
                     >
                         <label className='custom-label'>{element.uiName}</label>
                         <div
-                            className='input-group dropdown'
+                            className='input-group theme-group dropdown'
                             id={element.id}
                         >
                             <select
@@ -87,9 +87,11 @@ export default class CustomThemeChooser extends React.Component {
                             >
                                 {codeThemeOptions}
                             </select>
-                            <img
-                                src={'/static/images/themes/code_themes/' + theme[element.id] + '.png'}
-                            />
+                            <span className='input-group-addon'>
+                                <img
+                                    src={'/static/images/themes/code_themes/' + theme[element.id] + '.png'}
+                                />
+                            </span>
                         </div>
                     </div>
                 );
diff --git a/web/sass-files/sass/partials/_settings.scss b/web/sass-files/sass/partials/_settings.scss
index 3be83ed2fe..b304450bcf 100644
--- a/web/sass-files/sass/partials/_settings.scss
+++ b/web/sass-files/sass/partials/_settings.scss
@@ -125,6 +125,15 @@
             }
 
             .appearance-section {
+                .theme-group {
+                    .input-group-addon {
+                        padding: 4px 5px;
+                        width: 40px;
+                        img {
+                            border: 1px solid rgba(black, 0.15);
+                        }
+                    }
+                }
                 .premade-themes {
                     margin-bottom: 10px;
                     .theme-label {
diff --git a/web/static/images/themes/code_themes/github.png b/web/static/images/themes/code_themes/github.png
index d0538d6c0b..a49b877b18 100644
Binary files a/web/static/images/themes/code_themes/github.png and b/web/static/images/themes/code_themes/github.png differ
diff --git a/web/static/images/themes/code_themes/monokai.png b/web/static/images/themes/code_themes/monokai.png
index 8f92d2a18d..a71225b689 100644
Binary files a/web/static/images/themes/code_themes/monokai.png and b/web/static/images/themes/code_themes/monokai.png differ
diff --git a/web/static/images/themes/code_themes/solarized_dark.png b/web/static/images/themes/code_themes/solarized_dark.png
index 76055c6782..07774ff20d 100644
Binary files a/web/static/images/themes/code_themes/solarized_dark.png and b/web/static/images/themes/code_themes/solarized_dark.png differ
diff --git a/web/static/images/themes/code_themes/solarized_light.png b/web/static/images/themes/code_themes/solarized_light.png
index b9595c22d7..fc71dbb87a 100644
Binary files a/web/static/images/themes/code_themes/solarized_light.png and b/web/static/images/themes/code_themes/solarized_light.png differ